From 3ef5bf5a0a31b12116da644178b3c7afcbf8076d Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Mon, 5 Dec 2016 09:03:35 +0100 Subject: loplugin:unnecessaryoverride (dtors) in framework Change-Id: I52b12e390b97f15f9af07edd511fa36288f31fbd --- framework/source/accelerators/globalacceleratorconfiguration.cxx | 3 --- framework/source/accelerators/moduleacceleratorconfiguration.cxx | 7 ------- framework/source/services/ContextChangeEventMultiplexer.cxx | 5 ----- framework/source/services/modulemanager.cxx | 6 ------ framework/source/services/substitutepathvars.cxx | 5 ----- framework/source/services/taskcreatorsrv.cxx | 5 ----- framework/source/services/urltransformer.cxx | 2 -- framework/source/uiconfiguration/globalsettings.cxx | 5 ----- framework/source/uiconfiguration/uicategorydescription.cxx | 5 ----- framework/source/uiconfiguration/uiconfigurationmanager.cxx | 5 ----- framework/source/uielement/controlmenucontroller.cxx | 5 ----- framework/source/uielement/objectmenucontroller.cxx | 5 ----- framework/source/uielement/popuptoolbarcontroller.cxx | 6 ------ framework/source/uielement/recentfilesmenucontroller.cxx | 5 ----- framework/source/uielement/resourcemenucontroller.cxx | 5 ----- framework/source/uielement/thesaurusmenucontroller.cxx | 5 ----- framework/source/uifactory/addonstoolbarfactory.cxx | 5 ----- framework/source/uifactory/uielementfactorymanager.cxx | 3 --- framework/source/uifactory/windowcontentfactorymanager.cxx | 3 --- 19 files changed, 90 deletions(-) (limited to 'framework') diff --git a/framework/source/accelerators/globalacceleratorconfiguration.cxx b/framework/source/accelerators/globalacceleratorconfiguration.cxx index 5104c242c791..257802a9828f 100644 --- a/framework/source/accelerators/globalacceleratorconfiguration.cxx +++ b/framework/source/accelerators/globalacceleratorconfiguration.cxx @@ -54,9 +54,6 @@ public: */ explicit GlobalAcceleratorConfiguration(const css::uno::Reference< css::uno::XComponentContext >& xContext); - /** TODO */ - virtual ~GlobalAcceleratorConfiguration() override {} - virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override { diff --git a/framework/source/accelerators/moduleacceleratorconfiguration.cxx b/framework/source/accelerators/moduleacceleratorconfiguration.cxx index 4e1fc33c8f0a..9d56890992d8 100644 --- a/framework/source/accelerators/moduleacceleratorconfiguration.cxx +++ b/framework/source/accelerators/moduleacceleratorconfiguration.cxx @@ -68,9 +68,6 @@ public: const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Sequence< css::uno::Any >& lArguments); - /** TODO */ - virtual ~ModuleAcceleratorConfiguration() override; - virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override { @@ -124,10 +121,6 @@ ModuleAcceleratorConfiguration::ModuleAcceleratorConfiguration( static_cast< ::cppu::OWeakObject* >(this)); } -ModuleAcceleratorConfiguration::~ModuleAcceleratorConfiguration() -{ -} - void ModuleAcceleratorConfiguration::fillCache() { { diff --git a/framework/source/services/ContextChangeEventMultiplexer.cxx b/framework/source/services/ContextChangeEventMultiplexer.cxx index 1f666691c91f..fd695d110b4e 100644 --- a/framework/source/services/ContextChangeEventMultiplexer.cxx +++ b/framework/source/services/ContextChangeEventMultiplexer.cxx @@ -53,7 +53,6 @@ class ContextChangeEventMultiplexer { public: ContextChangeEventMultiplexer(); - virtual ~ContextChangeEventMultiplexer() override; ContextChangeEventMultiplexer(const ContextChangeEventMultiplexer&) = delete; ContextChangeEventMultiplexer& operator=(const ContextChangeEventMultiplexer&) = delete; @@ -121,10 +120,6 @@ ContextChangeEventMultiplexer::ContextChangeEventMultiplexer() { } -ContextChangeEventMultiplexer::~ContextChangeEventMultiplexer() -{ -} - void SAL_CALL ContextChangeEventMultiplexer::disposing() { ListenerMap aListeners; diff --git a/framework/source/services/modulemanager.cxx b/framework/source/services/modulemanager.cxx index 5cb7b4bf6460..53f89089a309 100644 --- a/framework/source/services/modulemanager.cxx +++ b/framework/source/services/modulemanager.cxx @@ -61,8 +61,6 @@ public: explicit ModuleManager(const css::uno::Reference< css::uno::XComponentContext >& xContext); - virtual ~ModuleManager() override; - ModuleManager(const ModuleManager&) = delete; ModuleManager& operator=(const ModuleManager&) = delete; @@ -151,10 +149,6 @@ ModuleManager::ModuleManager(const css::uno::Reference< css::uno::XComponentCont css::uno::UNO_QUERY_THROW ); } -ModuleManager::~ModuleManager() -{ -} - OUString ModuleManager::getImplementationName() throw (css::uno::RuntimeException, std::exception) { diff --git a/framework/source/services/substitutepathvars.cxx b/framework/source/services/substitutepathvars.cxx index 0bbc05563b8d..b946b37d7420 100644 --- a/framework/source/services/substitutepathvars.cxx +++ b/framework/source/services/substitutepathvars.cxx @@ -136,7 +136,6 @@ class SubstitutePathVariables : private cppu::BaseMutex, { public: explicit SubstitutePathVariables(const css::uno::Reference< css::uno::XComponentContext >& xContext); - virtual ~SubstitutePathVariables() override; virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override @@ -228,10 +227,6 @@ SubstitutePathVariables::SubstitutePathVariables( const Reference< XComponentCon m_aReSubstFixedVarOrder.sort(); } -SubstitutePathVariables::~SubstitutePathVariables() -{ -} - // XStringSubstitution OUString SAL_CALL SubstitutePathVariables::substituteVariables( const OUString& aText, sal_Bool bSubstRequired ) throw ( NoSuchElementException, RuntimeException, std::exception ) diff --git a/framework/source/services/taskcreatorsrv.cxx b/framework/source/services/taskcreatorsrv.cxx index 8757f8ae0d12..ca41f84236e0 100644 --- a/framework/source/services/taskcreatorsrv.cxx +++ b/framework/source/services/taskcreatorsrv.cxx @@ -64,7 +64,6 @@ private: public: explicit TaskCreatorService(const css::uno::Reference< css::uno::XComponentContext >& xContext); - virtual ~TaskCreatorService( ) override; virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override @@ -119,10 +118,6 @@ TaskCreatorService::TaskCreatorService(const css::uno::Reference< css::uno::XCom { } -TaskCreatorService::~TaskCreatorService() -{ -} - css::uno::Reference< css::uno::XInterface > SAL_CALL TaskCreatorService::createInstance() throw(css::uno::Exception , css::uno::RuntimeException, std::exception) diff --git a/framework/source/services/urltransformer.cxx b/framework/source/services/urltransformer.cxx index 581c14b0295b..99c78e99f803 100644 --- a/framework/source/services/urltransformer.cxx +++ b/framework/source/services/urltransformer.cxx @@ -37,8 +37,6 @@ class URLTransformer : public ::cppu::WeakImplHelper< css::util::XURLTransformer public: URLTransformer() {} - virtual ~URLTransformer() override {} - virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override { diff --git a/framework/source/uiconfiguration/globalsettings.cxx b/framework/source/uiconfiguration/globalsettings.cxx index 8701c83c8a02..214ff1f79322 100644 --- a/framework/source/uiconfiguration/globalsettings.cxx +++ b/framework/source/uiconfiguration/globalsettings.cxx @@ -50,7 +50,6 @@ class GlobalSettings_Access : public ::cppu::WeakImplHelper< { public: explicit GlobalSettings_Access( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); - virtual ~GlobalSettings_Access() override; // XComponent virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override; @@ -89,10 +88,6 @@ GlobalSettings_Access::GlobalSettings_Access( const css::uno::Reference< css::un { } -GlobalSettings_Access::~GlobalSettings_Access() -{ -} - // XComponent void SAL_CALL GlobalSettings_Access::dispose() throw ( css::uno::RuntimeException, std::exception ) diff --git a/framework/source/uiconfiguration/uicategorydescription.cxx b/framework/source/uiconfiguration/uicategorydescription.cxx index 7b6109a4d566..4efa5a8c2c9c 100644 --- a/framework/source/uiconfiguration/uicategorydescription.cxx +++ b/framework/source/uiconfiguration/uicategorydescription.cxx @@ -367,7 +367,6 @@ class UICategoryDescription : public UICommandDescription { public: explicit UICategoryDescription( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); - virtual ~UICategoryDescription() override; virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override @@ -407,10 +406,6 @@ UICategoryDescription::UICategoryDescription( const Reference< XComponentContext impl_fillElements("ooSetupFactoryCmdCategoryConfigRef"); } -UICategoryDescription::~UICategoryDescription() -{ -} - struct Instance { explicit Instance( css::uno::Reference const & context): diff --git a/framework/source/uiconfiguration/uiconfigurationmanager.cxx b/framework/source/uiconfiguration/uiconfigurationmanager.cxx index b798e2e0c553..fa0ee57bdfd0 100644 --- a/framework/source/uiconfiguration/uiconfigurationmanager.cxx +++ b/framework/source/uiconfiguration/uiconfigurationmanager.cxx @@ -84,7 +84,6 @@ public: } explicit UIConfigurationManager( const css::uno::Reference< css::uno::XComponentContext > & rxContext ); - virtual ~UIConfigurationManager() override; // XComponent virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override; @@ -693,10 +692,6 @@ UIConfigurationManager::UIConfigurationManager( const css::uno::Reference< css:: m_aUIElements.resize( css::ui::UIElementType::COUNT ); } -UIConfigurationManager::~UIConfigurationManager() -{ -} - // XComponent void SAL_CALL UIConfigurationManager::dispose() throw (css::uno::RuntimeException, std::exception) { diff --git a/framework/source/uielement/controlmenucontroller.cxx b/framework/source/uielement/controlmenucontroller.cxx index c5492482b22a..e4947ed5e7b7 100644 --- a/framework/source/uielement/controlmenucontroller.cxx +++ b/framework/source/uielement/controlmenucontroller.cxx @@ -179,7 +179,6 @@ class ControlMenuController : public svt::PopupMenuControllerBase public: explicit ControlMenuController( const uno::Reference< uno::XComponentContext >& xContext ); - virtual ~ControlMenuController() override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() @@ -246,10 +245,6 @@ ControlMenuController::ControlMenuController( const css::uno::Reference< css::un } -ControlMenuController::~ControlMenuController() -{ -} - // private function void ControlMenuController::updateImagesPopupMenu( PopupMenu* pPopupMenu ) { diff --git a/framework/source/uielement/objectmenucontroller.cxx b/framework/source/uielement/objectmenucontroller.cxx index d876ee044917..6404416913c5 100644 --- a/framework/source/uielement/objectmenucontroller.cxx +++ b/framework/source/uielement/objectmenucontroller.cxx @@ -57,7 +57,6 @@ class ObjectMenuController : public svt::PopupMenuControllerBase public: explicit ObjectMenuController( const css::uno::Reference< css::uno::XComponentContext >& xContext ); - virtual ~ObjectMenuController() override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() @@ -95,10 +94,6 @@ ObjectMenuController::ObjectMenuController( const css::uno::Reference< css::uno: { } -ObjectMenuController::~ObjectMenuController() -{ -} - // private function void ObjectMenuController::fillPopupMenu( const Sequence< css::embed::VerbDescriptor >& rVerbCommandSeq, Reference< css::awt::XPopupMenu >& rPopupMenu ) { diff --git a/framework/source/uielement/popuptoolbarcontroller.cxx b/framework/source/uielement/popuptoolbarcontroller.cxx index 55d180ee815f..c4e627d8c5a4 100644 --- a/framework/source/uielement/popuptoolbarcontroller.cxx +++ b/framework/source/uielement/popuptoolbarcontroller.cxx @@ -73,8 +73,6 @@ typedef cppu::ImplInheritanceHelper< svt::ToolboxController, class PopupMenuToolbarController : public ToolBarBase { public: - virtual ~PopupMenuToolbarController() override; - // XComponent virtual void SAL_CALL dispose() throw ( css::uno::RuntimeException, std::exception ) override; // XInitialization @@ -110,10 +108,6 @@ PopupMenuToolbarController::PopupMenuToolbarController( { } -PopupMenuToolbarController::~PopupMenuToolbarController() -{ -} - void SAL_CALL PopupMenuToolbarController::dispose() throw ( css::uno::RuntimeException, std::exception ) { diff --git a/framework/source/uielement/recentfilesmenucontroller.cxx b/framework/source/uielement/recentfilesmenucontroller.cxx index 0c7425bae05d..5d573586aa8a 100644 --- a/framework/source/uielement/recentfilesmenucontroller.cxx +++ b/framework/source/uielement/recentfilesmenucontroller.cxx @@ -54,7 +54,6 @@ class RecentFilesMenuController : public svt::PopupMenuControllerBase public: RecentFilesMenuController( const uno::Reference< uno::XComponentContext >& xContext, const uno::Sequence< uno::Any >& args ); - virtual ~RecentFilesMenuController() override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() @@ -119,10 +118,6 @@ RecentFilesMenuController::RecentFilesMenuController( const uno::Reference< uno: } } -RecentFilesMenuController::~RecentFilesMenuController() -{ -} - // private function void RecentFilesMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& rPopupMenu ) { diff --git a/framework/source/uielement/resourcemenucontroller.cxx b/framework/source/uielement/resourcemenucontroller.cxx index 4230177f7230..9633a7fa5bc0 100644 --- a/framework/source/uielement/resourcemenucontroller.cxx +++ b/framework/source/uielement/resourcemenucontroller.cxx @@ -28,7 +28,6 @@ class ResourceMenuController : public cppu::ImplInheritanceHelper< svt::PopupMen public: ResourceMenuController( const css::uno::Reference< css::uno::XComponentContext >& rxContext, const css::uno::Sequence< css::uno::Any >& rxArgs, bool bToolbarContainer ); - virtual ~ResourceMenuController() override; // XPopupMenuController virtual void SAL_CALL updatePopupMenu() throw ( css::uno::RuntimeException, std::exception ) override; @@ -108,10 +107,6 @@ ResourceMenuController::ResourceMenuController( const css::uno::Reference< css:: m_bInitialized = true; } -ResourceMenuController::~ResourceMenuController() -{ -} - void ResourceMenuController::updatePopupMenu() throw ( css::uno::RuntimeException, std::exception ) { diff --git a/framework/source/uielement/thesaurusmenucontroller.cxx b/framework/source/uielement/thesaurusmenucontroller.cxx index 9d55af45c520..360fd2f5cb20 100644 --- a/framework/source/uielement/thesaurusmenucontroller.cxx +++ b/framework/source/uielement/thesaurusmenucontroller.cxx @@ -30,7 +30,6 @@ class ThesaurusMenuController : public svt::PopupMenuControllerBase { public: explicit ThesaurusMenuController( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); - virtual ~ThesaurusMenuController() override; // XStatusListener virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& rEvent ) throw ( css::uno::RuntimeException, std::exception ) override; @@ -55,10 +54,6 @@ ThesaurusMenuController::ThesaurusMenuController( const css::uno::Reference< css { } -ThesaurusMenuController::~ThesaurusMenuController() -{ -} - void ThesaurusMenuController::statusChanged( const css::frame::FeatureStateEvent& rEvent ) throw ( css::uno::RuntimeException, std::exception ) { diff --git a/framework/source/uifactory/addonstoolbarfactory.cxx b/framework/source/uifactory/addonstoolbarfactory.cxx index 6cb52141bb24..c304859d7acc 100644 --- a/framework/source/uifactory/addonstoolbarfactory.cxx +++ b/framework/source/uifactory/addonstoolbarfactory.cxx @@ -55,7 +55,6 @@ class AddonsToolBarFactory : public ::cppu::WeakImplHelper< css::lang::XService { public: explicit AddonsToolBarFactory( const css::uno::Reference< css::uno::XComponentContext >& xContext ); - virtual ~AddonsToolBarFactory() override; virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override @@ -93,10 +92,6 @@ AddonsToolBarFactory::AddonsToolBarFactory( { } -AddonsToolBarFactory::~AddonsToolBarFactory() -{ -} - bool IsCorrectContext( const OUString& rModuleIdentifier, const OUString& aContextList ) { if ( aContextList.isEmpty() ) diff --git a/framework/source/uifactory/uielementfactorymanager.cxx b/framework/source/uifactory/uielementfactorymanager.cxx index f3ea311ee815..747f1cf76f45 100644 --- a/framework/source/uifactory/uielementfactorymanager.cxx +++ b/framework/source/uifactory/uielementfactorymanager.cxx @@ -352,7 +352,6 @@ class UIElementFactoryManager : private cppu::BaseMutex, virtual void SAL_CALL disposing() override; public: explicit UIElementFactoryManager( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); - virtual ~UIElementFactoryManager() override; virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override @@ -397,8 +396,6 @@ UIElementFactoryManager::UIElementFactoryManager( const Reference< XComponentCon "/org.openoffice.Office.UI.Factories/Registered/UIElementFactories")) {} -UIElementFactoryManager::~UIElementFactoryManager() {} - void SAL_CALL UIElementFactoryManager::disposing() { m_pConfigAccess.clear(); diff --git a/framework/source/uifactory/windowcontentfactorymanager.cxx b/framework/source/uifactory/windowcontentfactorymanager.cxx index ee61aba829f9..e41ea0af90de 100644 --- a/framework/source/uifactory/windowcontentfactorymanager.cxx +++ b/framework/source/uifactory/windowcontentfactorymanager.cxx @@ -50,7 +50,6 @@ class WindowContentFactoryManager : private cppu::BaseMutex, { public: explicit WindowContentFactoryManager( const css::uno::Reference< css::uno::XComponentContext>& rxContext ); - virtual ~WindowContentFactoryManager() override; virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override @@ -92,8 +91,6 @@ WindowContentFactoryManager::WindowContentFactoryManager( const uno::Reference< "/org.openoffice.Office.UI.WindowContentFactories/Registered/ContentFactories")) {} -WindowContentFactoryManager::~WindowContentFactoryManager() {} - void SAL_CALL WindowContentFactoryManager::disposing() { m_pConfigAccess.clear(); -- cgit