sfx2: Move InitInterface_Impl() out of SFX_DECL_INTERFACE too.

Change-Id: Ib737e0d1b5888986b308aa60d4140f65e4e90243

78 files changed, 456 insertions, 104 deletions

diff --git a/basctl/source/basicide/basdoc.hxx b/basctl/source/basicide/basdoc.hxx
index baf7a48a119c..4921e70c4549 100644
--- a/basctl/source/basicide/basdoc.hxx
+++ b/basctl/source/basicide/basdoc.hxx
@@ -53,6 +53,12 @@ public:
                         using SotObject::GetInterface;
                         SFX_DECL_OBJECTFACTORY();
                         SFX_DECL_INTERFACE( SVX_INTERFACE_BASIDE_DOCSH )
+
+private:
+    /// SfxInterface initializer.
+    static void InitInterface_Impl();
+
+public:
                         DocShell();
                         virtual ~DocShell();
 
diff --git a/basctl/source/inc/basidesh.hxx b/basctl/source/inc/basidesh.hxx
index fa5d4c65c3ac..97d1ac851268 100644
--- a/basctl/source/inc/basidesh.hxx
+++ b/basctl/source/inc/basidesh.hxx
@@ -152,6 +152,11 @@ public:
     SFX_DECL_INTERFACE( SVX_INTERFACE_BASIDE_VIEWSH )
     SFX_DECL_VIEWFACTORY(Shell);
 
+private:
+    /// SfxInterface initializer.
+    static void InitInterface_Impl();
+
+public:
     Shell( SfxViewFrame *pFrame, SfxViewShell *pOldSh );
     virtual ~Shell();
 
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 );
diff --git a/sc/inc/scmod.hxx b/sc/inc/scmod.hxx
index f15ea3304a00..db68ba765fc7 100644
--- a/sc/inc/scmod.hxx
+++ b/sc/inc/scmod.hxx
@@ -116,6 +116,11 @@ class ScModule: public SfxModule, public SfxListener, utl::ConfigurationListener
 public:
                     SFX_DECL_INTERFACE(SCID_APP)
 
+private:
+    /// SfxInterface initializer.
+    static void InitInterface_Impl();
+
+public:
                     ScModule( SfxObjectFactory* pFact );
     virtual         ~ScModule();
 
diff --git a/sc/source/ui/inc/auditsh.hxx b/sc/source/ui/inc/auditsh.hxx
index 3efcc6b2f110..6a902d6c4d75 100644
--- a/sc/source/ui/inc/auditsh.hxx
+++ b/sc/source/ui/inc/auditsh.hxx
@@ -31,17 +31,22 @@ class ScAuditingShell : public SfxShell
 {
 private:
     ScViewData* pViewData;
-    sal_uInt16      nFunction;
+    sal_uInt16  nFunction;
 
 public:
     TYPEINFO_OVERRIDE();
     SFX_DECL_INTERFACE(SCID_AUDITING_SHELL)
 
-                    ScAuditingShell(ScViewData* pData);
-                    virtual ~ScAuditingShell();
+private:
+    /// SfxInterface initializer.
+    static void InitInterface_Impl();
+
+public:
+    ScAuditingShell(ScViewData* pData);
+    virtual ~ScAuditingShell();
 
-    void    Execute(SfxRequest& rReq);
-    void    GetState(SfxItemSet& rSet);
+    void Execute(SfxRequest& rReq);
+    void GetState(SfxItemSet& rSet);
 };
 
 #endif
diff --git a/sc/source/ui/inc/cellsh.hxx b/sc/source/ui/inc/cellsh.hxx
index bcfbed18f174..b6ad427cb4a7 100644
--- a/sc/source/ui/inc/cellsh.hxx
+++ b/sc/source/ui/inc/cellsh.hxx
@@ -67,10 +67,14 @@ private:
     RotateTransliteration m_aRotateCase;
 
 public:
-
     TYPEINFO_OVERRIDE();
     SFX_DECL_INTERFACE(SCID_CELL_SHELL)
 
+private:
+    /// SfxInterface initializer.
+    static void InitInterface_Impl();
+
+public:
                 ScCellShell(ScViewData* pData);
     virtual     ~ScCellShell();
 
diff --git a/sc/source/ui/inc/chartsh.hxx b/sc/source/ui/inc/chartsh.hxx
index 947e616fb330..5466cb24e009 100644
--- a/sc/source/ui/inc/chartsh.hxx
+++ b/sc/source/ui/inc/chartsh.hxx
@@ -31,17 +31,21 @@ class ScViewData;
 class ScChartShell: public ScDrawShell
 {
 public:
-
     TYPEINFO_OVERRIDE();
     SFX_DECL_INTERFACE(SCID_CHART_SHELL)
 
-                ScChartShell(ScViewData* pData);
-    virtual     ~ScChartShell();
+private:
+    /// SfxInterface initializer.
+    static void InitInterface_Impl();
+
+public:
+    ScChartShell(ScViewData* pData);
+    virtual ~ScChartShell();
 
-    void    ExecuteExportAsGraphic(SfxRequest& rReq);
-    void    GetExportAsGraphicState(SfxItemSet &rSet);
+    void ExecuteExportAsGraphic(SfxRequest& rReq);
+    void GetExportAsGraphicState(SfxItemSet &rSet);
 
-    virtual void HandleSelectionChange (void);
+    virtual void HandleSelectionChange(void);
 };
 
 #endif
diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx
index 60c2657b1ce4..3a85c3c8fa00 100644
--- a/sc/source/ui/inc/docsh.hxx
+++ b/sc/source/ui/inc/docsh.hxx
@@ -170,10 +170,14 @@ protected:
 
 public:
                     TYPEINFO_OVERRIDE();
