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

5 files changed, 6 insertions, 6 deletions

diff --git a/include/oox/helper/binaryinputstream.hxx b/include/oox/helper/binaryinputstream.hxx
index cf247f02797b..1e86437daf67 100644
--- a/include/oox/helper/binaryinputstream.hxx
+++ b/include/oox/helper/binaryinputstream.hxx
@@ -270,7 +270,7 @@ public:
                             const css::uno::Reference< css::io::XInputStream >& rxInStrm,
                             bool bAutoClose );
 
-    virtual             ~BinaryXInputStream();
+    virtual             ~BinaryXInputStream() override;
 
     /** Closes the input stream. Does also close the wrapped UNO input stream
         if bAutoClose has been set to true in the constructor. */
diff --git a/include/oox/helper/binaryoutputstream.hxx b/include/oox/helper/binaryoutputstream.hxx
index 4dfbaf8559cc..796777f60209 100644
--- a/include/oox/helper/binaryoutputstream.hxx
+++ b/include/oox/helper/binaryoutputstream.hxx
@@ -149,7 +149,7 @@ public:
                             const css::uno::Reference< css::io::XOutputStream >& rxOutStrm,
                             bool bAutoClose );
 
-    virtual             ~BinaryXOutputStream();
+    virtual             ~BinaryXOutputStream() override;
 
     /** Flushes and closes the output stream. Does also close the wrapped UNO
         output stream if bAutoClose has been set to true in the constructor. */
diff --git a/include/oox/helper/binarystreambase.hxx b/include/oox/helper/binarystreambase.hxx
index f9fd1e0ebe15..d5f2387872f8 100644
--- a/include/oox/helper/binarystreambase.hxx
+++ b/include/oox/helper/binarystreambase.hxx
@@ -123,7 +123,7 @@ private:
 class OOX_DLLPUBLIC BinaryXSeekableStream : public virtual BinaryStreamBase
 {
 public:
-    virtual             ~BinaryXSeekableStream();
+    virtual             ~BinaryXSeekableStream() override;
 
     /** Returns the size of the stream, if wrapped stream is seekable, otherwise -1. */
     virtual sal_Int64   size() const override;
diff --git a/include/oox/helper/progressbar.hxx b/include/oox/helper/progressbar.hxx
index cbc4244a7ca7..88ddb99ff919 100644
--- a/include/oox/helper/progressbar.hxx
+++ b/include/oox/helper/progressbar.hxx
@@ -67,7 +67,7 @@ typedef std::shared_ptr< ISegmentProgressBar > ISegmentProgressBarRef;
 class OOX_DLLPUBLIC ISegmentProgressBar : public IProgressBar
 {
 public:
-    virtual             ~ISegmentProgressBar();
+    virtual             ~ISegmentProgressBar() override;
 
     /** Returns the length that is still free for creating sub segments. */
     virtual double      getFreeLength() const = 0;
@@ -86,7 +86,7 @@ public:
                             const css::uno::Reference< css::task::XStatusIndicator >& rxIndicator,
                             const OUString& rText );
 
-    virtual             ~ProgressBar();
+    virtual             ~ProgressBar() override;
 
     /** Returns the current position of the progress bar. */
     virtual double      getPosition() const override;
diff --git a/include/oox/helper/zipstorage.hxx b/include/oox/helper/zipstorage.hxx
index 4972254bbc0b..cea49fbd39bf 100644
--- a/include/oox/helper/zipstorage.hxx
+++ b/include/oox/helper/zipstorage.hxx
@@ -49,7 +49,7 @@ public:
                             const css::uno::Reference< css::uno::XComponentContext >& rxContext,
                             const css::uno::Reference< css::io::XStream >& rxStream );
 
-    virtual             ~ZipStorage();
+    virtual             ~ZipStorage() override;
 
 private:
     explicit            ZipStorage(