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
---
 xmloff/source/chart/SchXMLEnumConverter.cxx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'xmloff/source/chart/SchXMLEnumConverter.cxx')

diff --git a/xmloff/source/chart/SchXMLEnumConverter.cxx b/xmloff/source/chart/SchXMLEnumConverter.cxx
index 287dd1e56444..65c5a4ed7c8e 100644
--- a/xmloff/source/chart/SchXMLEnumConverter.cxx
+++ b/xmloff/source/chart/SchXMLEnumConverter.cxx
@@ -44,7 +44,7 @@ class XMLLegendPositionPropertyHdl : public XMLEnumPropertyHdl
 public:
     XMLLegendPositionPropertyHdl()
         : XMLEnumPropertyHdl( aXMLLegendPositionEnumMap, cppu::UnoType<chart::ChartLegendPosition>::get()) {}
-    virtual ~XMLLegendPositionPropertyHdl() {};
+    virtual ~XMLLegendPositionPropertyHdl() override {};
 };
 
 struct TheLegendPositionPropertyHdl : public rtl::Static< XMLLegendPositionPropertyHdl, TheLegendPositionPropertyHdl >
@@ -65,7 +65,7 @@ class XMLLegendExpansionPropertyHdl : public XMLEnumPropertyHdl
 public:
     XMLLegendExpansionPropertyHdl()
         : XMLEnumPropertyHdl( aXMLLegendExpansionEnumMap, cppu::UnoType<chart::ChartLegendExpansion>::get()) {}
-    virtual ~XMLLegendExpansionPropertyHdl() {};
+    virtual ~XMLLegendExpansionPropertyHdl() override {};
 };
 
 struct TheLegendExpansionPropertyHdl : public rtl::Static< XMLLegendExpansionPropertyHdl, TheLegendExpansionPropertyHdl >
-- 
cgit