-
                     SFX_DECL_INTERFACE(SCID_DOC_SHELL)
                     SFX_DECL_OBJECTFACTORY();
 
+private:
+    /// SfxInterface initializer.
+    static void InitInterface_Impl();
+
+public:
                     ScDocShell( const ScDocShell& rDocShell );
                     ScDocShell( const sal_uInt64 i_nSfxCreationFlags = SFXMODEL_EMBEDDED_OBJECT );
                     virtual ~ScDocShell();
diff --git a/sc/source/ui/inc/drawsh.hxx b/sc/source/ui/inc/drawsh.hxx
index 166a40f6b3c3..023a5a2f4270 100644
--- a/sc/source/ui/inc/drawsh.hxx
+++ b/sc/source/ui/inc/drawsh.hxx
@@ -51,6 +51,11 @@ public:
     TYPEINFO_OVERRIDE();
     SFX_DECL_INTERFACE(SCID_DRAW_SHELL)
 
+private:
+    /// SfxInterface initializer.
+    static void InitInterface_Impl();
+
+public:
                     ScDrawShell(ScViewData* pData);
                     virtual ~ScDrawShell();
 
diff --git a/sc/source/ui/inc/drformsh.hxx b/sc/source/ui/inc/drformsh.hxx
index 599906d3e3d4..464a6bd23d9d 100644
--- a/sc/source/ui/inc/drformsh.hxx
+++ b/sc/source/ui/inc/drformsh.hxx
@@ -27,18 +27,21 @@
 
 class ScViewData;
 
-
 #include "drawsh.hxx"
 
 class ScDrawFormShell: public ScDrawShell
 {
 public:
-
     TYPEINFO_OVERRIDE();
     SFX_DECL_INTERFACE(SCID_FORM_SHELL)
 
-                ScDrawFormShell(ScViewData* pData);
-    virtual     ~ScDrawFormShell();
+private:
+    /// SfxInterface initializer.
+    static void InitInterface_Impl();
+
+public:
+    ScDrawFormShell(ScViewData* pData);
+    virtual ~ScDrawFormShell();
 };
 
 #endif
diff --git a/sc/source/ui/inc/drtxtob.hxx b/sc/source/ui/inc/drtxtob.hxx
index 1930a23bc774..0dcba5ff8551 100644
--- a/sc/source/ui/inc/drtxtob.hxx
+++ b/sc/source/ui/inc/drtxtob.hxx
@@ -44,8 +44,13 @@ public:
     TYPEINFO_OVERRIDE();
     SFX_DECL_INTERFACE(SCID_DRAW_TEXT_SHELL)
 
-        ScDrawTextObjectBar(ScViewData* pData);
-        virtual ~ScDrawTextObjectBar();
+private:
+    /// SfxInterface initializer.
+    static void InitInterface_Impl();
+
+public:
+    ScDrawTextObjectBar(ScViewData* pData);
+    virtual ~ScDrawTextObjectBar();
 
     void StateDisableItems( SfxItemSet &rSet );
 
diff --git a/sc/source/ui/inc/editsh.hxx b/sc/source/ui/inc/editsh.hxx
index d77d991d50c4..26c55af5361c 100644
--- a/sc/source/ui/inc/editsh.hxx
+++ b/sc/source/ui/inc/editsh.hxx
@@ -52,8 +52,13 @@ public:
     TYPEINFO_OVERRIDE();
     SFX_DECL_INTERFACE(SCID_EDIT_SHELL)
 
-                    ScEditShell(EditView* pView, ScViewData* pData);
-                    virtual ~ScEditShell();
+private:
+    /// SfxInterface initializer.
+    static void InitInterface_Impl();
+
+public:
+    ScEditShell(EditView* pView, ScViewData* pData);
+    virtual ~ScEditShell();
 
     void    SetEditView(EditView* pView);
     EditView* GetEditView() {return pEditView;}
diff --git a/sc/source/ui/inc/formatsh.hxx b/sc/source/ui/inc/formatsh.hxx
index 13b004fdfb15..5be26e7da71e 100644
--- a/sc/source/ui/inc/formatsh.hxx
+++ b/sc/source/ui/inc/formatsh.hxx
@@ -32,15 +32,18 @@ class ScFormatShell: public SfxShell
     ScViewData* pViewData;
 
 protected:
-
     ScViewData*         GetViewData(){return pViewData;}
     const ScViewData*   GetViewData() const {return pViewData;}
 
 public:
-
     TYPEINFO_OVERRIDE();
     SFX_DECL_INTERFACE(SCID_FORMAT_SHELL)
 
+private:
+    /// SfxInterface initializer.
+    static void InitInterface_Impl();
+
+public:
                 ScFormatShell(ScViewData* pData);
     virtual     ~ScFormatShell();
 
