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

23 files changed, 23 insertions, 23 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 );
 
diff --git a/package/source/manifest/ManifestImport.hxx b/package/source/manifest/ManifestImport.hxx
index 4e25499f5629..9cace18ee251 100644
--- a/package/source/manifest/ManifestImport.hxx
+++ b/package/source/manifest/ManifestImport.hxx
@@ -119,7 +119,7 @@ protected:
 
 public:
     ManifestImport( std::vector < css::uno::Sequence < css::beans::PropertyValue > > & rNewVector );
-    virtual ~ManifestImport();
+    virtual ~ManifestImport() override;
     virtual void SAL_CALL startDocument(  )
         throw(css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL endDocument(  )
diff --git a/package/source/manifest/ManifestReader.hxx b/package/source/manifest/ManifestReader.hxx
index 0e0b4b0fa0aa..ba9221d5a77e 100644
--- a/package/source/manifest/ManifestReader.hxx
+++ b/package/source/manifest/ManifestReader.hxx
@@ -40,7 +40,7 @@ private:
     css::uno::Reference< css::uno::XComponentContext > m_xContext;
 public:
     ManifestReader( const css::uno::Reference< css::uno::XComponentContext > & xContext );
-    virtual ~ManifestReader();
+    virtual ~ManifestReader() override;
 
     // XManifestReader
     virtual css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > > SAL_CALL readManifestSequence( const css::uno::Reference< css::io::XInputStream >& rStream )
diff --git a/package/source/manifest/ManifestWriter.hxx b/package/source/manifest/ManifestWriter.hxx
index fd20e33252ce..0a63befb89f5 100644
--- a/package/source/manifest/ManifestWriter.hxx
+++ b/package/source/manifest/ManifestWriter.hxx
@@ -40,7 +40,7 @@ private:
     css::uno::Reference< css::uno::XComponentContext > m_xContext;
 public:
     ManifestWriter( const css::uno::Reference< css::uno::XComponentContext > & xContext );
-    virtual ~ManifestWriter();
+    virtual ~ManifestWriter() override;
 
     // XManifestWriter
     virtual void SAL_CALL writeManifestSequence( const css::uno::Reference< css::io::XOutputStream >& rStream, const css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > >& rSequence )
diff --git a/package/source/xstor/disposelistener.hxx b/package/source/xstor/disposelistener.hxx
index 21b9b31d05d1..75d81c8913c3 100644
--- a/package/source/xstor/disposelistener.hxx
+++ b/package/source/xstor/disposelistener.hxx
@@ -32,7 +32,7 @@ class OChildDispListener_Impl : public ::cppu::WeakImplHelper < css::lang::XEven
 
 public:
     explicit OChildDispListener_Impl( OStorage& aStorage );
-    virtual ~OChildDispListener_Impl();
+    virtual ~OChildDispListener_Impl() override;
 
     void OwnerIsDisposed();
 
diff --git a/package/source/xstor/ocompinstream.hxx b/package/source/xstor/ocompinstream.hxx
index 451f2201fb5a..36c91a54c190 100644
--- a/package/source/xstor/ocompinstream.hxx
+++ b/package/source/xstor/ocompinstream.hxx
@@ -58,7 +58,7 @@ public:
                       const css::uno::Sequence< css::beans::PropertyValue >& aProps,
                       sal_Int32 nStorageType );
 
-    virtual ~OInputCompStream();
+    virtual ~OInputCompStream() override;
 
     void InternalDispose();
 
diff --git a/package/source/xstor/oseekinstream.hxx b/package/source/xstor/oseekinstream.hxx
index dcadc763e98e..803f4c7fc783 100644
--- a/package/source/xstor/oseekinstream.hxx
+++ b/package/source/xstor/oseekinstream.hxx
@@ -40,7 +40,7 @@ public:
                       const css::uno::Sequence< css::beans::PropertyValue >& aProps,
                       sal_Int32 nStorageType );
 
