diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2016-09-13 13:09:01 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2016-09-13 13:19:22 +0200 |
commit | 91dd2db17bd6cb9b357d1d69b187174e31eabef0 (patch) | |
tree | d634de3a1a6820904b5699c2136b79b1a5a807c7 /lotuswordpro/source/filter/lwplaypiece.hxx | |
parent | 6f8ea7e89ea190b9462c945d55a3ad8777b2f3ef (diff) |
loplugin:override: No more need for the "MSVC dtor override" workaround
The issue of 362d4f0cd4e50111edfae9d30c90602c37ed65a2 "Explicitly mark
overriding destructors as 'virtual'" appears to no longer be a problem with
MSVC 2013.
(The little change in the rewriting code of compilerplugins/clang/override.cxx
was necessary to prevent an endless loop when adding "override" to
OOO_DLLPUBLIC_CHARTTOOLS virtual ~CloseableLifeTimeManager();
in chart2/source/inc/LifeTime.hxx, getting stuck in the leading
OOO_DLLPUBLIC_CHARTTOOLS macro. Can't remember what that
isAtEndOfImmediateMacroExpansion thing was originally necessary for, anyway.)
Change-Id: I534c634504d7216b9bb632c2775c04eaf27e927e
Diffstat (limited to 'lotuswordpro/source/filter/lwplaypiece.hxx')
-rw-r--r-- | lotuswordpro/source/filter/lwplaypiece.hxx | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/lotuswordpro/source/filter/lwplaypiece.hxx b/lotuswordpro/source/filter/lwplaypiece.hxx index 1fe7bb43c4ff..76ea400d1df3 100644 --- a/lotuswordpro/source/filter/lwplaypiece.hxx +++ b/lotuswordpro/source/filter/lwplaypiece.hxx @@ -95,7 +95,7 @@ protected: LwpRotor m_ContainerRotor; sal_uInt8 m_ContentOrientation; private: - virtual ~LwpLayoutGeometry(); + virtual ~LwpLayoutGeometry() override; }; class LwpLayoutScale : public LwpVirtualPiece @@ -124,7 +124,7 @@ protected: LwpPoint m_Offset; sal_uInt16 m_nPlacement; private: - virtual ~LwpLayoutScale(); + virtual ~LwpLayoutScale() override; }; #include "lwpmargins.hxx" @@ -143,7 +143,7 @@ protected: LwpMargins m_ExtMargins; LwpMargins m_ExtraMargins; private: - virtual ~LwpLayoutMargins(); + virtual ~LwpLayoutMargins() override; }; #include "lwpborderstuff.hxx" @@ -158,7 +158,7 @@ protected: protected: LwpBorderStuff m_BorderStuff; private: - virtual ~LwpLayoutBorder(); + virtual ~LwpLayoutBorder() override; }; class LwpLayoutBackground : public LwpVirtualPiece @@ -172,7 +172,7 @@ protected: protected: LwpBackgroundStuff m_BackgroundStuff; private: - virtual ~LwpLayoutBackground(); + virtual ~LwpLayoutBackground() override; }; class LwpExternalBorder @@ -199,7 +199,7 @@ protected: protected: LwpExternalBorder m_ExtranalBorder; private: - virtual ~LwpLayoutExternalBorder(); + virtual ~LwpLayoutExternalBorder() override; }; class LwpColumnInfo @@ -229,7 +229,7 @@ protected: sal_uInt16 m_nNumCols; LwpColumnInfo* m_pColumns; private: - virtual ~LwpLayoutColumns(); + virtual ~LwpLayoutColumns() override; }; class LwpLayoutGutters : public LwpVirtualPiece @@ -243,7 +243,7 @@ protected: protected: LwpBorderStuff m_BorderBuffer; private: - virtual ~LwpLayoutGutters(); + virtual ~LwpLayoutGutters() override; }; class LwpJoinStuff @@ -302,7 +302,7 @@ protected: protected: LwpJoinStuff m_JoinStuff; private: - virtual ~LwpLayoutJoins(); + virtual ~LwpLayoutJoins() override; }; #include "lwpshadow.hxx" @@ -318,7 +318,7 @@ protected: protected: LwpShadow m_Shadow; private: - virtual ~LwpLayoutShadow(); + virtual ~LwpLayoutShadow() override; }; class LwpLayoutRelativityGuts @@ -374,7 +374,7 @@ protected: protected: LwpLayoutRelativityGuts m_RelGuts; private: - virtual ~LwpLayoutRelativity(); + virtual ~LwpLayoutRelativity() override; }; #endif |