diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-09-13 13:09:01 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-09-13 13:19:22 +0200 |
| commit | 91dd2db17bd6cb9b357d1d69b187174e31eabef0 (patch) | |
| tree | d634de3a1a6820904b5699c2136b79b1a5a807c7 /sax | |
| parent | 6f8ea7e89ea190b9462c945d55a3ad8777b2f3ef (diff) | |
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
Diffstat (limited to 'sax')
| -rw-r--r-- | sax/qa/cppunit/parser.cxx | 2 | ||||
| -rw-r--r-- | sax/source/expatwrap/sax_expat.cxx | 2 | ||||
| -rw-r--r-- | sax/source/expatwrap/saxwriter.cxx | 2 | ||||
| -rw-r--r-- | sax/source/tools/fastserializer.hxx | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/sax/qa/cppunit/parser.cxx b/sax/qa/cppunit/parser.cxx index a94d5957c70d..287b712686d3 100644 --- a/sax/qa/cppunit/parser.cxx +++ b/sax/qa/cppunit/parser.cxx @@ -27,7 +27,7 @@ class DummyTokenHandler : public cppu::WeakImplHelper< xml::sax::XFastTokenHandl { public: DummyTokenHandler() {} - virtual ~DummyTokenHandler() {} + virtual ~DummyTokenHandler() override {} virtual sal_Int32 SAL_CALL getTokenFromUTF8( const uno::Sequence<sal_Int8>& ) throw (uno::RuntimeException, std::exception) override diff --git a/sax/source/expatwrap/sax_expat.cxx b/sax/source/expatwrap/sax_expat.cxx index 5e995405ed18..ba87c6f9e146 100644 --- a/sax/source/expatwrap/sax_expat.cxx +++ b/sax/source/expatwrap/sax_expat.cxx @@ -105,7 +105,7 @@ class SaxExpatParser public: SaxExpatParser(); - virtual ~SaxExpatParser(); + virtual ~SaxExpatParser() override; // css::lang::XInitialization: virtual void SAL_CALL initialize(css::uno::Sequence<css::uno::Any> const& rArguments) diff --git a/sax/source/expatwrap/saxwriter.cxx b/sax/source/expatwrap/saxwriter.cxx index 3679a396a168..9074688260e5 100644 --- a/sax/source/expatwrap/saxwriter.cxx +++ b/sax/source/expatwrap/saxwriter.cxx @@ -884,7 +884,7 @@ public: , m_nLevel(0) { } - virtual ~SAXWriter() + virtual ~SAXWriter() override { delete m_pSaxWriterHelper; } diff --git a/sax/source/tools/fastserializer.hxx b/sax/source/tools/fastserializer.hxx index 940bc4a39468..6f679e52f82d 100644 --- a/sax/source/tools/fastserializer.hxx +++ b/sax/source/tools/fastserializer.hxx @@ -177,7 +177,7 @@ private: #endif explicit ForMerge(sal_Int32 const nTag) : m_Tag(nTag) {} - virtual ~ForMerge() {} + virtual ~ForMerge() override {} virtual void setCurrentElement( ::sal_Int32 /*nToken*/ ) {} virtual Int8Sequence& getData(); |