diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-04-01 19:18:35 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-04-01 19:22:54 +0200 |
commit | 362d4f0cd4e50111edfae9d30c90602c37ed65a2 (patch) | |
tree | 0b432c049d580dcac6130bca9fb028bab8af8fa8 /sot | |
parent | b66d87086804460c1986df1b832fd6b2ea075a90 (diff) |
Explicitly mark overriding destructors as "virtual"
It appears that the C++ standard allows overriding destructors to be marked
"override," but at least some MSVC versions complain about it, so at least make
sure such destructors are explicitly marked "virtual."
Change-Id: I0e1cafa7584fd16ebdce61f569eae2373a71b0a1
Diffstat (limited to 'sot')
-rw-r--r-- | sot/source/sdstor/stgdir.hxx | 4 | ||||
-rw-r--r-- | sot/source/sdstor/stgole.hxx | 2 | ||||
-rw-r--r-- | sot/source/sdstor/stgstrms.hxx | 2 | ||||
-rw-r--r-- | sot/source/sdstor/ucbstorage.cxx | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/sot/source/sdstor/stgdir.hxx b/sot/source/sdstor/stgdir.hxx index a5b9ab4f1fc8..2a761050d04e 100644 --- a/sot/source/sdstor/stgdir.hxx +++ b/sot/source/sdstor/stgdir.hxx @@ -64,7 +64,7 @@ public: bool bInvalid; // true: invalid entry StgDirEntry( const void* pBuffer, sal_uInt32 nBufferLen, bool * pbOk ); StgDirEntry( const StgEntry& ); - ~StgDirEntry(); + virtual ~StgDirEntry(); void Invalidate( bool=false ); // invalidate all open entries void Enum( sal_Int32& ); // enumerate entries for iteration @@ -98,7 +98,7 @@ class StgDirStrm : public StgDataStrm void SetupEntry( sal_Int32, StgDirEntry* ); public: StgDirStrm( StgIo& ); - ~StgDirStrm(); + virtual ~StgDirStrm(); virtual bool SetSize( sal_Int32 ) SAL_OVERRIDE; // change the size bool Store(); void* GetEntry( sal_Int32 n, bool=false );// get an entry diff --git a/sot/source/sdstor/stgole.hxx b/sot/source/sdstor/stgole.hxx index 02f026448510..9c8cfcc9dbb0 100644 --- a/sot/source/sdstor/stgole.hxx +++ b/sot/source/sdstor/stgole.hxx @@ -34,7 +34,7 @@ class StgInternalStream : public SvStream virtual void FlushData() SAL_OVERRIDE; public: StgInternalStream( BaseStorage&, const OUString&, bool ); - ~StgInternalStream(); + virtual ~StgInternalStream(); void Commit(); }; diff --git a/sot/source/sdstor/stgstrms.hxx b/sot/source/sdstor/stgstrms.hxx index 27fdd62c3a93..80c91aa9b0e1 100644 --- a/sot/source/sdstor/stgstrms.hxx +++ b/sot/source/sdstor/stgstrms.hxx @@ -155,7 +155,7 @@ class StgTmpStrm : public SvMemoryStream public: StgTmpStrm( sal_uLong=16 ); - ~StgTmpStrm(); + virtual ~StgTmpStrm(); bool Copy( StgTmpStrm& ); virtual void SetSize( sal_uInt64 ) SAL_OVERRIDE; sal_uLong GetSize() const; diff --git a/sot/source/sdstor/ucbstorage.cxx b/sot/source/sdstor/ucbstorage.cxx index b26a355f395d..c955492748e7 100644 --- a/sot/source/sdstor/ucbstorage.cxx +++ b/sot/source/sdstor/ucbstorage.cxx @@ -402,7 +402,7 @@ enum RepresentModes { class UCBStorageStream_Impl : public SvRefBase, public SvStream { - ~UCBStorageStream_Impl(); + virtual ~UCBStorageStream_Impl(); public: virtual sal_uLong GetData( void* pData, sal_uLong nSize ) SAL_OVERRIDE; @@ -466,7 +466,7 @@ typedef ::std::vector< UCBStorageElement_Impl* > UCBStorageElementList_Impl; class UCBStorage_Impl : public SvRefBase { - ~UCBStorage_Impl(); + virtual ~UCBStorage_Impl(); public: UCBStorage* m_pAntiImpl; // only valid if external references exists |