sfx2/inc/sfx2/tbxctrl.hxx | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
New commits:
commit a5b6a379a2d628040db98060c2adfe8f2fac5607
Author: Tor Lillqvist <tlillqv...@suse.com>
Date: Tue Apr 30 15:26:07 2013 +0300
MSVC: member of dll interface class may not be declared with dll interface
Change-Id: I751832d8725354cebd892738fa80fd7bc5e43925
diff --git a/sfx2/inc/sfx2/tbxctrl.hxx b/sfx2/inc/sfx2/tbxctrl.hxx
index 728cee9..5b6b1e4 100644
--- a/sfx2/inc/sfx2/tbxctrl.hxx
+++ b/sfx2/inc/sfx2/tbxctrl.hxx
@@ -163,7 +163,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
@@ -361,7 +361,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();
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
