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/lwpfribtext.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/lwpfribtext.hxx')
-rw-r--r-- | lotuswordpro/source/filter/lwpfribtext.hxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lotuswordpro/source/filter/lwpfribtext.hxx b/lotuswordpro/source/filter/lwpfribtext.hxx index c4227dafffa9..138ef9a22e76 100644 --- a/lotuswordpro/source/filter/lwpfribtext.hxx +++ b/lotuswordpro/source/filter/lwpfribtext.hxx @@ -67,7 +67,7 @@ class LwpFribText : public LwpFrib { public: LwpFribText( LwpPara* pPara, bool bNoUnicode=false); - virtual ~LwpFribText(){} + virtual ~LwpFribText() override {} void Read(LwpObjectStream* pObjStrm, sal_uInt16 len) override; void XFConvert(XFContentContainer* pXFPara,LwpStory* pStory); private: @@ -81,14 +81,14 @@ class LwpFribHardSpace : public LwpFrib { public: explicit LwpFribHardSpace( LwpPara* pPara ) : LwpFrib(pPara){} - virtual ~LwpFribHardSpace(){} + virtual ~LwpFribHardSpace() override {} }; class LwpFribSoftHyphen : public LwpFrib { public: explicit LwpFribSoftHyphen( LwpPara* pPara ) : LwpFrib(pPara){} - virtual ~LwpFribSoftHyphen(){} + virtual ~LwpFribSoftHyphen() override {} }; class LwpFribParaNumber : public LwpFrib @@ -128,7 +128,7 @@ class LwpFribDocVar : public LwpFrib public: explicit LwpFribDocVar( LwpPara* pPara ); - virtual ~LwpFribDocVar(); + virtual ~LwpFribDocVar() override; void Read(LwpObjectStream* pObjStrm, sal_uInt16 len) override; @@ -179,14 +179,14 @@ class LwpFribTab : public LwpFrib { public: explicit LwpFribTab( LwpPara* pPara ) : LwpFrib(pPara){} - virtual ~LwpFribTab(){} + virtual ~LwpFribTab() override {} }; class LwpFribUnicode: public LwpFrib { public: explicit LwpFribUnicode( LwpPara* pPara ) : LwpFrib(pPara){} - virtual ~LwpFribUnicode(){} + virtual ~LwpFribUnicode() override {} void Read(LwpObjectStream* pObjStrm, sal_uInt16 len) override; void XFConvert(XFContentContainer* pXFPara,LwpStory* pStory); private: @@ -200,7 +200,7 @@ class LwpFribPageNumber : public LwpFrib public: explicit LwpFribPageNumber(LwpPara* pPara) : LwpFrib(pPara), m_nNumStyle(0), m_nStartNum(1), m_nStartOnPage(1), m_nFlag(0){} - virtual ~LwpFribPageNumber(){} + virtual ~LwpFribPageNumber() override {} void Read(LwpObjectStream* pObjStrm, sal_uInt16 len) override; void XFConvert(XFContentContainer* pXFPara); private: |