forms/source/xforms/NameContainer.hxx | 1 - forms/source/xforms/collection.hxx | 1 - forms/source/xforms/model_helper.hxx | 3 --- forms/source/xforms/namedcollection.hxx | 1 - forms/source/xforms/xformsevent.hxx | 1 - formula/source/ui/dlg/ControlHelper.hxx | 2 -- formula/source/ui/resource/ModuleHelper.cxx | 6 ------ framework/inc/helper/mischelper.hxx | 12 ------------ framework/inc/xml/imagesconfiguration.hxx | 2 -- framework/source/accelerators/presethandler.cxx | 2 -- framework/source/inc/dispatch/dispatchdisabler.hxx | 1 - framework/source/inc/loadenv/loadenvexception.hxx | 2 -- framework/source/layoutmanager/layoutmanager.cxx | 3 --- helpcompiler/inc/BasCodeTagger.hxx | 1 - helpcompiler/inc/HelpLinker.hxx | 3 --- hwpfilter/source/formula.h | 1 - hwpfilter/source/hbox.h | 2 -- i18npool/source/search/levdis.hxx | 1 - idlc/inc/astattribute.hxx | 1 - idlc/inc/astbasetype.hxx | 2 -- idlc/inc/astconstants.hxx | 1 - idlc/inc/astexception.hxx | 2 -- idlc/inc/astinterfacemember.hxx | 1 - idlc/inc/astmember.hxx | 2 -- idlc/inc/astmodule.hxx | 1 - idlc/inc/astneeds.hxx | 1 - idlc/inc/astobserves.hxx | 1 - idlc/inc/astoperation.hxx | 1 - idlc/inc/astparameter.hxx | 2 -- idlc/inc/astservice.hxx | 1 - idlc/inc/astservicemember.hxx | 1 - idlc/inc/asttype.hxx | 2 -- idlc/inc/asttypedef.hxx | 2 -- 33 files changed, 66 deletions(-)
New commits: commit b4adb0c533cc99633f360cb12014aa35599d943a Author: Noel Grandin <noel.gran...@collabora.co.uk> Date: Tue Jan 24 11:31:51 2017 +0200 loplugin: unnecessary destructor forms..idlc Change-Id: I765e0fa61f8134a60e5ea24452c6bbcb3fa8b054 Reviewed-on: https://gerrit.libreoffice.org/33492 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> diff --git a/forms/source/xforms/NameContainer.hxx b/forms/source/xforms/NameContainer.hxx index 621ea96..aa2a86c 100644 --- a/forms/source/xforms/NameContainer.hxx +++ b/forms/source/xforms/NameContainer.hxx @@ -78,7 +78,6 @@ protected: public: NameContainer() {} - virtual ~NameContainer() override {} // methods for XElementAccess diff --git a/forms/source/xforms/collection.hxx b/forms/source/xforms/collection.hxx index 8ea1ae1..4f860cc 100644 --- a/forms/source/xforms/collection.hxx +++ b/forms/source/xforms/collection.hxx @@ -61,7 +61,6 @@ protected: public: Collection() {} - virtual ~Collection() override {} const T& getItem( sal_Int32 n ) const { diff --git a/forms/source/xforms/model_helper.hxx b/forms/source/xforms/model_helper.hxx index 23423b4..b70bc23 100644 --- a/forms/source/xforms/model_helper.hxx +++ b/forms/source/xforms/model_helper.hxx @@ -53,7 +53,6 @@ class BindingCollection : public NamedCollection<css::uno::Reference<css::beans: public: explicit BindingCollection( Model* pModel ) : mpModel( pModel ) {} - virtual ~BindingCollection() override {} virtual bool isValid( const T& t ) const override { @@ -80,9 +79,7 @@ class SubmissionCollection : public NamedCollection<css::uno::Reference<css::bea public: explicit SubmissionCollection( Model* pModel ) : mpModel( pModel ) {} - virtual ~SubmissionCollection() override {} -public: virtual bool isValid( const T& t ) const override { return Submission::getSubmission( t ) != nullptr; diff --git a/forms/source/xforms/namedcollection.hxx b/forms/source/xforms/namedcollection.hxx index 1c53ad9..4cd629b 100644 --- a/forms/source/xforms/namedcollection.hxx +++ b/forms/source/xforms/namedcollection.hxx @@ -37,7 +37,6 @@ class NamedCollection : public cppu::ImplInheritanceHelper< public: NamedCollection() {} - virtual ~NamedCollection() {} const T& getItem( const OUString& rName ) const { diff --git a/forms/source/xforms/xformsevent.hxx b/forms/source/xforms/xformsevent.hxx index e3aff32..36bbcec 100644 --- a/forms/source/xforms/xformsevent.hxx +++ b/forms/source/xforms/xformsevent.hxx @@ -40,7 +40,6 @@ class XFormsEventConcrete : public cppu::WeakImplHelper< XFormsEvent > { , m_cancelable(false) { } - virtual ~XFormsEventConcrete() override {} virtual OUString SAL_CALL getType() throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Reference< css::xml::dom::events::XEventTarget > SAL_CALL getTarget() throw (css::uno::RuntimeException, std::exception) override; diff --git a/formula/source/ui/dlg/ControlHelper.hxx b/formula/source/ui/dlg/ControlHelper.hxx index 89e25bf..ccfac94 100644 --- a/formula/source/ui/dlg/ControlHelper.hxx +++ b/formula/source/ui/dlg/ControlHelper.hxx @@ -104,8 +104,6 @@ public: ArgInput(); - ~ArgInput() {} - void InitArgInput ( FixedText* pftArg, PushButton* pbtnFx, ArgEdit* pedArg, diff --git a/formula/source/ui/resource/ModuleHelper.cxx b/formula/source/ui/resource/ModuleHelper.cxx index 97fbf86..175cf9f 100644 --- a/formula/source/ui/resource/ModuleHelper.cxx +++ b/formula/source/ui/resource/ModuleHelper.cxx @@ -48,7 +48,6 @@ class OModuleImpl public: /// ctor OModuleImpl(); - ~OModuleImpl(); /// get the manager for the resources of the module ResMgr* getResManager(); @@ -59,11 +58,6 @@ OModuleImpl::OModuleImpl() } -OModuleImpl::~OModuleImpl() -{ -} - - ResMgr* OModuleImpl::getResManager() { // note that this method is not threadsafe, which counts for the whole class ! diff --git a/framework/inc/helper/mischelper.hxx b/framework/inc/helper/mischelper.hxx index de70443..c8f5927 100644 --- a/framework/inc/helper/mischelper.hxx +++ b/framework/inc/helper/mischelper.hxx @@ -153,10 +153,6 @@ class WeakContainerListener : public ::cppu::WeakImplHelper<css::container::XCon { } - virtual ~WeakContainerListener() override - { - } - // container.XContainerListener virtual void SAL_CALL elementInserted(const css::container::ContainerEvent& rEvent) throw(css::uno::RuntimeException, std::exception) override @@ -208,10 +204,6 @@ class WeakChangesListener : public ::cppu::WeakImplHelper<css::util::XChangesLis { } - virtual ~WeakChangesListener() override - { - } - // util.XChangesListener virtual void SAL_CALL changesOccurred(const css::util::ChangesEvent& rEvent) throw(css::uno::RuntimeException, std::exception) override @@ -245,10 +237,6 @@ class WeakDocumentEventListener : public ::cppu::WeakImplHelper<css::document::X { } - virtual ~WeakDocumentEventListener() override - { - } - virtual void SAL_CALL documentEventOccured(const css::document::DocumentEvent& rEvent) throw(css::uno::RuntimeException, std::exception) override { diff --git a/framework/inc/xml/imagesconfiguration.hxx b/framework/inc/xml/imagesconfiguration.hxx index 44b42a1..617882c 100644 --- a/framework/inc/xml/imagesconfiguration.hxx +++ b/framework/inc/xml/imagesconfiguration.hxx @@ -62,8 +62,6 @@ struct ImageListItemDescriptor { ImageListItemDescriptor() : nMaskMode( ImageMaskMode_Color ) {} - ~ImageListItemDescriptor() {} - OUString aURL; // an URL to a bitmap with several images inside Color aMaskColor; // a color used as transparent OUString aMaskURL; // an URL to an optional bitmap used as a mask diff --git a/framework/source/accelerators/presethandler.cxx b/framework/source/accelerators/presethandler.cxx index 9166826..62ba06b 100644 --- a/framework/source/accelerators/presethandler.cxx +++ b/framework/source/accelerators/presethandler.cxx @@ -63,8 +63,6 @@ struct TSharedStorages final : m_lStoragesShare() , m_lStoragesUser () {}; - - ~TSharedStorages() {}; }; /** @short provides access to the: diff --git a/framework/source/inc/dispatch/dispatchdisabler.hxx b/framework/source/inc/dispatch/dispatchdisabler.hxx index 92cb2416..b41d7af 100644 --- a/framework/source/inc/dispatch/dispatchdisabler.hxx +++ b/framework/source/inc/dispatch/dispatchdisabler.hxx @@ -46,7 +46,6 @@ class DispatchDisabler : public ::cppu::WeakImplHelper< css::uno::Reference< css::frame::XDispatchProvider > mxMaster; public: DispatchDisabler(const css::uno::Reference< css::uno::XComponentContext >& rxContext); - virtual ~DispatchDisabler() override {} // XInitialization virtual void SAL_CALL initialize( const ::css::uno::Sequence< ::css::uno::Any >& aArguments ) diff --git a/framework/source/inc/loadenv/loadenvexception.hxx b/framework/source/inc/loadenv/loadenvexception.hxx index fedf954..b75009c 100644 --- a/framework/source/inc/loadenv/loadenvexception.hxx +++ b/framework/source/inc/loadenv/loadenvexception.hxx @@ -83,8 +83,6 @@ class LoadEnvException css::uno::Any const & original = css::uno::Any()): m_nID(id), m_sMessage(message), m_exOriginal(original) {} - - ~LoadEnvException() {} }; } // namespace framework diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx index 85304a1..cd21f4e 100644 --- a/framework/source/layoutmanager/layoutmanager.cxx +++ b/framework/source/layoutmanager/layoutmanager.cxx @@ -3132,9 +3132,6 @@ namespace detail rManager.describeProperties(aProperties); m_pInfoHelper.reset( new ::cppu::OPropertyArrayHelper(aProperties, true) ); } - ~InfoHelperBuilder() - { - } InfoHelperBuilder(const InfoHelperBuilder&) = delete; InfoHelperBuilder& operator=(const InfoHelperBuilder&) = delete; diff --git a/helpcompiler/inc/BasCodeTagger.hxx b/helpcompiler/inc/BasCodeTagger.hxx index 1020374..ae180fa 100644 --- a/helpcompiler/inc/BasCodeTagger.hxx +++ b/helpcompiler/inc/BasCodeTagger.hxx @@ -54,7 +54,6 @@ class L10N_DLLPUBLIC LibXmlTreeWalker public: LibXmlTreeWalker( xmlDocPtr doc ); - ~LibXmlTreeWalker() {} void nextNode(); xmlNodePtr currentNode() { return m_pCurrentNode;} bool end(); diff --git a/helpcompiler/inc/HelpLinker.hxx b/helpcompiler/inc/HelpLinker.hxx index 59e4883..ddbe348 100644 --- a/helpcompiler/inc/HelpLinker.hxx +++ b/helpcompiler/inc/HelpLinker.hxx @@ -60,9 +60,6 @@ public: , m_bUseLangRoot(true) , m_bCreateIndex(true) {} - ~HelpLinker() - { - } private: Stringtable additionalFiles; diff --git a/hwpfilter/source/formula.h b/hwpfilter/source/formula.h index 62f44c7..d46e36b 100644 --- a/hwpfilter/source/formula.h +++ b/hwpfilter/source/formula.h @@ -36,7 +36,6 @@ public: eq = _eq; trim(); } - ~Formula(){ } void setDocumentHandler(Reference < XDocumentHandler > const & xHandler ) { diff --git a/hwpfilter/source/hbox.h b/hwpfilter/source/hbox.h index 8d039ae..310984c 100644 --- a/hwpfilter/source/hbox.h +++ b/hwpfilter/source/hbox.h @@ -394,7 +394,6 @@ struct Columns nTotal = INIT_SIZE; data.reset(new int[nTotal]); } - ~Columns() {} void AddColumnsSize(){ if (nTotal + ADD_AMOUNT < nTotal) // overflow @@ -454,7 +453,6 @@ struct Rows nTotal = INIT_SIZE; data.reset( new int[nTotal] ); } - ~Rows() {} void AddRowsSize(){ if (nTotal + ADD_AMOUNT < nTotal) // overflow diff --git a/i18npool/source/search/levdis.hxx b/i18npool/source/search/levdis.hxx index 4d834bd..e469a6a 100644 --- a/i18npool/source/search/levdis.hxx +++ b/i18npool/source/search/levdis.hxx @@ -122,7 +122,6 @@ public: { NewMem(s); } - ~WLevDisDistanceMem() {} int* GetPtr() const { return p.get(); } int* NewMem( size_t s ) { diff --git a/idlc/inc/astattribute.hxx b/idlc/inc/astattribute.hxx index 273e420..030f6e1 100644 --- a/idlc/inc/astattribute.hxx +++ b/idlc/inc/astattribute.hxx @@ -41,7 +41,6 @@ public: , m_flags(flags) , m_pType(pType) {} - virtual ~AstAttribute() override {} void setExceptions( OUString const * getDoc, DeclList const * getExc, diff --git a/idlc/inc/astbasetype.hxx b/idlc/inc/astbasetype.hxx index 35d0cc1..65c0f40 100644 --- a/idlc/inc/astbasetype.hxx +++ b/idlc/inc/astbasetype.hxx @@ -31,8 +31,6 @@ public: , m_exprType(type) {} - virtual ~AstBaseType() override {} - virtual bool isUnsigned() const override { switch (m_exprType) { case ET_ushort: diff --git a/idlc/inc/astconstants.hxx b/idlc/inc/astconstants.hxx index fb990f9..9f787e5 100644 --- a/idlc/inc/astconstants.hxx +++ b/idlc/inc/astconstants.hxx @@ -27,7 +27,6 @@ public: AstConstants(const OString& name, AstScope* pScope) : AstModule(NT_constants, name, pScope) {} - virtual ~AstConstants() override {} }; #endif // INCLUDED_IDLC_INC_ASTCONSTANTS_HXX diff --git a/idlc/inc/astexception.hxx b/idlc/inc/astexception.hxx index e00e288..b69f26f 100644 --- a/idlc/inc/astexception.hxx +++ b/idlc/inc/astexception.hxx @@ -27,8 +27,6 @@ public: AstException(const OString& name, AstException* pBaseType, AstScope* pScope) : AstStruct(NT_exception, name, pBaseType, pScope) {} - - virtual ~AstException() override {} }; #endif // INCLUDED_IDLC_INC_ASTEXCEPTION_HXX diff --git a/idlc/inc/astinterfacemember.hxx b/idlc/inc/astinterfacemember.hxx index a627b0d..ae381af 100644 --- a/idlc/inc/astinterfacemember.hxx +++ b/idlc/inc/astinterfacemember.hxx @@ -30,7 +30,6 @@ public: , m_flags(flags) , m_pRealInterface(pRealInterface) {} - virtual ~AstInterfaceMember() override {} AstInterface* getRealInterface() { return m_pRealInterface; } diff --git a/idlc/inc/astmember.hxx b/idlc/inc/astmember.hxx index 0563eb8..43597d1 100644 --- a/idlc/inc/astmember.hxx +++ b/idlc/inc/astmember.hxx @@ -31,8 +31,6 @@ public: AstType const * pType, OString const & name, AstScope * pScope): AstDeclaration(NT_member, name, pScope), m_pType(pType) {} - virtual ~AstMember() override {} - AstType const * getType() const { return m_pType; } protected: diff --git a/idlc/inc/astmodule.hxx b/idlc/inc/astmodule.hxx index 6f41b2d..da56f82 100644 --- a/idlc/inc/astmodule.hxx +++ b/idlc/inc/astmodule.hxx @@ -34,7 +34,6 @@ public: : AstDeclaration(type, name, pScope) , AstScope(type) {} - virtual ~AstModule() override {} virtual bool dump(RegistryKey& rKey) override; }; diff --git a/idlc/inc/astneeds.hxx b/idlc/inc/astneeds.hxx index 0df77f2..6b456b9 100644 --- a/idlc/inc/astneeds.hxx +++ b/idlc/inc/astneeds.hxx @@ -28,7 +28,6 @@ public: : AstDeclaration(NT_needs, name, pScope) , m_pRealService(pRealService) {} - virtual ~AstNeeds() override {} AstService* getRealService() { return m_pRealService; } diff --git a/idlc/inc/astobserves.hxx b/idlc/inc/astobserves.hxx index 8e4c404..b779a7b 100644 --- a/idlc/inc/astobserves.hxx +++ b/idlc/inc/astobserves.hxx @@ -28,7 +28,6 @@ public: : AstDeclaration(NT_observes, name, pScope) , m_pRealInterface(pRealInterface) {} - virtual ~AstObserves() override {} AstInterface* getRealInterface() { return m_pRealInterface; } diff --git a/idlc/inc/astoperation.hxx b/idlc/inc/astoperation.hxx index a4837cb..45b3faa 100644 --- a/idlc/inc/astoperation.hxx +++ b/idlc/inc/astoperation.hxx @@ -35,7 +35,6 @@ public: , AstScope(NT_operation) , m_pReturnType(pReturnType) {} - virtual ~AstOperation() override {} bool isVariadic() const; diff --git a/idlc/inc/astparameter.hxx b/idlc/inc/astparameter.hxx index ba7933c..f50f021 100644 --- a/idlc/inc/astparameter.hxx +++ b/idlc/inc/astparameter.hxx @@ -32,8 +32,6 @@ public: AstMember(NT_parameter, type, name, scope), m_direction(direction), m_rest(rest) {} - virtual ~AstParameter() override {} - Direction getDirection() const { return m_direction; } bool isRest() const { return m_rest; } diff --git a/idlc/inc/astservice.hxx b/idlc/inc/astservice.hxx index 8a7c0cf..4747005 100644 --- a/idlc/inc/astservice.hxx +++ b/idlc/inc/astservice.hxx @@ -38,7 +38,6 @@ public: , m_singleInterfaceBasedService(false) , m_defaultConstructor(false) {} - virtual ~AstService() override {} virtual bool dump(RegistryKey& rKey) override; diff --git a/idlc/inc/astservicemember.hxx b/idlc/inc/astservicemember.hxx index eba1cd9..1254848 100644 --- a/idlc/inc/astservicemember.hxx +++ b/idlc/inc/astservicemember.hxx @@ -30,7 +30,6 @@ public: , m_flags(flags) , m_pRealService(pRealService) {} - virtual ~AstServiceMember() override {} AstService* getRealService() { return m_pRealService; } diff --git a/idlc/inc/asttype.hxx b/idlc/inc/asttype.hxx index 083bd3b..89c16f7 100644 --- a/idlc/inc/asttype.hxx +++ b/idlc/inc/asttype.hxx @@ -28,8 +28,6 @@ public: : AstDeclaration(type, name, pScope) {} - virtual ~AstType() override {} - virtual bool isUnsigned() const { return false; } }; diff --git a/idlc/inc/asttypedef.hxx b/idlc/inc/asttypedef.hxx index 64eb148..3b097cc 100644 --- a/idlc/inc/asttypedef.hxx +++ b/idlc/inc/asttypedef.hxx @@ -28,8 +28,6 @@ public: AstType const * baseType, OString const & name, AstScope * scope): AstType(NT_typedef, name, scope), m_pBaseType(baseType) {} - virtual ~AstTypeDef() override {} - AstType const * getBaseType() const { return m_pBaseType; } _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits