From 0c59e2ddd6a174629618acea97cf5406c36ce7f3 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Mon, 28 Nov 2016 14:14:04 +0100 Subject: [PATCH] loplugin:unnecessaryoverride (dtors) in comphelper Change-Id: I13ebc4efa7f8bd0d3732ed65e397c710ae65d14e --- .../source/container/IndexedPropertyValuesContainer.cxx | 5 ----- .../source/container/NamedPropertyValuesContainer.cxx | 5 ----- comphelper/source/container/namecontainer.cxx | 5 ----- comphelper/source/eventattachermgr/eventattachermgr.cxx | 6 ------ comphelper/source/property/genericpropertyset.cxx | 4 ---- comphelper/source/streaming/memorystream.cxx | 5 ----- comphelper/source/xml/ofopxmlhelper.cxx | 7 ------- 7 files changed, 37 deletions(-) diff --git a/comphelper/source/container/IndexedPropertyValuesContainer.cxx b/comphelper/source/container/IndexedPropertyValuesContainer.cxx index d0ee59d5c25a..803b171dbf1e 100644 --- a/comphelper/source/container/IndexedPropertyValuesContainer.cxx +++ b/comphelper/source/container/IndexedPropertyValuesContainer.cxx @@ -35,7 +35,6 @@ class IndexedPropertyValuesContainer : public cppu::WeakImplHelper< container::X { public: IndexedPropertyValuesContainer() throw(); - virtual ~IndexedPropertyValuesContainer() throw() override; // XIndexContainer virtual void SAL_CALL insertByIndex( sal_Int32 nIndex, const css::uno::Any& aElement ) @@ -76,10 +75,6 @@ IndexedPropertyValuesContainer::IndexedPropertyValuesContainer() throw() { } -IndexedPropertyValuesContainer::~IndexedPropertyValuesContainer() throw() -{ -} - // XIndexContainer void SAL_CALL IndexedPropertyValuesContainer::insertByIndex( sal_Int32 nIndex, const css::uno::Any& aElement ) throw(css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, diff --git a/comphelper/source/container/NamedPropertyValuesContainer.cxx b/comphelper/source/container/NamedPropertyValuesContainer.cxx index 7bd50ebdf9d2..4ac5b42fb5f5 100644 --- a/comphelper/source/container/NamedPropertyValuesContainer.cxx +++ b/comphelper/source/container/NamedPropertyValuesContainer.cxx @@ -36,7 +36,6 @@ class NamedPropertyValuesContainer : public cppu::WeakImplHelper< container::XNa { public: NamedPropertyValuesContainer() throw(); - virtual ~NamedPropertyValuesContainer() throw() override; // XNameContainer virtual void SAL_CALL insertByName( const OUString& aName, const css::uno::Any& aElement ) @@ -79,10 +78,6 @@ NamedPropertyValuesContainer::NamedPropertyValuesContainer() throw() { } -NamedPropertyValuesContainer::~NamedPropertyValuesContainer() throw() -{ -} - // XNameContainer void SAL_CALL NamedPropertyValuesContainer::insertByName( const OUString& aName, const uno::Any& aElement ) throw(css::lang::IllegalArgumentException, css::container::ElementExistException, diff --git a/comphelper/source/container/namecontainer.cxx b/comphelper/source/container/namecontainer.cxx index f20be212fd48..1b2641f0af26 100644 --- a/comphelper/source/container/namecontainer.cxx +++ b/comphelper/source/container/namecontainer.cxx @@ -42,7 +42,6 @@ namespace comphelper { public: explicit NameContainer( css::uno::Type aType ); - virtual ~NameContainer() override; // XNameContainer virtual void SAL_CALL insertByName( const OUString& aName, const css::uno::Any& aElement ) @@ -90,10 +89,6 @@ NameContainer::NameContainer( css::uno::Type aType ) { } -NameContainer::~NameContainer() -{ -} - // XNameContainer void SAL_CALL NameContainer::insertByName( const OUString& aName, const Any& aElement ) throw(IllegalArgumentException, ElementExistException, diff --git a/comphelper/source/eventattachermgr/eventattachermgr.cxx b/comphelper/source/eventattachermgr/eventattachermgr.cxx index 1523333f4f4e..77f3a30c54e7 100644 --- a/comphelper/source/eventattachermgr/eventattachermgr.cxx +++ b/comphelper/source/eventattachermgr/eventattachermgr.cxx @@ -95,7 +95,6 @@ class ImplEventAttacherManager public: ImplEventAttacherManager( const Reference< XIntrospection > & rIntrospection, const Reference< XComponentContext >& rContext ); - virtual ~ImplEventAttacherManager() override; // Methods of XEventAttacherManager virtual void SAL_CALL registerScriptEvent(sal_Int32 Index, const ScriptEventDescriptor& ScriptEvent) @@ -380,11 +379,6 @@ ImplEventAttacherManager::ImplEventAttacherManager( const Reference< XIntrospect } } - -ImplEventAttacherManager::~ImplEventAttacherManager() -{ -} - Reference< XIdlReflection > ImplEventAttacherManager::getReflection() throw( Exception ) { Guard< Mutex > aGuard( aLock ); diff --git a/comphelper/source/property/genericpropertyset.cxx b/comphelper/source/property/genericpropertyset.cxx index f30a7b27d72f..6ee1da2bbd55 100644 --- a/comphelper/source/property/genericpropertyset.cxx +++ b/comphelper/source/property/genericpropertyset.cxx @@ -63,7 +63,6 @@ namespace comphelper public: explicit GenericPropertySet( PropertySetInfo* pInfo ) throw(); - virtual ~GenericPropertySet() throw() override; // XInterface virtual Any SAL_CALL queryAggregation( const Type & rType ) throw( RuntimeException, std::exception) override; @@ -94,9 +93,6 @@ GenericPropertySet::GenericPropertySet( PropertySetInfo* pInfo ) throw() { } -GenericPropertySet::~GenericPropertySet() throw() -{ -} void SAL_CALL GenericPropertySet::addPropertyChangeListener( const OUString& aPropertyName, const Reference< XPropertyChangeListener >& xListener ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { Reference < XPropertySetInfo > xInfo = getPropertySetInfo( ); diff --git a/comphelper/source/streaming/memorystream.cxx b/comphelper/source/streaming/memorystream.cxx index b4026427589c..addb09306837 100644 --- a/comphelper/source/streaming/memorystream.cxx +++ b/comphelper/source/streaming/memorystream.cxx @@ -45,7 +45,6 @@ class UNOMemoryStream : public WeakImplHelper > const & GetParsingResult(); explicit OFOPXMLHelper_Impl( sal_uInt16 nFormat ); // must not be created directly - virtual ~OFOPXMLHelper_Impl() override; // XDocumentHandler virtual void SAL_CALL startDocument() throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; @@ -277,12 +276,6 @@ OFOPXMLHelper_Impl::OFOPXMLHelper_Impl( sal_uInt16 nFormat ) { } - -OFOPXMLHelper_Impl::~OFOPXMLHelper_Impl() -{ -} - - uno::Sequence< uno::Sequence< beans::StringPair > > const & OFOPXMLHelper_Impl::GetParsingResult() { if ( m_aElementsSeq.size() )