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
---
 include/cppuhelper/compbase_ex.hxx | 4 ++--
 include/cppuhelper/component.hxx   | 2 +-
 include/cppuhelper/implbase.hxx    | 2 +-
 include/cppuhelper/weakagg.hxx     | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'include/cppuhelper')

diff --git a/include/cppuhelper/compbase_ex.hxx b/include/cppuhelper/compbase_ex.hxx
index 7c4179f96da2..611d0a10541f 100644
--- a/include/cppuhelper/compbase_ex.hxx
+++ b/include/cppuhelper/compbase_ex.hxx
@@ -55,7 +55,7 @@ protected:
 public:
     /** Destructor
     */
-    virtual ~WeakComponentImplHelperBase();
+    virtual ~WeakComponentImplHelperBase() SAL_OVERRIDE;
 
     // these are here to force memory de/allocation to sal lib.
     inline static void * SAL_CALL operator new( size_t nSize )
@@ -100,7 +100,7 @@ protected:
 
     WeakAggComponentImplHelperBase( ::osl::Mutex & rMutex );
 public:
-    virtual ~WeakAggComponentImplHelperBase();
+    virtual ~WeakAggComponentImplHelperBase() SAL_OVERRIDE;
 
     // these are here to force memory de/allocation to sal lib.
     inline static void * SAL_CALL operator new( size_t nSize )
diff --git a/include/cppuhelper/component.hxx b/include/cppuhelper/component.hxx
index 0b43c488af11..e9a684f1b14c 100644
--- a/include/cppuhelper/component.hxx
+++ b/include/cppuhelper/component.hxx
@@ -57,7 +57,7 @@ public:
     OComponentHelper( ::osl::Mutex & rMutex );
     /** Destructor. If this object was not disposed previously, object will be disposed manually.
     */
-    virtual ~OComponentHelper();
+    virtual ~OComponentHelper() SAL_OVERRIDE;
 
     // XAggregation
     virtual css::uno::Any SAL_CALL queryInterface(
diff --git a/include/cppuhelper/implbase.hxx b/include/cppuhelper/implbase.hxx
index 40a120545597..850224c49683 100644
--- a/include/cppuhelper/implbase.hxx
+++ b/include/cppuhelper/implbase.hxx
@@ -101,7 +101,7 @@ class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE WeakImplHelper:
 protected:
     WeakImplHelper() {}
 
-    virtual ~WeakImplHelper() {}
+    virtual ~WeakImplHelper() SAL_OVERRIDE {}
 
 public:
     css::uno::Any SAL_CALL queryInterface(css::uno::Type const & aType)
diff --git a/include/cppuhelper/weakagg.hxx b/include/cppuhelper/weakagg.hxx
index c08f00408e37..25a06875c3ba 100644
--- a/include/cppuhelper/weakagg.hxx
+++ b/include/cppuhelper/weakagg.hxx
@@ -88,7 +88,7 @@ protected:
         Despite the fact that a RuntimeException is allowed to be thrown, you must not throw any
         exception upon destruction!
     */
-    virtual ~OWeakAggObject();
+    virtual ~OWeakAggObject() SAL_OVERRIDE;
 
     /** weak reference to delegator.
     */
-- 
cgit