-    virtual ~OInputSeekStream();
+    virtual ~OInputSeekStream() override;
 
     virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) override;
 
diff --git a/package/source/xstor/owriteablestream.hxx b/package/source/xstor/owriteablestream.hxx
index 63c7fccee258..130d5fe1c532 100644
--- a/package/source/xstor/owriteablestream.hxx
+++ b/package/source/xstor/owriteablestream.hxx
@@ -272,7 +272,7 @@ protected:
 
 public:
 
-    virtual ~OWriteStream();
+    virtual ~OWriteStream() override;
 
     void CheckInitOnDemand();
     void DeInit();
diff --git a/package/source/xstor/selfterminatefilestream.hxx b/package/source/xstor/selfterminatefilestream.hxx
index 4cd4dbdbe81d..abd60c4676d1 100644
--- a/package/source/xstor/selfterminatefilestream.hxx
+++ b/package/source/xstor/selfterminatefilestream.hxx
@@ -41,7 +41,7 @@ protected:
 public:
     OSelfTerminateFileStream( const css::uno::Reference< css::uno::XComponentContext >& xContext, const OUString& aURL );
 
-    virtual ~OSelfTerminateFileStream();
+    virtual ~OSelfTerminateFileStream() override;
 
     void CloseStreamDeleteFile();
 
diff --git a/package/source/xstor/switchpersistencestream.hxx b/package/source/xstor/switchpersistencestream.hxx
index 713a7cfdbd01..dacb28ad805d 100644
--- a/package/source/xstor/switchpersistencestream.hxx
+++ b/package/source/xstor/switchpersistencestream.hxx
@@ -68,7 +68,7 @@ public:
         const css::uno::Reference< css::uno::XComponentContext >& xContext,
         const css::uno::Reference< css::io::XInputStream >& xInStream );
 
-    virtual ~SwitchablePersistenceStream();
+    virtual ~SwitchablePersistenceStream() override;
 
     void SwitchPersistenceTo( const css::uno::Reference< css::io::XStream >& xStream );
 
diff --git a/package/source/xstor/xstorage.hxx b/package/source/xstor/xstorage.hxx
index f7f82c086126..a0f2b3b74c8f 100644
--- a/package/source/xstor/xstorage.hxx
+++ b/package/source/xstor/xstorage.hxx
@@ -318,7 +318,7 @@ public:
 
     OStorage(   OStorage_Impl* pImpl, bool bReadOnlyWrap );
 
-    virtual ~OStorage();
+    virtual ~OStorage() override;
 
     void SAL_CALL InternalDispose( bool bNotifyImpl );
 
diff --git a/package/source/zipapi/XUnbufferedStream.hxx b/package/source/zipapi/XUnbufferedStream.hxx
index 1d34c2c158e6..a22124a5cd02 100644
--- a/package/source/zipapi/XUnbufferedStream.hxx
+++ b/package/source/zipapi/XUnbufferedStream.hxx
@@ -80,7 +80,7 @@ public:
                  const css::uno::Reference < css::io::XInputStream >& xRawStream,
                  const ::rtl::Reference< EncryptionData >& rData );
 
-    virtual ~XUnbufferedStream();
+    virtual ~XUnbufferedStream() override;
 
     // XInputStream
     virtual sal_Int32 SAL_CALL readBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead )
diff --git a/package/source/zipapi/blowfishcontext.hxx b/package/source/zipapi/blowfishcontext.hxx
index 47c4adf6c263..9f368a5cc117 100644
--- a/package/source/zipapi/blowfishcontext.hxx
+++ b/package/source/zipapi/blowfishcontext.hxx
@@ -37,7 +37,7 @@ class BlowfishCFB8CipherContext : public cppu::WeakImplHelper< css::xml::crypto:
 
 public:
 
