summaryrefslogtreecommitdiff
path: root/include/sot
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2016-09-13 13:09:01 +0200
committerStephan Bergmann <sbergman@redhat.com>2016-09-13 13:19:22 +0200
commit91dd2db17bd6cb9b357d1d69b187174e31eabef0 (patch)
treed634de3a1a6820904b5699c2136b79b1a5a807c7 /include/sot
parent6f8ea7e89ea190b9462c945d55a3ad8777b2f3ef (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 'include/sot')
-rw-r--r--include/sot/filelist.hxx2
-rw-r--r--include/sot/object.hxx2
-rw-r--r--include/sot/stg.hxx10
-rw-r--r--include/sot/storage.hxx4
4 files changed, 9 insertions, 9 deletions
diff --git a/include/sot/filelist.hxx b/include/sot/filelist.hxx
index 10502c12c7e6..430568c4151e 100644
--- a/include/sot/filelist.hxx
+++ b/include/sot/filelist.hxx
@@ -36,7 +36,7 @@ protected:
public:
FileList() {};
- virtual ~FileList();
+ virtual ~FileList() override;
// Zuweisungsoperator
FileList& operator=( const FileList& rFileList );
diff --git a/include/sot/object.hxx b/include/sot/object.hxx
index 8991a21b7590..9680eaba48a9 100644
--- a/include/sot/object.hxx
+++ b/include/sot/object.hxx
@@ -31,7 +31,7 @@ class SOT_DLLPUBLIC SotObject : virtual public SvRefBase
bool bInClose; // TRUE, in DoClose
protected:
- virtual ~SotObject();
+ virtual ~SotObject() override;
virtual bool Close();
public:
diff --git a/include/sot/stg.hxx b/include/sot/stg.hxx
index 9439c289c875..2c3ccda0cbfb 100644
--- a/include/sot/stg.hxx
+++ b/include/sot/stg.hxx
@@ -51,7 +51,7 @@ protected:
StreamMode m_nMode; // open mode
bool m_bAutoCommit;
StorageBase();
- virtual ~StorageBase();
+ virtual ~StorageBase() override;
public:
virtual bool Validate( bool=false ) const = 0;
virtual bool ValidateMode( StreamMode ) const = 0;
@@ -137,7 +137,7 @@ class StorageStream : public BaseStorageStream, public OLEStorageBase
//friend class Storage;
sal_uLong nPos; // current position
protected:
- virtual ~StorageStream();
+ virtual ~StorageStream() override;
public:
StorageStream( StgIo*, StgDirEntry*, StreamMode );
virtual sal_uLong Read( void * pData, sal_uLong nSize ) override;
@@ -163,7 +163,7 @@ class SOT_DLLPUBLIC Storage : public BaseStorage, public OLEStorageBase
void Init( bool bCreate );
Storage( StgIo*, StgDirEntry*, StreamMode );
protected:
- virtual ~Storage();
+ virtual ~Storage() override;
public:
Storage( const OUString &, StreamMode = StreamMode::STD_READWRITE, bool bDirect = true );
Storage( SvStream& rStrm, bool bDirect = true );
@@ -219,7 +219,7 @@ friend class UCBStorage;
UCBStorageStream_Impl*
pImp;
protected:
- virtual ~UCBStorageStream();
+ virtual ~UCBStorageStream() override;
public:
UCBStorageStream( const OUString& rName, StreamMode nMode, bool bDirect, const OString* pKey, bool bRepair, css::uno::Reference< css::ucb::XProgressHandler > const & xProgress );
UCBStorageStream( UCBStorageStream_Impl* );
@@ -253,7 +253,7 @@ class SOT_DLLPUBLIC UCBStorage : public BaseStorage
UCBStorage_Impl* pImp;
protected:
- virtual ~UCBStorage();
+ virtual ~UCBStorage() override;
public:
static bool IsStorageFile( SvStream* );
static OUString GetLinkedFile( SvStream& );
diff --git a/include/sot/storage.hxx b/include/sot/storage.hxx
index d2e56c6caf0e..92134c20f821 100644
--- a/include/sot/storage.hxx
+++ b/include/sot/storage.hxx
@@ -42,7 +42,7 @@ protected:
virtual sal_uLong PutData( const void* pData, sal_uLong nSize ) override;
virtual sal_uInt64 SeekPos(sal_uInt64 nPos) override;
virtual void FlushData() override;
- virtual ~SotStorageStream();
+ virtual ~SotStorageStream() override;
public:
SotStorageStream( const OUString &,
StreamMode = StreamMode::STD_READWRITE );
@@ -73,7 +73,7 @@ friend class SotStorageStream;
long m_nVersion;
protected:
- virtual ~SotStorage();
+ virtual ~SotStorage() override;
void CreateStorage( bool bUCBStorage, StreamMode );
public:
SotStorage( const OUString &,