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

3 files changed, 8 insertions, 8 deletions

diff --git a/l10ntools/inc/cfgmerge.hxx b/l10ntools/inc/cfgmerge.hxx
index 3982e3fdc631..2b43598a6d2f 100644
--- a/l10ntools/inc/cfgmerge.hxx
+++ b/l10ntools/inc/cfgmerge.hxx
@@ -149,7 +149,7 @@ public:
         const OString &rOutputFile,
         const OString &rFilePath
     );
-    virtual ~CfgExport();
+    virtual ~CfgExport() override;
 };
 
 /// Merge strings to *.xcu files
@@ -175,7 +175,7 @@ public:
     CfgMerge(
         const OString &rMergeSource, const OString &rOutputFile,
         const OString &rFilename, const OString &rLanguage );
-    virtual ~CfgMerge();
+    virtual ~CfgMerge() override;
 };
 
 #endif
diff --git a/l10ntools/inc/xmlparse.hxx b/l10ntools/inc/xmlparse.hxx
index f3085a51603b..235afdbc4ef0 100644
--- a/l10ntools/inc/xmlparse.hxx
+++ b/l10ntools/inc/xmlparse.hxx
@@ -98,7 +98,7 @@ protected:
 public:
     /// returns the parent of this node
     XMLParentNode *GetParent() { return m_pParent; }
-    virtual ~XMLChildNode(){};
+    virtual ~XMLChildNode() override {};
 };
 
 typedef std::vector< XMLChildNode* > XMLChildNodeList;
@@ -120,7 +120,7 @@ protected:
     XMLParentNode( const XMLParentNode& );
 
     XMLParentNode& operator=(const XMLParentNode& rObj);
-    virtual ~XMLParentNode();
+    virtual ~XMLParentNode() override;
 
 public:
     /// returns child list of this node
@@ -152,7 +152,7 @@ public:
         const OString &rFileName // the file name, empty if created from memory stream
     );
     XMLFile( const XMLFile& rObj ) ;
-    virtual ~XMLFile();
+    virtual ~XMLFile() override;
 
     void Print( XMLNode *pCur, sal_uInt16 nLevel = 0 );
     void SearchL10NElements( XMLChildNode *pCur, int pos = 0 );
@@ -219,7 +219,7 @@ public:
         XMLParentNode *pParent   // parent node of this element
     );
 
-    virtual ~XMLElement();
+    virtual ~XMLElement() override;
     XMLElement(const XMLElement&);
 
     XMLElement& operator=(const XMLElement& rObj);
diff --git a/l10ntools/inc/xrmmerge.hxx b/l10ntools/inc/xrmmerge.hxx
index 764629963c7e..746095aee157 100644
--- a/l10ntools/inc/xrmmerge.hxx
+++ b/l10ntools/inc/xrmmerge.hxx
@@ -95,7 +95,7 @@ public:
         const OString &rOutputFile,
         const OString &rFilePath
     );
-    virtual ~XRMResExport();
+    virtual ~XRMResExport() override;
 };
 
 
@@ -129,7 +129,7 @@ public:
         const OString &rOutputFile,
         const OString &rFilename
     );
-    virtual ~XRMResMerge();
+    virtual ~XRMResMerge() override;
 };
 
 #endif // INCLUDED_L10NTOOLS_INC_XRMMERGE_HXX