-    virtual ~BlowfishCFB8CipherContext();
+    virtual ~BlowfishCFB8CipherContext() override;
 
     static css::uno::Reference< css::xml::crypto::XCipherContext >
         Create( const css::uno::Sequence< sal_Int8 >& aDerivedKey, const css::uno::Sequence< sal_Int8 >& aInitVector, bool bEncrypt );
diff --git a/package/source/zipapi/sha1context.hxx b/package/source/zipapi/sha1context.hxx
index 5298d3bfea67..3be983d31913 100644
--- a/package/source/zipapi/sha1context.hxx
+++ b/package/source/zipapi/sha1context.hxx
@@ -35,7 +35,7 @@ class SHA1DigestContext : public cppu::WeakImplHelper< css::xml::crypto::XDigest
 
 public:
 
-    virtual ~SHA1DigestContext();
+    virtual ~SHA1DigestContext() override;
 
     static css::uno::Reference< css::xml::crypto::XDigestContext > Create();
 
diff --git a/package/source/zippackage/ContentInfo.hxx b/package/source/zippackage/ContentInfo.hxx
index 1fd3a95159a0..890368744bbe 100644
--- a/package/source/zippackage/ContentInfo.hxx
+++ b/package/source/zippackage/ContentInfo.hxx
@@ -47,7 +47,7 @@ public:
     , pFolder ( pNewFolder )
     {
     }
-    virtual ~ContentInfo ()
+    virtual ~ContentInfo () override
     {
         if ( bFolder )
             pFolder->clearParent();
diff --git a/package/source/zippackage/ZipPackageFolderEnumeration.hxx b/package/source/zippackage/ZipPackageFolderEnumeration.hxx
index eee73c5db362..6befe8c6f18f 100644
--- a/package/source/zippackage/ZipPackageFolderEnumeration.hxx
+++ b/package/source/zippackage/ZipPackageFolderEnumeration.hxx
@@ -36,7 +36,7 @@ protected:
 public:
     //ZipPackageFolderEnumeration (unordered_map < OUString, css::uno::Reference < css::container::XNamed >, hashFunc, eqFunc > &rInput);
     ZipPackageFolderEnumeration (ContentHash &rInput);
-    virtual ~ZipPackageFolderEnumeration();
+    virtual ~ZipPackageFolderEnumeration() override;
 
     // XEnumeration
     virtual sal_Bool SAL_CALL hasMoreElements(  )
diff --git a/package/source/zippackage/ZipPackageSink.hxx b/package/source/zippackage/ZipPackageSink.hxx
index 1f141d2eb989..6ece3eb528f7 100644
--- a/package/source/zippackage/ZipPackageSink.hxx
+++ b/package/source/zippackage/ZipPackageSink.hxx
@@ -28,7 +28,7 @@ protected:
     css::uno::Reference < css::io::XInputStream > xStream;
 public:
     ZipPackageSink();
-    virtual ~ZipPackageSink();
+    virtual ~ZipPackageSink() override;
     virtual void SAL_CALL setInputStream( const css::uno::Reference< css::io::XInputStream >& aStream )
         throw(css::uno::RuntimeException, std::exception) override;
     virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getInputStream(  )
diff --git a/package/source/zippackage/wrapstreamforshare.hxx b/package/source/zippackage/wrapstreamforshare.hxx
index 7e5950a39467..8fc51001755e 100644
--- a/package/source/zippackage/wrapstreamforshare.hxx
+++ b/package/source/zippackage/wrapstreamforshare.hxx
@@ -39,7 +39,7 @@ protected:
 public:
     WrapStreamForShare( const css::uno::Reference< css::io::XInputStream >& xInStream,
                         const rtl::Reference<SotMutexHolder>& rMutexRef );
-    virtual ~WrapStreamForShare();
+    virtual ~WrapStreamForShare() override;
 
     // XInputStream
     virtual sal_Int32 SAL_CALL readBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead )