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 --- sot/source/sdstor/stgcache.hxx | 2 +- sot/source/sdstor/stgdir.hxx | 4 ++-- sot/source/sdstor/stgole.hxx | 2 +- sot/source/sdstor/stgstrms.hxx | 4 ++-- sot/source/sdstor/ucbstorage.cxx | 6 +++--- sot/source/unoolestorage/xolesimplestorage.hxx | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) (limited to 'sot') diff --git a/sot/source/sdstor/stgcache.hxx b/sot/source/sdstor/stgcache.hxx index bc8511b64be8..0fafeba2abcc 100644 --- a/sot/source/sdstor/stgcache.hxx +++ b/sot/source/sdstor/stgcache.hxx @@ -100,7 +100,7 @@ class StgPage : public salhelper::SimpleReferenceObject sal_uInt8* mpData; // nSize bytes short mnSize; // size of this page StgPage( short nData, sal_Int32 nPage ); - virtual ~StgPage(); + virtual ~StgPage() override; public: StgPage(const StgPage&) = delete; StgPage& operator=(const StgPage&) = delete; diff --git a/sot/source/sdstor/stgdir.hxx b/sot/source/sdstor/stgdir.hxx index 794049ffa692..ca80ab6f3ffa 100644 --- a/sot/source/sdstor/stgdir.hxx +++ b/sot/source/sdstor/stgdir.hxx @@ -65,7 +65,7 @@ public: StgDirEntry(const void* pBuffer, sal_uInt32 nBufferLen, sal_uInt64 nUnderlyingStreamSize, bool * pbOk); explicit StgDirEntry( const StgEntry& ); - virtual ~StgDirEntry(); + virtual ~StgDirEntry() override; void Invalidate( bool ); // invalidate all open entries void Enum( sal_Int32& ); // enumerate entries for iteration @@ -96,7 +96,7 @@ class StgDirStrm : public StgDataStrm void SetupEntry( sal_Int32, StgDirEntry* ); public: explicit StgDirStrm( StgIo& ); - virtual ~StgDirStrm(); + virtual ~StgDirStrm() override; virtual bool SetSize( sal_Int32 ) override; // change the size bool Store(); void* GetEntry( sal_Int32 n, bool );// get an entry diff --git a/sot/source/sdstor/stgole.hxx b/sot/source/sdstor/stgole.hxx index cd8ff38a2c40..80a090ea3943 100644 --- a/sot/source/sdstor/stgole.hxx +++ b/sot/source/sdstor/stgole.hxx @@ -34,7 +34,7 @@ class StgInternalStream : public SvStream virtual void FlushData() override; public: StgInternalStream( BaseStorage&, const OUString&, bool ); - virtual ~StgInternalStream(); + virtual ~StgInternalStream() override; void Commit(); }; diff --git a/sot/source/sdstor/stgstrms.hxx b/sot/source/sdstor/stgstrms.hxx index c2c61c006b54..739cc124aac6 100644 --- a/sot/source/sdstor/stgstrms.hxx +++ b/sot/source/sdstor/stgstrms.hxx @@ -100,7 +100,7 @@ class StgFATStrm : public StgStrm { // the master FAT stream bool SetPage( short, sal_Int32 ); public: explicit StgFATStrm( StgIo& ); - virtual ~StgFATStrm() {} + virtual ~StgFATStrm() override {} using StgStrm::GetPage; sal_Int32 GetPage( short, bool, sal_uInt16 *pnMasterAlloc = nullptr); virtual bool SetSize( sal_Int32 ) override; @@ -152,7 +152,7 @@ class StgTmpStrm : public SvMemoryStream public: explicit StgTmpStrm( sal_uInt64=16 ); - virtual ~StgTmpStrm(); + virtual ~StgTmpStrm() override; bool Copy( StgTmpStrm& ); virtual void SetSize( sal_uInt64 ) override; sal_uInt64 GetSize() const; diff --git a/sot/source/sdstor/ucbstorage.cxx b/sot/source/sdstor/ucbstorage.cxx index 1056ce20dcf0..2823776cd7fc 100644 --- a/sot/source/sdstor/ucbstorage.cxx +++ b/sot/source/sdstor/ucbstorage.cxx @@ -89,7 +89,7 @@ protected: public: explicit FileStreamWrapper_Impl(const OUString& rName); - virtual ~FileStreamWrapper_Impl(); + virtual ~FileStreamWrapper_Impl() override; virtual void SAL_CALL seek( sal_Int64 _nLocation ) throw ( IllegalArgumentException, IOException, RuntimeException, std::exception) override; virtual sal_Int64 SAL_CALL getPosition( ) throw ( IOException, RuntimeException, std::exception) override; @@ -402,7 +402,7 @@ enum RepresentModes { class UCBStorageStream_Impl : public SvRefBase, public SvStream { - virtual ~UCBStorageStream_Impl(); + virtual ~UCBStorageStream_Impl() override; public: virtual sal_uLong GetData( void* pData, sal_uLong nSize ) override; @@ -466,7 +466,7 @@ typedef ::std::vector< UCBStorageElement_Impl* > UCBStorageElementList_Impl; class UCBStorage_Impl : public SvRefBase { - virtual ~UCBStorage_Impl(); + virtual ~UCBStorage_Impl() override; public: UCBStorage* m_pAntiImpl; // only valid if external references exists diff --git a/sot/source/unoolestorage/xolesimplestorage.hxx b/sot/source/unoolestorage/xolesimplestorage.hxx index dfe034d1d4b6..f91f97c46a4a 100644 --- a/sot/source/unoolestorage/xolesimplestorage.hxx +++ b/sot/source/unoolestorage/xolesimplestorage.hxx @@ -65,7 +65,7 @@ public: OLESimpleStorage(css::uno::Reference const & xContext, css::uno::Sequence const &arguments); - virtual ~OLESimpleStorage(); + virtual ~OLESimpleStorage() override; // XNameContainer -- cgit