diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-04-10 09:31:46 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-04-10 09:31:46 +0200 |
| commit | 1d25e1de0b9498e469cb052b2d86bf7f7ae6adae (patch) | |
| tree | aadf57192d9f7fb1c38c9fb7f8f5099b04fe17cf /sfx2/source/appl/appdde.cxx | |
| parent | 4f9674beaaa51b85d8405cf5d125ca19d55c1b32 (diff) | |
Clean up function declarations and some unused functions
Change-Id: I9d6e9df0b686c61597aaa0e194ab321445671a20
Diffstat (limited to 'sfx2/source/appl/appdde.cxx')
| -rw-r--r-- | sfx2/source/appl/appdde.cxx | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/sfx2/source/appl/appdde.cxx b/sfx2/source/appl/appdde.cxx index 65080b598a1d..c034467d832e 100644 --- a/sfx2/source/appl/appdde.cxx +++ b/sfx2/source/appl/appdde.cxx @@ -44,7 +44,7 @@ #include <comphelper/string.hxx> #include <com/sun/star/ucb/IllegalIdentifierException.hpp> - +#if defined WNT OUString SfxDdeServiceName_Impl( const OUString& sIn ) { @@ -60,7 +60,6 @@ OUString SfxDdeServiceName_Impl( const OUString& sIn ) return sReturn.makeStringAndClear(); } -#if defined( WNT ) class ImplDdeService : public DdeService { public: @@ -199,16 +198,19 @@ bool ImplDdeService::SysTopicExecute( const OUString* pStr ) class SfxDdeTriggerTopic_Impl : public DdeTopic { +#if defined WNT public: SfxDdeTriggerTopic_Impl() : DdeTopic( "TRIGGER" ) {} - virtual bool Execute( const OUString* ) SAL_OVERRIDE; + virtual bool Execute( const OUString* ) SAL_OVERRIDE { return true; } +#endif }; class SfxDdeDocTopic_Impl : public DdeTopic { +#if defined WNT public: SfxObjectShell* pSh; DdeData aData; @@ -223,6 +225,7 @@ public: virtual bool Execute( const OUString* ) SAL_OVERRIDE; virtual bool StartAdviseLoop() SAL_OVERRIDE; virtual bool MakeItem( const OUString& rItem ) SAL_OVERRIDE; +#endif }; @@ -555,6 +558,7 @@ void SfxApplication::AddDdeTopic( SfxObjectShell* pSh ) void SfxApplication::RemoveDdeTopic( SfxObjectShell* pSh ) { +#if defined WNT DBG_ASSERT( pAppData_Impl->pDocTopics, "There is no Dde-Service" ); //OV: DDE is disconnected in server mode! if( !pAppData_Impl->pDocTopics ) @@ -570,6 +574,9 @@ void SfxApplication::RemoveDdeTopic( SfxObjectShell* pSh ) pAppData_Impl->pDocTopics->erase( pAppData_Impl->pDocTopics->begin() + n ); } } +#else + (void) pSh; +#endif } const DdeService* SfxApplication::GetDdeService() const @@ -582,13 +589,7 @@ DdeService* SfxApplication::GetDdeService() return pAppData_Impl->pDdeService; } - - -bool SfxDdeTriggerTopic_Impl::Execute( const OUString* ) -{ - return true; -} - +#if defined WNT DdeData* SfxDdeDocTopic_Impl::Get( sal_uIntPtr nFormat ) { @@ -648,4 +649,6 @@ bool SfxDdeDocTopic_Impl::StartAdviseLoop() return bRet; } +#endif + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |