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/customize | |
| 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/customize')
| -rw-r--r-- | cui/source/customize/acccfg.cxx | 2 | ||||
| -rw-r--r-- | cui/source/customize/cfg.cxx | 2 | ||||
| -rw-r--r-- | cui/source/customize/eventdlg.hxx | 2 | ||||
| -rw-r--r-- | cui/source/customize/macropg_impl.hxx | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx index 588965ae201a..95ad22de82d3 100644 --- a/cui/source/customize/acccfg.cxx +++ b/cui/source/customize/acccfg.cxx @@ -636,7 +636,7 @@ class SfxAccCfgLBoxString_Impl : public SvLBoxString public: explicit SfxAccCfgLBoxString_Impl(const OUString& sText); - virtual ~SfxAccCfgLBoxString_Impl(); + virtual ~SfxAccCfgLBoxString_Impl() override; virtual void Paint(const Point& aPos, SvTreeListBox& rDevice, vcl::RenderContext& rRenderContext, const SvViewDataEntry* pView, const SvTreeListEntry& rEntry) override; diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index 14902158f6d7..eb49a59b911a 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -1537,7 +1537,7 @@ public: { } - virtual ~PopupPainter() { } + virtual ~PopupPainter() override { } virtual void Paint(const Point& rPos, SvTreeListBox& rOutDev, vcl::RenderContext& rRenderContext, const SvViewDataEntry* pView, const SvTreeListEntry& rEntry) override diff --git a/cui/source/customize/eventdlg.hxx b/cui/source/customize/eventdlg.hxx index a6d447909564..749bf11b8175 100644 --- a/cui/source/customize/eventdlg.hxx +++ b/cui/source/customize/eventdlg.hxx @@ -47,7 +47,7 @@ public: /// this is only to let callers know that there is a LateInit which *must* be called struct EarlyInit { }; SvxEventConfigPage( vcl::Window *pParent, const SfxItemSet& rSet, EarlyInit ); - virtual ~SvxEventConfigPage(); + virtual ~SvxEventConfigPage() override; virtual void dispose() override; void LateInit( const css::uno::Reference< css::frame::XFrame >& _rxFrame ); diff --git a/cui/source/customize/macropg_impl.hxx b/cui/source/customize/macropg_impl.hxx index 2c8c87b7fd01..f460ca216ca1 100644 --- a/cui/source/customize/macropg_impl.hxx +++ b/cui/source/customize/macropg_impl.hxx @@ -49,7 +49,7 @@ private: public: AssignComponentDialog( vcl::Window * pParent, const OUString& rURL ); - virtual ~AssignComponentDialog(); + virtual ~AssignComponentDialog() override; virtual void dispose() override; const OUString& getURL() const |