summaryrefslogtreecommitdiff
path: root/sw/inc
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2017-03-17 17:08:11 +0100
committerStephan Bergmann <sbergman@redhat.com>2017-03-17 17:08:33 +0100
commit5e3cca7b0ae81e2467fb306c1c707f6f5ba7d284 (patch)
tree57acf2288ab7163a17cfba6e239981b4b06177cd /sw/inc
parentf6e4de5a810aaa6bad75832ff21c2d52611e3543 (diff)
More workaround for the MSVC "dllpublic base template" mis-feature
(happens at least with a --disable-pch build) Change-Id: Id62b254e7835ab923955f0f6529bafa6825aa103
Diffstat (limited to 'sw/inc')
-rw-r--r--sw/inc/grfatr.hxx11
1 files changed, 9 insertions, 2 deletions
diff --git a/sw/inc/grfatr.hxx b/sw/inc/grfatr.hxx
index 396c4439d27a..b04b127d85ff 100644
--- a/sw/inc/grfatr.hxx
+++ b/sw/inc/grfatr.hxx
@@ -259,11 +259,18 @@ public:
sal_uInt8 nMemberId ) override;
};
-class SW_DLLPUBLIC SwDrawModeGrf : public SfxEnumItem<GraphicDrawMode>
+// MSVC hack:
+class SwDrawModeGrf_Base: public SfxEnumItem<GraphicDrawMode> {
+protected:
+ SwDrawModeGrf_Base(GraphicDrawMode nMode):
+ SfxEnumItem(RES_GRFATR_DRAWMODE, nMode) {}
+};
+
+class SW_DLLPUBLIC SwDrawModeGrf : public SwDrawModeGrf_Base
{
public:
SwDrawModeGrf( GraphicDrawMode nMode = GraphicDrawMode::Standard )
- : SfxEnumItem( RES_GRFATR_DRAWMODE, nMode )
+ : SwDrawModeGrf_Base( nMode )
{}
// pure virtual methods of SfxPoolItem