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 /sw/inc | |
| parent | b731d71c67b864b61f5c08e219140be59c473f53 (diff) | |
sfx2: Move InitInterface_Impl() out of SFX_DECL_INTERFACE too.
Change-Id: Ib737e0d1b5888986b308aa60d4140f65e4e90243
Diffstat (limited to 'sw/inc')
| -rw-r--r-- | sw/inc/docsh.hxx | 5 | ||||
| -rw-r--r-- | sw/inc/swmodule.hxx | 5 | ||||
| -rw-r--r-- | sw/inc/wdocsh.hxx | 6 |
3 files changed, 15 insertions, 1 deletions
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(); |