summaryrefslogtreecommitdiff
path: root/rsc
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2016-09-13 13:09:01 +0200
committerStephan Bergmann <sbergman@redhat.com>2016-09-13 13:19:22 +0200
commit91dd2db17bd6cb9b357d1d69b187174e31eabef0 (patch)
treed634de3a1a6820904b5699c2136b79b1a5a807c7 /rsc
parent6f8ea7e89ea190b9462c945d55a3ad8777b2f3ef (diff)
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
Diffstat (limited to 'rsc')
-rw-r--r--rsc/inc/rscarray.hxx6
-rw-r--r--rsc/inc/rscclass.hxx2
-rw-r--r--rsc/inc/rscconst.hxx2
-rw-r--r--rsc/inc/rsccont.hxx2
-rw-r--r--rsc/inc/rscdef.hxx2
5 files changed, 7 insertions, 7 deletions
diff --git a/rsc/inc/rscarray.hxx b/rsc/inc/rscarray.hxx
index a7bf2c4252e2..9ba70fb46d5e 100644
--- a/rsc/inc/rscarray.hxx
+++ b/rsc/inc/rscarray.hxx
@@ -34,7 +34,7 @@ protected:
public:
RSCINST aInst;
RscInstNode( sal_uInt32 nId );
- virtual ~RscInstNode();
+ virtual ~RscInstNode() override;
virtual sal_uInt32 GetId() const override;
RscInstNode * Left() const { return static_cast<RscInstNode *>(pLeft); };
RscInstNode * Right() const{ return static_cast<RscInstNode *>(pRight); };
@@ -61,7 +61,7 @@ protected:
public:
RscArray( Atom nId, sal_uInt32 nTypId,
RscTop * pSuper, RscEnum * pTypeClass );
- virtual ~RscArray();
+ virtual ~RscArray() override;
virtual RSCCLASS_TYPE GetClassType() const override;
virtual RscTop * GetTypeClass() const override;
@@ -96,7 +96,7 @@ class RscClassArray : public RscArray
public:
RscClassArray( Atom nId, sal_uInt32 nTypId,
RscTop * pSuper, RscEnum * pTypeClass );
- virtual ~RscClassArray();
+ virtual ~RscClassArray() override;
virtual void WriteSrcHeader( const RSCINST & rInst, FILE * fOutput,
RscTypCont * pTC, sal_uInt32 nTab,
const RscId & aId, const char * ) override;
diff --git a/rsc/inc/rscclass.hxx b/rsc/inc/rscclass.hxx
index 46fe526639ae..ed028e3651a9 100644
--- a/rsc/inc/rscclass.hxx
+++ b/rsc/inc/rscclass.hxx
@@ -57,7 +57,7 @@ protected:
sal_uInt32 nTupelIdx, RscTypCont * pTC );
public:
RscClass( Atom nId, sal_uInt32 nTypId, RscTop * pSuperCl );
- virtual ~RscClass();
+ virtual ~RscClass() override;
virtual RSCCLASS_TYPE GetClassType() const override;
diff --git a/rsc/inc/rscconst.hxx b/rsc/inc/rscconst.hxx
index ec3d3621b5f7..44b92b915547 100644
--- a/rsc/inc/rscconst.hxx
+++ b/rsc/inc/rscconst.hxx
@@ -36,7 +36,7 @@ protected:
sal_uInt32 nEntries; // number of entries in field
public:
RscConst( Atom nId, sal_uInt32 nTypId );
- virtual ~RscConst();
+ virtual ~RscConst() override;
virtual RSCCLASS_TYPE GetClassType() const override;
// sets the allowed values
void SetConstant( Atom nVarName, sal_Int32 lValue );
diff --git a/rsc/inc/rsccont.hxx b/rsc/inc/rsccont.hxx
index 1d7cc5870089..2843c6ca397b 100644
--- a/rsc/inc/rsccont.hxx
+++ b/rsc/inc/rsccont.hxx
@@ -57,7 +57,7 @@ public:
RscBaseCont( Atom nId, sal_uInt32 nTypId,
RscTop * pSuper = nullptr,
bool bNoId = true );
- virtual ~RscBaseCont();
+ virtual ~RscBaseCont() override;
virtual RSCCLASS_TYPE GetClassType() const override;
void SetTypeClass( RscTop * pClass, RscTop * pClass1 = nullptr )
{
diff --git a/rsc/inc/rscdef.hxx b/rsc/inc/rscdef.hxx
index 88d0a26a40a5..80ef6aba60bf 100644
--- a/rsc/inc/rscdef.hxx
+++ b/rsc/inc/rscdef.hxx
@@ -133,7 +133,7 @@ protected:
sal_Int32 lDefId );
RscDefine( sal_uLong lFileKey, const OString& rDefName,
RscExpression * pExpression );
- virtual ~RscDefine();
+ virtual ~RscDefine() override;
void IncRef(){ nRefCount++; }
void DecRef();
void DefineToNumber();