diff --git a/sc/source/ui/inc/graphsh.hxx b/sc/source/ui/inc/graphsh.hxx
index a00b24e80fcb..35d43d014c41 100644
--- a/sc/source/ui/inc/graphsh.hxx
+++ b/sc/source/ui/inc/graphsh.hxx
@@ -32,12 +32,16 @@ class ScViewData;
 class ScGraphicShell: public ScDrawShell
 {
 public:
-
     TYPEINFO_OVERRIDE();
     SFX_DECL_INTERFACE(SCID_GRAPHIC_SHELL)
 
-                ScGraphicShell(ScViewData* pData);
-    virtual     ~ScGraphicShell();
+private:
+    /// SfxInterface initializer.
+    static void InitInterface_Impl();
+
+public:
+    ScGraphicShell(ScViewData* pData);
+    virtual ~ScGraphicShell();
 
     void    Execute(SfxRequest& rReq);
     void    GetAttrState(SfxItemSet &rSet);
diff --git a/sc/source/ui/inc/mediash.hxx b/sc/source/ui/inc/mediash.hxx
index eb329256403b..d02b1c320a2a 100644
--- a/sc/source/ui/inc/mediash.hxx
+++ b/sc/source/ui/inc/mediash.hxx
@@ -32,15 +32,19 @@ class ScViewData;
 class ScMediaShell: public ScDrawShell
 {
 public:
-
     TYPEINFO_OVERRIDE();
     SFX_DECL_INTERFACE(SCID_MEDIA_SHELL)
 
-                ScMediaShell(ScViewData* pData);
-    virtual     ~ScMediaShell();
+private:
+    /// SfxInterface initializer.
+    static void InitInterface_Impl();
+
+public:
+    ScMediaShell(ScViewData* pData);
+    virtual ~ScMediaShell();
 
-    void    ExecuteMedia(SfxRequest& rReq);
-    void    GetMediaState(SfxItemSet &rSet);
+    void ExecuteMedia(SfxRequest& rReq);
+    void GetMediaState(SfxItemSet &rSet);
 };
 
 #endif
diff --git a/sc/source/ui/inc/oleobjsh.hxx b/sc/source/ui/inc/oleobjsh.hxx
index f82e5621dd59..6adfc6f10b2f 100644
--- a/sc/source/ui/inc/oleobjsh.hxx
+++ b/sc/source/ui/inc/oleobjsh.hxx
@@ -32,14 +32,18 @@ class ScViewData;
 class ScOleObjectShell: public ScDrawShell
 {
 public:
-
     TYPEINFO_OVERRIDE();
     SFX_DECL_INTERFACE(SCID_OLEOBJECT_SHELL)
 
-                ScOleObjectShell(ScViewData* pData);
-    virtual     ~ScOleObjectShell();
+private:
+    /// SfxInterface initializer.
+    static void InitInterface_Impl();
+
+public:
+    ScOleObjectShell(ScViewData* pData);
+    virtual ~ScOleObjectShell();
 
-    virtual void HandleSelectionChange (void);
+    virtual void HandleSelectionChange();
 };
 
 #endif
diff --git a/sc/source/ui/inc/pgbrksh.hxx b/sc/source/ui/inc/pgbrksh.hxx
index 3718cbcfe614..5db4da5de273 100644
--- a/sc/source/ui/inc/pgbrksh.hxx
+++ b/sc/source/ui/inc/pgbrksh.hxx
@@ -33,12 +33,16 @@ public:
     TYPEINFO_OVERRIDE();
     SFX_DECL_INTERFACE(SCID_PAGEBREAK_SHELL)
 
-                    ScPageBreakShell( ScTabViewShell* pView );
-                    virtual ~ScPageBreakShell();
+private:
+    /// SfxInterface initializer.
+    static void InitInterface_Impl();
+
+public:
+    ScPageBreakShell(ScTabViewShell* pView);
+    virtual ~ScPageBreakShell();
 
 };
 
 #endif
 
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/inc/pivotsh.hxx b/sc/source/ui/inc/pivotsh.hxx
index d52259f95254..a610aa517596 100644
--- a/sc/source/ui/inc/pivotsh.hxx
+++ b/sc/source/ui/inc/pivotsh.hxx
@@ -34,11 +34,16 @@ public:
     TYPEINFO_OVERRIDE();
     SFX_DECL_INTERFACE(SCID_PIVOT_SHELL)
 
-                    ScPivotShell( ScTabViewShell* pView );
-                    virtual ~ScPivotShell();
+private:
+    /// SfxInterface initializer.
+    static void InitInterface_Impl();
+
+public:
+    ScPivotShell(ScTabViewShell* pView);
+    virtual ~ScPivotShell();
 
-    void    Execute ( SfxRequest& rReq );
-    void    GetState( SfxItemSet& rSet );
+    void Execute(SfxRequest& rReq);
+    void GetState(SfxItemSet& rSet);
 
 private:
     ScTabViewShell* pViewShell;
diff --git a/sc/source/ui/inc/prevwsh.hxx b/sc/source/ui/inc/prevwsh.hxx
index 851824d15289..3f5a7341bda0 100644
--- a/sc/source/ui/inc/prevwsh.hxx
+++ b/sc/source/ui/inc/prevwsh.hxx
@@ -79,10 +79,14 @@ protected:
 
 public:
                     TYPEINFO_VISIBILITY( SC_DLLPUBLIC );
-
                     SFX_DECL_INTERFACE(SCID_PREVIEW_SHELL)
                     SFX_DECL_VIEWFACTORY(ScPreviewShell);
 
+private:
+    /// SfxInterface initializer.
+    static void InitInterface_Impl();
+
+public:
                     ScPreviewShell( SfxViewFrame*           pViewFrame,
                                     SfxViewShell*           pOldSh );
 
diff --git a/sc/source/ui/inc/tabvwsh.hxx b/sc/source/ui/inc/tabvwsh.hxx
index bd5f0a20b1f7..a4aa81a568df 100644
--- a/sc/source/ui/inc/tabvwsh.hxx
+++ b/sc/source/ui/inc/tabvwsh.hxx
@@ -230,11 +230,14 @@ protected:
 
 public:
                     TYPEINFO_VISIBILITY(SC_DLLPUBLIC);
-
                     SFX_DECL_INTERFACE(SCID_TABVIEW_SHELL)
                     SFX_DECL_VIEWFACTORY(ScTabViewShell);
 
+private:
+    /// SfxInterface initializer.
+    static void InitInterface_Impl();
 
