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/lwpnotes.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/lwpnotes.hxx')
-rw-r--r-- | lotuswordpro/source/filter/lwpnotes.hxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lotuswordpro/source/filter/lwpnotes.hxx b/lotuswordpro/source/filter/lwpnotes.hxx index 103195e268f6..157233f0e447 100644 --- a/lotuswordpro/source/filter/lwpnotes.hxx +++ b/lotuswordpro/source/filter/lwpnotes.hxx @@ -72,7 +72,7 @@ class LwpFribNote: public LwpFrib { public: explicit LwpFribNote(LwpPara* pPara ); - virtual ~LwpFribNote(){} + virtual ~LwpFribNote() override {} void Read(LwpObjectStream* pObjStrm, sal_uInt16 len) override; void RegisterNewStyle(); void XFConvert(XFContentContainer* pCont); @@ -88,7 +88,7 @@ class LwpNoteLayout: public LwpFrameLayout { public: LwpNoteLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm); - virtual ~LwpNoteLayout(); + virtual ~LwpNoteLayout() override; virtual LWP_LAYOUT_TYPE GetLayoutType () override { return LWP_NOTE_LAYOUT;} virtual void RegisterStyle() override; virtual void XFConvert(XFContentContainer* pCont) override; @@ -112,7 +112,7 @@ class LwpNoteHeaderLayout: public LwpFrameLayout { public: LwpNoteHeaderLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm); - virtual ~LwpNoteHeaderLayout(); + virtual ~LwpNoteHeaderLayout() override; virtual LWP_LAYOUT_TYPE GetLayoutType () override { return LWP_NOTEHEADER_LAYOUT;} virtual void RegisterStyle() override; virtual void XFConvert(XFContentContainer* pCont) override; @@ -129,7 +129,7 @@ class LwpNoteTextLayout: public LwpFrameLayout { public: LwpNoteTextLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm); - virtual ~LwpNoteTextLayout(); + virtual ~LwpNoteTextLayout() override; virtual LWP_LAYOUT_TYPE GetLayoutType () override { return LWP_NOTETEXT_LAYOUT;} virtual void RegisterStyle() override; virtual void XFConvert(XFContentContainer* pCont) override; @@ -146,7 +146,7 @@ class LwpViewportLayout: public LwpPlacableLayout { public: LwpViewportLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm); - virtual ~LwpViewportLayout(); + virtual ~LwpViewportLayout() override; virtual LWP_LAYOUT_TYPE GetLayoutType () override { return LWP_VIEWPORT_LAYOUT;} virtual void RegisterStyle() override; virtual void XFConvert(XFContentContainer* pCont) override; |