diff options
author | Jan Holesovsky <kendy@collabora.com> | 2014-04-18 18:04:32 +0200 |
---|---|---|
committer | Jan Holesovsky <kendy@collabora.com> | 2014-04-18 22:51:06 +0200 |
commit | 29d5ce2d88732c12c986d3b7991897043a7be576 (patch) | |
tree | dc33c784246e411b5434e22f64f71a297358f59e /include/sfx2 | |
parent | b731d71c67b864b61f5c08e219140be59c473f53 (diff) |
sfx2: Move InitInterface_Impl() out of SFX_DECL_INTERFACE too.
Change-Id: Ib737e0d1b5888986b308aa60d4140f65e4e90243
Diffstat (limited to 'include/sfx2')
-rw-r--r-- | include/sfx2/app.hxx | 6 | ||||
-rw-r--r-- | include/sfx2/module.hxx | 6 | ||||
-rw-r--r-- | include/sfx2/objsh.hxx | 5 | ||||
-rw-r--r-- | include/sfx2/shell.hxx | 3 | ||||
-rw-r--r-- | include/sfx2/viewfrm.hxx | 6 | ||||
-rw-r--r-- | include/sfx2/viewsh.hxx | 6 |
6 files changed, 29 insertions, 3 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(); |