+public:
                     /** -> Clone Method for Factory
                         Created from a general shell and inherit as much as possible */
                     ScTabViewShell( SfxViewFrame*           pViewFrame,
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);
 
diff --git a/sfx2/source/control/shell.cxx b/sfx2/source/control/shell.cxx
index 25b907935d07..b1f0aa2ebfbd 100644
--- a/sfx2/source/control/shell.cxx
+++ b/sfx2/source/control/shell.cxx
@@ -46,7 +46,6 @@
 
 #include <map>
 
-
 // Maps the Which() field to a pointer to a SfxPoolItem
 class SfxItemPtrMap : public std::map<sal_uInt16, SfxPoolItem*>
 {
@@ -60,7 +59,6 @@ public:
 
 TYPEINIT0(SfxShell);
 
-
 class SfxVerbSlotArr_Impl : public std::vector<SfxSlot*>
 {
 public:
@@ -73,7 +71,6 @@ public:
 
 using namespace com::sun::star;
 
-
 // SfxShell_Impl
 
 struct SfxShell_Impl: public SfxBroadcaster
diff --git a/starmath/inc/document.hxx b/starmath/inc/document.hxx
index a32520156ad1..eba196d161e1 100644
--- a/starmath/inc/document.hxx
+++ b/starmath/inc/document.hxx
@@ -156,9 +156,15 @@ class SmDocShell : public SfxObjectShell, public SfxListener
 public:
     TYPEINFO_OVERRIDE();
     SFX_DECL_INTERFACE(SFX_INTERFACE_SMA_START+1)
+
     using SotObject::GetInterface;
     SFX_DECL_OBJECTFACTORY();
 
+private:
+    /// SfxInterface initializer.
+    static void InitInterface_Impl();
+
+public:
                 SmDocShell( const sal_uInt64 i_nSfxCreationFlags );
     virtual     ~SmDocShell();
 
diff --git a/starmath/inc/smmod.hxx b/starmath/inc/smmod.hxx
index aa3540602650..b3af03d781e0 100644
--- a/starmath/inc/smmod.hxx
+++ b/starmath/inc/smmod.hxx
@@ -84,8 +84,6 @@ public:
     const OUString        GetExportSymbolSetName( const OUString &rUiName ) const;
 };
 
-
-
 class SmModule : public SfxModule, utl::ConfigurationListener
 {
     svtools::ColorConfig        *pColorConfig;
@@ -103,6 +101,11 @@ public:
     TYPEINFO_OVERRIDE();
     SFX_DECL_INTERFACE(SFX_INTERFACE_SMA_START + 0)
 
+private:
+    /// SfxInterface initializer.
+    static void InitInterface_Impl();
+
+public:
     SmModule(SfxObjectFactory* pObjFact);
     virtual ~SmModule();
 
diff --git a/starmath/inc/view.hxx b/starmath/inc/view.hxx
index 1f35a4b286d6..9c7980609250 100644
--- a/starmath/inc/view.hxx
+++ b/starmath/inc/view.hxx
@@ -298,6 +298,11 @@ public:
     SFX_DECL_INTERFACE(SFX_INTERFACE_SMA_START+2)
     SFX_DECL_VIEWFACTORY(SmViewShell);
 
+private:
+    /// SfxInterface initializer.
+    static void InitInterface_Impl();
+
+public:
     virtual void Execute( SfxRequest& rReq );
     virtual void GetState(SfxItemSet &);
 
diff --git a/sw/inc/docsh.hxx b/sw/inc/docsh.hxx
index 179744ae0ae6..278991c6770c 100644
--- a/sw/inc/docsh.hxx
+++ b/sw/inc/docsh.hxx
@@ -151,6 +151,11 @@ public:
     SFX_DECL_OBJECTFACTORY()
     TYPEINFO_OVERRIDE();
 
+private:
+    /// SfxInterface initializer.
+    static void InitInterface_Impl();
+
+public:
     static SfxInterface *_GetInterface() { return GetStaticInterface(); }
 
     static OUString GetEventName( sal_Int32 nId );
diff --git a/sw/inc/swmodule.hxx b/sw/inc/swmodule.hxx
index ba4198abb035..621789018aeb 100644
--- a/sw/inc/swmodule.hxx
+++ b/sw/inc/swmodule.hxx
@@ -124,6 +124,11 @@ public:
     TYPEINFO_OVERRIDE();
     SFX_DECL_INTERFACE(SW_INTERFACE_MODULE)
 
+private:
+    /// SfxInterface initializer.
+    static void InitInterface_Impl();
+
+public:
     // This Ctor only for SW-Dll.
     SwModule( SfxObjectFactory* pFact,
                 SfxObjectFactory* pWebFact,
diff --git a/sw/inc/wdocsh.hxx b/sw/inc/wdocsh.hxx
index bd0e80213b3d..015ec98eaed4 100644
--- a/sw/inc/wdocsh.hxx
+++ b/sw/inc/wdocsh.hxx
@@ -27,7 +27,6 @@ class SW_DLLPUBLIC SwWebDocShell: public SwDocShell
     sal_uInt16      nSourcePara;    // Active line in source view.
 
 public:
-
     using SotObject::GetInterface;
 
     // But implement yourself.
@@ -35,6 +34,11 @@ public:
     SFX_DECL_OBJECTFACTORY();
     TYPEINFO_OVERRIDE();
 
+private:
+    /// SfxInterface initializer.
+    static void InitInterface_Impl();
+
+public:
     SwWebDocShell(SfxObjectCreateMode eMode = SFX_CREATE_MODE_EMBEDDED);
     virtual ~SwWebDocShell();
 
diff --git a/sw/source/core/uibase/inc/annotsh.hxx b/sw/source/core/uibase/inc/annotsh.hxx
index 02fe9f399ed4..385810330d69 100644
--- a/sw/source/core/uibase/inc/annotsh.hxx
+++ b/sw/source/core/uibase/inc/annotsh.hxx
@@ -34,6 +34,11 @@ public:
     SFX_DECL_INTERFACE(SW_ANNOTATIONSHELL)
     TYPEINFO_OVERRIDE();
 
+private:
+    /// SfxInterface initializer.
+    static void InitInterface_Impl();
+
+public:
                 SwAnnotationShell(SwView&);
     virtual     ~SwAnnotationShell();
 
diff --git a/sw/source/core/uibase/inc/basesh.hxx b/sw/source/core/uibase/inc/basesh.hxx
index 5bbdb896a775..a145bbb5b753 100644
--- a/sw/source/core/uibase/inc/basesh.hxx
+++ b/sw/source/core/uibase/inc/basesh.hxx
@@ -71,6 +71,11 @@ public:
     SFX_DECL_INTERFACE(SW_BASESHELL)
     TYPEINFO_OVERRIDE();
 
+private:
+    /// SfxInterface initializer.
+    static void InitInterface_Impl();
+
+public:
     void        ExecDelete(SfxRequest &);
 
     void        ExecClpbrd(SfxRequest &);
diff --git a/sw/source/core/uibase/inc/beziersh.hxx b/sw/source/core/uibase/inc/beziersh.hxx
index 458ba453d2af..841440c9db9f 100644
--- a/sw/source/core/uibase/inc/beziersh.hxx
+++ b/sw/source/core/uibase/inc/beziersh.hxx
@@ -27,6 +27,11 @@ public:
     SFX_DECL_INTERFACE(SW_BEZIERSHELL)
     TYPEINFO_OVERRIDE();
 
+private:
+    /// SfxInterface initializer.
+    static void InitInterface_Impl();
+
+public:
             SwBezierShell(SwView &rView);
 
     void    GetState(SfxItemSet &);
diff --git a/sw/source/core/uibase/inc/drawsh.hxx b/sw/source/core/uibase/inc/drawsh.hxx
index 88888c50e85d..44eef8be2671 100644
--- a/sw/source/core/uibase/inc/drawsh.hxx
+++ b/sw/source/core/uibase/inc/drawsh.hxx
@@ -29,6 +29,11 @@ public:
     SFX_DECL_INTERFACE(SW_DRAWSHELL)
     TYPEINFO_OVERRIDE();
 
+private:
+    /// SfxInterface initializer.
+    static void InitInterface_Impl();
+
+public:
                 SwDrawShell(SwView &rView);
 
     void        Execute(SfxRequest &);
diff --git a/sw/source/core/uibase/inc/drformsh.hxx b/sw/source/core/uibase/inc/drformsh.hxx
index 9468a82a8c39..2cdcc11cd4a8 100644
--- a/sw/source/core/uibase/inc/drformsh.hxx
+++ b/sw/source/core/uibase/inc/drformsh.hxx
@@ -29,6 +29,11 @@ public:
     SFX_DECL_INTERFACE(SW_DRAWFORMSHELL)
     TYPEINFO_OVERRIDE();
 
+private:
+    /// SfxInterface initializer.
+    static void InitInterface_Impl();
+
+public:
                 SwDrawFormShell(SwView &rView);
     virtual     ~SwDrawFormShell();
 
diff --git a/sw/source/core/uibase/inc/drwbassh.hxx b/sw/source/core/uibase/inc/drwbassh.hxx
index b5ed0a22bc8f..1c6406a5b5e6 100644
--- a/sw/source/core/uibase/inc/drwbassh.hxx
+++ b/sw/source/core/uibase/inc/drwbassh.hxx
@@ -18,6 +18,7 @@
  */
 #ifndef INCLUDED_SW_SOURCE_UI_INC_DRWBASSH_HXX
 #define INCLUDED_SW_SOURCE_UI_INC_DRWBASSH_HXX
+
 #include "basesh.hxx"
 
 class SwView;
@@ -30,7 +31,7 @@ class SwDrawBaseShell: public SwBaseShell
 {
     SwDrawBase* pDrawActual;
 
-    sal_uInt16      eDrawMode;
+    sal_uInt16  eDrawMode;
 
     DECL_LINK( CheckGroupShapeNameHdl, AbstractSvxNameDialog* );
     DECL_LINK(ValidatePosition, SvxSwFrameValidation* );
@@ -41,14 +42,18 @@ public:
     SFX_DECL_INTERFACE(SW_DRAWBASESHELL)
     TYPEINFO_OVERRIDE();
 
+private:
+    /// SfxInterface initializer.
+    static void InitInterface_Impl();
+
+public:
     void        Execute(SfxRequest &);
     void        GetState(SfxItemSet &);
     void        GetDrawAttrStateForIFBX( SfxItemSet& rSet );
     void        DisableState(SfxItemSet &rSet)               { Disable(rSet);}
-    sal_Bool        Disable(SfxItemSet& rSet, sal_uInt16 nWhich = 0);
+    sal_Bool    Disable(SfxItemSet& rSet, sal_uInt16 nWhich = 0);
 
     void        StateStatusline(SfxItemSet &rSet);
-
 };
 
 #endif
diff --git a/sw/source/core/uibase/inc/drwtxtsh.hxx b/sw/source/core/uibase/inc/drwtxtsh.hxx
index 1da91e4766fc..9046db46d600 100644
--- a/sw/source/core/uibase/inc/drwtxtsh.hxx
+++ b/sw/source/core/uibase/inc/drwtxtsh.hxx
@@ -36,11 +36,17 @@ class SwDrawTextShell: public SfxShell
 
     void        SetAttrToMarked(const SfxItemSet& rAttr);
     void        InsertSymbol(SfxRequest& rReq);
-    sal_Bool        IsTextEdit();
+    sal_Bool    IsTextEdit();
+
 public:
     SFX_DECL_INTERFACE(SW_DRWTXTSHELL)
     TYPEINFO_OVERRIDE();
 
+private:
+    /// SfxInterface initializer.
+    static void InitInterface_Impl();
+
+public:
     SwView     &GetView() { return rView; }
     SwWrtShell &GetShell();
 
diff --git a/sw/source/core/uibase/inc/frmsh.hxx b/sw/source/core/uibase/inc/frmsh.hxx
index 4bed75ff0fa5..1e43a96d784b 100644
--- a/sw/source/core/uibase/inc/frmsh.hxx
+++ b/sw/source/core/uibase/inc/frmsh.hxx
@@ -23,10 +23,14 @@
 
 class SwFrameShell: public SwBaseShell
 {
-
 public:
     SFX_DECL_INTERFACE(SW_FRAMESHELL)
 
+private:
+    /// SfxInterface initializer.
+    static void InitInterface_Impl();
+
+public:
             SwFrameShell(SwView &rView);
     virtual ~SwFrameShell();
 
diff --git a/sw/source/core/uibase/inc/glshell.hxx b/sw/source/core/uibase/inc/glshell.hxx
index eac10f079af9..e5e5e735790d 100644
--- a/sw/source/core/uibase/inc/glshell.hxx
+++ b/sw/source/core/uibase/inc/glshell.hxx
@@ -32,10 +32,14 @@ protected:
     virtual bool Save() SAL_OVERRIDE;
 
 public:
-
     TYPEINFO_OVERRIDE();
     SFX_DECL_INTERFACE(SW_GLOSDOCSHELL)
 
+private:
+    /// SfxInterface initializer.
+    static void InitInterface_Impl();
+
+public:
     SwGlosDocShell( sal_Bool bNewShow = sal_True);
     virtual ~SwGlosDocShell();
 
@@ -62,10 +66,14 @@ protected:
     virtual bool Save() SAL_OVERRIDE;
 
 public:
-
     TYPEINFO_OVERRIDE();
     SFX_DECL_INTERFACE(SW_WEBGLOSDOCSHELL)
 
+private:
+    /// SfxInterface initializer.
+    static void InitInterface_Impl();
+
+public:
     SwWebGlosDocShell();
     virtual ~SwWebGlosDocShell();
 
diff --git a/sw/source/core/uibase/inc/grfsh.hxx b/sw/source/core/uibase/inc/grfsh.hxx
index b05b5cb97d16..3c341836f3bc 100644
--- a/sw/source/core/uibase/inc/grfsh.hxx
+++ b/sw/source/core/uibase/inc/grfsh.hxx
@@ -26,6 +26,11 @@ class SwGrfShell: public SwBaseShell
 public:
     SFX_DECL_INTERFACE(SW_GRFSHELL)
 
+private:
+    /// SfxInterface initializer.
+    static void InitInterface_Impl();
+
+public:
     void Execute(SfxRequest& rRequest);
     void ExecAttr(SfxRequest& rRequest);
     void GetAttrState(SfxItemSet& rRequest);
diff --git a/sw/source/core/uibase/inc/listsh.hxx b/sw/source/core/uibase/inc/listsh.hxx
index ee6a57cb5ea6..9efeee35d981 100644
--- a/sw/source/core/uibase/inc/listsh.hxx
+++ b/sw/source/core/uibase/inc/listsh.hxx
@@ -27,6 +27,11 @@ public:
     SFX_DECL_INTERFACE(SW_LISTSHELL)
     TYPEINFO_OVERRIDE();
 
+private:
+    /// SfxInterface initializer.
+    static void InitInterface_Impl();
+
+public:
             SwListShell(SwView &rView);
 
     void    Execute(SfxRequest &);
diff --git a/sw/source/core/uibase/inc/mediash.hxx b/sw/source/core/uibase/inc/mediash.hxx
index 8d8cfd7b23b4..a197cdc08279 100644
--- a/sw/source/core/uibase/inc/mediash.hxx
+++ b/sw/source/core/uibase/inc/mediash.hxx
@@ -26,6 +26,11 @@ class SwMediaShell: public SwBaseShell
 public:
     SFX_DECL_INTERFACE(SW_MEDIASHELL)
 
+private:
+    /// SfxInterface initializer.
+    static void InitInterface_Impl();
+
+public:
     void    ExecMedia(SfxRequest &);
     void    GetMediaState(SfxItemSet &);
 
diff --git a/sw/source/core/uibase/inc/navsh.hxx b/sw/source/core/uibase/inc/navsh.hxx
index d05983a3948c..3c103e98b982 100644
--- a/sw/source/core/uibase/inc/navsh.hxx
+++ b/sw/source/core/uibase/inc/navsh.hxx
@@ -16,13 +16,19 @@ class SfxItemSet;
 class SwNavigationShell: public SwBaseShell
 {
 public:
-  SFX_DECL_INTERFACE(SW_NAVIGATIONSHELL)
+    SFX_DECL_INTERFACE(SW_NAVIGATIONSHELL)
 
-  SwNavigationShell(SwView &rView);
+private:
+    /// SfxInterface initializer.
+    static void InitInterface_Impl();
 
-  void  GetState(SfxItemSet &);
-  void  Execute(SfxRequest &);
+public:
+    SwNavigationShell(SwView &rView);
+
+    void GetState(SfxItemSet &);
+    void Execute(SfxRequest &);
 };
 
 #endif
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/uibase/inc/olesh.hxx b/sw/source/core/uibase/inc/olesh.hxx
index f9b6108a8edf..15c8a2175198 100644
--- a/sw/source/core/uibase/inc/olesh.hxx
+++ b/sw/source/core/uibase/inc/olesh.hxx
@@ -26,8 +26,12 @@ class SwOleShell: public SwFrameShell
 public:
     SFX_DECL_INTERFACE(SW_OLESHELL)
 
-            SwOleShell(SwView &rView);
+private:
+    /// SfxInterface initializer.
+    static void InitInterface_Impl();
 
+public:
+    SwOleShell(SwView &rView);
 };
 
 #endif
diff --git a/sw/source/core/uibase/inc/pview.hxx b/sw/source/core/uibase/inc/pview.hxx
index 59bdf83e6c5b..4db7139ce45b 100644
--- a/sw/source/core/uibase/inc/pview.hxx
+++ b/sw/source/core/uibase/inc/pview.hxx
@@ -220,6 +220,11 @@ public:
     SFX_DECL_INTERFACE(SW_PAGEPREVIEW)
     TYPEINFO_OVERRIDE();
 
+private:
+    /// SfxInterface initializer.
+    static void InitInterface_Impl();
+
+public:
     inline Window*          GetFrameWindow() const { return &(GetViewFrame())->GetWindow(); }
     inline SwViewShell*       GetViewShell() const { return pViewWin->GetViewShell(); }
     inline const Rectangle& GetVisArea() const { return aVisArea; }
diff --git a/sw/source/core/uibase/inc/srcview.hxx b/sw/source/core/uibase/inc/srcview.hxx
index 6ac7f305641a..43636d51544b 100644
--- a/sw/source/core/uibase/inc/srcview.hxx
+++ b/sw/source/core/uibase/inc/srcview.hxx
@@ -50,11 +50,15 @@ protected:
                                                         sal_Bool bRecursive = sal_False);
 
 public:
-
     SFX_DECL_VIEWFACTORY(SwSrcView);
     SFX_DECL_INTERFACE(SW_SRC_VIEWSHELL)
     TYPEINFO_OVERRIDE();
 
+private:
+    /// SfxInterface initializer.
+    static void InitInterface_Impl();
+
+public:
     SwSrcView(SfxViewFrame* pFrame, SfxViewShell*);
 
     virtual ~SwSrcView();
diff --git a/sw/source/core/uibase/inc/tabsh.hxx b/sw/source/core/uibase/inc/tabsh.hxx
index 9928fcb356a1..78c23cd7ea70 100644
--- a/sw/source/core/uibase/inc/tabsh.hxx
+++ b/sw/source/core/uibase/inc/tabsh.hxx
@@ -36,6 +36,11 @@ public:
     SFX_DECL_INTERFACE(SW_TABSHELL)
     TYPEINFO_OVERRIDE();
 
+private:
+    /// SfxInterface initializer.
+    static void InitInterface_Impl();
+
+public:
     void    Execute(SfxRequest &);
     void    GetState(SfxItemSet &);
     void    GetFrmBorderState(SfxItemSet &rSet);
diff --git a/sw/source/core/uibase/inc/textsh.hxx b/sw/source/core/uibase/inc/textsh.hxx
index 9bb47271e3a4..3adf8669a602 100644
--- a/sw/source/core/uibase/inc/textsh.hxx
+++ b/sw/source/core/uibase/inc/textsh.hxx
@@ -37,10 +37,14 @@ class SwTextShell: public SwBaseShell
     bool InsertMediaDlg( SfxRequest& );
 
 public:
-
     SFX_DECL_INTERFACE(SW_TEXTSHELL)
     TYPEINFO_OVERRIDE();
 
+private:
+    /// SfxInterface initializer.
+    static void InitInterface_Impl();
+
+public:
     DECL_LINK( RedlineNextHdl, AbstractSvxPostItDialog * );
     DECL_LINK( RedlinePrevHdl, AbstractSvxPostItDialog * );
 
diff --git a/sw/source/core/uibase/inc/view.hxx b/sw/source/core/uibase/inc/view.hxx
index 6526b22d93f5..b1b736d40a84 100644
--- a/sw/source/core/uibase/inc/view.hxx
+++ b/sw/source/core/uibase/inc/view.hxx
@@ -394,11 +394,15 @@ protected:
     using SfxShell::GetDispatcher;
 
 public:
-
     SFX_DECL_VIEWFACTORY(SwView);
     SFX_DECL_INTERFACE(SW_VIEWSHELL)
     TYPEINFO_OVERRIDE();
 
+private:
+    /// SfxInterface initializer.
+    static void InitInterface_Impl();
+
+public:
     SfxDispatcher   &GetDispatcher();
 
     void                    GotFocus() const;
diff --git a/sw/source/core/uibase/inc/wformsh.hxx b/sw/source/core/uibase/inc/wformsh.hxx
index 697c67aa5b13..90ec9b13e17f 100644
--- a/sw/source/core/uibase/inc/wformsh.hxx
+++ b/sw/source/core/uibase/inc/wformsh.hxx
@@ -25,9 +25,15 @@ class SwWebDrawFormShell : public SwDrawFormShell
 {
 public:
     SwWebDrawFormShell(SwView &rShell);
-    virtual     ~SwWebDrawFormShell();
+    virtual ~SwWebDrawFormShell();
 
     SFX_DECL_INTERFACE(SW_WEBDRAWFORMSHELL)
+
+private:
+    /// SfxInterface initializer.
+    static void InitInterface_Impl();
+
+public:
     TYPEINFO_OVERRIDE();
 };
 
diff --git a/sw/source/core/uibase/inc/wfrmsh.hxx b/sw/source/core/uibase/inc/wfrmsh.hxx
index 390acd29c841..60286b93f638 100644
--- a/sw/source/core/uibase/inc/wfrmsh.hxx
+++ b/sw/source/core/uibase/inc/wfrmsh.hxx
@@ -24,11 +24,15 @@
 
 class SwWebFrameShell: public SwFrameShell
 {
-
 public:
     SFX_DECL_INTERFACE(SW_WEBFRAMESHELL)
     TYPEINFO_OVERRIDE();
 
+private:
+    /// SfxInterface initializer.
+    static void InitInterface_Impl();
+
+public:
              SwWebFrameShell(SwView &rView);
     virtual ~SwWebFrameShell();
 };
diff --git a/sw/source/core/uibase/inc/wgrfsh.hxx b/sw/source/core/uibase/inc/wgrfsh.hxx
index 4a6a045c0dd0..8060dbdda5ff 100644
--- a/sw/source/core/uibase/inc/wgrfsh.hxx
+++ b/sw/source/core/uibase/inc/wgrfsh.hxx
@@ -29,6 +29,10 @@ public:
 
     SFX_DECL_INTERFACE(SW_WEBGRFSHELL)
     TYPEINFO_OVERRIDE();
+
+private:
+    /// SfxInterface initializer.
+    static void InitInterface_Impl();
 };
 
 #endif
diff --git a/sw/source/core/uibase/inc/wlistsh.hxx b/sw/source/core/uibase/inc/wlistsh.hxx
index ad7bf69fd7c6..19aede991ef9 100644
--- a/sw/source/core/uibase/inc/wlistsh.hxx
+++ b/sw/source/core/uibase/inc/wlistsh.hxx
@@ -25,10 +25,16 @@ class SwWebListShell: public SwListShell
 {
 public:
     SFX_DECL_INTERFACE(SW_WEBLISTSHELL)
+
+private:
+    /// SfxInterface initializer.
+    static void InitInterface_Impl();
+
+public:
     TYPEINFO_OVERRIDE();
 
-    virtual     ~SwWebListShell();
-                SwWebListShell(SwView &rView);
+    SwWebListShell(SwView &rView);
+    virtual ~SwWebListShell();
 };
 
 #endif
diff --git a/sw/source/core/uibase/inc/wolesh.hxx b/sw/source/core/uibase/inc/wolesh.hxx
index bf9dcad60718..093cc6018f65 100644
--- a/sw/source/core/uibase/inc/wolesh.hxx
+++ b/sw/source/core/uibase/inc/wolesh.hxx
@@ -26,8 +26,13 @@ class SwWebOleShell: public SwOleShell
 public:
     SFX_DECL_INTERFACE(SW_WEBOLESHELL)
 
-    virtual     ~SwWebOleShell();
-                SwWebOleShell(SwView &rView);
+private:
+    /// SfxInterface initializer.
+    static void InitInterface_Impl();
+
+public:
+    SwWebOleShell(SwView &rView);
+    virtual ~SwWebOleShell();
 };
 
 #endif
