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

4 files changed, 16 insertions, 16 deletions

diff --git a/include/filter/msfilter/escherex.hxx b/include/filter/msfilter/escherex.hxx
index e71ec4715264..8282ffd570ae 100644
--- a/include/filter/msfilter/escherex.hxx
+++ b/include/filter/msfilter/escherex.hxx
@@ -1061,7 +1061,7 @@ class MSFILTER_DLLPUBLIC EscherExGlobal : public EscherGraphicProvider
 {
 public:
     explicit            EscherExGlobal( sal_uInt32 nGraphicProvFlags = E_GRAPH_PROV_DO_NOT_ROTATE_METAFILES );
-    virtual             ~EscherExGlobal();
+    virtual             ~EscherExGlobal() override;
 
     /** Returns a new drawing ID for a new drawing container (DGCONTAINER). */
     sal_uInt32          GenerateDrawingId();
@@ -1165,7 +1165,7 @@ class MSFILTER_DLLPUBLIC EscherEx : public EscherPersistTable
 
 public:
     explicit            EscherEx( const std::shared_ptr<EscherExGlobal>& rxGlobal, SvStream* pOutStrm, bool bOOXML = false );
-    virtual             ~EscherEx();
+    virtual             ~EscherEx() override;
 
     /** Creates and returns a new shape identifier, updates the internal shape
         counters and registers the identifier in the DGG cluster table. */
diff --git a/include/filter/msfilter/mstoolbar.hxx b/include/filter/msfilter/mstoolbar.hxx
index acf5a2d54dd2..3495a05b197e 100644
--- a/include/filter/msfilter/mstoolbar.hxx
+++ b/include/filter/msfilter/mstoolbar.hxx
@@ -113,7 +113,7 @@ class MSFILTER_DLLPUBLIC WString : public TBBase
 
 public:
     WString(){};
-    virtual ~WString(){};
+    virtual ~WString() override {};
     bool Read(SvStream &rS) override;
     const OUString& getString(){ return sString; }
 };
@@ -132,7 +132,7 @@ class MSFILTER_DLLPUBLIC TBCExtraInfo : public TBBase
     TBCExtraInfo& operator = ( const TBCExtraInfo&) = delete;
 public:
     TBCExtraInfo();
-    virtual ~TBCExtraInfo(){}
+    virtual ~TBCExtraInfo() override {}
     bool Read(SvStream &rS) override;
 #ifdef DEBUG_FILTER_MSTOOLBAR
     virtual void Print( FILE* ) override;
@@ -150,7 +150,7 @@ class MSFILTER_DLLPUBLIC TBCGeneralInfo  : public TBBase
 
 public:
     TBCGeneralInfo();
-    virtual ~TBCGeneralInfo() {}
+    virtual ~TBCGeneralInfo() override {}
     bool Read(SvStream &rS) override;
 #if OSL_DEBUG_LEVEL > 1
     virtual void Print( FILE* ) override;
@@ -166,7 +166,7 @@ friend class TBCBSpecific; // #FIXME hacky access, need to fix
     Bitmap mBitMap;
 public:
     TBCBitMap();
-    virtual ~TBCBitMap();
+    virtual ~TBCBitMap() override;
     bool Read(SvStream &rS) override;
 #ifdef DEBUG_FILTER_MSTOOLBAR
     virtual void Print( FILE* ) override;
@@ -181,7 +181,7 @@ class MSFILTER_DLLPUBLIC TBCMenuSpecific : public TBBase
     std::shared_ptr< WString > name; //exist only if tbid equals 0x00000001
 public:
     TBCMenuSpecific();
-    virtual ~TBCMenuSpecific(){}
+    virtual ~TBCMenuSpecific() override {}
     bool Read(SvStream &rS) override;
 #if OSL_DEBUG_LEVEL > 1
     virtual void Print( FILE* ) override;
@@ -201,7 +201,7 @@ class MSFILTER_DLLPUBLIC TBCCDData : public TBBase
 
 public:
     TBCCDData();
-    virtual ~TBCCDData();
+    virtual ~TBCCDData() override;
     bool Read(SvStream &rS) override;
 #if OSL_DEBUG_LEVEL > 1
     virtual void Print( FILE* ) override;
