strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

MSVC: member of dll interface class may not be declared with dll interface

Browse source 
Change-Id: I751832d8725354cebd892738fa80fd7bc5e43925
This commit is contained in:
Tor Lillqvist 2013-04-30 15:26:07 +03:00
parent abacc389db
commit ade26b5c7b
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
include/sfx2/tbxctrl.hxx
View file

@ -162,7 +162,7 @@ public:
#define SFX_DECL_TOOLBOX_CONTROL() \ #define SFX_DECL_TOOLBOX_CONTROL() \
static SfxToolBoxControl* CreateImpl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox &rTbx ); \ 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 /* For special ToolBox controls, such as a font selection box or toolbox
tear-off floating windows, an appropriate Item-Subclass of SfxTooBoxControl tear-off floating windows, an appropriate Item-Subclass of SfxTooBoxControl
@ -360,7 +360,11 @@ module initialization has to call RegisterControl().
class SfxRecentFilesToolBoxControl : public SfxToolBoxControl class SfxRecentFilesToolBoxControl : public SfxToolBoxControl
{ {
public: 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 ); SfxRecentFilesToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rBox );
virtual ~SfxRecentFilesToolBoxControl(); virtual ~SfxRecentFilesToolBoxControl();