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 /sw/source/uibase/table | |
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 'sw/source/uibase/table')
-rw-r--r-- | sw/source/uibase/table/tablepg.hxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sw/source/uibase/table/tablepg.hxx b/sw/source/uibase/table/tablepg.hxx index 8a20880661b4..07da38c4d243 100644 --- a/sw/source/uibase/table/tablepg.hxx +++ b/sw/source/uibase/table/tablepg.hxx @@ -81,7 +81,7 @@ class SwFormatTablePage : public SfxTabPage public: SwFormatTablePage( vcl::Window* pParent, const SfxItemSet& rSet ); - virtual ~SwFormatTablePage(); + virtual ~SwFormatTablePage() override; virtual void dispose() override; static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); @@ -132,7 +132,7 @@ class SwTableColumnPage : public SfxTabPage public: SwTableColumnPage( vcl::Window* pParent, const SfxItemSet& rSet ); - virtual ~SwTableColumnPage(); + virtual ~SwTableColumnPage() override; virtual void dispose() override; static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); @@ -182,7 +182,7 @@ class SwTextFlowPage : public SfxTabPage public: SwTextFlowPage( vcl::Window* pParent, const SfxItemSet& rSet ); - virtual ~SwTextFlowPage(); + virtual ~SwTextFlowPage() override; virtual void dispose() override; static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) override; |