diff options
| -rw-r--r-- | include/svx/sdgmoitm.hxx | 14 | ||||
| -rw-r--r-- | sw/inc/grfatr.hxx | 11 |
2 files changed, 20 insertions, 5 deletions
diff --git a/include/svx/sdgmoitm.hxx b/include/svx/sdgmoitm.hxx index 2ff3c6e0fcc9..2c7f13a2f9cd 100644 --- a/include/svx/sdgmoitm.hxx +++ b/include/svx/sdgmoitm.hxx @@ -25,12 +25,20 @@ #include <svx/svddef.hxx> #include <svx/svxdllapi.h> +// MSVC hack: +class SdrGrafModeItem_Base: public SfxEnumItem<GraphicDrawMode> { +protected: + SdrGrafModeItem_Base(GraphicDrawMode eMode): + SfxEnumItem(SDRATTR_GRAFMODE, eMode) {} -class SVX_DLLPUBLIC SdrGrafModeItem : public SfxEnumItem<GraphicDrawMode> + SdrGrafModeItem_Base(SvStream& rIn): SfxEnumItem(SDRATTR_GRAFMODE, rIn) {} +}; + +class SVX_DLLPUBLIC SdrGrafModeItem : public SdrGrafModeItem_Base { public: - SdrGrafModeItem( GraphicDrawMode eMode = GraphicDrawMode::Standard ) : SfxEnumItem( SDRATTR_GRAFMODE, eMode ) {} - SdrGrafModeItem( SvStream& rIn ) : SfxEnumItem( SDRATTR_GRAFMODE, rIn ) {} + SdrGrafModeItem( GraphicDrawMode eMode = GraphicDrawMode::Standard ) : SdrGrafModeItem_Base( eMode ) {} + SdrGrafModeItem( SvStream& rIn ) : SdrGrafModeItem_Base( rIn ) {} virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const override; 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 |