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
---
 scaddins/source/analysis/analysis.hxx       | 2 +-
 scaddins/source/analysis/analysishelper.hxx | 2 +-
 scaddins/source/datefunc/datefunc.hxx       | 2 +-
 scaddins/source/pricing/pricing.hxx         | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'scaddins')

diff --git a/scaddins/source/analysis/analysis.hxx b/scaddins/source/analysis/analysis.hxx
index ae2b0de6d839..fa9d9517b96d 100644
--- a/scaddins/source/analysis/analysis.hxx
+++ b/scaddins/source/analysis/analysis.hxx
@@ -77,7 +77,7 @@ private:
 public:
     explicit                    AnalysisAddIn(
                                     const css::uno::Reference< css::uno::XComponentContext >& xContext );
-    virtual                     ~AnalysisAddIn();
+    virtual                     ~AnalysisAddIn() override;
 
     double                      FactDouble( sal_Int32 nNum ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
 
diff --git a/scaddins/source/analysis/analysishelper.hxx b/scaddins/source/analysis/analysishelper.hxx
index 393ce6ab56fa..190da12d3779 100644
--- a/scaddins/source/analysis/analysishelper.hxx
+++ b/scaddins/source/analysis/analysishelper.hxx
@@ -488,7 +488,7 @@ public:
                                 ConvertDataClass    eClass,
                                 bool            bPrefSupport = false );
 
-    virtual                 ~ConvertDataLinear();
+    virtual                 ~ConvertDataLinear() override;
 
     virtual double          Convert( double fVal, const ConvertData& rTo,
                                 sal_Int16 nMatchLevelFrom, sal_Int16 nMatchLevelTo ) const throw( css::uno::RuntimeException, css::lang::IllegalArgumentException ) override;
diff --git a/scaddins/source/datefunc/datefunc.hxx b/scaddins/source/datefunc/datefunc.hxx
index 2fbf06f9d962..201297ed7171 100644
--- a/scaddins/source/datefunc/datefunc.hxx
+++ b/scaddins/source/datefunc/datefunc.hxx
@@ -200,7 +200,7 @@ private:
 
 public:
                                 ScaDateAddIn();
-    virtual                     ~ScaDateAddIn() =default;
+    virtual                     ~ScaDateAddIn() override =default;
 
     static OUString      getImplementationName_Static();
     static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
diff --git a/scaddins/source/pricing/pricing.hxx b/scaddins/source/pricing/pricing.hxx
index 4c2f3a4a0a8c..6d1966df88d6 100644
--- a/scaddins/source/pricing/pricing.hxx
+++ b/scaddins/source/pricing/pricing.hxx
@@ -212,7 +212,7 @@ private:
 
 public:
                                 ScaPricingAddIn();
-    virtual                     ~ScaPricingAddIn();
+    virtual                     ~ScaPricingAddIn() override;
 
     static OUString      getImplementationName_Static();
     static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
-- 
cgit