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
---
 stoc/source/servicemanager/servicemanager.cxx | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'stoc/source/servicemanager')

diff --git a/stoc/source/servicemanager/servicemanager.cxx b/stoc/source/servicemanager/servicemanager.cxx
index 8aa9fed302a4..2aec83c41396 100644
--- a/stoc/source/servicemanager/servicemanager.cxx
+++ b/stoc/source/servicemanager/servicemanager.cxx
@@ -161,7 +161,7 @@ public:
         : aFactories( rFactories )
         , nIt( 0 )
         {}
-    virtual ~ServiceEnumeration_Impl() {}
+    virtual ~ServiceEnumeration_Impl() override {}
 
     // XEnumeration
     sal_Bool SAL_CALL hasMoreElements()
@@ -253,7 +253,7 @@ public:
         : aImplementationMap( rImplementationMap )
         , aIt( aImplementationMap.begin() )
         {}
-    virtual ~ImplementationEnumeration_Impl();
+    virtual ~ImplementationEnumeration_Impl() override;
 
     // XEnumeration
     virtual sal_Bool SAL_CALL hasMoreElements()
@@ -372,7 +372,7 @@ class OServiceManager
 {
 public:
     explicit OServiceManager( Reference< XComponentContext > const & xContext );
-    virtual ~OServiceManager();
+    virtual ~OServiceManager() override;
 
     // XInitialization
     void SAL_CALL initialize( Sequence< Any > const & args )
@@ -512,7 +512,7 @@ protected:
 public:
     explicit OServiceManagerWrapper(
         Reference< XComponentContext > const & xContext );
-    virtual ~OServiceManagerWrapper();
+    virtual ~OServiceManagerWrapper() override;
 
     // XServiceInfo
     virtual OUString SAL_CALL getImplementationName() throw (RuntimeException, std::exception) override
@@ -1270,7 +1270,7 @@ class ORegistryServiceManager : public OServiceManager
 {
 public:
     explicit ORegistryServiceManager( Reference< XComponentContext > const & xContext );
-    virtual ~ORegistryServiceManager();
+    virtual ~ORegistryServiceManager() override;
 
     // XInitialization
     void SAL_CALL initialize(const Sequence< Any >& Arguments)
-- 
cgit