sfx2: Move InitInterface_Impl() out of SFX_DECL_INTERFACE too.

Change-Id: Ib737e0d1b5888986b308aa60d4140f65e4e90243

16 files changed, 94 insertions, 24 deletions

diff --git a/sd/inc/sdmod.hxx b/sd/inc/sdmod.hxx
index 10c7fde59f8b..5a5450d9c3c6 100644
--- a/sd/inc/sdmod.hxx
+++ b/sd/inc/sdmod.hxx
@@ -73,11 +73,15 @@ enum SdOptionStreamMode
 class SdModule : public SfxModule, public SfxListener
 {
 public:
-
                             TYPEINFO_OVERRIDE();
                             SFX_DECL_INTERFACE(SD_IF_SDAPP)
                             DECL_LINK( CalcFieldValueHdl, EditFieldInfo* );
 
+private:
+    /// SfxInterface initializer.
+    static void InitInterface_Impl();
+
+public:
                             SdModule(SfxObjectFactory* pDrawObjFact, SfxObjectFactory* pGraphicObjFact);
     virtual                 ~SdModule();
 
diff --git a/sd/source/ui/inc/BezierObjectBar.hxx b/sd/source/ui/inc/BezierObjectBar.hxx
index 11036a21f28a..07ca754c170c 100644
--- a/sd/source/ui/inc/BezierObjectBar.hxx
+++ b/sd/source/ui/inc/BezierObjectBar.hxx
@@ -36,8 +36,13 @@ public:
     TYPEINFO_OVERRIDE();
     SFX_DECL_INTERFACE(SD_IF_SDDRAWBEZIEROBJECTBAR)
 
-    BezierObjectBar (ViewShell* pSdViewShell, View* pSdView);
-    virtual ~BezierObjectBar (void);
+private:
+    /// SfxInterface initializer.
+    static void InitInterface_Impl();
+
+public:
+    BezierObjectBar(ViewShell* pSdViewShell, View* pSdView);
+    virtual ~BezierObjectBar();
 
     void GetAttrState(SfxItemSet& rSet);
     void Execute(SfxRequest &rReq);
diff --git a/sd/source/ui/inc/DrawDocShell.hxx b/sd/source/ui/inc/DrawDocShell.hxx
index b34f7d44a194..7f125242bb09 100644
--- a/sd/source/ui/inc/DrawDocShell.hxx
+++ b/sd/source/ui/inc/DrawDocShell.hxx
@@ -44,7 +44,6 @@ namespace sd {
 class FrameView;
 class ViewShell;
 
-
 // DrawDocShell
 class SD_DLLPUBLIC DrawDocShell : public SfxObjectShell
 {
@@ -53,6 +52,11 @@ public:
     SFX_DECL_INTERFACE(SD_IF_SDDRAWDOCSHELL)
     SFX_DECL_OBJECTFACTORY();
 
+private:
+    /// SfxInterface initializer.
+    static void InitInterface_Impl();
+
+public:
     DrawDocShell (
         SfxObjectCreateMode eMode = SFX_CREATE_MODE_EMBEDDED,
         sal_Bool bSdDataObj=sal_False,
diff --git a/sd/source/ui/inc/DrawViewShell.hxx b/sd/source/ui/inc/DrawViewShell.hxx
index 2e873a29d2d2..57d830141de5 100644
--- a/sd/source/ui/inc/DrawViewShell.hxx
+++ b/sd/source/ui/inc/DrawViewShell.hxx
@@ -66,9 +66,13 @@ public:
     static const int SLOTARRAY_COUNT = 24;
 
     TYPEINFO_OVERRIDE();
-
     SFX_DECL_INTERFACE(SD_IF_SDDRAWVIEWSHELL)
 
+private:
+    /// SfxInterface initializer.
+    static void InitInterface_Impl();
+
+public:
     /** Create a new stackable shell that may take some information
         (e.g. the frame view) from the given previous shell.
         @param ePageKind
diff --git a/sd/source/ui/inc/GraphicDocShell.hxx b/sd/source/ui/inc/GraphicDocShell.hxx
index fc3c8602e51c..5808493f9ef3 100644
--- a/sd/source/ui/inc/GraphicDocShell.hxx
+++ b/sd/source/ui/inc/GraphicDocShell.hxx
@@ -37,8 +37,13 @@ class GraphicDocShell
 {
 public:
     TYPEINFO_OVERRIDE();
-
     SFX_DECL_INTERFACE(SD_IF_SDGRAPHICDOCSHELL)
+
+private:
+    /// SfxInterface initializer.
+    static void InitInterface_Impl();
+
+public:
     SFX_DECL_OBJECTFACTORY();
 
     using SotObject::GetInterface;
diff --git a/sd/source/ui/inc/GraphicObjectBar.hxx b/sd/source/ui/inc/GraphicObjectBar.hxx
index 3f28c15c3e80..bd0f5804bac5 100644
--- a/sd/source/ui/inc/GraphicObjectBar.hxx
+++ b/sd/source/ui/inc/GraphicObjectBar.hxx
@@ -29,7 +29,6 @@ namespace sd {
 class View;
 class ViewShell;
 
-
 class GraphicObjectBar
     : public SfxShell
 {
@@ -37,6 +36,11 @@ public:
     TYPEINFO_OVERRIDE();
     SFX_DECL_INTERFACE( SD_IF_SDDRAWGRAFOBJECTBAR )
 
+private:
+    /// SfxInterface initializer.
+    static void InitInterface_Impl();
+
+public:
     GraphicObjectBar (ViewShell* pSdViewShell, ::sd::View* pSdView);
     virtual ~GraphicObjectBar (void);
 
@@ -50,7 +54,6 @@ protected:
     ::sd::View* mpView;
     ViewShell*  mpViewSh;
     sal_uInt16          nMappedSlotFilter;
-
 };
 
 } // end of namespace sd
diff --git a/sd/source/ui/inc/GraphicViewShell.hxx b/sd/source/ui/inc/GraphicViewShell.hxx
index f09d27473cb7..632a31e6f4b0 100644
--- a/sd/source/ui/inc/GraphicViewShell.hxx
+++ b/sd/source/ui/inc/GraphicViewShell.hxx
@@ -44,6 +44,11 @@ public:
     SFX_DECL_VIEWFACTORY(GraphicViewShell);
     SFX_DECL_INTERFACE(SD_IF_SDGRAPHICVIEWSHELL)
 
+private:
+    /// SfxInterface initializer.
+    static void InitInterface_Impl();
+
+public:
     /** Create a new view shell for the Draw application.
         @param rViewShellBase
             The new object will be stacked on this view shell base.
diff --git a/sd/source/ui/inc/MediaObjectBar.hxx b/sd/source/ui/inc/MediaObjectBar.hxx
index 863deb6f1cc1..00be1fbfc83b 100644
--- a/sd/source/ui/inc/MediaObjectBar.hxx
+++ b/sd/source/ui/inc/MediaObjectBar.hxx
@@ -29,7 +29,6 @@ namespace sd {
 class View;
 class ViewShell;
 
-
 class MediaObjectBar
     : public SfxShell
 {
@@ -37,6 +36,12 @@ public:
     TYPEINFO_OVERRIDE();
     SFX_DECL_INTERFACE( SD_IF_SDDRAWMEDIAOBJECTBAR )
 
+private:
+    /// SfxInterface initializer.
+    static void InitInterface_Impl();
+
+public:
+
     MediaObjectBar (ViewShell* pSdViewShell, ::sd::View* pSdView);
     virtual ~MediaObjectBar (void);
 
diff --git a/sd/source/ui/inc/OutlineViewShell.hxx b/sd/source/ui/inc/OutlineViewShell.hxx
index 0897f2d6c908..141a1881a4cc 100644
--- a/sd/source/ui/inc/OutlineViewShell.hxx
+++ b/sd/source/ui/inc/OutlineViewShell.hxx
@@ -41,8 +41,10 @@ public:
     SFX_DECL_VIEWFACTORY(OutlineViewShell);
     SFX_DECL_INTERFACE(SD_IF_SDOUTLINEVIEWSHELL)
 
-    // The previous macros change access mode.  To be sure switch back
-    // to public access.
+private:
+    /// SfxInterface initializer.
+    static void InitInterface_Impl();
+
 public:
     /** Create a new view shell for the outline mode.
         @param rViewShellBase
diff --git a/sd/source/ui/inc/PaneShells.hxx b/sd/source/ui/inc/PaneShells.hxx
index 0dd1c55bcb4e..151a0a7de908 100644
--- a/sd/source/ui/inc/PaneShells.hxx
+++ b/sd/source/ui/inc/PaneShells.hxx
@@ -27,7 +27,6 @@
 
 namespace sd {
 
-
 /** Shell that displays the left pane for Impress.  The shell does not do
     anything else and has especially no slots.
 */
@@ -38,13 +37,15 @@ public:
     TYPEINFO_OVERRIDE();
     SFX_DECL_INTERFACE(SD_IF_SDLEFTIMPRESSPANESHELL)
 
+private:
+    /// SfxInterface initializer.
+    static void InitInterface_Impl();
+
+public:
     LeftImpressPaneShell (void);
     virtual ~LeftImpressPaneShell (void);
 };
 
-
-
-
 /** Shell that displays the left pane for Draw.  The shell does not do
     anything else and has especially no slots.
 */
@@ -55,13 +56,15 @@ public:
     TYPEINFO_OVERRIDE();
     SFX_DECL_INTERFACE(SD_IF_SDLEFTDRAWPANESHELL)
 
+private:
+    /// SfxInterface initializer.
+    static void InitInterface_Impl();
+
+public:
     LeftDrawPaneShell (void);
     virtual ~LeftDrawPaneShell (void);
 };
 
-
-
-
 /** Shell that displays the right pane for both Impress and Draw.  The shell
     does not do anything else and has especially no slots.
 */
@@ -71,6 +74,11 @@ public:
     TYPEINFO_OVERRIDE();
     SFX_DECL_INTERFACE( SD_IF_SDTOOLPANELPANESHELL )
 
+private:
+    /// SfxInterface initializer.
+    static void InitInterface_Impl();
+
+public:
     ToolPanelPaneShell();
     virtual ~ToolPanelPaneShell();
 };
diff --git a/sd/source/ui/inc/PresentationViewShell.hxx b/sd/source/ui/inc/PresentationViewShell.hxx
index 035256539504..75a64cef95f7 100644
--- a/sd/source/ui/inc/PresentationViewShell.hxx
+++ b/sd/source/ui/inc/PresentationViewShell.hxx
@@ -35,6 +35,11 @@ public:
     SFX_DECL_VIEWFACTORY(PresViewShell);
     SFX_DECL_INTERFACE( SD_IF_SDPRESVIEWSHELL )
 
+private:
+    /// SfxInterface initializer.
+    static void InitInterface_Impl();
+
+public:
     PresentationViewShell( SfxViewFrame* pFrame, ViewShellBase& rViewShellBase, ::Window* pParentWindow, FrameView* pFrameView = NULL);
     virtual ~PresentationViewShell (void);
 
diff --git a/sd/source/ui/inc/SlideSorterViewShell.hxx b/sd/source/ui/inc/SlideSorterViewShell.hxx
index 66cdebe2108d..238e1a5005fd 100644
--- a/sd/source/ui/inc/SlideSorterViewShell.hxx
+++ b/sd/source/ui/inc/SlideSorterViewShell.hxx
@@ -31,7 +31,6 @@ namespace sd { namespace slidesorter { namespace controller {
 class SlotManager;
 } } }
 
-
 namespace sd { namespace slidesorter {
 
 class SlideSorter;
@@ -45,6 +44,11 @@ public:
     TYPEINFO_OVERRIDE();
     SFX_DECL_INTERFACE(SD_IF_SDSLIDESORTERVIEWSHELL)
 
+private:
+    /// SfxInterface initializer.
+    static void InitInterface_Impl();
+
+public:
     static ::boost::shared_ptr<SlideSorterViewShell> Create(
         SfxViewFrame* pFrame,
         ViewShellBase& rViewShellBase,
diff --git a/sd/source/ui/inc/TextObjectBar.hxx b/sd/source/ui/inc/TextObjectBar.hxx
index 6d760dc195d9..17388f18c3b6 100644
--- a/sd/source/ui/inc/TextObjectBar.hxx
+++ b/sd/source/ui/inc/TextObjectBar.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_SD_SOURCE_UI_INC_TEXTOBJECTBAR_HXX
 #define INCLUDED_SD_SOURCE_UI_INC_TEXTOBJECTBAR_HXX
 
-
 #include <sfx2/module.hxx>
 #include <sfx2/shell.hxx>
 #include "glob.hxx"
@@ -39,6 +38,11 @@ public:
     TYPEINFO_OVERRIDE();
     SFX_DECL_INTERFACE(SD_IF_SDDRAWTEXTOBJECTBAR)
 
+private:
+    /// SfxInterface initializer.
+    static void InitInterface_Impl();
+
+public:
     TextObjectBar (
         ViewShell* pSdViewShell,
         SfxItemPool& rItemPool,
diff --git a/sd/source/ui/inc/ViewShellBase.hxx b/sd/source/ui/inc/ViewShellBase.hxx
index 02aaa22897fe..e693e6183065 100644
--- a/sd/source/ui/inc/ViewShellBase.hxx
+++ b/sd/source/ui/inc/ViewShellBase.hxx
@@ -66,6 +66,11 @@ public:
     SFX_DECL_VIEWFACTORY(ViewShellBase);
     SFX_DECL_INTERFACE(SD_IF_SDVIEWSHELLBASE)
 
+private:
+    /// SfxInterface initializer.
+    static void InitInterface_Impl();
+
+public:
     /** This constructor is used by the view factory of the SFX macros.
         Note that LateInit() has to be called after the constructor
         terminates and before doing anything else.
diff --git a/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx b/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx
index 3830f5b640c4..329219eba972 100644
--- a/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx
+++ b/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx
@@ -58,6 +58,11 @@ public:
     TYPEINFO_OVERRIDE();
     SFX_DECL_INTERFACE(SD_IF_SDTOOLPANELSHELL)
 
+private:
+    /// SfxInterface initializer.
+    static void InitInterface_Impl();
+
+public:
     ToolPanelViewShell (
         SfxViewFrame* pFrame,
         ViewShellBase& rViewShellBase,
@@ -134,7 +139,6 @@ private:
     */
     ::std::auto_ptr<PopupMenu> CreatePopupMenu (bool bIsDocking);
 
-
     /** Initialize the task pane view shell if that has not yet been done
         before.  If mbIsInitialized is already set to <TRUE/> then this
         method returns immediately.
@@ -142,9 +146,6 @@ private:
     void Initialize (void);
 };
 
-
-
-
 } } // end of namespace ::sd::toolpanel
 
 #endif
diff --git a/sd/source/ui/table/tableobjectbar.hxx b/sd/source/ui/table/tableobjectbar.hxx
index 4bbdf99b267d..b62a4f63236e 100644
--- a/sd/source/ui/table/tableobjectbar.hxx
+++ b/sd/source/ui/table/tableobjectbar.hxx
@@ -39,6 +39,12 @@ public:
     TYPEINFO_OVERRIDE();
     SFX_DECL_INTERFACE( SD_IF_SDDRAWTABLEOBJECTBAR )
 
+private:
+    /// SfxInterface initializer.
+    static void InitInterface_Impl();
+
+public:
+
     TableObjectBar( ::sd::ViewShell* pSdViewShell, ::sd::View* pSdView);
     virtual ~TableObjectBar (void);