From 33c34f4b878ade73d3a1950433310713b7ff3923 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Thu, 1 Dec 2016 08:54:40 +0100 Subject: loplugin:unnecessaryoverride (dtors) in toolkit Change-Id: Id95c044e75eccb0f394fd31e4776eda4c023341d --- toolkit/source/awt/vclxtoolkit.cxx | 10 ---------- toolkit/source/controls/dialogcontrol.cxx | 5 ----- toolkit/source/controls/grid/defaultgridcolumnmodel.cxx | 7 ------- toolkit/source/controls/grid/defaultgriddatamodel.cxx | 7 ------- toolkit/source/controls/tree/treedatamodel.cxx | 5 ----- 5 files changed, 34 deletions(-) (limited to 'toolkit') diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx index 116e77cb68ff..1695a8750f28 100644 --- a/toolkit/source/awt/vclxtoolkit.cxx +++ b/toolkit/source/awt/vclxtoolkit.cxx @@ -154,10 +154,6 @@ public: Start(); } - virtual ~Pause() override - { - } - virtual void Invoke() override { SolarMutexGuard aSolarGuard; @@ -219,7 +215,6 @@ protected: public: VCLXToolkit(); - virtual ~VCLXToolkit() override; // css::awt::XToolkitExperimental virtual void SAL_CALL processEventsToIdle() @@ -728,11 +723,6 @@ VCLXToolkit::VCLXToolkit(): } } -VCLXToolkit::~VCLXToolkit() -{ -} - - void SAL_CALL VCLXToolkit::disposing() { #ifndef DISABLE_DYNLOADING diff --git a/toolkit/source/controls/dialogcontrol.cxx b/toolkit/source/controls/dialogcontrol.cxx index 896037750be1..e13026c91413 100644 --- a/toolkit/source/controls/dialogcontrol.cxx +++ b/toolkit/source/controls/dialogcontrol.cxx @@ -149,7 +149,6 @@ protected: public: explicit UnoControlDialogModel( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); UnoControlDialogModel( const UnoControlDialogModel& rModel ); - virtual ~UnoControlDialogModel() override; UnoControlModel* Clone() const override; // css::beans::XMultiPropertySet @@ -226,10 +225,6 @@ UnoControlDialogModel::UnoControlDialogModel( const UnoControlDialogModel& rMode setFastPropertyValue_NoBroadcast( BASEPROPERTY_USERFORMCONTAINEES, makeAny( xNameCont ) ); } -UnoControlDialogModel::~UnoControlDialogModel() -{ -} - UnoControlModel* UnoControlDialogModel::Clone() const { // clone the container itself diff --git a/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx b/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx index 6099359ce8fe..5f3c21d14b2e 100644 --- a/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx +++ b/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx @@ -56,7 +56,6 @@ class DefaultGridColumnModel :public ::cppu::BaseMutex public: DefaultGridColumnModel(); DefaultGridColumnModel( DefaultGridColumnModel const & i_copySource ); - virtual ~DefaultGridColumnModel() override; // XGridColumnModel virtual ::sal_Int32 SAL_CALL getColumnCount() throw (css::uno::RuntimeException, std::exception) override; @@ -133,12 +132,6 @@ private: m_aColumns.swap( aColumns ); } - - DefaultGridColumnModel::~DefaultGridColumnModel() - { - } - - ::sal_Int32 SAL_CALL DefaultGridColumnModel::getColumnCount() throw (RuntimeException, std::exception) { return m_aColumns.size(); diff --git a/toolkit/source/controls/grid/defaultgriddatamodel.cxx b/toolkit/source/controls/grid/defaultgriddatamodel.cxx index e5c7e006a6a0..4e96dfd0b2ce 100644 --- a/toolkit/source/controls/grid/defaultgriddatamodel.cxx +++ b/toolkit/source/controls/grid/defaultgriddatamodel.cxx @@ -53,7 +53,6 @@ class DefaultGridDataModel :public ::cppu::BaseMutex public: DefaultGridDataModel(); DefaultGridDataModel( DefaultGridDataModel const & i_copySource ); - virtual ~DefaultGridDataModel() override; // XMutableGridDataModel virtual void SAL_CALL addRow( const Any& i_heading, const css::uno::Sequence< css::uno::Any >& Data ) throw (css::uno::RuntimeException, std::exception) override; @@ -130,12 +129,6 @@ private: { } - - DefaultGridDataModel::~DefaultGridDataModel() - { - } - - void DefaultGridDataModel::broadcast( GridDataEvent const & i_event, void ( SAL_CALL XGridDataListener::*i_listenerMethod )( GridDataEvent const & ), ::comphelper::ComponentGuard & i_instanceLock ) { diff --git a/toolkit/source/controls/tree/treedatamodel.cxx b/toolkit/source/controls/tree/treedatamodel.cxx index d58b6e13361b..0f925a5566fa 100644 --- a/toolkit/source/controls/tree/treedatamodel.cxx +++ b/toolkit/source/controls/tree/treedatamodel.cxx @@ -49,7 +49,6 @@ class MutableTreeDataModel : public ::cppu::WeakAggImplHelper2< XMutableTreeData { public: MutableTreeDataModel(); - virtual ~MutableTreeDataModel() override; void broadcast( broadcast_type eType, const Reference< XTreeNode >& xParentNode, const Reference< XTreeNode >& rNode ); @@ -141,10 +140,6 @@ MutableTreeDataModel::MutableTreeDataModel() { } -MutableTreeDataModel::~MutableTreeDataModel() -{ -} - void MutableTreeDataModel::broadcast( broadcast_type eType, const Reference< XTreeNode >& xParentNode, const Reference< XTreeNode >& rNode ) { ::cppu::OInterfaceContainerHelper* pIter = BrdcstHelper.getContainer( cppu::UnoType::get() ); -- cgit