diff options
| author | Tor Lillqvist <tlillqvist@suse.com> | 2013-04-30 15:26:07 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@suse.com> | 2013-04-30 15:27:42 +0300 |
| commit | ade26b5c7bd2a88be5147feace1969cc01ae3ed4 (patch) | |
| tree | a513e49a1ee244131cc6131d11736d2d777e33fe | |
| parent | abacc389db8c7e2bde00cace7292d6259e4c8e6a (diff) | |
MSVC: member of dll interface class may not be declared with dll interface
Change-Id: I751832d8725354cebd892738fa80fd7bc5e43925
| -rw-r--r-- | include/sfx2/tbxctrl.hxx | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/include/sfx2/tbxctrl.hxx b/include/sfx2/tbxctrl.hxx index e50527f31086..b67ed111aa74 100644 --- a/include/sfx2/tbxctrl.hxx +++ b/include/sfx2/tbxctrl.hxx @@ -162,7 +162,7 @@ public: #define SFX_DECL_TOOLBOX_CONTROL() \ static SfxToolBoxControl* CreateImpl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox &rTbx ); \ - static void SFX2_DLLPUBLIC RegisterControl(sal_uInt16 nSlotId = 0, SfxModule *pMod=NULL) + static void RegisterControl(sal_uInt16 nSlotId = 0, SfxModule *pMod=NULL) /* For special ToolBox controls, such as a font selection box or toolbox tear-off floating windows, an appropriate Item-Subclass of SfxTooBoxControl @@ -360,7 +360,11 @@ module initialization has to call RegisterControl(). class SfxRecentFilesToolBoxControl : public SfxToolBoxControl { public: - SFX_DECL_TOOLBOX_CONTROL(); + // We don't use SFX_DECL_TOOLBOX_CONTROL() here as we need to have this + // RegisterControl() marked as SFX2_DLLPUBLIC + static SfxToolBoxControl* CreateImpl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox &rTbx ); + static void SFX2_DLLPUBLIC RegisterControl(sal_uInt16 nSlotId = 0, SfxModule *pMod=NULL); + SfxRecentFilesToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rBox ); virtual ~SfxRecentFilesToolBoxControl(); |