Clean up function declarations and some unused functions

Change-Id: I7a2b5970fd0ab2059b5f5b0100a049e04ba54ee3

62 files changed, 499 insertions, 421 deletions

diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx
index e7ae612a2678..f859038f76da 100644
--- a/sd/source/ui/animations/CustomAnimationDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationDialog.cxx
@@ -68,6 +68,7 @@
 
 #include "glob.hrc"
 #include "CustomAnimationDialog.hxx"
+#include "CustomAnimationPane.hxx"
 #include "CustomAnimation.hrc"
 #include "STLPropertySet.hxx"
 
@@ -94,7 +95,6 @@ using ::com::sun::star::beans::XPropertySet;
 
 namespace sd {
 
-extern void fillRepeatComboBox( ListBox* pBox );
 extern void fillDurationComboBox( ListBox* pBox );
 extern OUString getShapeDescription( const Reference< XShape >& xShape, bool bWithText = true );
 extern OUString getPropertyName( sal_Int32 nPropertyType );
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx
index b188b6d602d5..38ad91a3d148 100644
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -44,6 +44,7 @@
 #include "CustomAnimationCreateDialog.hxx"
 #include "CustomAnimation.hrc"
 #include "CustomAnimationList.hxx"
+#include "createcustomanimationpanel.hxx"
 #include <vcl/lstbox.hxx>
 #include <vcl/fixed.hxx>
 
diff --git a/sd/source/ui/animations/CustomAnimationPane.hxx b/sd/source/ui/animations/CustomAnimationPane.hxx
index bc87ea36838b..1f71fe02936b 100644
--- a/sd/source/ui/animations/CustomAnimationPane.hxx
+++ b/sd/source/ui/animations/CustomAnimationPane.hxx
@@ -177,6 +177,8 @@ private:
     ScopeLock maSelectionLock;
 };
 
+void fillRepeatComboBox( ListBox* pBox );
+
 }
 
 #endif // INCLUDED_SD_SOURCE_UI_ANIMATIONS_CUSTOMANIMATIONPANE_HXX
diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx
index 42877a396a90..a3f18bf1c678 100644
--- a/sd/source/ui/animations/SlideTransitionPane.cxx
+++ b/sd/source/ui/animations/SlideTransitionPane.cxx
@@ -21,6 +21,7 @@
 
 #include "SlideTransitionPane.hxx"
 #include "CustomAnimation.hrc"
+#include "createslidetransitionpanel.hxx"
 
 #include "TransitionPreset.hxx"
 #include "sdresid.hxx"
@@ -85,15 +86,6 @@ struct TransitionEffect
     {
         init();
     }
-    explicit TransitionEffect( sal_Int16 nType, sal_Int16 nSubType,
-                               sal_Bool  bDirection, sal_Int32 nFadeColor ) :
-            mnType( nType),
-            mnSubType( nSubType ),
-            mbDirection( bDirection ),
-            mnFadeColor( nFadeColor )
-    {
-        init();
-    }
     explicit TransitionEffect( const SdPage & rPage ) :
             mnType( rPage.getTransitionType() ),
             mnSubType( rPage.getTransitionSubtype() ),
diff --git a/sd/source/ui/app/sddll.cxx b/sd/source/ui/app/sddll.cxx
index 9b09e9cfc651..7b6b89c9ea6d 100644
--- a/sd/source/ui/app/sddll.cxx
+++ b/sd/source/ui/app/sddll.cxx
@@ -28,6 +28,7 @@
 #include <svx/objfac3d.hxx>
 #include <vcl/svapp.hxx>
 
+#include "registerinterfaces.hxx"
 #include "sddll.hxx"
 #include "app.hrc"
 #include "AnimationChildWindow.hxx"
@@ -101,10 +102,6 @@
 using namespace ::rtl;
 using namespace ::com::sun::star;
 
