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/lwpfribmark.hxx | |
parent | avoid loading all calendars of a locale (diff) | |
download | core-91dd2db17bd6cb9b357d1d69b187174e31eabef0.tar.gz core-91dd2db17bd6cb9b357d1d69b187174e31eabef0.zip |
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/lwpfribmark.hxx')
-rw-r--r-- | lotuswordpro/source/filter/lwpfribmark.hxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lotuswordpro/source/filter/lwpfribmark.hxx b/lotuswordpro/source/filter/lwpfribmark.hxx index 226e57f0c460..c9803a7b3989 100644 --- a/lotuswordpro/source/filter/lwpfribmark.hxx +++ b/lotuswordpro/source/filter/lwpfribmark.hxx @@ -74,7 +74,7 @@ public: : LwpFrib(pPara) , m_nType(0) {} - virtual ~LwpFribCHBlock(){} + virtual ~LwpFribCHBlock() override {} void Read(LwpObjectStream* pObjStrm, sal_uInt16 len) override; LwpCHBlkMarker* GetMarker(); sal_uInt8 GetType(){return m_nType;} @@ -89,7 +89,7 @@ class LwpFribBookMark : public LwpFrib { public: explicit LwpFribBookMark( LwpPara* pPara ); - virtual ~LwpFribBookMark(){} + virtual ~LwpFribBookMark() override {} void Read(LwpObjectStream* pObjStrm, sal_uInt16 len) override; const LwpObjectID& GetMarkerID(){return m_objMarker;} sal_uInt8 GetType(){return m_nType;} @@ -107,7 +107,7 @@ class LwpFribField : public LwpFrib { public: explicit LwpFribField( LwpPara* pPara ); - virtual ~LwpFribField(){} + virtual ~LwpFribField() override {} void Read(LwpObjectStream* pObjStrm, sal_uInt16 len) override; LwpFieldMark* GetMarker(); sal_uInt8 GetType(){return m_nType;} @@ -148,7 +148,7 @@ class LwpFribRubyMarker : public LwpFrib { public: explicit LwpFribRubyMarker( LwpPara* pPara ); - virtual ~LwpFribRubyMarker(){} + virtual ~LwpFribRubyMarker() override {} void Read(LwpObjectStream* pObjStrm, sal_uInt16 len) override; LwpRubyMarker* GetMarker(); sal_uInt8 GetType(){return m_nType;} |