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/lwplayout.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/lwplayout.hxx')
-rw-r--r-- | lotuswordpro/source/filter/lwplayout.hxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lotuswordpro/source/filter/lwplayout.hxx b/lotuswordpro/source/filter/lwplayout.hxx index e2db72f0a505..54ec8ebbe469 100644 --- a/lotuswordpro/source/filter/lwplayout.hxx +++ b/lotuswordpro/source/filter/lwplayout.hxx @@ -95,7 +95,7 @@ class LwpVirtualLayout : public LwpDLNFPVList { public: LwpVirtualLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm); - virtual ~LwpVirtualLayout(){} + virtual ~LwpVirtualLayout() override {} inline virtual sal_uInt16 GetNumCols(){return 1;} virtual double GetColWidth(sal_uInt16 nIndex); virtual double GetColGap(sal_uInt16 nIndex); @@ -294,7 +294,7 @@ class LwpHeadLayout : public LwpVirtualLayout { public: LwpHeadLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm); - virtual ~LwpHeadLayout(){} + virtual ~LwpHeadLayout() override {} void RegisterStyle() override; rtl::Reference<LwpVirtualLayout> FindEnSuperTableLayout(); protected: @@ -332,7 +332,7 @@ class LwpMiddleLayout : public LwpVirtualLayout { public: LwpMiddleLayout( LwpObjectHeader &objHdr, LwpSvStream* pStrm ); - virtual ~LwpMiddleLayout(); + virtual ~LwpMiddleLayout() override; LwpLayoutGeometry* GetGeometry() { if (m_bGettingGeometry) @@ -420,7 +420,7 @@ class LwpLayout : public LwpMiddleLayout { public: LwpLayout( LwpObjectHeader &objHdr, LwpSvStream* pStrm ); - virtual ~LwpLayout(); + virtual ~LwpLayout() override; XFColumns* GetXFColumns(); XFColumnSep* GetColumnSep(); LwpShadow* GetShadow(); @@ -465,7 +465,7 @@ class LwpPlacableLayout : public LwpLayout { public: LwpPlacableLayout( LwpObjectHeader &objHdr, LwpSvStream* pStrm ); - virtual ~LwpPlacableLayout(); + virtual ~LwpPlacableLayout() override; sal_uInt8 GetWrapType(); LwpLayoutRelativity* GetRelativityPiece(); virtual sal_uInt8 GetRelativeType() override; |