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 --- embeddedobj/source/general/intercept.cxx | 32 ------------------------------- embeddedobj/source/general/xcreator.cxx | 33 -------------------------------- embeddedobj/source/inc/intercept.hxx | 11 ----------- embeddedobj/source/inc/xcreator.hxx | 3 --- 4 files changed, 79 deletions(-) (limited to 'embeddedobj/source') diff --git a/embeddedobj/source/general/intercept.cxx b/embeddedobj/source/general/intercept.cxx index 3f0afee1a12b..ce0551d63e65 100644 --- a/embeddedobj/source/general/intercept.cxx +++ b/embeddedobj/source/general/intercept.cxx @@ -28,7 +28,6 @@ using namespace ::com::sun::star; #define IUL 6 - uno::Sequence< OUString > Interceptor::m_aInterceptedURL(IUL); class StatusChangeListenerContainer @@ -41,40 +40,12 @@ public: } }; - void Interceptor::DisconnectDocHolder() { osl::MutexGuard aGuard( m_aMutex ); m_pDocHolder = NULL; } -void SAL_CALL -Interceptor::addEventListener( - const uno::Reference& Listener ) - throw( uno::RuntimeException ) -{ - osl::MutexGuard aGuard( m_aMutex ); - - if ( ! m_pDisposeEventListeners ) - m_pDisposeEventListeners = - new cppu::OInterfaceContainerHelper( m_aMutex ); - - m_pDisposeEventListeners->addInterface( Listener ); -} - - -void SAL_CALL -Interceptor::removeEventListener( - const uno::Reference< lang::XEventListener >& Listener ) - throw( uno::RuntimeException ) -{ - osl::MutexGuard aGuard( m_aMutex ); - - if ( m_pDisposeEventListeners ) - m_pDisposeEventListeners->removeInterface( Listener ); -} - - Interceptor::Interceptor( DocumentHolder* pDocHolder ) : m_pDocHolder( pDocHolder ), m_pDisposeEventListeners(0), @@ -89,7 +60,6 @@ Interceptor::Interceptor( DocumentHolder* pDocHolder ) } - Interceptor::~Interceptor() { if( m_pDisposeEventListeners ) @@ -99,8 +69,6 @@ Interceptor::~Interceptor() delete m_pStatCL; } - - //XDispatch void SAL_CALL Interceptor::dispatch( diff --git a/embeddedobj/source/general/xcreator.cxx b/embeddedobj/source/general/xcreator.cxx index b3db0f04ef27..4f301d407ce0 100644 --- a/embeddedobj/source/general/xcreator.cxx +++ b/embeddedobj/source/general/xcreator.cxx @@ -393,38 +393,6 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta return xResult; } - -uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInstanceLinkUserInit( - const uno::Sequence< sal_Int8 >& aClassID, - const OUString& aClassName, - const uno::Reference< embed::XStorage >& xStorage, - const OUString& sEntName, - const uno::Sequence< beans::PropertyValue >& lArguments, - const uno::Sequence< beans::PropertyValue >& lObjArgs ) - throw ( lang::IllegalArgumentException, - io::IOException, - uno::Exception, - uno::RuntimeException ) -{ - uno::Reference< uno::XInterface > xResult; - - OUString aEmbedFactory = m_aConfigHelper.GetFactoryNameByClassID( aClassID ); - uno::Reference< embed::XLinkFactory > xLinkFactory( - m_xContext->getServiceManager()->createInstanceWithContext(aEmbedFactory, m_xContext), - uno::UNO_QUERY ); - if ( !xLinkFactory.is() ) - throw uno::RuntimeException(); // TODO: - - return xLinkFactory->createInstanceLinkUserInit( aClassID, - aClassName, - xStorage, - sEntName, - lArguments, - lObjArgs ); - -} - - OUString SAL_CALL UNOEmbeddedObjectCreator::getImplementationName() throw ( uno::RuntimeException, std::exception ) { @@ -437,7 +405,6 @@ sal_Bool SAL_CALL UNOEmbeddedObjectCreator::supportsService( const OUString& Ser return cppu::supportsService(this, ServiceName); } - uno::Sequence< OUString > SAL_CALL UNOEmbeddedObjectCreator::getSupportedServiceNames() throw ( uno::RuntimeException, std::exception ) { diff --git a/embeddedobj/source/inc/intercept.hxx b/embeddedobj/source/inc/intercept.hxx index f08135f113ba..65782195dc92 100644 --- a/embeddedobj/source/inc/intercept.hxx +++ b/embeddedobj/source/inc/intercept.hxx @@ -41,17 +41,6 @@ public: virtual ~Interceptor(); void DisconnectDocHolder(); - // overwritten to release the statuslistner. - - // XComponent - void SAL_CALL - addEventListener( - const com::sun::star::uno::Reference< com::sun::star::lang::XEventListener >& xListener ) - throw( com::sun::star::uno::RuntimeException ); - - void SAL_CALL - removeEventListener( const com::sun::star::uno::Reference< com::sun::star::lang::XEventListener >& aListener ) - throw( com::sun::star::uno::RuntimeException ); //XDispatch virtual void SAL_CALL diff --git a/embeddedobj/source/inc/xcreator.hxx b/embeddedobj/source/inc/xcreator.hxx index 22dfcaeaf609..6d1552850efe 100644 --- a/embeddedobj/source/inc/xcreator.hxx +++ b/embeddedobj/source/inc/xcreator.hxx @@ -63,9 +63,6 @@ public: // XLinkCreator virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceLink( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const OUString& sEntName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aMediaDescr, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lObjArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // XLinkFactory - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceLinkUserInit( const ::com::sun::star::uno::Sequence< ::sal_Int8 >& aClassID, const OUString& sClassName, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const OUString& sEntryName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aObjectArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - // XServiceInfo virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; -- cgit