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 /forms/source/solar | |
| 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 'forms/source/solar')
| -rw-r--r-- | forms/source/solar/component/navbarcontrol.hxx | 4 | ||||
| -rw-r--r-- | forms/source/solar/inc/navtoolbar.hxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/forms/source/solar/component/navbarcontrol.hxx b/forms/source/solar/component/navbarcontrol.hxx index b871e115fdf0..3fa62b30ac7c 100644 --- a/forms/source/solar/component/navbarcontrol.hxx +++ b/forms/source/solar/component/navbarcontrol.hxx @@ -49,7 +49,7 @@ namespace frm ); protected: - virtual ~ONavigationBarControl(); + virtual ~ONavigationBarControl() override; public: // XServiceInfo - static version @@ -98,7 +98,7 @@ namespace frm explicit ONavigationBarPeer( const css::uno::Reference< css::uno::XComponentContext >& _rxORB ); - virtual ~ONavigationBarPeer(); + virtual ~ONavigationBarPeer() override; public: // XInterface diff --git a/forms/source/solar/inc/navtoolbar.hxx b/forms/source/solar/inc/navtoolbar.hxx index a9b92b68932c..b195f7ba9b55 100644 --- a/forms/source/solar/inc/navtoolbar.hxx +++ b/forms/source/solar/inc/navtoolbar.hxx @@ -69,7 +69,7 @@ namespace frm const std::shared_ptr< const ICommandImageProvider >& _pImageProvider, const OUString & sModuleId ); - virtual ~NavigationToolBar( ); + virtual ~NavigationToolBar( ) override; virtual void dispose() override; /** sets the dispatcher which is to be used for the features |