From 91dd2db17bd6cb9b357d1d69b187174e31eabef0 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Tue, 13 Sep 2016 13:09:01 +0200 Subject: 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 --- framework/source/layoutmanager/toolbarlayoutmanager.hxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'framework/source/layoutmanager') diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.hxx b/framework/source/layoutmanager/toolbarlayoutmanager.hxx index 2f0beb0a7fe7..200ef47635d7 100644 --- a/framework/source/layoutmanager/toolbarlayoutmanager.hxx +++ b/framework/source/layoutmanager/toolbarlayoutmanager.hxx @@ -74,7 +74,7 @@ class ToolbarLayoutManager : public ::cppu::WeakImplHelper< css::awt::XDockableW ToolbarLayoutManager( const css::uno::Reference< css::uno::XComponentContext >& rxContext, const css::uno::Reference< css::ui::XUIElementFactory >& xUIElementFactory, LayoutManager* pParentLayouter ); - virtual ~ToolbarLayoutManager(); + virtual ~ToolbarLayoutManager() override; void reset(); void attach( const css::uno::Reference< css::frame::XFrame >& xFrame, -- cgit