sfx2: Move InitInterface_Impl() out of SFX_DECL_INTERFACE too.

Change-Id: Ib737e0d1b5888986b308aa60d4140f65e4e90243

16 files changed, 110 insertions, 44 deletions

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,