diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-09-13 13:09:01 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-09-13 13:19:22 +0200 |
| commit | 91dd2db17bd6cb9b357d1d69b187174e31eabef0 (patch) | |
| tree | d634de3a1a6820904b5699c2136b79b1a5a807c7 /sc/inc/fmtuno.hxx | |
| parent | 6f8ea7e89ea190b9462c945d55a3ad8777b2f3ef (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/fmtuno.hxx')
| -rw-r--r-- | sc/inc/fmtuno.hxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sc/inc/fmtuno.hxx b/sc/inc/fmtuno.hxx index 774d94ad19bb..547989d82d31 100644 --- a/sc/inc/fmtuno.hxx +++ b/sc/inc/fmtuno.hxx @@ -82,7 +82,7 @@ public: ScTableConditionalFormat() = delete; ScTableConditionalFormat(ScDocument* pDoc, sal_uLong nKey, SCTAB nTab, formula::FormulaGrammar::Grammar eGrammar); - virtual ~ScTableConditionalFormat(); + virtual ~ScTableConditionalFormat() override; void FillFormat( ScConditionalFormat& rFormat, ScDocument* pDoc, formula::FormulaGrammar::Grammar eGrammar) const; @@ -147,7 +147,7 @@ private: public: ScTableConditionalEntry() = delete; ScTableConditionalEntry(const ScCondFormatEntryItem& aItem); - virtual ~ScTableConditionalEntry(); + virtual ~ScTableConditionalEntry() override; void GetData(ScCondFormatEntryItem& rData) const; @@ -223,7 +223,7 @@ public: ScTableValidationObj() = delete; ScTableValidationObj(ScDocument* pDoc, sal_uLong nKey, const formula::FormulaGrammar::Grammar eGrammar); - virtual ~ScTableValidationObj(); + virtual ~ScTableValidationObj() override; ScValidationData* CreateValidationData( ScDocument* pDoc, formula::FormulaGrammar::Grammar eGrammar ) const; |