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/sax/fastattribs.hxx | 2 +- include/sax/fastparser.hxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'include/sax') diff --git a/include/sax/fastattribs.hxx b/include/sax/fastattribs.hxx index 42f5f34941a5..1dcbbf491869 100644 --- a/include/sax/fastattribs.hxx +++ b/include/sax/fastattribs.hxx @@ -76,7 +76,7 @@ class SAX_DLLPUBLIC FastAttributeList : public ::cppu::WeakImplHelper1< css::xml public: FastAttributeList( const css::uno::Reference< css::xml::sax::XFastTokenHandler >& xTokenHandler, FastTokenHandlerBase *pOptHandlerBase = nullptr ); - virtual ~FastAttributeList(); + virtual ~FastAttributeList() override; void clear(); void add( sal_Int32 nToken, const sal_Char* pValue ); diff --git a/include/sax/fastparser.hxx b/include/sax/fastparser.hxx index 85eaf305e4fe..a238229e3f01 100644 --- a/include/sax/fastparser.hxx +++ b/include/sax/fastparser.hxx @@ -53,7 +53,7 @@ class FASTSAX_DLLPUBLIC FastSaxParser public: FastSaxParser(); - virtual ~FastSaxParser(); + virtual ~FastSaxParser() override; // css::lang::XInitialization: virtual void SAL_CALL initialize(css::uno::Sequence const& rArguments) throw (css::uno::RuntimeException, css::uno::Exception, std::exception) override; -- cgit