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 /sfx2/source/appl/newhelp.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 'sfx2/source/appl/newhelp.hxx')
-rw-r--r-- | sfx2/source/appl/newhelp.hxx | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/sfx2/source/appl/newhelp.hxx b/sfx2/source/appl/newhelp.hxx index c23fcb7c58c2..a7b82d417050 100644 --- a/sfx2/source/appl/newhelp.hxx +++ b/sfx2/source/appl/newhelp.hxx @@ -58,7 +58,7 @@ private: public: ContentListBox_Impl(vcl::Window* pParent, WinBits nStyle); - virtual ~ContentListBox_Impl(); + virtual ~ContentListBox_Impl() override; virtual void dispose() override; virtual void RequestingChildren( SvTreeListEntry* pParent ) override; @@ -80,7 +80,7 @@ protected: public: HelpTabPage_Impl(vcl::Window* pParent, SfxHelpIndexWindow_Impl* _pIdxWin, const OString& rID, const OUString& rUIXMLDescription); - virtual ~HelpTabPage_Impl(); + virtual ~HelpTabPage_Impl() override; virtual void dispose() override; virtual Control* GetLastFocusControl() = 0; @@ -95,7 +95,7 @@ private: public: ContentTabPage_Impl(vcl::Window* pParent, SfxHelpIndexWindow_Impl* _pIdxWin); - virtual ~ContentTabPage_Impl(); + virtual ~ContentTabPage_Impl() override; virtual void dispose() override; virtual void ActivatePage() override; @@ -143,7 +143,7 @@ private: public: IndexTabPage_Impl( vcl::Window* pParent, SfxHelpIndexWindow_Impl* _pIdxWin ); - virtual ~IndexTabPage_Impl(); + virtual ~IndexTabPage_Impl() override; virtual void dispose() override; virtual void ActivatePage() override; @@ -221,7 +221,7 @@ private: public: SearchTabPage_Impl( vcl::Window* pParent, SfxHelpIndexWindow_Impl* _pIdxWin ); - virtual ~SearchTabPage_Impl(); + virtual ~SearchTabPage_Impl() override; virtual void dispose() override; virtual void ActivatePage() override; @@ -247,7 +247,7 @@ private: public: BookmarksBox_Impl(vcl::Window* pParent, WinBits nStyle); - virtual ~BookmarksBox_Impl(); + virtual ~BookmarksBox_Impl() override; virtual void dispose() override; virtual bool Notify( NotifyEvent& rNEvt ) override; @@ -263,7 +263,7 @@ private: public: BookmarksTabPage_Impl( vcl::Window* pParent, SfxHelpIndexWindow_Impl* _pIdxWin ); - virtual ~BookmarksTabPage_Impl(); + virtual ~BookmarksTabPage_Impl() override; virtual void dispose() override; virtual void ActivatePage() override; @@ -323,7 +323,7 @@ private: public: explicit SfxHelpIndexWindow_Impl( SfxHelpWindow_Impl* pParent ); - virtual ~SfxHelpIndexWindow_Impl(); + virtual ~SfxHelpIndexWindow_Impl() override; virtual void dispose() override; virtual void Resize() override; @@ -462,7 +462,7 @@ private: public: explicit SfxHelpTextWindow_Impl( SfxHelpWindow_Impl* pParent ); - virtual ~SfxHelpTextWindow_Impl(); + virtual ~SfxHelpTextWindow_Impl() override; virtual void dispose() override; virtual void Resize() override; @@ -529,7 +529,7 @@ friend class SfxHelpIndexWindow_Impl; public: SfxHelpWindow_Impl( const css::uno::Reference < css::frame::XFrame2 >& rFrame, vcl::Window* pParent, WinBits nBits ); - virtual ~SfxHelpWindow_Impl(); + virtual ~SfxHelpWindow_Impl() override; virtual void dispose() override; virtual bool PreNotify( NotifyEvent& rNEvt ) override; @@ -567,7 +567,7 @@ private: VclPtr<Edit> m_pTitleED; public: SfxAddHelpBookmarkDialog_Impl( vcl::Window* pParent, bool bRename = true ); - virtual ~SfxAddHelpBookmarkDialog_Impl(); + virtual ~SfxAddHelpBookmarkDialog_Impl() override; virtual void dispose() override; void SetTitle( const OUString& rTitle ); |