diff options
author | Caolán McNamara <caolanm@redhat.com> | 2011-08-30 23:32:29 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2011-08-31 10:43:26 +0100 |
commit | 0aeacaf4e8be61091b578d96d5f540cd81f84d2b (patch) | |
tree | 03e9d553e2b5bf7fcba1608e2739a05dcf47727b /sfx2 | |
parent | skip solver dir itself (diff) | |
download | core-0aeacaf4e8be61091b578d96d5f540cd81f84d2b.tar.gz core-0aeacaf4e8be61091b578d96d5f540cd81f84d2b.zip |
various unused code
Diffstat (limited to 'sfx2')
-rw-r--r-- | sfx2/inc/sfx2/app.hxx | 8 | ||||
-rw-r--r-- | sfx2/inc/sfx2/frmdescr.hxx | 1 | ||||
-rw-r--r-- | sfx2/source/appl/app.cxx | 16 | ||||
-rw-r--r-- | sfx2/source/appl/appdde.cxx | 47 | ||||
-rw-r--r-- | sfx2/source/doc/frmdescr.cxx | 6 |
5 files changed, 11 insertions, 67 deletions
diff --git a/sfx2/inc/sfx2/app.hxx b/sfx2/inc/sfx2/app.hxx index ca78c56ad1b9..c11627bbe7d5 100644 --- a/sfx2/inc/sfx2/app.hxx +++ b/sfx2/inc/sfx2/app.hxx @@ -167,13 +167,7 @@ public: // DDE long DdeExecute( const String& rCmd ); - long DdeGetData( const String& rItem, - const String& rMimeType, - ::com::sun::star::uno::Any & rValue ); - long DdeSetData( const String& rItem, - const String& rMimeType, - const ::com::sun::star::uno::Any & rValue ); - sal_Bool InitializeDde(); + sal_Bool InitializeDde(); const DdeService* GetDdeService() const; DdeService* GetDdeService(); void AddDdeTopic( SfxObjectShell* ); diff --git a/sfx2/inc/sfx2/frmdescr.hxx b/sfx2/inc/sfx2/frmdescr.hxx index a0748d65a94b..ab268e15068e 100644 --- a/sfx2/inc/sfx2/frmdescr.hxx +++ b/sfx2/inc/sfx2/frmdescr.hxx @@ -113,7 +113,6 @@ public: { return aActualURL; } void SetActualURL( const INetURLObject& rURL ); void SetActualURL( const String& rURL ); - sal_Bool CheckContent() const; void SetReadOnly( sal_Bool bSet ) { bReadOnly = bSet;} sal_Bool IsReadOnly( ) const { return bReadOnly;} void SetEditable( sal_Bool bSet ); diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx index ed3695cdb940..f5be7bd92e0e 100644 --- a/sfx2/source/appl/app.cxx +++ b/sfx2/source/appl/app.cxx @@ -121,10 +121,6 @@ #include <sfx2/mnuitem.hxx> #endif -#if defined( WNT ) -#define DDE_AVAILABLE -#endif - #include <unotools/saveopt.hxx> #include <unotools/undoopt.hxx> #include <svtools/helpopt.hxx> @@ -323,11 +319,10 @@ SfxApplication::SfxApplication() RTL_LOGFILE_CONTEXT_TRACE( aLog, "{ initialize DDE" ); -#ifdef DDE_AVAILABLE -#ifndef DBG_UTIL - InitializeDde(); -#else - if( !InitializeDde() ) + sal_Bool bOk = InitializeDde(); + +#ifdef DBG_UTIL + if( !bOk ) { rtl::OStringBuffer aStr( RTL_CONSTASCII_STRINGPARAM("No DDE-Service possible. Error: ")); @@ -337,7 +332,8 @@ SfxApplication::SfxApplication() aStr.append('?'); DBG_ASSERT( sal_False, aStr.getStr() ); } -#endif +#else + (void)bOk; #endif pSfxHelp = new SfxHelp; diff --git a/sfx2/source/appl/appdde.cxx b/sfx2/source/appl/appdde.cxx index 1c93a6336e97..366c49f18aec 100644 --- a/sfx2/source/appl/appdde.cxx +++ b/sfx2/source/appl/appdde.cxx @@ -201,48 +201,6 @@ long SfxApplication::DdeExecute return 1; } -//-------------------------------------------------------------------- - -long SfxApplication::DdeGetData -( - const String&, // the Item to be addressed - const String&, // in: Format - ::com::sun::star::uno::Any& // out: requested data -) - -/* [Description] - - This method can be overloaded by application developers, to receive - DDE-data-requests directed to thier SfxApplication subclass. - - The base implementation provides no data and returns 0. -*/ - -{ - return 0; -} - -//-------------------------------------------------------------------- - -long SfxApplication::DdeSetData -( - const String&, // the Item to be addressed - const String&, // in: Format - const ::com::sun::star::uno::Any& // out: requested data -) - -/* [Description] - - This method can be overloaded by application developers, to receive - DDE-data directed to thier SfxApplication subclass. - - The base implementation is not receiving any data and returns 0. -*/ - -{ - return 0; -} - long SfxObjectShell::DdeExecute ( const String& rCmd // Expressed in our BASIC-Syntax @@ -436,11 +394,13 @@ long SfxViewFrame::DdeSetData sal_Bool SfxApplication::InitializeDde() { + int nError = 0; +#if defined( WNT ) DBG_ASSERT( !pAppData_Impl->pDdeService, "Dde can not be initialized multiple times" ); pAppData_Impl->pDdeService = new ImplDdeService( Application::GetAppName() ); - int nError = pAppData_Impl->pDdeService->GetError(); + nError = pAppData_Impl->pDdeService->GetError(); if( !nError ) { pAppData_Impl->pDocTopics = new SfxDdeDocTopics_Impl; @@ -458,6 +418,7 @@ sal_Bool SfxApplication::InitializeDde() pAppData_Impl->pTriggerTopic = new SfxDdeTriggerTopic_Impl; pAppData_Impl->pDdeService2->AddTopic( *pAppData_Impl->pTriggerTopic ); } +#endif return !nError; } diff --git a/sfx2/source/doc/frmdescr.cxx b/sfx2/source/doc/frmdescr.cxx index 383c843ab158..8a07a7b5944a 100644 --- a/sfx2/source/doc/frmdescr.cxx +++ b/sfx2/source/doc/frmdescr.cxx @@ -119,12 +119,6 @@ sal_Bool SfxFrameDescriptor::IsEditable() const return pImp->bEditable; } -sal_Bool SfxFrameDescriptor::CheckContent() const -{ - sal_Bool bRet = !( aURL == aActualURL ); - return bRet; -} - SfxFrameDescriptor* SfxFrameDescriptor::Clone( sal_Bool bWithIds ) const { SfxFrameDescriptor *pFrame = new SfxFrameDescriptor; |