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/clipcontext.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/clipcontext.hxx')
-rw-r--r-- | sc/inc/clipcontext.hxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sc/inc/clipcontext.hxx b/sc/inc/clipcontext.hxx index 31a1c600c77a..9951c053ff7e 100644 --- a/sc/inc/clipcontext.hxx +++ b/sc/inc/clipcontext.hxx @@ -82,7 +82,7 @@ public: ScDocument* pRefUndoDoc, ScDocument* pClipDoc, InsertDeleteFlags nInsertFlag, bool bAsLink, bool bSkipAttrForEmptyCells); - virtual ~CopyFromClipContext(); + virtual ~CopyFromClipContext() override; void setTabRange(SCTAB nStart, SCTAB nEnd); @@ -138,7 +138,7 @@ class CopyToClipContext : public ClipContextBase public: CopyToClipContext() = delete; CopyToClipContext(ScDocument& rDoc, bool bKeepScenarioFlags, bool bCloneNotes); - virtual ~CopyToClipContext(); + virtual ~CopyToClipContext() override; bool isKeepScenarioFlags() const; bool isCloneNotes() const; @@ -150,7 +150,7 @@ class CopyToDocContext : public ClipContextBase public: CopyToDocContext(ScDocument& rDoc); - virtual ~CopyToDocContext(); + virtual ~CopyToDocContext() override; void setStartListening( bool b ); bool isStartListening() const; @@ -160,7 +160,7 @@ class MixDocContext : public ClipContextBase { public: MixDocContext(ScDocument& rDoc); - virtual ~MixDocContext(); + virtual ~MixDocContext() override; }; } |