@@ -229,7 +229,7 @@ class TBCBSpecific :  public TBBase
 
 public:
     TBCBSpecific();
-    virtual ~TBCBSpecific(){}
+    virtual ~TBCBSpecific() override {}
     bool Read(SvStream &rS) override;
 #if OSL_DEBUG_LEVEL > 1
     virtual void Print( FILE* ) override;
@@ -275,7 +275,7 @@ class MSFILTER_DLLPUBLIC TBCHeader : public TBBase
 
 public:
     TBCHeader();
-    virtual ~TBCHeader();
+    virtual ~TBCHeader() override;
     sal_uInt8 getTct() const { return tct; }
     sal_uInt16 getTcID() const { return tcid; }
     bool isVisible() { return !( bFlagsTCR & 0x1 ); }
@@ -296,7 +296,7 @@ class MSFILTER_DLLPUBLIC TBCData : public TBBase
     TBCData& operator = ( const TBCData&) = delete;
 public:
     TBCData( const TBCHeader& Header );
-    virtual ~TBCData(){}
+    virtual ~TBCData() override {}
     bool Read(SvStream &rS) override;
 #ifdef DEBUG_FILTER_MSTOOLBAR
     virtual void Print( FILE* ) override;
@@ -318,7 +318,7 @@ class MSFILTER_DLLPUBLIC TB : public TBBase
     WString name; //Structure of type WString that specifies the toolbar name
 public:
     TB();
-    virtual ~TB(){}
+    virtual ~TB() override {}
     bool Read(SvStream &rS) override;
 #ifdef DEBUG_FILTER_MSTOOLBAR
     virtual void Print( FILE* ) override;
@@ -356,7 +356,7 @@ class MSFILTER_DLLPUBLIC TBVisualData : public TBBase
 
 public:
     TBVisualData();
-    virtual ~TBVisualData(){}
+    virtual ~TBVisualData() override {}
     bool Read(SvStream &rS) override;
 #ifdef DEBUG_FILTER_MSTOOLBAR
     virtual void Print( FILE* ) override;
diff --git a/include/filter/msfilter/msvbahelper.hxx b/include/filter/msfilter/msvbahelper.hxx
index 366760bfc447..344f13c6ffaf 100644
--- a/include/filter/msfilter/msvbahelper.hxx
+++ b/include/filter/msfilter/msvbahelper.hxx
@@ -76,7 +76,7 @@ class VBAMacroResolver : public VBAMacroResolverBase
 {
 public:
     explicit            VBAMacroResolver();
-    virtual             ~VBAMacroResolver();
+    virtual             ~VBAMacroResolver() override;
 
     // com.sun.star.lang.XServiceInfo interface -------------------------------
 
diff --git a/include/filter/msfilter/svdfppt.hxx b/include/filter/msfilter/svdfppt.hxx
index ee893ad42932..8b8f1219878c 100644
--- a/include/filter/msfilter/svdfppt.hxx
+++ b/include/filter/msfilter/svdfppt.hxx
@@ -465,7 +465,7 @@ public:
     PowerPointImportParam& rImportParam;
 
                         SdrEscherImport( PowerPointImportParam&, const OUString& rBaseURL );
-    virtual             ~SdrEscherImport();
+    virtual             ~SdrEscherImport() override;
     virtual bool        GetColorFromPalette( sal_uInt16 nNum, Color& rColor ) const override;
     virtual bool        SeekToShape( SvStream& rSt, void* pClientData, sal_uInt32 nId ) const override;
     PptFontEntityAtom*  GetFontEnityAtom( sal_uInt32 nNum ) const;
@@ -601,7 +601,7 @@ protected:
 
 public:
                             SdrPowerPointImport( PowerPointImportParam&, const OUString& rBaseURL );
-    virtual                 ~SdrPowerPointImport();
+    virtual                 ~SdrPowerPointImport() override;
     sal_uInt16              GetPageCount( PptPageKind eKind = PPT_SLIDEPAGE ) const;
     void                    SetPageNum( sal_uInt16 nPageNum, PptPageKind = PPT_SLIDEPAGE );
     Size                    GetPageSize() const;