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/unotools/streamwrap.hxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'include/unotools/streamwrap.hxx') diff --git a/include/unotools/streamwrap.hxx b/include/unotools/streamwrap.hxx index 1fb8d2b45dde..e2303a1ac58a 100644 --- a/include/unotools/streamwrap.hxx +++ b/include/unotools/streamwrap.hxx @@ -55,7 +55,7 @@ protected: public: OInputStreamWrapper(SvStream& _rStream); OInputStreamWrapper(SvStream* pStream, bool bOwner=false); - virtual ~OInputStreamWrapper(); + virtual ~OInputStreamWrapper() override; // css::io::XInputStream virtual sal_Int32 SAL_CALL readBytes(css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead) throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::uno::RuntimeException, std::exception) override; @@ -102,7 +102,7 @@ public: UNOTOOLS_DLLPUBLIC OOutputStreamWrapper(SvStream& _rStream); protected: - virtual ~OOutputStreamWrapper(); + virtual ~OOutputStreamWrapper() override; // css::io::XOutputStream virtual void SAL_CALL writeBytes(const css::uno::Sequence< sal_Int8 >& aData) throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::uno::RuntimeException, std::exception) override; @@ -131,7 +131,7 @@ public: OSeekableOutputStreamWrapper(SvStream& _rStream); private: - virtual ~OSeekableOutputStreamWrapper(); + virtual ~OSeekableOutputStreamWrapper() override; // disambiguate XInterface virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& _rType ) throw (css::uno::RuntimeException, std::exception) override; -- cgit