5 files changed, 18 insertions, 44 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: */
diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx
index 96f604a4fdec..b4452d4b05f7 100644
--- a/sfx2/source/appl/appopen.cxx
+++ b/sfx2/source/appl/appopen.cxx
@@ -84,6 +84,7 @@
 #include <sfx2/objitem.hxx>
 #include <sfx2/objsh.hxx>
 #include <svl/slstitm.hxx>
+#include "appopen.hxx"
 #include "objshimp.hxx"
 #include "openflag.hxx"
 #include <sfx2/passwd.hxx>
@@ -113,33 +114,6 @@ using namespace ::com::sun::star::container;
 using namespace ::cppu;
 using namespace ::sfx2;
 
-
-
-class SfxOpenDocStatusListener_Impl : public WeakImplHelper1< XDispatchResultListener >
-{
-public:
-    bool    bFinished;
-    bool    bSuccess;
-    virtual void SAL_CALL   dispatchFinished( const DispatchResultEvent& Event ) throw(RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual void SAL_CALL   disposing( const EventObject& Source ) throw(RuntimeException, std::exception) SAL_OVERRIDE;
-                            SfxOpenDocStatusListener_Impl()
-                                : bFinished( false )
-                                , bSuccess( false )
-                            {}
-};
-
-void SAL_CALL SfxOpenDocStatusListener_Impl::dispatchFinished( const DispatchResultEvent& aEvent ) throw(RuntimeException, std::exception)
-{
-    bSuccess = ( aEvent.State == DispatchResultState::SUCCESS );
-    bFinished = true;
-}
-
-void SAL_CALL SfxOpenDocStatusListener_Impl::disposing( const EventObject& ) throw(RuntimeException, std::exception)
-{
-}
-
-
-
 void SetTemplate_Impl( const OUString &rFileName,
                         const OUString &rLongName,
                         SfxObjectShell *pDoc)
diff --git a/sfx2/source/appl/fwkhelper.cxx b/sfx2/source/appl/fwkhelper.cxx
index 395e7c0fe0d3..af88e5519e58 100644
--- a/sfx2/source/appl/fwkhelper.cxx
+++ b/sfx2/source/appl/fwkhelper.cxx
@@ -17,13 +17,16 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <sal/config.h>
+
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/frame/XFrame.hpp>
-#include <sal/config.h>
+#include <framework/sfxhelperfunctions.hxx>
 
 #include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 
+#include "fwkhelper.hxx"
 #include "workwin.hxx"
 #include <sfx2/frame.hxx>
 
diff --git a/sfx2/source/appl/helpinterceptor.cxx b/sfx2/source/appl/helpinterceptor.cxx
index fa81e5455a69..a7dc82cb7c66 100644
--- a/sfx2/source/appl/helpinterceptor.cxx
+++ b/sfx2/source/appl/helpinterceptor.cxx
@@ -36,10 +36,6 @@ using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::util;
 using namespace ::com::sun::star::lang;
 
-extern void AppendConfigToken_Impl( OUString& rURL, bool bQuestionMark ); // sfxhelp.cxx
-
-// class HelpInterceptor_Impl --------------------------------------------
-
 HelpInterceptor_Impl::HelpInterceptor_Impl() :
 
     m_pHistory  ( NULL ),
diff --git a/sfx2/source/appl/linksrc.cxx b/sfx2/source/appl/linksrc.cxx
index 5c3e98c48b29..23ab8cb97883 100644
--- a/sfx2/source/appl/linksrc.cxx
+++ b/sfx2/source/appl/linksrc.cxx
@@ -185,8 +185,6 @@ struct SvLinkSource_Impl
     {
     }
     ~SvLinkSource_Impl();
-
-    void Closed();
 };
 
 SvLinkSource_Impl::~SvLinkSource_Impl()