diff --git a/sw/source/core/uibase/inc/wtabsh.hxx b/sw/source/core/uibase/inc/wtabsh.hxx
index bc367e20a38c..a423b3c9d632 100644
--- a/sw/source/core/uibase/inc/wtabsh.hxx
+++ b/sw/source/core/uibase/inc/wtabsh.hxx
@@ -27,8 +27,13 @@ public:
     SFX_DECL_INTERFACE(SW_WEBTABSHELL)
     TYPEINFO_OVERRIDE();
 
-    virtual     ~SwWebTableShell();
-                SwWebTableShell(SwView &rView);
+private:
+    /// SfxInterface initializer.
+    static void InitInterface_Impl();
+
+public:
+    SwWebTableShell(SwView &rView);
+    virtual ~SwWebTableShell();
 };
 
 #endif
diff --git a/sw/source/core/uibase/inc/wtextsh.hxx b/sw/source/core/uibase/inc/wtextsh.hxx
index 713aa5e540fd..be11aa4516f8 100644
--- a/sw/source/core/uibase/inc/wtextsh.hxx
+++ b/sw/source/core/uibase/inc/wtextsh.hxx
@@ -24,11 +24,15 @@
 
 class SwWebTextShell: public SwTextShell
 {
-
 public:
     SFX_DECL_INTERFACE(SW_WEBTEXTSHELL)
     TYPEINFO_OVERRIDE();
 
+private:
+    /// SfxInterface initializer.
+    static void InitInterface_Impl();
+
+public:
              SwWebTextShell(SwView &rView);
     virtual ~SwWebTextShell();
 };
diff --git a/sw/source/core/uibase/inc/wview.hxx b/sw/source/core/uibase/inc/wview.hxx
index fa19410f9b2d..355eea993705 100644
--- a/sw/source/core/uibase/inc/wview.hxx
+++ b/sw/source/core/uibase/inc/wview.hxx
@@ -26,12 +26,17 @@ class SW_DLLPUBLIC SwWebView: public SwView
 {
 protected:
     virtual void    SelectShell() SAL_OVERRIDE;
-public:
 
+public:
     SFX_DECL_VIEWFACTORY(SwWebView);
     SFX_DECL_INTERFACE(SW_WEBVIEWSHELL)
     TYPEINFO_OVERRIDE();
 
+private:
+    /// SfxInterface initializer.
+    static void InitInterface_Impl();
+
+public:
     SwWebView(SfxViewFrame* pFrame, SfxViewShell*);
     virtual ~SwWebView();
 };