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/lwprowlayout.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/lwprowlayout.hxx')
-rw-r--r-- | lotuswordpro/source/filter/lwprowlayout.hxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lotuswordpro/source/filter/lwprowlayout.hxx b/lotuswordpro/source/filter/lwprowlayout.hxx index 6494c2223f19..e34ae8147852 100644 --- a/lotuswordpro/source/filter/lwprowlayout.hxx +++ b/lotuswordpro/source/filter/lwprowlayout.hxx @@ -76,7 +76,7 @@ class LwpRowLayout : public LwpVirtualLayout { public: LwpRowLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm); - virtual ~LwpRowLayout(); + virtual ~LwpRowLayout() override; virtual LWP_LAYOUT_TYPE GetLayoutType () override { return LWP_ROW_LAYOUT;} sal_uInt16 GetRowID() { return crowid;} virtual void RegisterStyle() override; @@ -118,7 +118,7 @@ class LwpRowHeadingLayout : public LwpRowLayout { public: LwpRowHeadingLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm); - virtual ~LwpRowHeadingLayout(); + virtual ~LwpRowHeadingLayout() override; virtual LWP_LAYOUT_TYPE GetLayoutType () override { return LWP_ROW_HEADING_LAYOUT;} protected: void Read() override; |