From 91dd2db17bd6cb9b357d1d69b187174e31eabef0 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Tue, 13 Sep 2016 13:09:01 +0200
Subject: 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
---
 writerperfect/inc/DirectoryStream.hxx    | 2 +-
 writerperfect/inc/ImportFilter.hxx       | 2 +-
 writerperfect/inc/WPFTEncodingDialog.hxx | 2 +-
 writerperfect/inc/WPXSvInputStream.hxx   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'writerperfect/inc')

diff --git a/writerperfect/inc/DirectoryStream.hxx b/writerperfect/inc/DirectoryStream.hxx
index e02aab6f44bb..dce2a63a82f2 100644
--- a/writerperfect/inc/DirectoryStream.hxx
+++ b/writerperfect/inc/DirectoryStream.hxx
@@ -38,7 +38,7 @@ class WRITERPERFECT_DLLPUBLIC DirectoryStream : public librevenge::RVNGInputStre
 
 public:
     explicit DirectoryStream(const css::uno::Reference<css::ucb::XContent> &xContent);
-    virtual ~DirectoryStream();
+    virtual ~DirectoryStream() override;
 
     static bool isDirectory(const css::uno::Reference<css::ucb::XContent> &xContent);
 
diff --git a/writerperfect/inc/ImportFilter.hxx b/writerperfect/inc/ImportFilter.hxx
index e7a27f4ee847..2b4b9bb5103b 100644
--- a/writerperfect/inc/ImportFilter.hxx
+++ b/writerperfect/inc/ImportFilter.hxx
@@ -60,7 +60,7 @@ public:
     {
     }
 
-    virtual ~ImportFilterImpl()
+    virtual ~ImportFilterImpl() override
     {
     }
 
diff --git a/writerperfect/inc/WPFTEncodingDialog.hxx b/writerperfect/inc/WPFTEncodingDialog.hxx
index 9fc747d749ff..f6daaab89ebf 100644
--- a/writerperfect/inc/WPFTEncodingDialog.hxx
+++ b/writerperfect/inc/WPFTEncodingDialog.hxx
@@ -28,7 +28,7 @@ class WRITERPERFECT_DLLPUBLIC WPFTEncodingDialog : public ModalDialog
 public:
     WPFTEncodingDialog(const OUString &title, const OUString &defEncoding);
 
-    virtual ~WPFTEncodingDialog();
+    virtual ~WPFTEncodingDialog() override;
 
     OUString GetEncoding() const;
     bool hasUserCalledCancel() const
diff --git a/writerperfect/inc/WPXSvInputStream.hxx b/writerperfect/inc/WPXSvInputStream.hxx
index 9bbefbb35bd6..c6b5d74406b5 100644
--- a/writerperfect/inc/WPXSvInputStream.hxx
+++ b/writerperfect/inc/WPXSvInputStream.hxx
@@ -39,7 +39,7 @@ class WRITERPERFECT_DLLPUBLIC WPXSvInputStream : public librevenge::RVNGInputStr
 {
 public:
     WPXSvInputStream(css::uno::Reference< css::io::XInputStream > const &xStream);
-    virtual ~WPXSvInputStream();
+    virtual ~WPXSvInputStream() override;
 
     virtual bool isStructured() override;
     virtual unsigned subStreamCount() override;
-- 
cgit