summaryrefslogtreecommitdiff
path: root/framework/inc/uielement/generictoolbarcontroller.hxx
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2016-09-13 13:09:01 +0200
committerStephan Bergmann <sbergman@redhat.com>2016-09-13 13:19:22 +0200
commit91dd2db17bd6cb9b357d1d69b187174e31eabef0 (patch)
treed634de3a1a6820904b5699c2136b79b1a5a807c7 /framework/inc/uielement/generictoolbarcontroller.hxx
parent6f8ea7e89ea190b9462c945d55a3ad8777b2f3ef (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 'framework/inc/uielement/generictoolbarcontroller.hxx')
-rw-r--r--framework/inc/uielement/generictoolbarcontroller.hxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/framework/inc/uielement/generictoolbarcontroller.hxx b/framework/inc/uielement/generictoolbarcontroller.hxx
index 69f57f7f5e54..c171d7bb287f 100644
--- a/framework/inc/uielement/generictoolbarcontroller.hxx
+++ b/framework/inc/uielement/generictoolbarcontroller.hxx
@@ -39,7 +39,7 @@ class GenericToolbarController : public svt::ToolboxController
ToolBox* pToolBar,
sal_uInt16 nID,
const OUString& aCommand );
- virtual ~GenericToolbarController();
+ virtual ~GenericToolbarController() override;
// XComponent
virtual void SAL_CALL dispose() throw ( css::uno::RuntimeException, std::exception ) override;
@@ -82,7 +82,7 @@ class MenuToolbarController : public GenericToolbarController
const OUString& aModuleIdentifier,
const css::uno::Reference< css::container::XIndexAccess >& xMenuDesc );
- virtual ~MenuToolbarController();
+ virtual ~MenuToolbarController() override;
// XToolbarController
virtual void SAL_CALL click() throw ( css::uno::RuntimeException, std::exception ) override;
virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createPopupWindow() throw (css::uno::RuntimeException, std::exception) override;