sfx2: Move InitInterface_Impl() out of SFX_DECL_INTERFACE too.

Change-Id: Ib737e0d1b5888986b308aa60d4140f65e4e90243

9 files changed, 46 insertions, 5 deletions

diff --git a/include/sfx2/app.hxx b/include/sfx2/app.hxx
index b628e95e9ccd..17b80b90ba1f 100644
--- a/include/sfx2/app.hxx
+++ b/include/sfx2/app.hxx
@@ -140,6 +140,12 @@ public:
                                 TYPEINFO_OVERRIDE();
                                 SFX_DECL_INTERFACE(SFX_INTERFACE_SFXAPP)
 
+private:
+    /// SfxInterface initializer.
+    static void InitInterface_Impl();
+
+public:
+
                                 SfxApplication();
                                 virtual ~SfxApplication();
     static SfxApplication*      GetOrCreate();
diff --git a/include/sfx2/module.hxx b/include/sfx2/module.hxx
index a12bd1646641..9dbfbad287bd 100644
--- a/include/sfx2/module.hxx
+++ b/include/sfx2/module.hxx
@@ -69,6 +69,12 @@ public:
                                 TYPEINFO_OVERRIDE();
                                 SFX_DECL_INTERFACE(SFX_INTERFACE_SFXMODULE)
 
+private:
+    /// SfxInterface initializer.
+    static void InitInterface_Impl();
+
+public:
+
                                 SfxModule( ResMgr* pMgrP, bool bDummy,
                                     SfxObjectFactory* pFactoryP, ... );
                                 virtual ~SfxModule();
diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx
index 84757d495015..79082aaf72b2 100644
--- a/include/sfx2/objsh.hxx
+++ b/include/sfx2/objsh.hxx
@@ -206,6 +206,11 @@ public:
                                 TYPEINFO_OVERRIDE();
                                 SFX_DECL_INTERFACE(SFX_INTERFACE_SFXDOCSH)
 
+private:
+    /// SfxInterface initializer.
+    static void InitInterface_Impl();
+
+public:
     static const com::sun::star::uno::Sequence<sal_Int8>& getUnoTunnelId();
     /* Stampit disable/enable cancel button for print jobs
        default = true = enable! */
diff --git a/include/sfx2/shell.hxx b/include/sfx2/shell.hxx
index 3a8c5d847085..7047e4dccf46 100644
--- a/include/sfx2/shell.hxx
+++ b/include/sfx2/shell.hxx
@@ -300,9 +300,6 @@ inline void SfxShell::SetPool
 
 #define SFX_DECL_INTERFACE(nId)                                             \
             static SfxInterface*                pInterface;                 \
-        private:                                                            \
-            static void                         InitInterface_Impl();       \
-        public:                                                             \
             static const SfxFormalArgument*     pSfxFormalArgs_Impl;        \
             static SfxInterface*                GetStaticInterface();       \
             static SfxInterfaceId               GetInterfaceId() {return SfxInterfaceId(nId);} \
diff --git a/include/sfx2/viewfrm.hxx b/include/sfx2/viewfrm.hxx
index 86e6f0c5fd0a..09ec9b566214 100644
--- a/include/sfx2/viewfrm.hxx
+++ b/include/sfx2/viewfrm.hxx
@@ -91,6 +91,12 @@ public:
                             TYPEINFO_OVERRIDE();
                             SFX_DECL_INTERFACE(SFX_INTERFACE_SFXVIEWFRM)
 
+private:
+    /// SfxInterface initializer.
+    static void InitInterface_Impl();
+
+public:
+
     static void             SetViewFrame( SfxViewFrame* );
 
     static SfxViewFrame*    LoadHiddenDocument( SfxObjectShell& i_rDoc, const sal_uInt16 i_nViewId );
diff --git a/include/sfx2/viewsh.hxx b/include/sfx2/viewsh.hxx
index e95377b46e5a..a8c3c3214a25 100644
--- a/include/sfx2/viewsh.hxx
+++ b/include/sfx2/viewsh.hxx
@@ -165,6 +165,12 @@ public:
                                 TYPEINFO_OVERRIDE();
                                 SFX_DECL_INTERFACE(SFX_INTERFACE_SFXVIEWSH)
 
+private:
+    /// SfxInterface initializer.
+    static void InitInterface_Impl();
+
+public:
+
                                 SfxViewShell( SfxViewFrame *pFrame, sal_uInt16 nFlags = 0 );
     virtual                     ~SfxViewShell();
 
diff --git a/include/svx/extrusionbar.hxx b/include/svx/extrusionbar.hxx
index fd1effac0781..921c1a272636 100644
--- a/include/svx/extrusionbar.hxx
+++ b/include/svx/extrusionbar.hxx
@@ -41,7 +41,12 @@ public:
     TYPEINFO_OVERRIDE();
     SFX_DECL_INTERFACE(SVX_INTERFACE_EXTRUSION_BAR)
 
-     ExtrusionBar(SfxViewShell* pViewShell );
+private:
+    /// SfxInterface initializer.
+    static void InitInterface_Impl();
+
+public:
+    ExtrusionBar(SfxViewShell* pViewShell);
     virtual ~ExtrusionBar();
 
     static void execute( SdrView* pSdrView, SfxRequest& rReq, SfxBindings& rBindings );
diff --git a/include/svx/fmshell.hxx b/include/svx/fmshell.hxx
index 222c71f36747..b733b253d06c 100644
--- a/include/svx/fmshell.hxx
+++ b/include/svx/fmshell.hxx
@@ -103,6 +103,11 @@ public:
     SFX_DECL_INTERFACE(SVX_INTERFACE_FORM_SH)
     TYPEINFO_OVERRIDE();
 
+private:
+    /// SfxInterface initializer.
+    static void InitInterface_Impl();
+
+public:
     FmFormShell(SfxViewShell* pParent, FmFormView* pView = NULL);
     virtual ~FmFormShell();
 
diff --git a/include/svx/fontworkbar.hxx b/include/svx/fontworkbar.hxx
index 2ca04ca7a3be..f3f06b73fabd 100644
--- a/include/svx/fontworkbar.hxx
+++ b/include/svx/fontworkbar.hxx
@@ -41,7 +41,12 @@ public:
     TYPEINFO_OVERRIDE();
     SFX_DECL_INTERFACE(SVX_INTERFACE_FONTWORK_BAR)
 
-     FontworkBar(SfxViewShell* pViewShell );
+private:
+    /// SfxInterface initializer.
+    static void InitInterface_Impl();
+
+public:
+    FontworkBar(SfxViewShell* pViewShell);
     virtual ~FontworkBar();
 
     static void execute( SdrView* pSdrView, SfxRequest& rReq, SfxBindings& rBindings );