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 /svtools/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 'svtools/inc')
-rw-r--r-- | svtools/inc/roadmap.hxx | 2 | ||||
-rw-r--r-- | svtools/inc/table/defaultinputhandler.hxx | 2 | ||||
-rw-r--r-- | svtools/inc/table/gridtablerenderer.hxx | 2 | ||||
-rw-r--r-- | svtools/inc/table/tablecontrol.hxx | 2 | ||||
-rw-r--r-- | svtools/inc/vclxaccessibleheaderbar.hxx | 4 | ||||
-rw-r--r-- | svtools/inc/vclxaccessibleheaderbaritem.hxx | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/svtools/inc/roadmap.hxx b/svtools/inc/roadmap.hxx index 312ec797ab29..db5c83956b1c 100644 --- a/svtools/inc/roadmap.hxx +++ b/svtools/inc/roadmap.hxx @@ -51,7 +51,7 @@ protected: public: ORoadmap( vcl::Window* _pParent, WinBits _nWinStyle = 0 ); - virtual ~ORoadmap( ); + virtual ~ORoadmap( ) override; virtual void dispose() override; void SetRoadmapBitmap( const BitmapEx& maBitmap ); diff --git a/svtools/inc/table/defaultinputhandler.hxx b/svtools/inc/table/defaultinputhandler.hxx index 5e04eeb0e551..af4c6ad7ac24 100644 --- a/svtools/inc/table/defaultinputhandler.hxx +++ b/svtools/inc/table/defaultinputhandler.hxx @@ -42,7 +42,7 @@ namespace svt { namespace table public: DefaultInputHandler(); - virtual ~DefaultInputHandler(); + virtual ~DefaultInputHandler() override; virtual bool MouseMove ( ITableControl& _rControl, const MouseEvent& rMEvt ) override; virtual bool MouseButtonDown ( ITableControl& _rControl, const MouseEvent& rMEvt ) override; diff --git a/svtools/inc/table/gridtablerenderer.hxx b/svtools/inc/table/gridtablerenderer.hxx index fba9c2c4b2cf..b761daca6735 100644 --- a/svtools/inc/table/gridtablerenderer.hxx +++ b/svtools/inc/table/gridtablerenderer.hxx @@ -53,7 +53,7 @@ namespace svt { namespace table at least as long as the renderer instance lives */ GridTableRenderer( ITableModel& _rModel ); - virtual ~GridTableRenderer(); + virtual ~GridTableRenderer() override; /** determines whether or not to paint grid lines */ diff --git a/svtools/inc/table/tablecontrol.hxx b/svtools/inc/table/tablecontrol.hxx index 9ab11b1f634a..4f6f2891a956 100644 --- a/svtools/inc/table/tablecontrol.hxx +++ b/svtools/inc/table/tablecontrol.hxx @@ -63,7 +63,7 @@ namespace svt { namespace table public: TableControl( vcl::Window* _pParent, WinBits _nStyle ); - virtual ~TableControl(); + virtual ~TableControl() override; virtual void dispose() override; /// sets a new table model diff --git a/svtools/inc/vclxaccessibleheaderbar.hxx b/svtools/inc/vclxaccessibleheaderbar.hxx index bcf640d6c7e8..798637c6b924 100644 --- a/svtools/inc/vclxaccessibleheaderbar.hxx +++ b/svtools/inc/vclxaccessibleheaderbar.hxx @@ -37,7 +37,7 @@ class VCLXAccessibleHeaderBar : public VCLXAccessibleComponent public: VclPtr<HeaderBar> m_pHeadBar; - virtual ~VCLXAccessibleHeaderBar(); + virtual ~VCLXAccessibleHeaderBar() override; VCLXAccessibleHeaderBar( VCLXWindow* pVCLXindow ); @@ -65,7 +65,7 @@ class VCLXHeaderBar : public VCLXWindow { public: VCLXHeaderBar(vcl::Window* pHeaderBar); - virtual ~VCLXHeaderBar(); + virtual ~VCLXHeaderBar() override; virtual css::uno::Reference< css::accessibility::XAccessibleContext > CreateAccessibleContext() override; diff --git a/svtools/inc/vclxaccessibleheaderbaritem.hxx b/svtools/inc/vclxaccessibleheaderbaritem.hxx index 88e257e53987..504de6e0c87c 100644 --- a/svtools/inc/vclxaccessibleheaderbaritem.hxx +++ b/svtools/inc/vclxaccessibleheaderbaritem.hxx @@ -67,7 +67,7 @@ protected: public: VCLXAccessibleHeaderBarItem( HeaderBar* pHeadBar, sal_Int32 _nIndexInParent ); - virtual ~VCLXAccessibleHeaderBarItem(); + virtual ~VCLXAccessibleHeaderBarItem() override; // XInterface DECLARE_XINTERFACE() |