From 309574394bd4ae3e9e10e5ff0d64bdd7bbbc8b83 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Thu, 29 Jan 2015 09:07:25 +0000 Subject: callcatcher: large newly detected unused methods post de-virtualization i.e lots now able to be detected after... commit b44cbb26efe1d0b0950b1e1613e131b506dc3876 Author: Noel Grandin Date: Tue Jan 20 12:38:10 2015 +0200 new loplugin: change virtual methods to non-virtual Where we can prove that the virtual method is never overriden. In the case of pure-virtual methods, we remove the method entirely. Sometimes this leads to entire methods and fields being eliminated. Change-Id: I605e2fa56f7186c3d3a764f3cd30f5cf7f881f9d --- reportdesign/source/core/api/Section.cxx | 41 ---------------------------- reportdesign/source/core/inc/Section.hxx | 2 -- reportdesign/source/filter/xml/xmlfilter.cxx | 13 --------- reportdesign/source/filter/xml/xmlfilter.hxx | 5 ---- 4 files changed, 61 deletions(-) (limited to 'reportdesign') diff --git a/reportdesign/source/core/api/Section.cxx b/reportdesign/source/core/api/Section.cxx index 9f68bc34433a..d25f0e2d5ae1 100644 --- a/reportdesign/source/core/api/Section.cxx +++ b/reportdesign/source/core/api/Section.cxx @@ -437,47 +437,6 @@ const ::std::vector< OUString >& lcl_getControlModelMap() } -uno::Reference< report::XReportComponent > SAL_CALL OSection::createReportComponent( const OUString& _sReportComponentSpecifier ) throw (uno::Exception, lang::IllegalArgumentException,uno::RuntimeException) -{ - ::osl::ResettableMutexGuard aGuard(m_aMutex); - const ::std::vector< OUString >& aRet = lcl_getControlModelMap(); - ::std::vector< OUString >::const_iterator aFind = ::std::find(aRet.begin(),aRet.end(),_sReportComponentSpecifier); - if ( aFind == aRet.end() ) - throw lang::IllegalArgumentException(); - - uno::Reference< report::XReportComponent > xRet; - uno::Reference< lang::XMultiServiceFactory> xFac(getReportDefinition(),uno::UNO_QUERY_THROW); - switch( aFind - aRet.begin() ) - { - case 0: - xRet.set(xFac->createInstance("com.sun.star.form.component.FixedText"),uno::UNO_QUERY); - break; - case 1: - xRet.set(xFac->createInstance("com.sun.star.awt.UnoControlFixedLineModel"),uno::UNO_QUERY); - break; - case 2: - xRet.set(xFac->createInstance("com.sun.star.form.component.DatabaseImageControl"),uno::UNO_QUERY); - break; - case 3: - xRet.set(xFac->createInstance("com.sun.star.form.component.FormattedField"),uno::UNO_QUERY); - break; - case 4: - xRet.set(xFac->createInstance("com.sun.star.drawing.ControlShape"),uno::UNO_QUERY); - break; - default: - break; - } - return xRet; -} - -uno::Sequence< OUString > SAL_CALL OSection::getAvailableReportComponentNames( ) throw (uno::RuntimeException) -{ - ::osl::MutexGuard aGuard(m_aMutex); - - const ::std::vector< OUString >& aRet = lcl_getControlModelMap(); - return uno::Sequence< OUString >(aRet.data(), aRet.size()); -} - // XChild uno::Reference< uno::XInterface > SAL_CALL OSection::getParent( ) throw (uno::RuntimeException, std::exception) { diff --git a/reportdesign/source/core/inc/Section.hxx b/reportdesign/source/core/inc/Section.hxx index 8ba80c1a58fb..3bf846d05e1e 100644 --- a/reportdesign/source/core/inc/Section.hxx +++ b/reportdesign/source/core/inc/Section.hxx @@ -187,8 +187,6 @@ namespace reportdesign virtual ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroup > SAL_CALL getGroup() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition > SAL_CALL getReportDefinition() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent > SAL_CALL createReportComponent( const OUString& _sReportComponentSpecifier ) throw (::com::sun::star::uno::Exception, ::com::sun::star::lang::IllegalArgumentException,::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableReportComponentNames( ) throw (::com::sun::star::uno::RuntimeException); // XChild virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setParent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& Parent ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/reportdesign/source/filter/xml/xmlfilter.cxx b/reportdesign/source/filter/xml/xmlfilter.cxx index 39a38015bbf4..77a2358b4a48 100644 --- a/reportdesign/source/filter/xml/xmlfilter.cxx +++ b/reportdesign/source/filter/xml/xmlfilter.cxx @@ -945,19 +945,6 @@ SvXMLImportContext* ORptFilter::CreateStylesContext(const OUString& rLocalName, return pContext; } -SvXMLImport& ORptFilter::getGlobalContext() -{ - return *this; -} - -void ORptFilter::enterEventContext() -{ -} - -void ORptFilter::leaveEventContext() -{ -} - SvXMLImportContext *ORptFilter::CreateFontDeclsContext( const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList > & xAttrList ) diff --git a/reportdesign/source/filter/xml/xmlfilter.hxx b/reportdesign/source/filter/xml/xmlfilter.hxx index 5ad1c29e5ef3..4fa25c67c856 100644 --- a/reportdesign/source/filter/xml/xmlfilter.hxx +++ b/reportdesign/source/filter/xml/xmlfilter.hxx @@ -168,11 +168,6 @@ public: void removeFunction(const OUString& _sFunctionName); inline const TGroupFunctionMap& getFunctions() const { return m_aFunctions; } - SvXMLImport& getGlobalContext(); - - void enterEventContext(); - void leaveEventContext(); - bool isOldFormat() const; }; -- cgit