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/styleuno.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/styleuno.hxx')
-rw-r--r-- | sc/inc/styleuno.hxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sc/inc/styleuno.hxx b/sc/inc/styleuno.hxx index 33bb7193aed1..a6fb761e38a9 100644 --- a/sc/inc/styleuno.hxx +++ b/sc/inc/styleuno.hxx @@ -61,7 +61,7 @@ private: public: ScStyleFamiliesObj(ScDocShell* pDocSh); - virtual ~ScStyleFamiliesObj(); + virtual ~ScStyleFamiliesObj() override; virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; @@ -130,7 +130,7 @@ private: public: ScStyleFamilyObj(ScDocShell* pDocSh, SfxStyleFamily eFam); - virtual ~ScStyleFamilyObj(); + virtual ~ScStyleFamilyObj() override; virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; @@ -234,7 +234,7 @@ private: public: ScStyleObj() = delete; ScStyleObj(ScDocShell* pDocSh, SfxStyleFamily eFam, const OUString& rName); - virtual ~ScStyleObj(); + virtual ~ScStyleObj() override; // created by getImplementation: bool IsInserted() const { return pDocShell != nullptr; } |