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/lwpframelayout.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/lwpframelayout.hxx')
| -rw-r--r-- | lotuswordpro/source/filter/lwpframelayout.hxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lotuswordpro/source/filter/lwpframelayout.hxx b/lotuswordpro/source/filter/lwpframelayout.hxx index 505e0cb8fe5b..603f0d33d15c 100644 --- a/lotuswordpro/source/filter/lwpframelayout.hxx +++ b/lotuswordpro/source/filter/lwpframelayout.hxx @@ -123,7 +123,7 @@ class LwpFrameLayout: public LwpPlacableLayout { public: LwpFrameLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm); - virtual ~LwpFrameLayout(); + virtual ~LwpFrameLayout() override; virtual LWP_LAYOUT_TYPE GetLayoutType () override { return LWP_FRAME_LAYOUT;} virtual void RegisterStyle() override; virtual void XFConvert(XFContentContainer* pCont) override; @@ -151,7 +151,7 @@ class LwpGroupLayout: public LwpPlacableLayout { public: LwpGroupLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm); - virtual ~LwpGroupLayout(); + virtual ~LwpGroupLayout() override; virtual LWP_LAYOUT_TYPE GetLayoutType () override { return LWP_GROUP_LAYOUT;} virtual void RegisterStyle() override; virtual void XFConvert(XFContentContainer* pCont) override; @@ -171,7 +171,7 @@ class LwpGroupFrame: public LwpContent { public: LwpGroupFrame(LwpObjectHeader &objHdr, LwpSvStream* pStrm); - virtual ~LwpGroupFrame(); + virtual ~LwpGroupFrame() override; virtual void RegisterStyle() override; virtual void XFConvert(XFContentContainer* pCont) override; protected: @@ -184,7 +184,7 @@ class LwpDropcapLayout : public LwpFrameLayout { public: LwpDropcapLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm); - virtual ~LwpDropcapLayout(){} + virtual ~LwpDropcapLayout() override {} virtual LWP_LAYOUT_TYPE GetLayoutType () override { return LWP_DROPCAP_LAYOUT;} virtual void Parse(IXFStream* pOutputStream) override; virtual void XFConvert(XFContentContainer* pCont) override; @@ -205,7 +205,7 @@ class LwpRubyLayout : public LwpFrameLayout { public: LwpRubyLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm); - virtual ~LwpRubyLayout(){} + virtual ~LwpRubyLayout() override {} LwpRubyMarker* GetMarker(); void ConvertContentText(); LwpStory* GetContentStory(); |