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 /package/inc | |
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 'package/inc')
-rw-r--r-- | package/inc/ZipPackage.hxx | 2 | ||||
-rw-r--r-- | package/inc/ZipPackageBuffer.hxx | 2 | ||||
-rw-r--r-- | package/inc/ZipPackageEntry.hxx | 2 | ||||
-rw-r--r-- | package/inc/ZipPackageFolder.hxx | 2 | ||||
-rw-r--r-- | package/inc/ZipPackageStream.hxx | 2 | ||||
-rw-r--r-- | package/inc/zipfileaccess.hxx | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/package/inc/ZipPackage.hxx b/package/inc/ZipPackage.hxx index 12e1602178ac..378876962b0d 100644 --- a/package/inc/ZipPackage.hxx +++ b/package/inc/ZipPackage.hxx @@ -117,7 +117,7 @@ protected: public: ZipPackage( const css::uno::Reference < css::uno::XComponentContext > &xContext ); - virtual ~ZipPackage(); + virtual ~ZipPackage() override; ZipFile& getZipFile() { return *m_pZipFile;} sal_Int32 getFormat() const { return m_nFormat; } diff --git a/package/inc/ZipPackageBuffer.hxx b/package/inc/ZipPackageBuffer.hxx index 6873d7b45065..daac93d7c17f 100644 --- a/package/inc/ZipPackageBuffer.hxx +++ b/package/inc/ZipPackageBuffer.hxx @@ -37,7 +37,7 @@ protected: bool m_bMustInitBuffer; public: ZipPackageBuffer(); - virtual ~ZipPackageBuffer(); + virtual ~ZipPackageBuffer() override; inline void realloc ( sal_Int32 nSize ) { m_aBuffer.realloc ( nSize ); } const css::uno::Sequence < sal_Int8>& getSequence () const { return m_aBuffer; } diff --git a/package/inc/ZipPackageEntry.hxx b/package/inc/ZipPackageEntry.hxx index 6d7381e280b7..1dc3539e234d 100644 --- a/package/inc/ZipPackageEntry.hxx +++ b/package/inc/ZipPackageEntry.hxx @@ -57,7 +57,7 @@ protected: public: ZipEntry aEntry; ZipPackageEntry(); - virtual ~ZipPackageEntry(); + virtual ~ZipPackageEntry() override; const OUString& GetMediaType () const { return msMediaType; } void SetMediaType ( const OUString & sNewType) { msMediaType = sNewType; } diff --git a/package/inc/ZipPackageFolder.hxx b/package/inc/ZipPackageFolder.hxx index b024d2ccea04..916c82477d9d 100644 --- a/package/inc/ZipPackageFolder.hxx +++ b/package/inc/ZipPackageFolder.hxx @@ -47,7 +47,7 @@ public: ZipPackageFolder( const css::uno::Reference < css::uno::XComponentContext >& xContext, sal_Int32 nFormat, bool bAllowRemoveOnInsert ); - virtual ~ZipPackageFolder(); + virtual ~ZipPackageFolder() override; const OUString& GetVersion() const { return m_sVersion; } void SetVersion( const OUString& aVersion ) { m_sVersion = aVersion; } diff --git a/package/inc/ZipPackageStream.hxx b/package/inc/ZipPackageStream.hxx index 67f536816a0a..bd1367bab7fa 100644 --- a/package/inc/ZipPackageStream.hxx +++ b/package/inc/ZipPackageStream.hxx @@ -124,7 +124,7 @@ public: const css::uno::Reference < css::uno::XComponentContext >& xContext, sal_Int32 nFormat, bool bAllowRemoveOnInsert ); - virtual ~ZipPackageStream(); + virtual ~ZipPackageStream() override; css::uno::Reference< css::io::XInputStream > GetRawEncrStreamNoHeaderCopy(); css::uno::Reference< css::io::XInputStream > TryToGetRawFromDataStream(bool bAddHeaderForEncr ); diff --git a/package/inc/zipfileaccess.hxx b/package/inc/zipfileaccess.hxx index d324b0a4476c..8160447e33b0 100644 --- a/package/inc/zipfileaccess.hxx +++ b/package/inc/zipfileaccess.hxx @@ -53,7 +53,7 @@ class OZipFileAccess : public ::cppu::WeakImplHelper< public: OZipFileAccess( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); - virtual ~OZipFileAccess(); + virtual ~OZipFileAccess() override; static css::uno::Sequence< OUString > GetPatternsFromString_Impl( const OUString& aString ); |