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/inc | |
| 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/inc')
| -rw-r--r-- | slideshow/source/inc/animation.hxx | 2 | ||||
| -rw-r--r-- | slideshow/source/inc/soundplayer.hxx | 2 | ||||
| -rw-r--r-- | slideshow/source/inc/vieweventhandler.hxx | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/slideshow/source/inc/animation.hxx b/slideshow/source/inc/animation.hxx index 9108b72101d6..9a722df6d146 100644 --- a/slideshow/source/inc/animation.hxx +++ b/slideshow/source/inc/animation.hxx @@ -47,7 +47,7 @@ namespace slideshow class Animation : public virtual SharedPtrAble { public: - virtual ~Animation() {} + virtual ~Animation() override {} /** Notify that the animation going active soon. diff --git a/slideshow/source/inc/soundplayer.hxx b/slideshow/source/inc/soundplayer.hxx index 737103512dec..82af088af462 100644 --- a/slideshow/source/inc/soundplayer.hxx +++ b/slideshow/source/inc/soundplayer.hxx @@ -66,7 +66,7 @@ namespace slideshow const OUString& rSoundURL, const css::uno::Reference< css::uno::XComponentContext>& rComponentContext ); - virtual ~SoundPlayer(); + virtual ~SoundPlayer() override; /** Query duration of sound playback. diff --git a/slideshow/source/inc/vieweventhandler.hxx b/slideshow/source/inc/vieweventhandler.hxx index 1c658bb90ace..1291c0fd2b48 100644 --- a/slideshow/source/inc/vieweventhandler.hxx +++ b/slideshow/source/inc/vieweventhandler.hxx @@ -42,7 +42,7 @@ namespace slideshow class ViewEventHandler : public virtual SharedPtrAble { public: - virtual ~ViewEventHandler() {} + virtual ~ViewEventHandler() override {} /** Notify new view. |