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/poolitem.hxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'include/svl/poolitem.hxx') diff --git a/include/svl/poolitem.hxx b/include/svl/poolitem.hxx index 81723690e7d4..feb209fa5f71 100644 --- a/include/svl/poolitem.hxx +++ b/include/svl/poolitem.hxx @@ -236,7 +236,7 @@ public: static SfxPoolItem* CreateDefault(); explicit SfxVoidItem( sal_uInt16 nWhich ); SfxVoidItem( const SfxVoidItem& ); - virtual ~SfxVoidItem(); + virtual ~SfxVoidItem() override; virtual bool operator==( const SfxPoolItem& ) const override; @@ -260,7 +260,7 @@ public: SfxSetItem( sal_uInt16 nWhich, SfxItemSet *pSet ); SfxSetItem( sal_uInt16 nWhich, const SfxItemSet &rSet ); SfxSetItem( const SfxSetItem&, SfxItemPool *pPool = nullptr ); - virtual ~SfxSetItem(); + virtual ~SfxSetItem() override; virtual bool operator==( const SfxPoolItem& ) const override; @@ -286,7 +286,7 @@ class SVL_DLLPUBLIC SfxPoolItemHint: public SfxHint SfxPoolItem* pObj; public: explicit SfxPoolItemHint( SfxPoolItem* Object ) : pObj(Object) {} - virtual ~SfxPoolItemHint() {} + virtual ~SfxPoolItemHint() override {} SfxPoolItem* GetObject() const { return pObj; } }; -- cgit