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

1 files changed, 7 insertions, 7 deletions

diff --git a/sc/inc/token.hxx b/sc/inc/token.hxx
index 1a3f9f0aca70..94a1da8b0db1 100644
--- a/sc/inc/token.hxx
+++ b/sc/inc/token.hxx
@@ -151,7 +151,7 @@ public:
     ScExternalSingleRefToken( sal_uInt16 nFileId, const svl::SharedString& rTabName, const ScSingleRefData& r );
     ScExternalSingleRefToken( const ScExternalSingleRefToken& r );
     ScExternalSingleRefToken() = delete;
-    virtual ~ScExternalSingleRefToken();
+    virtual ~ScExternalSingleRefToken() override;
 
     virtual sal_uInt16                  GetIndex() const override;
     virtual svl::SharedString GetString() const override;
@@ -171,7 +171,7 @@ public:
     ScExternalDoubleRefToken() = delete;
     ScExternalDoubleRefToken( sal_uInt16 nFileId, const svl::SharedString& rTabName, const ScComplexRefData& r );
     ScExternalDoubleRefToken( const ScExternalDoubleRefToken& r );
-    virtual ~ScExternalDoubleRefToken();
+    virtual ~ScExternalDoubleRefToken() override;
 
     virtual sal_uInt16                 GetIndex() const override;
     virtual svl::SharedString GetString() const override;
@@ -194,7 +194,7 @@ public:
     ScExternalNameToken() = delete;
     ScExternalNameToken( sal_uInt16 nFileId, const svl::SharedString& rName );
     ScExternalNameToken( const ScExternalNameToken& r );
-    virtual ~ScExternalNameToken();
+    virtual ~ScExternalNameToken() override;
 
     virtual sal_uInt16              GetIndex() const override;
     virtual svl::SharedString GetString() const override;
@@ -222,7 +222,7 @@ public:
     ScTableRefToken() = delete;
     ScTableRefToken( sal_uInt16 nIndex, Item eItem );
     ScTableRefToken( const ScTableRefToken& r );
-    virtual ~ScTableRefToken();
+    virtual ~ScTableRefToken() override;
 
     virtual sal_uInt16          GetIndex() const override;
     virtual void                SetIndex( sal_uInt16 n ) override;
@@ -253,7 +253,7 @@ public:
                                     FormulaToken( formula::svJumpMatrix ), pJumpMatrix( p ) {}
                                 ScJumpMatrixToken( const ScJumpMatrixToken& r ) :
                                     FormulaToken( r ), pJumpMatrix( r.pJumpMatrix ) {}
-    virtual                     ~ScJumpMatrixToken();
+    virtual                     ~ScJumpMatrixToken() override;
     virtual ScJumpMatrix*       GetJumpMatrix() const override;
     virtual bool                operator==( const formula::FormulaToken& rToken ) const override;
     virtual FormulaToken*       Clone() const override { return new ScJumpMatrixToken(*this); }
@@ -310,7 +310,7 @@ protected:
 public:
     ScMatrixCellResultToken( const ScConstMatrixRef& pMat, formula::FormulaToken* pUL );
     ScMatrixCellResultToken( const ScMatrixCellResultToken& r );
-    virtual ~ScMatrixCellResultToken();
+    virtual ~ScMatrixCellResultToken() override;
     virtual double              GetDouble() const override;
     virtual svl::SharedString GetString() const override;
     virtual const ScMatrix*     GetMatrix() const override;
@@ -337,7 +337,7 @@ public:
     ScMatrixFormulaCellToken( SCCOL nC, SCROW nR, const ScConstMatrixRef& pMat, formula::FormulaToken* pUL );
     ScMatrixFormulaCellToken( SCCOL nC, SCROW nR );
     ScMatrixFormulaCellToken( const ScMatrixFormulaCellToken& r );
-    virtual ~ScMatrixFormulaCellToken();
+    virtual ~ScMatrixFormulaCellToken() override;
 
     virtual bool                operator==( const formula::FormulaToken& rToken ) const override;
     virtual FormulaToken*       Clone() const override { return new ScMatrixFormulaCellToken(*this); }