sw/inc/grfatr.hxx | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-)
New commits: commit 11640778262504f3575e97ceee1a02eee908c0f5 Author: Mike Kaganski <[email protected]> AuthorDate: Mon Nov 24 20:25:04 2025 +0100 Commit: Mike Kaganski <[email protected]> CommitDate: Tue Nov 25 15:17:39 2025 +0100 Drop a MSVC hack Introduced in commit 5e3cca7b0ae81e2467fb306c1c707f6f5ba7d284 (More workaround for the MSVC "dllpublic base template" mis- feature, 2017-03-17). Seems to not affect MSVC 2022 anymore? Change-Id: I1b3e8899b2fbdf643fb184eb7949303b2498ea40 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194480 Reviewed-by: Mike Kaganski <[email protected]> Tested-by: Jenkins Code-Style: Mike Kaganski <[email protected]> diff --git a/sw/inc/grfatr.hxx b/sw/inc/grfatr.hxx index 5eacf5d48004..7b2424d82928 100644 --- a/sw/inc/grfatr.hxx +++ b/sw/inc/grfatr.hxx @@ -261,21 +261,12 @@ public: sal_uInt8 nMemberId ) override; }; -// MSVC hack: -class SwDrawModeGrf_Base: public SfxEnumItem<GraphicDrawMode> { -protected: - SwDrawModeGrf_Base(GraphicDrawMode nMode): - SfxEnumItem(RES_GRFATR_DRAWMODE, nMode) {} - - virtual SfxItemType ItemType() const override = 0; -}; - -class SW_DLLPUBLIC SwDrawModeGrf final : public SwDrawModeGrf_Base +class SW_DLLPUBLIC SwDrawModeGrf final : public SfxEnumItem<GraphicDrawMode> { public: DECLARE_ITEM_TYPE_FUNCTION(SwDrawModeGrf) SwDrawModeGrf( GraphicDrawMode nMode = GraphicDrawMode::Standard ) - : SwDrawModeGrf_Base( nMode ) + : SfxEnumItem(RES_GRFATR_DRAWMODE, nMode) {} // pure virtual methods of SfxPoolItem
