summaryrefslogtreecommitdiff
path: root/sc/inc/queryparam.hxx
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 /sc/inc/queryparam.hxx
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 'sc/inc/queryparam.hxx')
-rw-r--r--sc/inc/queryparam.hxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/sc/inc/queryparam.hxx b/sc/inc/queryparam.hxx
index c1ea63a659d7..68ac18b6f84a 100644
--- a/sc/inc/queryparam.hxx
+++ b/sc/inc/queryparam.hxx
@@ -101,7 +101,7 @@ struct SC_DLLPUBLIC ScQueryParam : public ScQueryParamBase, public ScQueryParamT
ScQueryParam();
ScQueryParam( const ScQueryParam& r );
ScQueryParam( const ScDBQueryParamInternal& r );
- virtual ~ScQueryParam();
+ virtual ~ScQueryParam() override;
ScQueryParam& operator= ( const ScQueryParam& r );
bool operator== ( const ScQueryParam& rOther ) const;
@@ -120,7 +120,7 @@ struct ScDBQueryParamBase : public ScQueryParamBase
DataType GetType() const { return meType;}
ScDBQueryParamBase() = delete;
- virtual ~ScDBQueryParamBase();
+ virtual ~ScDBQueryParamBase() override;
protected:
ScDBQueryParamBase(DataType eType);
@@ -132,7 +132,7 @@ private:
struct ScDBQueryParamInternal : public ScDBQueryParamBase, public ScQueryParamTable
{
ScDBQueryParamInternal();
- virtual ~ScDBQueryParamInternal();
+ virtual ~ScDBQueryParamInternal() override;
virtual bool IsValidFieldIndex() const override;
};
@@ -142,7 +142,7 @@ struct ScDBQueryParamMatrix : public ScDBQueryParamBase
ScMatrixRef mpMatrix;
ScDBQueryParamMatrix();
- virtual ~ScDBQueryParamMatrix();
+ virtual ~ScDBQueryParamMatrix() override;
virtual bool IsValidFieldIndex() const override;
};