diff options
| author | Tor Lillqvist <tlillqvist@suse.com> | 2013-04-30 15:26:07 +0300 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2013-05-01 00:56:55 +0200 |
| commit | e6a462e56e725aab30614f553e951b91fdd3467b (patch) | |
| tree | 9c2a32a7c93f9322960d441e0bf9d8bcb86d656c | |
| parent | d27159060290da5cebb8c1daea32042394ce59f1 (diff) | |
MSVC: member of dll interface class may not be declared with dll interface
Change-Id: I751832d8725354cebd892738fa80fd7bc5e43925
| -rw-r--r-- | sfx2/inc/sfx2/tbxctrl.hxx | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sfx2/inc/sfx2/tbxctrl.hxx b/sfx2/inc/sfx2/tbxctrl.hxx index 5791654f7aa8..3109d1f0b286 100644 --- a/sfx2/inc/sfx2/tbxctrl.hxx +++ b/sfx2/inc/sfx2/tbxctrl.hxx @@ -174,7 +174,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 @@ -375,7 +375,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(); |