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/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 'sfx2/inc')
-rw-r--r-- | sfx2/inc/inettbc.hxx | 2 | ||||
-rw-r--r-- | sfx2/inc/sorgitm.hxx | 2 | ||||
-rw-r--r-- | sfx2/inc/srchdlg.hxx | 2 | ||||
-rw-r--r-- | sfx2/inc/uitest/sfx_uiobject.hxx | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/sfx2/inc/inettbc.hxx b/sfx2/inc/inettbc.hxx index 322f744f119a..d96b33e882d5 100644 --- a/sfx2/inc/inettbc.hxx +++ b/sfx2/inc/inettbc.hxx @@ -51,7 +51,7 @@ public: SFX_DECL_TOOLBOX_CONTROL(); SfxURLToolBoxControl_Impl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rBox ); - virtual ~SfxURLToolBoxControl_Impl(); + virtual ~SfxURLToolBoxControl_Impl() override; virtual VclPtr<vcl::Window> CreateItemWindow( vcl::Window* pParent ) override; virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) override; diff --git a/sfx2/inc/sorgitm.hxx b/sfx2/inc/sorgitm.hxx index 45b5d795803f..521eaa8967cb 100644 --- a/sfx2/inc/sorgitm.hxx +++ b/sfx2/inc/sorgitm.hxx @@ -32,7 +32,7 @@ public: static SfxPoolItem* CreateDefault(); SfxScriptOrganizerItem(); SfxScriptOrganizerItem( const SfxScriptOrganizerItem& ); - virtual ~SfxScriptOrganizerItem(); + virtual ~SfxScriptOrganizerItem() override; virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; virtual bool operator==( const SfxPoolItem& ) const override; diff --git a/sfx2/inc/srchdlg.hxx b/sfx2/inc/srchdlg.hxx index 728fd86986dc..5152b8e2d952 100644 --- a/sfx2/inc/srchdlg.hxx +++ b/sfx2/inc/srchdlg.hxx @@ -57,7 +57,7 @@ private: public: SearchDialog( vcl::Window* pWindow, const OUString& rConfigName ); - virtual ~SearchDialog(); + virtual ~SearchDialog() override; virtual void dispose() override; void SetFindHdl( const Link<SearchDialog&,void>& rLink ) { m_aFindHdl = rLink; } diff --git a/sfx2/inc/uitest/sfx_uiobject.hxx b/sfx2/inc/uitest/sfx_uiobject.hxx index 470e70053a57..2feb03135236 100644 --- a/sfx2/inc/uitest/sfx_uiobject.hxx +++ b/sfx2/inc/uitest/sfx_uiobject.hxx @@ -22,7 +22,7 @@ public: SfxTabDialogUIObject(VclPtr<SfxTabDialog> xTabDialog); - virtual ~SfxTabDialogUIObject(); + virtual ~SfxTabDialogUIObject() override; virtual StringMap get_state() override; |