summaryrefslogtreecommitdiff
path: root/include/sot
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-04-01 19:18:35 +0200
committerStephan Bergmann <sbergman@redhat.com>2014-04-01 19:22:54 +0200
commit362d4f0cd4e50111edfae9d30c90602c37ed65a2 (patch)
tree0b432c049d580dcac6130bca9fb028bab8af8fa8 /include/sot
parentb66d87086804460c1986df1b832fd6b2ea075a90 (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 'include/sot')
-rw-r--r--include/sot/filelist.hxx2
-rw-r--r--include/sot/stg.hxx8
-rw-r--r--include/sot/storage.hxx4
3 files changed, 7 insertions, 7 deletions
diff --git a/include/sot/filelist.hxx b/include/sot/filelist.hxx
index 847f498be097..e3b063e8860f 100644
--- a/include/sot/filelist.hxx
+++ b/include/sot/filelist.hxx
@@ -45,7 +45,7 @@ public:
TYPEINFO_OVERRIDE();
FileList() {};
- ~FileList();
+ virtual ~FileList();
// Zuweisungsoperator
FileList& operator=( const FileList& rFileList );
diff --git a/include/sot/stg.hxx b/include/sot/stg.hxx
index 2805d2acdda2..b42ed4c7f590 100644
--- a/include/sot/stg.hxx
+++ b/include/sot/stg.hxx
@@ -154,7 +154,7 @@ class StorageStream : public BaseStorageStream, public OLEStorageBase
//friend class Storage;
sal_uLong nPos; // current position
protected:
- ~StorageStream();
+ virtual ~StorageStream();
public:
TYPEINFO_OVERRIDE();
StorageStream( StgIo*, StgDirEntry*, StreamMode );
@@ -183,7 +183,7 @@ class SOT_DLLPUBLIC Storage : public BaseStorage, public OLEStorageBase
void Init( bool bCreate );
Storage( StgIo*, StgDirEntry*, StreamMode );
protected:
- ~Storage();
+ virtual ~Storage();
public:
TYPEINFO_OVERRIDE();
Storage( const OUString &, StreamMode = STREAM_STD_READWRITE, bool bDirect = true );
@@ -247,7 +247,7 @@ friend class UCBStorage;
UCBStorageStream_Impl*
pImp;
protected:
- ~UCBStorageStream();
+ virtual ~UCBStorageStream();
public:
TYPEINFO_OVERRIDE();
UCBStorageStream( const OUString& rName, StreamMode nMode, bool bDirect, const OString* pKey, bool bRepair, ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XProgressHandler > xProgress );
@@ -284,7 +284,7 @@ class SOT_DLLPUBLIC UCBStorage : public BaseStorage
UCBStorage_Impl* pImp;
protected:
- ~UCBStorage();
+ virtual ~UCBStorage();
public:
static bool IsStorageFile( SvStream* );
static bool IsDiskSpannedFile( SvStream* );
diff --git a/include/sot/storage.hxx b/include/sot/storage.hxx
index b0c5b4670733..a82efb1307ae 100644
--- a/include/sot/storage.hxx
+++ b/include/sot/storage.hxx
@@ -58,7 +58,7 @@ protected:
virtual sal_uLong PutData( const void* pData, sal_uLong nSize ) SAL_OVERRIDE;
virtual sal_uInt64 SeekPos(sal_uInt64 nPos) SAL_OVERRIDE;
virtual void FlushData() SAL_OVERRIDE;
- ~SotStorageStream();
+ virtual ~SotStorageStream();
public:
SotStorageStream( const OUString &,
StreamMode = STREAM_STD_READWRITE,
@@ -114,7 +114,7 @@ friend class SvStorage;
long m_nVersion;
protected:
- ~SotStorage();
+ virtual ~SotStorage();
void CreateStorage( bool bUCBStorage, StreamMode, StorageMode );
public:
SotStorage( const OUString &,