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 /slideshow/source/engine/effectrewinder.cxx | |
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 'slideshow/source/engine/effectrewinder.cxx')
-rw-r--r-- | slideshow/source/engine/effectrewinder.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/slideshow/source/engine/effectrewinder.cxx b/slideshow/source/engine/effectrewinder.cxx index dca1a1ee524e..19106567127b 100644 --- a/slideshow/source/engine/effectrewinder.cxx +++ b/slideshow/source/engine/effectrewinder.cxx @@ -43,7 +43,7 @@ class RewinderEventHandler : public EventHandler public: typedef ::std::function<bool ()> Action; explicit RewinderEventHandler (const Action& rAction) : maAction(rAction) {} - virtual ~RewinderEventHandler() {} + virtual ~RewinderEventHandler() override {} private: const Action maAction; virtual bool handleEvent() override { return maAction(); } @@ -55,7 +55,7 @@ class RewinderAnimationEventHandler : public AnimationEventHandler public: typedef ::std::function<bool (const AnimationNodeSharedPtr& rpNode)> Action; explicit RewinderAnimationEventHandler (const Action& rAction) : maAction(rAction) {} - virtual ~RewinderAnimationEventHandler() {} + virtual ~RewinderAnimationEventHandler() override {} private: const Action maAction; virtual bool handleAnimationEvent (const AnimationNodeSharedPtr& rpNode) override |