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
---
 connectivity/source/cpool/ZConnectionPool.hxx    | 2 +-
 connectivity/source/cpool/ZConnectionWrapper.hxx | 2 +-
 connectivity/source/cpool/ZDriverWrapper.hxx     | 2 +-
 connectivity/source/cpool/ZPoolCollection.hxx    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'connectivity/source/cpool')

diff --git a/connectivity/source/cpool/ZConnectionPool.hxx b/connectivity/source/cpool/ZConnectionPool.hxx
index 7cb93c28c994..c4aa5111f132 100644
--- a/connectivity/source/cpool/ZConnectionPool.hxx
+++ b/connectivity/source/cpool/ZConnectionPool.hxx
@@ -129,7 +129,7 @@ namespace connectivity
 
     protected:
         // the dtor will be called from the last instance  (last release call)
-        virtual ~OConnectionPool();
+        virtual ~OConnectionPool() override;
     public:
         OConnectionPool(const css::uno::Reference< css::sdbc::XDriver >& _xDriver,
                         const css::uno::Reference< css::uno::XInterface >& _xDriverNode,
diff --git a/connectivity/source/cpool/ZConnectionWrapper.hxx b/connectivity/source/cpool/ZConnectionWrapper.hxx
index 08053d064dc2..7ce68a9a60ad 100644
--- a/connectivity/source/cpool/ZConnectionWrapper.hxx
+++ b/connectivity/source/cpool/ZConnectionWrapper.hxx
@@ -42,7 +42,7 @@ namespace connectivity
     protected:
         // OComponentHelper
         virtual void SAL_CALL disposing() override;
-        virtual ~OConnectionWeakWrapper();
+        virtual ~OConnectionWeakWrapper() override;
     public:
         explicit OConnectionWeakWrapper(css::uno::Reference< css::uno::XAggregation >& _xConnection);
 
diff --git a/connectivity/source/cpool/ZDriverWrapper.hxx b/connectivity/source/cpool/ZDriverWrapper.hxx
index da0d39e212d5..0d183d110fd4 100644
--- a/connectivity/source/cpool/ZDriverWrapper.hxx
+++ b/connectivity/source/cpool/ZDriverWrapper.hxx
@@ -61,7 +61,7 @@ namespace connectivity
 
     protected:
         /// dtor
-        virtual ~ODriverWrapper();
+        virtual ~ODriverWrapper() override;
         // XDriver
         virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL connect( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
         virtual sal_Bool SAL_CALL acceptsURL( const OUString& url ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
diff --git a/connectivity/source/cpool/ZPoolCollection.hxx b/connectivity/source/cpool/ZPoolCollection.hxx
index 25c3f5a934d1..ea5e2d307f38 100644
--- a/connectivity/source/cpool/ZPoolCollection.hxx
+++ b/connectivity/source/cpool/ZPoolCollection.hxx
@@ -105,7 +105,7 @@ namespace connectivity
         void clearConnectionPools(bool _bDispose);
         void clearDesktop();
     protected:
-        virtual ~OPoolCollection();
+        virtual ~OPoolCollection() override;
     public:
 
         static css::uno::Any getNodeValue( const OUString& _rPath,
-- 
cgit