diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-09-13 13:09:01 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-09-13 13:19:22 +0200 |
| commit | 91dd2db17bd6cb9b357d1d69b187174e31eabef0 (patch) | |
| tree | d634de3a1a6820904b5699c2136b79b1a5a807c7 /include/sot/storage.hxx | |
| parent | 6f8ea7e89ea190b9462c945d55a3ad8777b2f3ef (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/storage.hxx')
| -rw-r--r-- | include/sot/storage.hxx | 4 |
1 files changed, 2 insertions, 2 deletions
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 &, |