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 --- include/svl/style.hxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'include/svl/style.hxx') diff --git a/include/svl/style.hxx b/include/svl/style.hxx index ddff30a67a31..794322da11b2 100644 --- a/include/svl/style.hxx +++ b/include/svl/style.hxx @@ -93,7 +93,7 @@ protected: SfxStyleSheetBase( const OUString&, SfxStyleSheetBasePool*, SfxStyleFamily eFam, sal_uInt16 mask ); SfxStyleSheetBase( const SfxStyleSheetBase& ); - virtual ~SfxStyleSheetBase(); + virtual ~SfxStyleSheetBase() override; virtual void Load( SvStream&, sal_uInt16 ); void Store( SvStream& ); @@ -203,7 +203,7 @@ protected: virtual SfxStyleSheetBase* Create( const OUString&, SfxStyleFamily, sal_uInt16 ); virtual SfxStyleSheetBase* Create( const SfxStyleSheetBase& ); - virtual ~SfxStyleSheetBasePool(); + virtual ~SfxStyleSheetBasePool() override; void StoreStyleSheet(const rtl::Reference< SfxStyleSheetBase >&); @@ -279,7 +279,7 @@ protected: { assert(false); } - virtual ~SfxStyleSheet(); + virtual ~SfxStyleSheet() override; }; -- cgit