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 /vcl/source/window | |
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 'vcl/source/window')
-rw-r--r-- | vcl/source/window/dockmgr.cxx | 4 | ||||
-rw-r--r-- | vcl/source/window/dockwin.cxx | 2 | ||||
-rw-r--r-- | vcl/source/window/menubarwindow.hxx | 4 | ||||
-rw-r--r-- | vcl/source/window/menufloatingwindow.hxx | 2 | ||||
-rw-r--r-- | vcl/source/window/scrwnd.hxx | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/vcl/source/window/dockmgr.cxx b/vcl/source/window/dockmgr.cxx index fe473fff994d..d01b055cf04e 100644 --- a/vcl/source/window/dockmgr.cxx +++ b/vcl/source/window/dockmgr.cxx @@ -56,7 +56,7 @@ private: public: ImplDockFloatWin2( vcl::Window* pParent, WinBits nWinBits, ImplDockingWindowWrapper* pDockingWin ); - virtual ~ImplDockFloatWin2(); + virtual ~ImplDockFloatWin2() override; virtual void dispose() override; virtual void Move() override; @@ -469,7 +469,7 @@ private: public: ImplPopupFloatWin( vcl::Window* pParent, ImplDockingWindowWrapper* pDockingWin, bool bHasGrip ); - virtual ~ImplPopupFloatWin(); + virtual ~ImplPopupFloatWin() override; virtual void dispose() override; virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible() override; diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx index 1a61dd564798..af564e6d5df0 100644 --- a/vcl/source/window/dockwin.cxx +++ b/vcl/source/window/dockwin.cxx @@ -72,7 +72,7 @@ private: public: ImplDockFloatWin( vcl::Window* pParent, WinBits nWinBits, DockingWindow* pDockingWin ); - virtual ~ImplDockFloatWin(); + virtual ~ImplDockFloatWin() override; virtual void dispose() override; virtual void Move() override; diff --git a/vcl/source/window/menubarwindow.hxx b/vcl/source/window/menubarwindow.hxx index f82d9bd8711a..e7fec20b4a80 100644 --- a/vcl/source/window/menubarwindow.hxx +++ b/vcl/source/window/menubarwindow.hxx @@ -41,7 +41,7 @@ class DecoToolBox : public ToolBox public: explicit DecoToolBox(vcl::Window* pParent); - virtual ~DecoToolBox() {} + virtual ~DecoToolBox() override {} void DataChanged( const DataChangedEvent& rDCEvt ) override; @@ -110,7 +110,7 @@ private: public: explicit MenuBarWindow( vcl::Window* pParent ); - virtual ~MenuBarWindow(); + virtual ~MenuBarWindow() override; virtual void dispose() override; void ShowButtons(bool bClose, bool bFloat, bool bHide); diff --git a/vcl/source/window/menufloatingwindow.hxx b/vcl/source/window/menufloatingwindow.hxx index ce157e5c12f4..8ffd7be32182 100644 --- a/vcl/source/window/menufloatingwindow.hxx +++ b/vcl/source/window/menufloatingwindow.hxx @@ -84,7 +84,7 @@ protected: public: MenuFloatingWindow(Menu* pMenu, vcl::Window* pParent, WinBits nStyle); - virtual ~MenuFloatingWindow(); + virtual ~MenuFloatingWindow() override; virtual void dispose() override; void doShutdown(); diff --git a/vcl/source/window/scrwnd.hxx b/vcl/source/window/scrwnd.hxx index dc438cb3ffdc..3509312eccff 100644 --- a/vcl/source/window/scrwnd.hxx +++ b/vcl/source/window/scrwnd.hxx @@ -73,7 +73,7 @@ protected: public: explicit ImplWheelWindow( vcl::Window* pParent ); - virtual ~ImplWheelWindow(); + virtual ~ImplWheelWindow() override; virtual void dispose() override; void ImplStop(); |