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 /cui/source/inc/numpages.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 'cui/source/inc/numpages.hxx')
-rw-r--r-- | cui/source/inc/numpages.hxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx index 6047683759e2..83401e460c7b 100644 --- a/cui/source/inc/numpages.hxx +++ b/cui/source/inc/numpages.hxx @@ -102,7 +102,7 @@ protected: public: SvxSingleNumPickTabPage(vcl::Window* pParent, const SfxItemSet& rSet); - virtual ~SvxSingleNumPickTabPage(); + virtual ~SvxSingleNumPickTabPage() override; virtual void dispose() override; static VclPtr<SfxTabPage> Create( vcl::Window* pParent, @@ -135,7 +135,7 @@ protected: public: SvxBulletPickTabPage(vcl::Window* pParent, const SfxItemSet& rSet); - virtual ~SvxBulletPickTabPage(); + virtual ~SvxBulletPickTabPage() override; virtual void dispose() override; static VclPtr<SfxTabPage> Create( vcl::Window* pParent, @@ -179,7 +179,7 @@ protected: public: SvxNumPickTabPage(vcl::Window* pParent, const SfxItemSet& rSet); - virtual ~SvxNumPickTabPage(); + virtual ~SvxNumPickTabPage() override; virtual void dispose() override; static VclPtr<SfxTabPage> Create( vcl::Window* pParent, @@ -226,7 +226,7 @@ protected: public: SvxBitmapPickTabPage(vcl::Window* pParent, const SfxItemSet& rSet); - virtual ~SvxBitmapPickTabPage(); + virtual ~SvxBitmapPickTabPage() override; virtual void dispose() override; static VclPtr<SfxTabPage> Create( vcl::Window* pParent, @@ -337,7 +337,7 @@ class SvxNumOptionsTabPage : public SfxTabPage public: SvxNumOptionsTabPage(vcl::Window* pParent, const SfxItemSet& rSet); - virtual ~SvxNumOptionsTabPage(); + virtual ~SvxNumOptionsTabPage() override; virtual void dispose() override; static VclPtr<SfxTabPage> Create( vcl::Window* pParent, @@ -432,7 +432,7 @@ class SvxNumPositionTabPage : public SfxTabPage public: SvxNumPositionTabPage(vcl::Window* pParent, const SfxItemSet& rSet); - virtual ~SvxNumPositionTabPage(); + virtual ~SvxNumPositionTabPage() override; virtual void dispose() override; virtual void ActivatePage(const SfxItemSet& rSet) override; |