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
---
 UnoControls/inc/basecontainercontrol.hxx                   | 2 +-
 UnoControls/inc/basecontrol.hxx                            | 2 +-
 UnoControls/inc/multiplexer.hxx                            | 2 +-
 UnoControls/source/inc/OConnectionPointContainerHelper.hxx | 2 +-
 UnoControls/source/inc/OConnectionPointHelper.hxx          | 2 +-
 UnoControls/source/inc/framecontrol.hxx                    | 2 +-
 UnoControls/source/inc/progressbar.hxx                     | 2 +-
 UnoControls/source/inc/progressmonitor.hxx                 | 2 +-
 UnoControls/source/inc/statusindicator.hxx                 | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'UnoControls')

diff --git a/UnoControls/inc/basecontainercontrol.hxx b/UnoControls/inc/basecontainercontrol.hxx
index e62b9af8b0ad..908b8a2873b5 100644
--- a/UnoControls/inc/basecontainercontrol.hxx
+++ b/UnoControls/inc/basecontainercontrol.hxx
@@ -55,7 +55,7 @@ public:
 
        BaseContainerControl( const css::uno::Reference< css::uno::XComponentContext >& rxContext );
 
-    virtual ~BaseContainerControl();
+    virtual ~BaseContainerControl() override;
 
     //  XInterface
 
diff --git a/UnoControls/inc/basecontrol.hxx b/UnoControls/inc/basecontrol.hxx
index 3970e75a925c..2be5cb5e68f9 100644
--- a/UnoControls/inc/basecontrol.hxx
+++ b/UnoControls/inc/basecontrol.hxx
@@ -119,7 +119,7 @@ public:
 
     BaseControl( const css::uno::Reference< css::uno::XComponentContext >& rxContext );
 
-    virtual ~BaseControl();
+    virtual ~BaseControl() override;
 
     //  XInterface
 
diff --git a/UnoControls/inc/multiplexer.hxx b/UnoControls/inc/multiplexer.hxx
index d82f073419ac..f238293444f1 100644
--- a/UnoControls/inc/multiplexer.hxx
+++ b/UnoControls/inc/multiplexer.hxx
@@ -83,7 +83,7 @@ public:
 
     OMRCListenerMultiplexerHelper( const OMRCListenerMultiplexerHelper& aCopyInstance );
 
-    virtual ~OMRCListenerMultiplexerHelper();
+    virtual ~OMRCListenerMultiplexerHelper() override;
 
     //  XInterface
 
diff --git a/UnoControls/source/inc/OConnectionPointContainerHelper.hxx b/UnoControls/source/inc/OConnectionPointContainerHelper.hxx
index 698c5102552c..31a95f5e42a4 100644
--- a/UnoControls/source/inc/OConnectionPointContainerHelper.hxx
+++ b/UnoControls/source/inc/OConnectionPointContainerHelper.hxx
@@ -39,7 +39,7 @@ public:
 
     OConnectionPointContainerHelper( ::osl::Mutex& aMutex );
 
-    virtual ~OConnectionPointContainerHelper();
+    virtual ~OConnectionPointContainerHelper() override;
 
     //  XInterface
 
diff --git a/UnoControls/source/inc/OConnectionPointHelper.hxx b/UnoControls/source/inc/OConnectionPointHelper.hxx
index f686ef8e6409..371b70facdfa 100644
--- a/UnoControls/source/inc/OConnectionPointHelper.hxx
+++ b/UnoControls/source/inc/OConnectionPointHelper.hxx
@@ -44,7 +44,7 @@ public:
                             OConnectionPointContainerHelper*    pContainerImplementation    ,
                             css::uno::Type                       aType                       );
 
-    virtual ~OConnectionPointHelper();
+    virtual ~OConnectionPointHelper() override;
 
     //  XInterface
 
diff --git a/UnoControls/source/inc/framecontrol.hxx b/UnoControls/source/inc/framecontrol.hxx
index e98fdecc8fa9..ff28dadcf858 100644
--- a/UnoControls/source/inc/framecontrol.hxx
+++ b/UnoControls/source/inc/framecontrol.hxx
@@ -65,7 +65,7 @@ public:
 
     FrameControl( const css::uno::Reference< css::uno::XComponentContext >& rxContext );
 
-    virtual ~FrameControl();
+    virtual ~FrameControl() override;
 
     //  XInterface
 
diff --git a/UnoControls/source/inc/progressbar.hxx b/UnoControls/source/inc/progressbar.hxx
index 5e2046376174..e7523d778fba 100644
--- a/UnoControls/source/inc/progressbar.hxx
+++ b/UnoControls/source/inc/progressbar.hxx
@@ -52,7 +52,7 @@ public:
 
     ProgressBar( const css::uno::Reference< css::uno::XComponentContext >& rxContext );
 
-    virtual ~ProgressBar();
+    virtual ~ProgressBar() override;
 
     //  XInterface
 
diff --git a/UnoControls/source/inc/progressmonitor.hxx b/UnoControls/source/inc/progressmonitor.hxx
index 2879b920d67c..04044cc50fe2 100644
--- a/UnoControls/source/inc/progressmonitor.hxx
+++ b/UnoControls/source/inc/progressmonitor.hxx
@@ -104,7 +104,7 @@ public:
 
     ProgressMonitor( const css::uno::Reference< css::uno::XComponentContext >& rxContext );
 
-    virtual ~ProgressMonitor();
+    virtual ~ProgressMonitor() override;
 
     //  XInterface
 
diff --git a/UnoControls/source/inc/statusindicator.hxx b/UnoControls/source/inc/statusindicator.hxx
index a2a6c6d1bee9..b1e377c46f4d 100644
--- a/UnoControls/source/inc/statusindicator.hxx
+++ b/UnoControls/source/inc/statusindicator.hxx
@@ -61,7 +61,7 @@ class StatusIndicator   : public css::awt::XLayoutConstrains
 
         StatusIndicator( const css::uno::Reference< css::uno::XComponentContext >& rxContext );
 
-        virtual ~StatusIndicator();
+        virtual ~StatusIndicator() override;
 
         //  XInterface
 
-- 
cgit