-namespace sd { namespace ui { namespace table {
-    extern void RegisterInterfaces( SfxModule* pMod );
-} } }
-
 // Register all Factorys
 void SdDLL::RegisterFactorys()
 {
diff --git a/sd/source/ui/controller/slidelayoutcontroller.cxx b/sd/source/ui/controller/slidelayoutcontroller.cxx
index 2e82bf81f3bc..34a5e2b69412 100644
--- a/sd/source/ui/controller/slidelayoutcontroller.cxx
+++ b/sd/source/ui/controller/slidelayoutcontroller.cxx
@@ -44,6 +44,7 @@
 #include <sfx2/imagemgr.hxx>
 
 #include "app.hrc"
+#include "facreg.hxx"
 #include "glob.hrc"
 #include "strings.hrc"
 #include "res_bmp.hrc"
@@ -311,7 +312,7 @@ IMPL_LINK( LayoutToolbarMenu, SelectHdl, void *, pControl )
 
 
 
-OUString SlideLayoutController_getImplementationName()
+OUString SlideLayoutController_getImplementationName() throw (css::uno::RuntimeException)
 {
     return OUString( "com.sun.star.comp.sd.SlideLayoutController" );
 }
@@ -327,7 +328,7 @@ Sequence< OUString >  SlideLayoutController_getSupportedServiceNames() throw( Ru
 
 
 
-Reference< XInterface > SAL_CALL SlideLayoutController_createInstance( const Reference< XMultiServiceFactory >& rSMgr ) throw( RuntimeException )
+Reference< XInterface > SAL_CALL SlideLayoutController_createInstance( const Reference< XMultiServiceFactory >& rSMgr )
 {
     return static_cast< cppu::OWeakObject * >(
         new SlideLayoutController( comphelper::getComponentContext(rSMgr), ".uno:AssignLayout", false ));
@@ -335,7 +336,7 @@ Reference< XInterface > SAL_CALL SlideLayoutController_createInstance( const Ref
 
 
 
-OUString InsertSlideController_getImplementationName()
+OUString InsertSlideController_getImplementationName() throw (css::uno::RuntimeException)
 {
     return OUString( "com.sun.star.comp.sd.InsertSlideController" );
 }
@@ -351,7 +352,7 @@ Sequence< OUString >  InsertSlideController_getSupportedServiceNames() throw( Ru
 
 
 
-Reference< XInterface > SAL_CALL InsertSlideController_createInstance( const Reference< XMultiServiceFactory >& rSMgr ) throw( RuntimeException )
+Reference< XInterface > SAL_CALL InsertSlideController_createInstance( const Reference< XMultiServiceFactory >& rSMgr )
 {
     return static_cast< cppu::OWeakObject * >(
         new SlideLayoutController( comphelper::getComponentContext(rSMgr), ".uno:InsertPage" , true ) );
diff --git a/sd/source/ui/dlg/dlgass.cxx b/sd/source/ui/dlg/dlgass.cxx
index 59eab0c9242f..3baf0d0a6586 100644
--- a/sd/source/ui/dlg/dlgass.cxx
+++ b/sd/source/ui/dlg/dlgass.cxx
@@ -254,7 +254,6 @@ public:
     OUString GetUiTextForCommand (const OUString& aCommandURL);
     Image GetUiIconForCommand (const OUString& aCommandURL);
 
-    DECL_LINK( StartScanHdl, void * );
     DECL_LINK( SelectFileHdl, void * );
     DECL_LINK( SelectRegionHdl, ListBox * );
     DECL_LINK( UpdatePreviewHdl, void * );
diff --git a/sd/source/ui/dlg/headerfooterdlg.cxx b/sd/source/ui/dlg/headerfooterdlg.cxx
index e7dd0cd553f9..32db72343837 100644
--- a/sd/source/ui/dlg/headerfooterdlg.cxx
+++ b/sd/source/ui/dlg/headerfooterdlg.cxx
@@ -137,15 +137,12 @@ private:
     Edit*        mpTBFooter;
 
     CheckBox*   mpCBSlideNumber;
-    FixedText*   mpFTPageNumber;
 
     CheckBox*    mpCBNotOnTitle;
 
     PresLayoutPreview*   mpCTPreview;
 
-    SdPage*             mpCurrentPage;
     SdDrawDocument*    mpDoc;
-    HeaderFooterDialog* mpDialog;
     LanguageType        meOldLanguage;
 
     bool            mbHandoutMode;
@@ -159,12 +156,9 @@ private:
     void GetOrSetDateTimeLanguage( LanguageType &rLanguage, bool bSet, SdPage* pPage );
 
 public:
-    HeaderFooterTabPage( HeaderFooterDialog* pDialog, ::Window* pParent, SdDrawDocument* pDoc, SdPage* pActualPage, bool bHandoutMode );
+    HeaderFooterTabPage( ::Window* pParent, SdDrawDocument* pDoc, SdPage* pActualPage, bool bHandoutMode );
     virtual ~HeaderFooterTabPage();
 
-    static  SfxTabPage* Create( ::Window*, const SfxItemSet& );
-    static  sal_uInt16*    GetRanges();
-
     void    init( const HeaderFooterSettings& rSettings, bool bNotOnTitle );
     void    getData( HeaderFooterSettings& rSettings, bool& rNotOnTitle );
     void    update();
@@ -210,7 +204,7 @@ HeaderFooterDialog::HeaderFooterDialog( ViewShell* pViewShell, ::Window* pParent
     mpTabCtrl->Show();
 
     mnSlidesId = mpTabCtrl->GetPageId("slides");
-    mpSlideTabPage = new HeaderFooterTabPage( this, mpTabCtrl, pDoc, pSlide, false );
+    mpSlideTabPage = new HeaderFooterTabPage( mpTabCtrl, pDoc, pSlide, false );
     mpTabCtrl->SetTabPage( mnSlidesId, mpSlideTabPage );
 
     Size aSiz = mpSlideTabPage->GetSizePixel();
@@ -223,7 +217,7 @@ HeaderFooterDialog::HeaderFooterDialog( ViewShell* pViewShell, ::Window* pParent
     }
 
     mnNotesId = mpTabCtrl->GetPageId("notes");
-    mpNotesHandoutsTabPage = new HeaderFooterTabPage( this, mpTabCtrl, pDoc, pNotes, true );
+    mpNotesHandoutsTabPage = new HeaderFooterTabPage( mpTabCtrl, pDoc, pNotes, true );
     mpTabCtrl->SetTabPage( mnNotesId, mpNotesHandoutsTabPage );
 
     get(maPBApplyToAll, "apply_all" );
@@ -427,11 +421,9 @@ void HeaderFooterDialog::change( SdUndoGroup* pUndoGroup, SdPage* pPage, const H
 
 
 
-HeaderFooterTabPage::HeaderFooterTabPage( HeaderFooterDialog* pDialog, ::Window* pWindow, SdDrawDocument* pDoc, SdPage* pActualPage, bool bHandoutMode ) :
+HeaderFooterTabPage::HeaderFooterTabPage( ::Window* pWindow, SdDrawDocument* pDoc, SdPage* pActualPage, bool bHandoutMode ) :
         TabPage( pWindow, "HeaderFooterTab", "modules/simpress/ui/headerfootertab.ui" ),
-        mpCurrentPage(pActualPage),
         mpDoc(pDoc),
-        mpDialog(pDialog),
         mbHandoutMode( bHandoutMode )
 {
     get(mpFTIncludeOn, "include_label");
diff --git a/sd/source/ui/docshell/docshell.cxx b/sd/source/ui/docshell/docshell.cxx
index 573fb792f689..8999bdf5cee4 100644
--- a/sd/source/ui/docshell/docshell.cxx
+++ b/sd/source/ui/docshell/docshell.cxx
@@ -81,8 +81,6 @@ SFX_IMPL_INTERFACE(DrawDocShell, SfxObjectShell, SdResId(0))
 
 namespace sd {
 
-GraphicFilter* GetGrfFilter();
-
 /**
  * slotmaps and definitions of SFX
  */
diff --git a/sd/source/ui/framework/configuration/Configuration.cxx b/sd/source/ui/framework/configuration/Configuration.cxx
index 9684d916aed8..ace59d79e546 100644
--- a/sd/source/ui/framework/configuration/Configuration.cxx
+++ b/sd/source/ui/framework/configuration/Configuration.cxx
@@ -22,6 +22,8 @@
 
 #include "framework/FrameworkHelper.hxx"
 
+#include <facreg.hxx>
+
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::drawing::framework;
@@ -62,7 +64,7 @@ public:
 //----- Service ---------------------------------------------------------------
 
 Reference<XInterface> SAL_CALL Configuration_createInstance (
-    const Reference<XComponentContext>& rxContext)
+    const Reference<XComponentContext>& rxContext) throw (css::uno::Exception)
 {
     (void)rxContext;
     return Reference<XInterface>(static_cast<XWeak*>(new Configuration(NULL,false)));
diff --git a/sd/source/ui/framework/configuration/ConfigurationController.cxx b/sd/source/ui/framework/configuration/ConfigurationController.cxx
index 989570442f0a..957f7ef05f56 100644
--- a/sd/source/ui/framework/configuration/ConfigurationController.cxx
+++ b/sd/source/ui/framework/configuration/ConfigurationController.cxx
@@ -30,6 +30,7 @@
 #include "ConfigurationClassifier.hxx"
 #include "ViewShellBase.hxx"
 #include "DrawController.hxx"
+#include "facreg.hxx"
 #include <com/sun/star/drawing/framework/XControllerManager.hpp>
 #include <com/sun/star/util/XURLTransformer.hpp>
 
@@ -44,7 +45,7 @@ using ::sd::framework::FrameworkHelper;
 namespace sd { namespace framework {
 
 Reference<XInterface> SAL_CALL ConfigurationController_createInstance (
-    const Reference<XComponentContext>& rxContext)
+    const Reference<XComponentContext>& rxContext) throw (css::uno::Exception)
 {
     (void)rxContext;
     return static_cast<XWeak*>(new ConfigurationController());
diff --git a/sd/source/ui/framework/configuration/ResourceId.cxx b/sd/source/ui/framework/configuration/ResourceId.cxx
index 7c7f2cad7380..a09a06d7df01 100644
--- a/sd/source/ui/framework/configuration/ResourceId.cxx
+++ b/sd/source/ui/framework/configuration/ResourceId.cxx
@@ -27,6 +27,8 @@
 #include <comphelper/processfactory.hxx>
 #include <rtl/ref.hxx>
 
+#include <facreg.hxx>
+
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
@@ -43,7 +45,7 @@ using namespace ::com::sun::star::drawing::framework;
 namespace sd { namespace framework {
 
 Reference<XInterface> SAL_CALL ResourceId_createInstance (
-    const Reference<XComponentContext>& rxContext)
+    const Reference<XComponentContext>& rxContext) throw (css::uno::Exception)
 {
     (void)rxContext;
     return Reference<XInterface>(static_cast<XWeak*>(new ::sd::framework::ResourceId()));
diff --git a/sd/source/ui/framework/factories/BasicPaneFactory.cxx b/sd/source/ui/framework/factories/BasicPaneFactory.cxx
index 4d10a1368eae..3c7a2382f81a 100644
--- a/sd/source/ui/framework/factories/BasicPaneFactory.cxx
+++ b/sd/source/ui/framework/factories/BasicPaneFactory.cxx
@@ -19,6 +19,7 @@
 
 
 #include "BasicPaneFactory.hxx"
+#include "facreg.hxx"
 
 #include "ChildWindowPane.hxx"
 #include "FrameWindowPane.hxx"
@@ -86,7 +87,7 @@ public:
 
 
 Reference<XInterface> SAL_CALL BasicPaneFactory_createInstance (
-    const Reference<XComponentContext>& rxContext)
+    const Reference<XComponentContext>& rxContext) throw (css::uno::Exception)
 {
     return Reference<XInterface>(static_cast<XWeak*>(new BasicPaneFactory(rxContext)));
 }
diff --git a/sd/source/ui/framework/factories/BasicToolBarFactory.cxx b/sd/source/ui/framework/factories/BasicToolBarFactory.cxx
index e05f32e9da9a..de217914d828 100644
--- a/sd/source/ui/framework/factories/BasicToolBarFactory.cxx
+++ b/sd/source/ui/framework/factories/BasicToolBarFactory.cxx
@@ -21,6 +21,7 @@
 #include "BasicToolBarFactory.hxx"
 
 #include "ViewTabBar.hxx"
+#include "facreg.hxx"
 #include "framework/FrameworkHelper.hxx"
 #include <unotools/mediadescriptor.hxx>
 
@@ -36,7 +37,7 @@ namespace sd { namespace framework {
 
 
 Reference<XInterface> SAL_CALL BasicToolBarFactory_createInstance (
-    const Reference<XComponentContext>& rxContext)
+    const Reference<XComponentContext>& rxContext) throw (css::uno::Exception)
 {
     return static_cast<XWeak*>(new BasicToolBarFactory(rxContext));
 }
diff --git a/sd/source/ui/framework/factories/BasicViewFactory.cxx b/sd/source/ui/framework/factories/BasicViewFactory.cxx
index 1bcd6e350eeb..d45e5e44b64b 100644
--- a/sd/source/ui/framework/factories/BasicViewFactory.cxx
+++ b/sd/source/ui/framework/factories/BasicViewFactory.cxx
@@ -36,6 +36,7 @@
 #include "PresentationViewShell.hxx"
 #include "SlideSorterViewShell.hxx"
 #include "FrameView.hxx"
+#include "facreg.hxx"
 
 #include <sfx2/viewfrm.hxx>
 #include <vcl/wrkwin.hxx>
@@ -55,7 +56,7 @@ namespace sd { namespace framework {
 
 
 Reference<XInterface> SAL_CALL BasicViewFactory_createInstance (
-    const Reference<XComponentContext>& rxContext)
+    const Reference<XComponentContext>& rxContext) throw (css::uno::Exception)
 {
     return Reference<XInterface>(static_cast<XWeak*>(new BasicViewFactory(rxContext)));
 }
diff --git a/sd/source/ui/framework/factories/PresentationFactory.cxx b/sd/source/ui/framework/factories/PresentationFactory.cxx
index 0639765115a3..52892f876488 100644
--- a/sd/source/ui/framework/factories/PresentationFactory.cxx
+++ b/sd/source/ui/framework/factories/PresentationFactory.cxx
@@ -23,6 +23,7 @@
 #include "framework/FrameworkHelper.hxx"
 #include "DrawController.hxx"
 #include "ViewShellBase.hxx"
+#include "facreg.hxx"
 #include <com/sun/star/drawing/framework/XControllerManager.hpp>
 #include <cppuhelper/compbase1.hxx>
 #include <tools/diagnose_ex.h>
@@ -98,7 +99,7 @@ private:
 //===== PresentationFactoryProvider service ===================================
 
 Reference<XInterface> SAL_CALL PresentationFactoryProvider_createInstance (
-    const Reference<XComponentContext>& rxContext)
+    const Reference<XComponentContext>& rxContext) throw (css::uno::Exception)
 {
     return Reference<XInterface>(static_cast<XWeak*>(new PresentationFactoryProvider(rxContext)));
 }
diff --git a/sd/source/ui/framework/module/ModuleController.cxx b/sd/source/ui/framework/module/ModuleController.cxx
index 568d2b04e172..8269c73ba45f 100644
--- a/sd/source/ui/framework/module/ModuleController.cxx
+++ b/sd/source/ui/framework/module/ModuleController.cxx
@@ -27,6 +27,8 @@
 
 #include <tools/diagnose_ex.h>
 
+#include <facreg.hxx>
+
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::drawing::framework;
@@ -66,7 +68,7 @@ public:
 
 
 Reference<XInterface> SAL_CALL ModuleController_createInstance (
-    const Reference<XComponentContext>& rxContext)
+    const Reference<XComponentContext>& rxContext) throw (css::uno::Exception)
 {
     return Reference<XInterface>(ModuleController::CreateInstance(rxContext), UNO_QUERY);
 }
diff --git a/sd/source/ui/inc/createcustomanimationpanel.hxx b/sd/source/ui/inc/createcustomanimationpanel.hxx
new file mode 100644
index 000000000000..6054f3e8ee4f
--- /dev/null
+++ b/sd/source/ui/inc/createcustomanimationpanel.hxx
@@ -0,0 +1,33 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#ifndef INCLUDED_SD_SOURCE_UI_INC_CREATESLIDETRANSITIONPANEL_HXX
+#define INCLUDED_SD_SOURCE_UI_INC_CREATESLIDETRANSITIONPANEL_HXX
+
+#include <sal/config.h>
+
+namespace sd {
+
+::Window * createCustomAnimationPanel (::Window* pParent, ViewShellBase& rBase, const cssu::Reference<css::frame::XFrame>& rxFrame);
+
+}
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/inc/createslidetransitionpanel.hxx b/sd/source/ui/inc/createslidetransitionpanel.hxx
new file mode 100644
index 000000000000..db9c60715f5f
--- /dev/null
+++ b/sd/source/ui/inc/createslidetransitionpanel.hxx
@@ -0,0 +1,33 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#ifndef INCLUDED_SD_SOURCE_UI_INC_CREATESLIDETRANSITIONPANEL_HXX
+#define INCLUDED_SD_SOURCE_UI_INC_CREATESLIDETRANSITIONPANEL_HXX
+
+#include <sal/config.h>
+
+namespace sd {
+
+::Window* createSlideTransitionPanel (::Window* pParent, ViewShellBase& rBase, const cssu::Reference<css::frame::XFrame>& rxFrame);
+
+}
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/inc/createtabledesignpanel.hxx b/sd/source/ui/inc/createtabledesignpanel.hxx
new file mode 100644
index 000000000000..ceaa882cfda6
--- /dev/null
+++ b/sd/source/ui/inc/createtabledesignpanel.hxx
@@ -0,0 +1,33 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#ifndef INCLUDED_SD_SOURCE_UI_INC_CREATETABLEDESIGNPANEL_HXX
+#define INCLUDED_SD_SOURCE_UI_INC_CREATETABLEDESIGNPANEL_HXX
+
+#include <sal/config.h>
+
+namespace sd {
+
+::Window * createTableDesignPanel (::Window* pParent, ViewShellBase& rBase);
+
+}
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/inc/createtableobjectbar.hxx b/sd/source/ui/inc/createtableobjectbar.hxx
new file mode 100644
index 000000000000..5ed8e4393ca5
--- /dev/null
+++ b/sd/source/ui/inc/createtableobjectbar.hxx
@@ -0,0 +1,38 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#ifndef INCLUDED_SD_SOURCE_UI_INC_CREATETABLEOBJECTBAR_HXX
+#define INCLUDED_SD_SOURCE_UI_INC_CREATETABLEOBJECTBAR_HXX
+
+#include <sal/config.h>
+
+namespace sd {
+    class View;
+    class ViewShell;
+}
+
+namespace sd { namespace ui { namespace table {
+
+SfxShell* CreateTableObjectBar( ViewShell& rShell, ::sd::View* pView );
+
+} } }
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/inc/facreg.hxx b/sd/source/ui/inc/facreg.hxx
new file mode 100644
index 000000000000..d6be721ac071
--- /dev/null
+++ b/sd/source/ui/inc/facreg.hxx
@@ -0,0 +1,187 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#ifndef INCLUDED_SD_SOURCE_UI_INC_FACREG_HXX
+#define INCLUDED_SD_SOURCE_UI_INC_FACREG_HXX
+
+#include <sal/config.h>
+
+namespace com { namespace sun { namespace star {
+    namespace lang { class XMultiServiceFactory; }
+    namespace uno { class XComponentContext; }
+} } }
+
+css::uno::Reference< css::uno::XInterface > SAL_CALL SdDrawingDocument_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & _rxFactory, const sal_uInt64 _nCreationFlags );
+OUString SdDrawingDocument_getImplementationName() throw( css::uno::RuntimeException );
+css::uno::Sequence< OUString > SAL_CALL SdDrawingDocument_getSupportedServiceNames() throw( css::uno::RuntimeException );
+
+css::uno::Reference< css::uno::XInterface > SAL_CALL SdPresentationDocument_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & _rxFactory, const sal_uInt64 _nCreationFlags );
+OUString SdPresentationDocument_getImplementationName() throw( css::uno::RuntimeException );
+css::uno::Sequence< OUString > SAL_CALL SdPresentationDocument_getSupportedServiceNames() throw( css::uno::RuntimeException );
+
+css::uno::Reference< css::uno::XInterface > SAL_CALL SdHtmlOptionsDialog_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & _rxFactory );
+OUString SdHtmlOptionsDialog_getImplementationName() throw( css::uno::RuntimeException );
+css::uno::Sequence< OUString > SAL_CALL SdHtmlOptionsDialog_getSupportedServiceNames() throw( css::uno::RuntimeException );
+
+css::uno::Reference< css::uno::XInterface > SAL_CALL SdUnoModule_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & _rxFactory );
+OUString SdUnoModule_getImplementationName() throw( css::uno::RuntimeException );
+css::uno::Sequence< OUString > SAL_CALL SdUnoModule_getSupportedServiceNames() throw( css::uno::RuntimeException );
+
+namespace sd
+{
+css::uno::Reference< css::uno::XInterface > SAL_CALL RandomNode_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & _rxFactory );
+OUString RandomNode__getImplementationName() throw( css::uno::RuntimeException );
+css::uno::Sequence< OUString > SAL_CALL RandomNode_getSupportedServiceNames() throw( css::uno::RuntimeException );
+
+css::uno::Reference< css::uno::XInterface > SAL_CALL SlideLayoutController_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & _rxFactory );
+OUString SlideLayoutController_getImplementationName() throw( css::uno::RuntimeException );
+css::uno::Sequence< OUString >  SlideLayoutController_getSupportedServiceNames() throw( css::uno::RuntimeException );
+
+css::uno::Reference< css::uno::XInterface > SAL_CALL InsertSlideController_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & _rxFactory );
+OUString InsertSlideController_getImplementationName() throw( css::uno::RuntimeException );
+css::uno::Sequence< OUString >  InsertSlideController_getSupportedServiceNames() throw( css::uno::RuntimeException );
+}
+
+namespace sd { namespace framework {
+
+css::uno::Reference<css::uno::XInterface> SAL_CALL Configuration_createInstance(
+    const css::uno::Reference<css::uno::XComponentContext>& rxContext)
+    throw(css::uno::Exception);
+OUString Configuration_getImplementationName(void) throw (css::uno::RuntimeException);
+css::uno::Sequence<OUString> SAL_CALL Configuration_getSupportedServiceNames (void)
+    throw (css::uno::RuntimeException);
+
+css::uno::Reference<css::uno::XInterface> SAL_CALL ConfigurationController_createInstance(
+    const css::uno::Reference<css::uno::XComponentContext>& rxContext)
+    throw(css::uno::Exception);
+OUString ConfigurationController_getImplementationName(void) throw (css::uno::RuntimeException);
+css::uno::Sequence<OUString> SAL_CALL ConfigurationController_getSupportedServiceNames (void)
+    throw (css::uno::RuntimeException);
+
+css::uno::Reference<css::uno::XInterface> SAL_CALL ModuleController_createInstance(
+    const css::uno::Reference<css::uno::XComponentContext>& rxContext)
+    throw(css::uno::Exception);
+OUString ModuleController_getImplementationName(void) throw (css::uno::RuntimeException);
+css::uno::Sequence<OUString> SAL_CALL ModuleController_getSupportedServiceNames (void)
+    throw (css::uno::RuntimeException);
+
+css::uno::Reference<css::uno::XInterface> SAL_CALL BasicPaneFactory_createInstance(
+    const css::uno::Reference<css::uno::XComponentContext>& rxContext)
+    throw(css::uno::Exception);
+OUString BasicPaneFactory_getImplementationName(void) throw (css::uno::RuntimeException);
+css::uno::Sequence<OUString> SAL_CALL BasicPaneFactory_getSupportedServiceNames (void)
+    throw (css::uno::RuntimeException);
+
+css::uno::Reference<css::uno::XInterface> SAL_CALL BasicToolBarFactory_createInstance(
+    const css::uno::Reference<css::uno::XComponentContext>& rxContext)
+    throw(css::uno::Exception);
+OUString BasicToolBarFactory_getImplementationName(void) throw (css::uno::RuntimeException);
+css::uno::Sequence<OUString> SAL_CALL BasicToolBarFactory_getSupportedServiceNames (void)
+    throw (css::uno::RuntimeException);
+
+css::uno::Reference<css::uno::XInterface> SAL_CALL BasicViewFactory_createInstance(
+    const css::uno::Reference<css::uno::XComponentContext>& rxContext)
+    throw(css::uno::Exception);
+OUString BasicViewFactory_getImplementationName(void) throw (css::uno::RuntimeException);
+css::uno::Sequence<OUString> SAL_CALL BasicViewFactory_getSupportedServiceNames (void)
+    throw (css::uno::RuntimeException);
+
+css::uno::Reference<css::uno::XInterface> SAL_CALL ResourceId_createInstance(
+    const css::uno::Reference<css::uno::XComponentContext>& rxContext)
+    throw(css::uno::Exception);
+OUString ResourceId_getImplementationName(void) throw (css::uno::RuntimeException);
+css::uno::Sequence<OUString> SAL_CALL ResourceId_getSupportedServiceNames (void)
+    throw (css::uno::RuntimeException);
+
+css::uno::Reference<css::uno::XInterface> SAL_CALL PresentationFactoryProvider_createInstance(
+    const css::uno::Reference<css::uno::XComponentContext>& rxContext)
+    throw(css::uno::Exception);
+OUString PresentationFactoryProvider_getImplementationName(void)
+    throw (css::uno::RuntimeException);
+css::uno::Sequence<OUString> SAL_CALL PresentationFactoryProvider_getSupportedServiceNames (void)
+    throw (css::uno::RuntimeException);
+} }
+
+namespace sd { namespace sidebar {
+
+css::uno::Reference<css::uno::XInterface> SAL_CALL PanelFactory_createInstance(
+    const css::uno::Reference<css::uno::XComponentContext>& rxContext)
+    throw(css::uno::Exception);
+OUString PanelFactory_getImplementationName(void) throw (css::uno::RuntimeException);
+css::uno::Sequence<OUString> SAL_CALL PanelFactory_getSupportedServiceNames (void)
+    throw (css::uno::RuntimeException);
+
+} }
+
+namespace sd { namespace presenter {
+css::uno::Reference<css::uno::XInterface> SAL_CALL SlideRenderer_createInstance(
+    const css::uno::Reference<css::uno::XComponentContext>& rxContext)
+    throw(css::uno::Exception);
+OUString SlideRenderer_getImplementationName(void)
+    throw (css::uno::RuntimeException);
+css::uno::Sequence<OUString> SAL_CALL SlideRenderer_getSupportedServiceNames (void)
+    throw (css::uno::RuntimeException);
+
+css::uno::Reference<css::uno::XInterface> SAL_CALL PresenterCanvas_createInstance(
+    const css::uno::Reference<css::uno::XComponentContext>& rxContext)
+    throw(css::uno::Exception);
+OUString PresenterCanvas_getImplementationName(void)
+    throw (css::uno::RuntimeException);
+css::uno::Sequence<OUString> SAL_CALL PresenterCanvas_getSupportedServiceNames (void)
+    throw (css::uno::RuntimeException);
+
+css::uno::Reference<css::uno::XInterface> SAL_CALL PresenterTextViewService_createInstance(
+    const css::uno::Reference<css::uno::XComponentContext>& rxContext)
+    throw(css::uno::Exception);
+OUString PresenterTextViewService_getImplementationName(void)
+    throw (css::uno::RuntimeException);
+css::uno::Sequence<OUString> SAL_CALL PresenterTextViewService_getSupportedServiceNames (void)
+    throw (css::uno::RuntimeException);
+
+css::uno::Reference<css::uno::XInterface> SAL_CALL PresenterHelperService_createInstance(
+    const css::uno::Reference<css::uno::XComponentContext>& rxContext)
+    throw(css::uno::Exception);
+OUString PresenterHelperService_getImplementationName(void)
+    throw (css::uno::RuntimeException);
+css::uno::Sequence<OUString> SAL_CALL PresenterHelperService_getSupportedServiceNames (void)
+    throw (css::uno::RuntimeException);
+
+css::uno::Reference<css::uno::XInterface> SAL_CALL PresenterPreviewCache_createInstance(
+    const css::uno::Reference<css::uno::XComponentContext>& rxContext)
+    throw(css::uno::Exception);
+OUString PresenterPreviewCache_getImplementationName(void)
+    throw (css::uno::RuntimeException);
+css::uno::Sequence<OUString> SAL_CALL PresenterPreviewCache_getSupportedServiceNames (void)
+    throw (css::uno::RuntimeException);
+} }
+
+
+namespace sd { namespace slidesorter {
+css::uno::Reference<css::uno::XInterface> SAL_CALL SlideSorterService_createInstance(
+    const css::uno::Reference<css::uno::XComponentContext>& rxContext)
+    throw(css::uno::Exception);
+OUString SlideSorterService_getImplementationName(void)
+    throw (css::uno::RuntimeException);
+css::uno::Sequence<OUString> SAL_CALL SlideSorterService_getSupportedServiceNames (void)
+    throw (css::uno::RuntimeException);
+} }
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/inc/registerinterfaces.hxx b/sd/source/ui/inc/registerinterfaces.hxx
new file mode 100644
index 000000000000..8d30575e9455
--- /dev/null
+++ b/sd/source/ui/inc/registerinterfaces.hxx
@@ -0,0 +1,33 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#ifndef INCLUDED_SD_SOURCE_UI_INC_REGISTERINTERFACES_HXX
+#define INCLUDED_SD_SOURCE_UI_INC_REGISTERINTERFACES_HXX
+
+#include <sal/config.h>
+
+namespace sd { namespace ui { namespace table {
+
+void RegisterInterfaces( SfxModule* pMod );
+
+} } }
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/inc/tablefunction.hxx b/sd/source/ui/inc/tablefunction.hxx
new file mode 100644
index 000000000000..b6e14c63e412
--- /dev/null
+++ b/sd/source/ui/inc/tablefunction.hxx
@@ -0,0 +1,33 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#ifndef INCLUDED_SD_SOURCE_UI_INC_TABLEFUNCTION_HXX
+#define INCLUDED_SD_SOURCE_UI_INC_TABLEFUNCTION_HXX
+
+#include <sal/config.h>
+
+namespace sd {
+
+void CreateTableFromRTF( SvStream& rStream, SdDrawDocument* pModel );
+
+}
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/presenter/PresenterCanvas.cxx b/sd/source/ui/presenter/PresenterCanvas.cxx
index f2f6ae76fb53..e5184930a7f1 100644
--- a/sd/source/ui/presenter/PresenterCanvas.cxx
+++ b/sd/source/ui/presenter/PresenterCanvas.cxx
@@ -19,6 +19,7 @@
 
 
 #include "PresenterCanvas.hxx"
+#include "facreg.hxx"
 
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
@@ -42,7 +43,7 @@ namespace sd { namespace presenter {
 //===== Service ===============================================================
 
 Reference<XInterface> SAL_CALL PresenterCanvas_createInstance (
-    const Reference<XComponentContext>& rxContext)
+    const Reference<XComponentContext>& rxContext) throw (css::uno::Exception)
 {
     (void)rxContext;
     return Reference<XInterface>(static_cast<XWeak*>(new PresenterCanvas()));
diff --git a/sd/source/ui/presenter/PresenterHelper.cxx b/sd/source/ui/presenter/PresenterHelper.cxx
index e186ac943aa7..a50df63b74f8 100644
--- a/sd/source/ui/presenter/PresenterHelper.cxx
+++ b/sd/source/ui/presenter/PresenterHelper.cxx
@@ -24,6 +24,7 @@
 #include "PresenterHelper.hxx"
 #include "CanvasUpdateRequester.hxx"
 #include "PresenterCanvas.hxx"
+#include "facreg.hxx"
 #include <cppcanvas/vclfactory.hxx>
 #include <com/sun/star/awt/WindowAttribute.hpp>
 #include <com/sun/star/awt/WindowClass.hpp>
@@ -44,7 +45,7 @@ namespace sd { namespace presenter {
 //===== Service ===============================================================
 
 Reference<XInterface> SAL_CALL PresenterHelperService_createInstance (
-    const Reference<XComponentContext>& rxContext)
+    const Reference<XComponentContext>& rxContext) throw (css::uno::Exception)
 {
     return Reference<XInterface>(static_cast<XWeak*>(new PresenterHelper(rxContext)));
 }
diff --git a/sd/source/ui/presenter/PresenterPreviewCache.cxx b/sd/source/ui/presenter/PresenterPreviewCache.cxx
index b8f43befe6e6..998cbb1a12a4 100644
--- a/sd/source/ui/presenter/PresenterPreviewCache.cxx
+++ b/sd/source/ui/presenter/PresenterPreviewCache.cxx
@@ -19,6 +19,7 @@
 
 
 #include "PresenterPreviewCache.hxx"
+#include "facreg.hxx"
 
 #include "cache/SlsCacheContext.hxx"
 #include "tools/IdleDetection.hxx"
@@ -77,7 +78,7 @@ private:
 //===== Service ===============================================================
 
 Reference<XInterface> SAL_CALL PresenterPreviewCache_createInstance (
-    const Reference<XComponentContext>& rxContext)
+    const Reference<XComponentContext>& rxContext) throw (css::uno::Exception)
 {
     return Reference<XInterface>(static_cast<XWeak*>(new PresenterPreviewCache(rxContext)));
 }
diff --git a/sd/source/ui/presenter/PresenterTextView.cxx b/sd/source/ui/presenter/PresenterTextView.cxx
index b3cea2b393d0..bc595f1139b3 100644
--- a/sd/source/ui/presenter/PresenterTextView.cxx
+++ b/sd/source/ui/presenter/PresenterTextView.cxx
@@ -19,6 +19,7 @@
 
 
 #include "PresenterTextView.hxx"
+#include "facreg.hxx"
 
 #include <i18nlangtag/mslangid.hxx>
 #include <cppcanvas/vclfactory.hxx>
@@ -52,7 +53,7 @@ namespace sd { namespace presenter {
 
 // Service
 Reference<XInterface> SAL_CALL PresenterTextViewService_createInstance (
-    const Reference<XComponentContext>& rxContext)
+    const Reference<XComponentContext>& rxContext) throw (css::uno::Exception)
 {
     return Reference<XInterface>(static_cast<XWeak*>(new PresenterTextView(rxContext)));
 }
diff --git a/sd/source/ui/presenter/SlideRenderer.cxx b/sd/source/ui/presenter/SlideRenderer.cxx
index ff42f71582c2..0526a0de7bee 100644
--- a/sd/source/ui/presenter/SlideRenderer.cxx
+++ b/sd/source/ui/presenter/SlideRenderer.cxx
@@ -19,6 +19,7 @@
 
 
 #include "SlideRenderer.hxx"
+#include "facreg.hxx"
 #include "sdpage.hxx"
 #include <toolkit/helper/vclunohelper.hxx>
 #include <com/sun/star/rendering/XBitmapCanvas.hpp>
@@ -34,7 +35,7 @@ namespace sd { namespace presenter {
 //===== Service ===============================================================
 
 Reference<XInterface> SAL_CALL SlideRenderer_createInstance (
-    const Reference<XComponentContext>& rxContext)
+    const Reference<XComponentContext>& rxContext) throw (css::uno::Exception)
 {
     return Reference<XInterface>(static_cast<XWeak*>(new SlideRenderer(rxContext)));
 }
diff --git a/sd/source/ui/remotecontrol/ImagePreparer.cxx b/sd/source/ui/remotecontrol/ImagePreparer.cxx
index ba998880b303..3a022b2d4975 100644
--- a/sd/source/ui/remotecontrol/ImagePreparer.cxx
+++ b/sd/source/ui/remotecontrol/ImagePreparer.cxx
@@ -201,8 +201,6 @@ void ImagePreparer::sendNotes( sal_uInt32 aSlideNumber )
         Transmitter::PRIORITY_LOW );
 }
 
-sal_Bool ExportTo( uno::Reference< drawing::XDrawPage>& aNotesPage, const OUString& aUrl );
-
 // Code copied from sdremote/source/presenter/PresenterNotesView.cxx
 OString ImagePreparer::prepareNotes( sal_uInt32 aSlideNumber )
 {
@@ -283,119 +281,4 @@ OString ImagePreparer::prepareNotes( sal_uInt32 aSlideNumber )
         aRet.makeStringAndClear(), RTL_TEXTENCODING_UTF8 );
 }
 
-sal_Bool ExportTo( uno::Reference< drawing::XDrawPage>& aNotesPage, const OUString& aUrl )
-{
-    OUString aFilterName( "XHTML Draw File" );
-    uno::Reference< document::XExporter > xExporter;
-
-    {
-        uno::Reference< lang::XMultiServiceFactory >  xMan = ::comphelper::getProcessServiceFactory();
-        uno::Reference < lang::XMultiServiceFactory > xFilterFact (
-                xMan->createInstance( "com.sun.star.document.FilterFactory" ), uno::UNO_QUERY );
-
-        uno::Sequence < beans::PropertyValue > aProps;
-        uno::Reference < container::XNameAccess > xFilters ( xFilterFact, uno::UNO_QUERY );
-        if ( xFilters->hasByName( aFilterName ) )
-            xFilters->getByName( aFilterName ) >>= aProps;
-        else
-            fprintf( stderr, "Couldn't find by name.\n" );
-
-        OUString aFilterImplName;
-        sal_Int32 nFilterProps = aProps.getLength();
-        for ( sal_Int32 nFilterProp = 0; nFilterProp<nFilterProps; nFilterProp++ )
-        {
-            const beans::PropertyValue& rFilterProp = aProps[nFilterProp];
-            if ( rFilterProp.Name.equalsAscii("FilterService") )
-            {
-                rFilterProp.Value >>= aFilterImplName;
-                break;
-            }
-        }
-
-        fprintf( stderr, "aName%s\n", OUStringToOString(aFilterImplName, RTL_TEXTENCODING_UTF8).getStr() );
-        if ( !aFilterImplName.isEmpty() )
-        {
-            try{
-            xExporter = uno::Reference< document::XExporter >
-                ( xFilterFact->createInstanceWithArguments( aFilterName, uno::Sequence < uno::Any >() ), uno::UNO_QUERY );
-            }catch(const uno::Exception&)
-                {
-                    xExporter.clear();
-                    fprintf( stderr, "Couldn't create instance of filter.\n" );
-                }
-        }
-    }
-
-    if ( xExporter.is() )
-    {
-        try{
-        uno::Reference< lang::XComponent >  xComp( aNotesPage, uno::UNO_QUERY_THROW );
-        uno::Reference< document::XFilter > xFilter( xExporter, uno::UNO_QUERY_THROW );
-        xExporter->setSourceDocument( xComp );
-
-        com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue > aOldArgs ( 2 );
-        aOldArgs[0].Name = "FileName";
-        aOldArgs[0].Value <<= OUString( aUrl );
-        aOldArgs[1].Name = "FilterName";
-        aOldArgs[1].Value <<= OUString("com.sun.star.documentconversion.XSLTFilter");
-
-        SfxMedium rMedium( aUrl , STREAM_STD_WRITE  );
-
-        const com::sun::star::beans::PropertyValue * pOldValue = aOldArgs.getConstArray();
-        com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue > aArgs ( aOldArgs.getLength() );
-        com::sun::star::beans::PropertyValue * pNewValue = aArgs.getArray();
-
-
-        // put in the REAL file name, and copy all PropertyValues
-        const OUString sOutputStream ( "OutputStream" );
-        const OUString sStream ( "StreamForOutput" );
-        sal_Bool bHasOutputStream = sal_False;
-        sal_Bool bHasStream = sal_False;
-        sal_Bool bHasBaseURL = sal_False;
-        sal_Int32 i;
-        sal_Int32 nEnd = aOldArgs.getLength();
-
-        for ( i = 0; i < nEnd; i++ )
-        {
-            pNewValue[i] = pOldValue[i];
-            if ( pOldValue[i].Name == "FileName" )
-                pNewValue[i].Value <<= OUString ( rMedium.GetName() );
-            else if ( pOldValue[i].Name == sOutputStream )
-                bHasOutputStream = sal_True;
-            else if ( pOldValue[i].Name == sStream )
-                bHasStream = sal_True;
-            else if ( pOldValue[i].Name == "DocumentBaseURL" )
-                bHasBaseURL = sal_True;
-        }
-
-        if ( !bHasOutputStream )
-        {
-            aArgs.realloc ( ++nEnd );
-            aArgs[nEnd-1].Name = sOutputStream;
-            aArgs[nEnd-1].Value <<= uno::Reference < io::XOutputStream > ( new utl::OOutputStreamWrapper ( *rMedium.GetOutStream() ) );
-        }
-
-        // add stream as well, for OOX export and maybe others
-        if ( !bHasStream )
-        {
-            aArgs.realloc ( ++nEnd );
-            aArgs[nEnd-1].Name = sStream;
-            aArgs[nEnd-1].Value <<= com::sun::star::uno::Reference < com::sun::star::io::XStream > ( new utl::OStreamWrapper ( *rMedium.GetOutStream() ) );
-        }
-
-        if ( !bHasBaseURL )
-        {
-            aArgs.realloc ( ++nEnd );
-            aArgs[nEnd-1].Name = "DocumentBaseURL";
-            aArgs[nEnd-1].Value <<= rMedium.GetBaseURL( true );
-        }
-
-        return xFilter->filter( aArgs );
-        }catch(const uno::Exception&)
-        {}
-    }
-
-    return sal_False;
-}
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/sidebar/CustomAnimationPanel.cxx b/sd/source/ui/sidebar/CustomAnimationPanel.cxx
index fcc9ad3e0a13..56a425e782ed 100644
--- a/sd/source/ui/sidebar/CustomAnimationPanel.cxx
+++ b/sd/source/ui/sidebar/CustomAnimationPanel.cxx
@@ -18,14 +18,10 @@
  */
 
 #include "CustomAnimationPanel.hxx"
+#include "createcustomanimationpanel.hxx"
 
 #include "ViewShellBase.hxx"
 
-
-namespace sd {
-    extern ::Window * createCustomAnimationPanel (::Window* pParent, ViewShellBase& rBase, const cssu::Reference<css::frame::XFrame>& rxFrame);
-}
-
 namespace sd { namespace sidebar {
 
 
diff --git a/sd/source/ui/sidebar/MasterPageObserver.cxx b/sd/source/ui/sidebar/MasterPageObserver.cxx
index 386e0f8a642c..65853925625b 100644
--- a/sd/source/ui/sidebar/MasterPageObserver.cxx
+++ b/sd/source/ui/sidebar/MasterPageObserver.cxx
@@ -67,13 +67,6 @@ public:
     */
     void RemoveEventListener (const Link& rEventListener);
 
-    /** Return a set of the names of master pages for the given document.
-        This convenience method exists because this set is part of the
-        internal data structure and thus takes no time to create.
-    */
-    inline MasterPageObserver::MasterPageNameSet GetMasterPageNames (
-        SdDrawDocument& rDocument);
-
 private:
     ::std::vector<Link> maListeners;
 
@@ -257,25 +250,6 @@ void MasterPageObserver::Implementation::RemoveEventListener (
             rEventListener));
 }
 
-
-
-
-MasterPageObserver::MasterPageNameSet
-    MasterPageObserver::Implementation::GetMasterPageNames (
-        SdDrawDocument& rDocument)
-{
-    MasterPageContainer::iterator aMasterPageDescriptor (
-        maUsedMasterPages.find(&rDocument));
-    if (aMasterPageDescriptor != maUsedMasterPages.end())
-        return aMasterPageDescriptor->second;
-    else
-        // Not found so return an empty set.
-        return MasterPageObserver::MasterPageNameSet();
-}
-
-
-
-
 void MasterPageObserver::Implementation::Notify(
     SfxBroadcaster& rBroadcaster,
     const SfxHint& rHint)
diff --git a/sd/source/ui/sidebar/PanelFactory.cxx b/sd/source/ui/sidebar/PanelFactory.cxx
index a647e89d94de..847ec576ec2f 100644
--- a/sd/source/ui/sidebar/PanelFactory.cxx
+++ b/sd/source/ui/sidebar/PanelFactory.cxx
@@ -18,6 +18,7 @@
  */
 
 #include "PanelFactory.hxx"
+#include "facreg.hxx"
 #include "framework/Pane.hxx"
 #include "ViewShellBase.hxx"
 #include "DrawController.hxx"
@@ -65,7 +66,7 @@ Reference<lang::XEventListener> mxControllerDisposeListener;
 // ----- Service functions ----------------------------------------------------
 
 Reference<XInterface> SAL_CALL PanelFactory_createInstance (
-    const Reference<XComponentContext>& rxContext)
+    const Reference<XComponentContext>& rxContext) throw (css::uno::Exception)
 {
     return Reference<XInterface>(static_cast<XWeak*>(new PanelFactory(rxContext)));
 }
diff --git a/sd/source/ui/sidebar/SlideTransitionPanel.cxx b/sd/source/ui/sidebar/SlideTransitionPanel.cxx
index 8541d18eecc0..30cbe1392207 100644
--- a/sd/source/ui/sidebar/SlideTransitionPanel.cxx
+++ b/sd/source/ui/sidebar/SlideTransitionPanel.cxx
@@ -18,17 +18,10 @@
  */
 
 #include "SlideTransitionPanel.hxx"
+#include "createslidetransitionpanel.hxx"
 
 #include "ViewShellBase.hxx"
 
-
-namespace sd {
-    extern ::Window* createSlideTransitionPanel (::Window* pParent, ViewShellBase& rBase, const cssu::Reference<css::frame::XFrame>& rxFrame);
-}
-
-
-
-
 namespace sd { namespace sidebar {
 
 
diff --git a/sd/source/ui/sidebar/TableDesignPanel.cxx b/sd/source/ui/sidebar/TableDesignPanel.cxx
index 8379bacf8ea5..dd9a1333a514 100644
--- a/sd/source/ui/sidebar/TableDesignPanel.cxx
+++ b/sd/source/ui/sidebar/TableDesignPanel.cxx
@@ -18,15 +18,10 @@
  */
 
 #include "TableDesignPanel.hxx"
+#include "createtabledesignpanel.hxx"
 
 #include "ViewShellBase.hxx"
 
-
-namespace sd {
-    extern ::Window * createTableDesignPanel (::Window* pParent, ViewShellBase& rBase);
-}
-
-
 namespace sd { namespace sidebar {
 
 
diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx
index 5eb675418e42..8c62476ef73d 100644
--- a/sd/source/ui/slideshow/slideshow.cxx
+++ b/sd/source/ui/slideshow/slideshow.cxx
@@ -42,6 +42,7 @@
 #include "framework/FrameworkHelper.hxx"
 
 #include "FrameView.hxx"
+#include "createpresentation.hxx"
 #include "unomodel.hxx"
 #include "slideshow.hxx"
 #include "slideshowimpl.hxx"
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index 6193b12730c5..86574f86be98 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -57,6 +57,7 @@
 #include <svx/galbrws.hxx>
 #include "NavigatorChildWindow.hxx"
 #include "AnimationChildWindow.hxx"
+#include "notifydocumentevent.hxx"
 #include <slideshowimpl.hxx>
 #include <slideshowviewimpl.hxx>
 #include <pgjump.hxx>
@@ -94,7 +95,6 @@ using namespace ::com::sun::star::document;
 using namespace ::com::sun::star::presentation;
 using namespace ::com::sun::star::beans;
 
-extern void NotifyDocumentEvent( SdDrawDocument* pDocument, const OUString& rEventName );
 extern OUString getUiNameFromPageApiNameImpl( const OUString& rApiName );
 
 namespace sd
diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx b/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx
index 8e20f19e8600..f0d23099ddad 100644
--- a/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx
@@ -61,8 +61,6 @@ public:
 
     bool HasReplacement (void) const { return (mpReplacement.get() != NULL); }
     inline bool HasLosslessReplacement (void) const;
-    void Clear (void) { maPreview.SetEmpty(); maMarkedPreview.SetEmpty();
-        mpReplacement.reset(); mpCompressor.reset(); }
     void Invalidate (void) { mpReplacement.reset(); mpCompressor.reset(); mbIsUpToDate = false; }
     bool IsPrecious (void) const { return mbIsPrecious; }
     void SetPrecious (bool bIsPrecious) { mbIsPrecious = bIsPrecious; }
diff --git a/sd/source/ui/slidesorter/model/SlsPageEnumeration.cxx b/sd/source/ui/slidesorter/model/SlsPageEnumeration.cxx
index 74ceb59bb0d6..58a8c4321c8b 100644
--- a/sd/source/ui/slidesorter/model/SlsPageEnumeration.cxx
+++ b/sd/source/ui/slidesorter/model/SlsPageEnumeration.cxx
@@ -17,6 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <sal/config.h>
+
+#include <boost/noncopyable.hpp>
 
 #include "model/SlideSorterModel.hxx"
 #include "model/SlsPageDescriptor.hxx"
@@ -27,7 +30,7 @@ using namespace ::sd::slidesorter::model;
 namespace {
 
 class PageEnumerationImpl
-    : public Enumeration<SharedPageDescriptor>
+    : public Enumeration<SharedPageDescriptor>, private boost::noncopyable
 {
 public:
     inline PageEnumerationImpl (
@@ -62,9 +65,6 @@ private:
         one pointed to by mnIndex.
     */
     inline void AdvanceToNextValidElement (void);
-
-    // Assignment operator not implemented.
-    PageEnumerationImpl& operator= (const PageEnumerationImpl&);
 };
 
 } // end of anonymouse namespace
diff --git a/sd/source/ui/slidesorter/shell/SlideSorterService.cxx b/sd/source/ui/slidesorter/shell/SlideSorterService.cxx
index 93fc714425bc..f94a993e50fd 100644
--- a/sd/source/ui/slidesorter/shell/SlideSorterService.cxx
+++ b/sd/source/ui/slidesorter/shell/SlideSorterService.cxx
@@ -19,6 +19,7 @@
 
 
 #include "SlideSorterService.hxx"
+#include "facreg.hxx"
 #include "controller/SlideSorterController.hxx"
 #include "controller/SlsProperties.hxx"
 #include "controller/SlsCurrentSlideManager.hxx"
@@ -59,7 +60,7 @@ namespace {
 //===== Service ===============================================================
 
 Reference<XInterface> SAL_CALL SlideSorterService_createInstance (
-    const Reference<XComponentContext>& rxContext)
+    const Reference<XComponentContext>& rxContext) throw (css::uno::Exception)
 {
     return Reference<XInterface>(static_cast<drawing::XDrawView*>(new SlideSorterService(rxContext)));
 }
diff --git a/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx b/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx
index e8c925d63506..4891da29745a 100644
--- a/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx
+++ b/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx
@@ -144,7 +144,6 @@ private:
     RunContainer maRuns;
     InsertPosition maInsertPosition;
 
-    void StopAnimation (void);
     SharedPageObjectRun GetRun (
         view::Layouter& rLayouter,
         const InsertPosition& rInsertPosition,
diff --git a/sd/source/ui/slidesorter/view/SlsLayouter.cxx b/sd/source/ui/slidesorter/view/SlsLayouter.cxx
index 2c3cf5bdd3a7..48b94eeeb400 100644
--- a/sd/source/ui/slidesorter/view/SlsLayouter.cxx
+++ b/sd/source/ui/slidesorter/view/SlsLayouter.cxx
@@ -227,9 +227,6 @@ protected:
 class VerticalImplementation : public Layouter::Implementation
 {
 public:
-    VerticalImplementation (
-        const SharedSdWindow& rpWindow,
-        const ::boost::shared_ptr<view::Theme>& rpTheme);
     VerticalImplementation (const Implementation& rImplementation);
 
     virtual Layouter::Orientation GetOrientation (void) const SAL_OVERRIDE;
diff --git a/sd/source/ui/table/TableDesignPane.cxx b/sd/source/ui/table/TableDesignPane.cxx
index 1b73da750733..c0211b62b5a7 100644
--- a/sd/source/ui/table/TableDesignPane.cxx
+++ b/sd/source/ui/table/TableDesignPane.cxx
@@ -46,6 +46,7 @@
 #include <svx/sdr/table/tabledesign.hxx>
 
 #include "TableDesignPane.hxx"
+#include "createtabledesignpanel.hxx"
 
 #include "DrawDocShell.hxx"
 #include "ViewShellBase.hxx"
diff --git a/sd/source/ui/table/TableDesignPane.hxx b/sd/source/ui/table/TableDesignPane.hxx
index 7af968d215bc..496734227367 100644
--- a/sd/source/ui/table/TableDesignPane.hxx
+++ b/sd/source/ui/table/TableDesignPane.hxx
@@ -137,6 +137,8 @@ public:
     virtual short Execute() SAL_OVERRIDE;
 };
 
+void showTableDesignDialog( ::Window*, ViewShellBase& );
+
 }
 
 #endif // _SD_TABLEFORMATPANE_HXX
diff --git a/sd/source/ui/table/tablefunction.cxx b/sd/source/ui/table/tablefunction.cxx
index 49eb75300b3b..55c147943821 100644
--- a/sd/source/ui/table/tablefunction.cxx
+++ b/sd/source/ui/table/tablefunction.cxx
@@ -53,8 +53,10 @@
 #include <svl/style.hxx>
 
 #include "framework/FrameworkHelper.hxx"
+#include "TableDesignPane.hxx"
 #include "app.hrc"
 #include "glob.hrc"
+#include "tablefunction.hxx"
 #include "DrawViewShell.hxx"
 #include "drawdoc.hxx"
 #include "DrawDocShell.hxx"
@@ -79,7 +81,6 @@ using namespace ::com::sun::star::linguistic2;
 
 namespace sd
 {
-extern void showTableDesignDialog( ::Window*, ViewShellBase& );
 
 static void apply_table_style( SdrTableObj* pObj, SdrModel* pModel, const OUString& sTableStyle )
 {
diff --git a/sd/source/ui/table/tableobjectbar.cxx b/sd/source/ui/table/tableobjectbar.cxx
index 8c47f7be2cda..cc9f9d55b29f 100644
--- a/sd/source/ui/table/tableobjectbar.cxx
+++ b/sd/source/ui/table/tableobjectbar.cxx
@@ -36,6 +36,8 @@
 #include <svx/svxids.hrc>
 
 #include "app.hrc"
+#include "createtableobjectbar.hxx"
+#include "registerinterfaces.hxx"
 #include "res_bmp.hrc"
 #include "glob.hrc"
 #include "strings.hrc"
diff --git a/sd/source/ui/unoidl/UnoDocumentSettings.cxx b/sd/source/ui/unoidl/UnoDocumentSettings.cxx
index 7026001ed891..2bc55c066be5 100644
--- a/sd/source/ui/unoidl/UnoDocumentSettings.cxx
+++ b/sd/source/ui/unoidl/UnoDocumentSettings.cxx
@@ -38,6 +38,7 @@
 
 #include "drawdoc.hxx"
 #include "DrawDocShell.hxx"
+#include "UnoDocumentSettings.hxx"
 #include "unomodel.hxx"
 
 #include "optsitem.hxx"
@@ -123,7 +124,7 @@ namespace sd
     };
 
     Reference< XInterface > SAL_CALL DocumentSettings_createInstance( SdXImpressDocument* pModel )
-        throw( Exception )
+        throw ()
     {
         DBG_ASSERT( pModel, "I need a model for the DocumentSettings!" );
         return (XWeak*)new DocumentSettings( pModel );
diff --git a/sd/source/ui/unoidl/facreg.cxx b/sd/source/ui/unoidl/facreg.cxx
index 9d8253e06aa5..e979cf3ae61c 100644
--- a/sd/source/ui/unoidl/facreg.cxx
+++ b/sd/source/ui/unoidl/facreg.cxx
@@ -19,6 +19,7 @@
 
 #include <com/sun/star/registry/XRegistryKey.hpp>
 
+#include "facreg.hxx"
 #include "sddll.hxx"
 
 #include <cppuhelper/factory.hxx>
@@ -33,164 +34,6 @@
 
 using namespace com::sun::star;
 
-
-// Forward declarations of the factories.
-
-extern uno::Reference< uno::XInterface > SAL_CALL SdDrawingDocument_createInstance( const uno::Reference< lang::XMultiServiceFactory > & _rxFactory, const sal_uInt64 _nCreationFlags );
-extern OUString SdDrawingDocument_getImplementationName() throw( uno::RuntimeException );
-extern uno::Sequence< OUString > SAL_CALL SdDrawingDocument_getSupportedServiceNames() throw( uno::RuntimeException );
-
-extern uno::Reference< uno::XInterface > SAL_CALL SdPresentationDocument_createInstance( const uno::Reference< lang::XMultiServiceFactory > & _rxFactory, const sal_uInt64 _nCreationFlags );
-extern OUString SdPresentationDocument_getImplementationName() throw( uno::RuntimeException );
-extern uno::Sequence< OUString > SAL_CALL SdPresentationDocument_getSupportedServiceNames() throw( uno::RuntimeException );
-
-extern uno::Reference< uno::XInterface > SAL_CALL SdHtmlOptionsDialog_CreateInstance( const uno::Reference< lang::XMultiServiceFactory > & _rxFactory );
-extern OUString SdHtmlOptionsDialog_getImplementationName() throw( uno::RuntimeException );
-extern uno::Sequence< OUString > SAL_CALL SdHtmlOptionsDialog_getSupportedServiceNames() throw( uno::RuntimeException );
-
-extern uno::Reference< uno::XInterface > SAL_CALL SdUnoModule_createInstance( const uno::Reference< lang::XMultiServiceFactory > & _rxFactory );
-extern OUString SdUnoModule_getImplementationName() throw( uno::RuntimeException );
-extern uno::Sequence< OUString > SAL_CALL SdUnoModule_getSupportedServiceNames() throw( uno::RuntimeException );
-
-namespace sd
-{
-extern uno::Reference< uno::XInterface > SAL_CALL RandomNode_createInstance( const uno::Reference< lang::XMultiServiceFactory > & _rxFactory );
-extern OUString RandomNode__getImplementationName() throw( uno::RuntimeException );
-extern uno::Sequence< OUString > SAL_CALL RandomNode_getSupportedServiceNames() throw( uno::RuntimeException );
-
-extern uno::Reference< uno::XInterface > SAL_CALL SlideLayoutController_createInstance( const uno::Reference< lang::XMultiServiceFactory > & _rxFactory );
-extern OUString SlideLayoutController_getImplementationName() throw( uno::RuntimeException );
-extern uno::Sequence< OUString >  SlideLayoutController_getSupportedServiceNames() throw( uno::RuntimeException );
-
-extern uno::Reference< uno::XInterface > SAL_CALL InsertSlideController_createInstance( const uno::Reference< lang::XMultiServiceFactory > & _rxFactory );
-extern OUString InsertSlideController_getImplementationName() throw( uno::RuntimeException );
-extern uno::Sequence< OUString >  InsertSlideController_getSupportedServiceNames() throw( uno::RuntimeException );
-}
-
-namespace sd { namespace framework {
-
-extern uno::Reference<uno::XInterface> SAL_CALL Configuration_createInstance(
-    const uno::Reference<uno::XComponentContext>& rxContext)
-    throw(uno::Exception);
-extern OUString Configuration_getImplementationName(void) throw (uno::RuntimeException);
-extern uno::Sequence<OUString> SAL_CALL Configuration_getSupportedServiceNames (void)
-    throw (uno::RuntimeException);
-
-extern uno::Reference<uno::XInterface> SAL_CALL ConfigurationController_createInstance(
-    const uno::Reference<uno::XComponentContext>& rxContext)
-    throw(uno::Exception);
-extern OUString ConfigurationController_getImplementationName(void) throw (uno::RuntimeException);
-extern uno::Sequence<OUString> SAL_CALL ConfigurationController_getSupportedServiceNames (void)
-    throw (uno::RuntimeException);
-
-extern uno::Reference<uno::XInterface> SAL_CALL ModuleController_createInstance(
-    const uno::Reference<uno::XComponentContext>& rxContext)
-    throw(uno::Exception);
-extern OUString ModuleController_getImplementationName(void) throw (uno::RuntimeException);
-extern uno::Sequence<OUString> SAL_CALL ModuleController_getSupportedServiceNames (void)
-    throw (uno::RuntimeException);
-
-extern uno::Reference<uno::XInterface> SAL_CALL BasicPaneFactory_createInstance(
-    const uno::Reference<uno::XComponentContext>& rxContext)
-    throw(uno::Exception);
-extern OUString BasicPaneFactory_getImplementationName(void) throw (uno::RuntimeException);
-extern uno::Sequence<OUString> SAL_CALL BasicPaneFactory_getSupportedServiceNames (void)
-    throw (uno::RuntimeException);
-
-extern uno::Reference<uno::XInterface> SAL_CALL BasicToolBarFactory_createInstance(
-    const uno::Reference<uno::XComponentContext>& rxContext)
-    throw(uno::Exception);
-extern OUString BasicToolBarFactory_getImplementationName(void) throw (uno::RuntimeException);
-extern uno::Sequence<OUString> SAL_CALL BasicToolBarFactory_getSupportedServiceNames (void)
-    throw (uno::RuntimeException);
-
-extern uno::Reference<uno::XInterface> SAL_CALL BasicViewFactory_createInstance(
-    const uno::Reference<uno::XComponentContext>& rxContext)
-    throw(uno::Exception);
-extern OUString BasicViewFactory_getImplementationName(void) throw (uno::RuntimeException);
-extern uno::Sequence<OUString> SAL_CALL BasicViewFactory_getSupportedServiceNames (void)
-    throw (uno::RuntimeException);
-
-extern uno::Reference<uno::XInterface> SAL_CALL ResourceId_createInstance(
-    const uno::Reference<uno::XComponentContext>& rxContext)
-    throw(uno::Exception);
-extern OUString ResourceId_getImplementationName(void) throw (uno::RuntimeException);
-extern uno::Sequence<OUString> SAL_CALL ResourceId_getSupportedServiceNames (void)
-    throw (uno::RuntimeException);
-
-extern uno::Reference<uno::XInterface> SAL_CALL PresentationFactoryProvider_createInstance(
-    const uno::Reference<uno::XComponentContext>& rxContext)
-    throw(uno::Exception);
-extern OUString PresentationFactoryProvider_getImplementationName(void)
-    throw (uno::RuntimeException);
-extern uno::Sequence<OUString> SAL_CALL PresentationFactoryProvider_getSupportedServiceNames (void)
-    throw (uno::RuntimeException);
-} }
-
-namespace sd { namespace sidebar {
-
-extern uno::Reference<uno::XInterface> SAL_CALL PanelFactory_createInstance(
-    const uno::Reference<uno::XComponentContext>& rxContext)
-    throw(uno::Exception);
-extern OUString PanelFactory_getImplementationName(void) throw (uno::RuntimeException);
-extern uno::Sequence<OUString> SAL_CALL PanelFactory_getSupportedServiceNames (void)
-    throw (uno::RuntimeException);
-
-} }
-
-namespace sd { namespace presenter {
-extern uno::Reference<uno::XInterface> SAL_CALL SlideRenderer_createInstance(
-    const uno::Reference<uno::XComponentContext>& rxContext)
-    throw(uno::Exception);
-extern OUString SlideRenderer_getImplementationName(void)
-    throw (uno::RuntimeException);
-extern uno::Sequence<OUString> SAL_CALL SlideRenderer_getSupportedServiceNames (void)
-    throw (uno::RuntimeException);
-
-extern uno::Reference<uno::XInterface> SAL_CALL PresenterCanvas_createInstance(
-    const uno::Reference<uno::XComponentContext>& rxContext)
-    throw(uno::Exception);
-extern OUString PresenterCanvas_getImplementationName(void)
-    throw (uno::RuntimeException);
-extern uno::Sequence<OUString> SAL_CALL PresenterCanvas_getSupportedServiceNames (void)
-    throw (uno::RuntimeException);
-
-extern uno::Reference<uno::XInterface> SAL_CALL PresenterTextViewService_createInstance(
-    const uno::Reference<uno::XComponentContext>& rxContext)
-    throw(uno::Exception);
-extern OUString PresenterTextViewService_getImplementationName(void)
-    throw (uno::RuntimeException);
-extern uno::Sequence<OUString> SAL_CALL PresenterTextViewService_getSupportedServiceNames (void)
-    throw (uno::RuntimeException);
-
-extern uno::Reference<uno::XInterface> SAL_CALL PresenterHelperService_createInstance(
-    const uno::Reference<uno::XComponentContext>& rxContext)
-    throw(uno::Exception);
-extern OUString PresenterHelperService_getImplementationName(void)
-    throw (uno::RuntimeException);
-extern uno::Sequence<OUString> SAL_CALL PresenterHelperService_getSupportedServiceNames (void)
-    throw (uno::RuntimeException);
-
-extern uno::Reference<uno::XInterface> SAL_CALL PresenterPreviewCache_createInstance(
-    const uno::Reference<uno::XComponentContext>& rxContext)
-    throw(uno::Exception);
-extern OUString PresenterPreviewCache_getImplementationName(void)
-    throw (uno::RuntimeException);
-extern uno::Sequence<OUString> SAL_CALL PresenterPreviewCache_getSupportedServiceNames (void)
-    throw (uno::RuntimeException);
-} }
-
-
-namespace sd { namespace slidesorter {
-extern uno::Reference<uno::XInterface> SAL_CALL SlideSorterService_createInstance(
-    const uno::Reference<uno::XComponentContext>& rxContext)
-    throw(uno::Exception);
-extern OUString SlideSorterService_getImplementationName(void)
-    throw (uno::RuntimeException);
-extern uno::Sequence<OUString> SAL_CALL SlideSorterService_getSupportedServiceNames (void)
-    throw (uno::RuntimeException);
-} }
-
 using namespace ::sd;
 using namespace ::sd::framework;
 using namespace ::sd::presenter;
diff --git a/sd/source/ui/unoidl/randomnode.cxx b/sd/source/ui/unoidl/randomnode.cxx
index 5ce5b5339800..830694fea882 100644
--- a/sd/source/ui/unoidl/randomnode.cxx
+++ b/sd/source/ui/unoidl/randomnode.cxx
@@ -34,6 +34,8 @@
 #include <cppuhelper/supportsservice.hxx>
 #include <osl/mutex.hxx>
 #include "CustomAnimationPreset.hxx"
+#include "facreg.hxx"
+#include "randomnode.hxx"
 
 using ::osl::Mutex;
 using ::osl::Guard;
diff --git a/sd/source/ui/unoidl/unocpres.cxx b/sd/source/ui/unoidl/unocpres.cxx
index 6f4db923bb24..dd813c5f236d 100644
--- a/sd/source/ui/unoidl/unocpres.cxx
+++ b/sd/source/ui/unoidl/unocpres.cxx
@@ -26,6 +26,7 @@
 #include <comphelper/extract.hxx>
 #include <cppuhelper/supportsservice.hxx>
 
+#include "createunocustomshow.hxx"
 #include "unohelp.hxx"
 #include "unomodel.hxx"
 #include "drawdoc.hxx"
diff --git a/sd/source/ui/unoidl/unodoc.cxx b/sd/source/ui/unoidl/unodoc.cxx
index c33dd80697da..e6ff30967a79 100644
--- a/sd/source/ui/unoidl/unodoc.cxx
+++ b/sd/source/ui/unoidl/unodoc.cxx
@@ -23,6 +23,7 @@
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 
 #include "sddll.hxx"
+#include "facreg.hxx"
 #include "DrawDocShell.hxx"
 #include "GraphicDocShell.hxx"
 #include <osl/mutex.hxx>
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index 7dd272fcace7..aa911339b30b 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -35,7 +35,9 @@
 #include <cppuhelper/supportsservice.hxx>
 
 #include <editeng/unofield.hxx>
+#include <notifydocumentevent.hxx>
 #include <unomodel.hxx>
+#include <unopool.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/bindings.hxx>
 #include <vcl/svapp.hxx>
@@ -109,8 +111,6 @@ using namespace ::osl;
 using namespace ::cppu;
 using namespace ::com::sun::star;
 
-extern uno::Reference< uno::XInterface > SdUnoCreatePool( SdDrawDocument* pDrawModel );
-
 class SdUnoForbiddenCharsTable : public SvxUnoForbiddenCharsTable,
                                  public SfxListener
 {
@@ -768,8 +768,6 @@ uno::Reference< container::XNameContainer > SAL_CALL SdXImpressDocument::getCust
     return xCustomPres;
 }
 
-extern uno::Reference< presentation::XPresentation > createPresentation( SdXImpressDocument& rModel );
-
 // XPresentationSupplier
 uno::Reference< presentation::XPresentation > SAL_CALL SdXImpressDocument::getPresentation()
     throw(uno::RuntimeException, std::exception)
diff --git a/sd/source/ui/unoidl/unomodule.cxx b/sd/source/ui/unoidl/unomodule.cxx
index 784381977cf3..ca507c2fe1f9 100644
--- a/sd/source/ui/unoidl/unomodule.cxx
+++ b/sd/source/ui/unoidl/unomodule.cxx
@@ -21,6 +21,7 @@
 #include <com/sun/star/frame/DispatchResultState.hpp>
 #include <cppuhelper/supportsservice.hxx>
 
+#include "facreg.hxx"
 #include "sddll.hxx"
 #include "sdmod.hxx"
 #include "unomodule.hxx"
diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx
index 476332f570e4..eac1f29d8024 100644
--- a/sd/source/ui/unoidl/unoobj.cxx
+++ b/sd/source/ui/unoidl/unoobj.cxx
@@ -290,8 +290,6 @@ struct SortStruct
 typedef SortStruct  SORT;
 typedef SORT*       PSORT;
 
-extern "C" int SAL_CALL SortFunc( const void* p1, const void* p2 );
-
 SdXShape::SdXShape( SvxShape* pShape, SdXImpressDocument* pModel) throw()
 :   mpShape( pShape ),
     mpPropSet( pModel?
diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx
index 4c04ab3a18da..75ed1d3c9266 100644
--- a/sd/source/ui/unoidl/unopage.cxx
+++ b/sd/source/ui/unoidl/unopage.cxx
@@ -35,6 +35,8 @@
 #include <toolkit/helper/vclunohelper.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
+#include <AnnotationEnumeration.hxx>
+#include <createunopageimpl.hxx>
 #include <unomodel.hxx>
 #include <unopage.hxx>
 #include <svx/svxids.hrc>
@@ -81,11 +83,6 @@ using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::drawing;
 using namespace ::com::sun::star::office;
 
-namespace sd {
-extern Reference< XAnnotation > createAnnotation( const Reference< XComponentContext >& xContext, SdPage* );
-extern Reference< XAnnotationEnumeration > createAnnotationEnumeration( const sd::AnnotationVector& );
-}
-
 // this are the ids for page properties
 enum WID_PAGE
 {
diff --git a/sd/source/ui/unoidl/unopool.cxx b/sd/source/ui/unoidl/unopool.cxx
index 8914bc0c9081..857874bf1b0d 100644
--- a/sd/source/ui/unoidl/unopool.cxx
+++ b/sd/source/ui/unoidl/unopool.cxx
@@ -23,6 +23,7 @@
 #include <svx/unopool.hxx>
 
 #include "drawdoc.hxx"
+#include "unopool.hxx"
 
 using namespace ::com::sun::star;
 using namespace ::rtl;
diff --git a/sd/source/ui/unoidl/unopool.hxx b/sd/source/ui/unoidl/unopool.hxx
new file mode 100644
index 000000000000..db7e009d4baa
--- /dev/null
+++ b/sd/source/ui/unoidl/unopool.hxx
@@ -0,0 +1,30 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#ifndef INCLUDED_SD_SOURCE_UI_UNOIDL_UNOPOOL_HXX
+#define INCLUDED_SD_SOURCE_UI_UNOIDL_UNOPOOL_HXX
+
+#include <sal/config.h>
+
+css::uno::Reference<css::uno::XInterface> SdUnoCreatePool(
+    SdDrawDocument * pDrawModel);
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/view/ViewShellManager.cxx b/sd/source/ui/view/ViewShellManager.cxx
index dba0ca8ee24f..3be7dd0f4d83 100644
--- a/sd/source/ui/view/ViewShellManager.cxx
+++ b/sd/source/ui/view/ViewShellManager.cxx
@@ -204,8 +204,6 @@ private:
 
     SfxShell* mpTopShell;
 
-    void GatherActiveShells (ShellStack& rShellList);
-
     void UpdateShellStack (void);
 
     void CreateShells (void);
diff --git a/sd/source/ui/view/ViewTabBar.cxx b/sd/source/ui/view/ViewTabBar.cxx
index 56970bf0e8e9..d93f5833e717 100644
--- a/sd/source/ui/view/ViewTabBar.cxx
+++ b/sd/source/ui/view/ViewTabBar.cxx
@@ -79,23 +79,6 @@ private:
 
 } // end of anonymous namespace
 
-
-
-
-
-class ViewTabPage : public TabPage
-{
-public:
-    ViewTabPage (Window* pParent) : TabPage(pParent) {}
-    virtual void Resize (void) SAL_OVERRIDE
-    { SetPosSizePixel(Point(0,0),GetParent()->GetOutputSizePixel()); }
-};
-
-
-
-
-//===== ViewTabBar ============================================================
-
 ViewTabBar::ViewTabBar (
     const Reference<XResourceId>& rxViewTabBarId,
     const Reference<frame::XController>& rxController)
diff --git a/sd/source/ui/view/sdview3.cxx b/sd/source/ui/view/sdview3.cxx
index f317d910dd1b..f588d9f32180 100644
--- a/sd/source/ui/view/sdview3.cxx
+++ b/sd/source/ui/view/sdview3.cxx
@@ -55,6 +55,7 @@
 #include <toolkit/helper/vclunohelper.hxx>
 #include "DrawDocShell.hxx"
 #include "fupoor.hxx"
+#include "tablefunction.hxx"
 #include "Window.hxx"
 #include "sdxfer.hxx"
 #include "sdpage.hxx"
@@ -1490,8 +1491,6 @@ sal_Bool View::InsertData( const TransferableDataHelper& rDataHelper,
     return bReturn;
 }
 
-extern void CreateTableFromRTF( SvStream& rStream, SdDrawDocument* pModel  );
-
 bool View::PasteRTFTable( SotStorageStreamRef xStm, SdrPage* pPage, sal_uLong nPasteOptions )
 {
     SdDrawDocument* pModel = new SdDrawDocument( DOCUMENT_TYPE_IMPRESS, mpDocSh );
diff --git a/sd/source/ui/view/viewoverlaymanager.cxx b/sd/source/ui/view/viewoverlaymanager.cxx
index 0afec03231a6..9d32cfd59043 100644
--- a/sd/source/ui/view/viewoverlaymanager.cxx
+++ b/sd/source/ui/view/viewoverlaymanager.cxx
@@ -187,10 +187,6 @@ void ImageButtonHdl::HideTip()
     }
 }
 
-
-
-extern OUString ImplRetrieveLabelFromCommand( const Reference< XFrame >& xFrame, const OUString& aCmdURL );
-
 void ImageButtonHdl::onMouseEnter(const MouseEvent& rMEvt)
 {
 
diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx
index f87d917f74c3..ca89e24e3774 100644
--- a/sd/source/ui/view/viewshel.cxx
+++ b/sd/source/ui/view/viewshel.cxx
@@ -20,6 +20,7 @@
 
 #include "ViewShell.hxx"
 #include "ViewShellImplementation.hxx"
+#include "createtableobjectbar.hxx"
 
 #include <com/sun/star/embed/EmbedStates.hpp>
 #include "ViewShellBase.hxx"
@@ -81,10 +82,6 @@
 #include <glob.hrc>
 #include "AccessibleDocumentViewBase.hxx"
 
-namespace sd { namespace ui { namespace table {
-    extern SfxShell* CreateTableObjectBar( ViewShell& rShell, ::sd::View* pView );
-} } }
-
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::presentation;