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 /sdext/source/presenter/PresenterProtocolHandler.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 'sdext/source/presenter/PresenterProtocolHandler.cxx')
-rw-r--r-- | sdext/source/presenter/PresenterProtocolHandler.cxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/sdext/source/presenter/PresenterProtocolHandler.cxx b/sdext/source/presenter/PresenterProtocolHandler.cxx index 441ecd94d085..107c18c01660 100644 --- a/sdext/source/presenter/PresenterProtocolHandler.cxx +++ b/sdext/source/presenter/PresenterProtocolHandler.cxx @@ -60,7 +60,7 @@ namespace { public: explicit GotoPreviousSlideCommand ( const rtl::Reference<PresenterController>& rpPresenterController); - virtual ~GotoPreviousSlideCommand() {} + virtual ~GotoPreviousSlideCommand() override {} virtual void Execute() override; virtual bool IsEnabled() const override; private: @@ -72,7 +72,7 @@ namespace { public: explicit GotoNextSlideCommand ( const rtl::Reference<PresenterController>& rpPresenterController); - virtual ~GotoNextSlideCommand() {} + virtual ~GotoNextSlideCommand() override {} virtual void Execute() override; // The next slide command is always enabled, even when the current slide // is the last slide: from the last slide it goes to the pause slide, @@ -87,7 +87,7 @@ namespace { public: explicit GotoNextEffectCommand ( const rtl::Reference<PresenterController>& rpPresenterController); - virtual ~GotoNextEffectCommand() {} + virtual ~GotoNextEffectCommand() override {} virtual void Execute() override; private: rtl::Reference<PresenterController> mpPresenterController; @@ -98,7 +98,7 @@ namespace { public: explicit SwitchMonitorCommand ( const rtl::Reference<PresenterController>& rpPresenterController); - virtual ~SwitchMonitorCommand() {} + virtual ~SwitchMonitorCommand() override {} virtual void Execute() override; private: rtl::Reference<PresenterController> mpPresenterController; @@ -109,7 +109,7 @@ namespace { { public: explicit RestartTimerCommand(const rtl::Reference<PresenterController>& rpPresenterController); - virtual ~RestartTimerCommand(); + virtual ~RestartTimerCommand() override; virtual void Execute() override; private: rtl::Reference<PresenterController> mpPresenterController; @@ -121,7 +121,7 @@ namespace { SetNotesViewCommand ( const bool bOn, const rtl::Reference<PresenterController>& rpPresenterController); - virtual ~SetNotesViewCommand() {} + virtual ~SetNotesViewCommand() override {} virtual void Execute() override; virtual Any GetState() const override; private: @@ -136,7 +136,7 @@ namespace { SetSlideSorterCommand ( const bool bOn, const rtl::Reference<PresenterController>& rpPresenterController); - virtual ~SetSlideSorterCommand() {} + virtual ~SetSlideSorterCommand() override {} virtual void Execute() override; virtual Any GetState() const override; private: @@ -150,7 +150,7 @@ namespace { SetHelpViewCommand ( const bool bOn, const rtl::Reference<PresenterController>& rpPresenterController); - virtual ~SetHelpViewCommand() {} + virtual ~SetHelpViewCommand() override {} virtual void Execute() override; virtual Any GetState() const override; private: @@ -164,7 +164,7 @@ namespace { NotesFontSizeCommand( const rtl::Reference<PresenterController>& rpPresenterController, const sal_Int32 nSizeChange); - virtual ~NotesFontSizeCommand() {} + virtual ~NotesFontSizeCommand() override {} virtual void Execute() override; virtual Any GetState() const override; protected: @@ -239,7 +239,7 @@ private: Dispatch ( const OUString& rsURLPath, const ::rtl::Reference<PresenterController>& rpPresenterController); - virtual ~Dispatch(); + virtual ~Dispatch() override; void ThrowIfDisposed() const throw (css::lang::DisposedException); }; |