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 --- sc/source/ui/inc/dapitype.hxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sc/source/ui/inc/dapitype.hxx') diff --git a/sc/source/ui/inc/dapitype.hxx b/sc/source/ui/inc/dapitype.hxx index 97255f8aaa16..3ffaef9c5974 100644 --- a/sc/source/ui/inc/dapitype.hxx +++ b/sc/source/ui/inc/dapitype.hxx @@ -37,7 +37,7 @@ private: public: ScDataPilotSourceTypeDlg(vcl::Window* pParent, bool bEnableExternal); - virtual ~ScDataPilotSourceTypeDlg(); + virtual ~ScDataPilotSourceTypeDlg() override; virtual void dispose() override; bool IsDatabase() const; bool IsExternal() const; @@ -61,7 +61,7 @@ private: public: ScDataPilotServiceDlg( vcl::Window* pParent, const std::vector& rServices ); - virtual ~ScDataPilotServiceDlg(); + virtual ~ScDataPilotServiceDlg() override; virtual void dispose() override; OUString GetServiceName() const; -- cgit