diff options
author | Alexandre Vicenzi <vicenzi.alexandre@gmail.com> | 2014-01-31 04:53:17 -0200 |
---|---|---|
committer | Marcos Souza <marcos.souza.org@gmail.com> | 2014-02-02 17:38:09 +0000 |
commit | 93ef9a43a53218bdfbdea2ec20fba73fef08db75 (patch) | |
tree | 02536ba1f94b8712372f33be509ad1e68086844c /bridges | |
parent | 434ca1afe510b44de75278da7c84137717bf6e6e (diff) |
fdo#54938 Convert bridges, editeng and others to cppu::supportsService
Change-Id: I7ff5189473c3e0831c2f1e95264d1a04f3b716a9
Reviewed-on: https://gerrit.libreoffice.org/7761
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Marcos Souza <marcos.souza.org@gmail.com>
Tested-by: Marcos Souza <marcos.souza.org@gmail.com>
Diffstat (limited to 'bridges')
-rw-r--r-- | bridges/test/testcomp.cxx | 41 |
1 files changed, 2 insertions, 39 deletions
diff --git a/bridges/test/testcomp.cxx b/bridges/test/testcomp.cxx index 7851547c000a..c588663a8dd4 100644 --- a/bridges/test/testcomp.cxx +++ b/bridges/test/testcomp.cxx @@ -20,22 +20,15 @@ #include <string.h> #include <stdlib.h> #include <osl/time.h> - #include <uno/threadpool.h> - #include <osl/mutex.hxx> #include <osl/diagnose.h> - #include <test/XTestFactory.hpp> #include <cppuhelper/servicefactory.hxx> - #include <com/sun/star/bridge/XInstanceProvider.hpp> - #include <com/sun/star/registry/XImplementationRegistration.hpp> - #include <com/sun/star/test/performance/XPerformanceTest.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> - #include <cppuhelper/weak.hxx> using namespace ::test; @@ -249,35 +242,28 @@ public: { throw _aDummyRE; } }; - void ServiceImpl::async() throw(::com::sun::star::uno::RuntimeException) {} // XServiceInfo -//__________________________________________________________________________________________________ OUString ServiceImpl::getImplementationName() throw (RuntimeException) { return OUString( ); } -//__________________________________________________________________________________________________ + sal_Bool ServiceImpl::supportsService( const OUString & /* rServiceName */) throw (RuntimeException) { return sal_False; } -//__________________________________________________________________________________________________ + Sequence< OUString > ServiceImpl::getSupportedServiceNames() throw (RuntimeException) { return Sequence< OUString > (); } -/****************** - * OCallMe - * - *****************/ - Any OCallMe::queryInterface( const Type & aType ) throw ( RuntimeException ) { Any a = ::cppu::queryInterface( aType, @@ -368,10 +354,6 @@ void OCallMe::callAgain( const Reference< ::test::XCallMe >& callAgainArg, } } -/******************** - * OInterfaceTest - * - *******************/ Any OInterfaceTest::queryInterface( const Type & aType ) throw ( RuntimeException ) { Any a = ::cppu::queryInterface( aType, @@ -383,7 +365,6 @@ Any OInterfaceTest::queryInterface( const Type & aType ) throw ( RuntimeExcepti return OWeakObject::queryInterface( aType ); } - void OInterfaceTest::setIn( const Reference< ::test::XCallMe >& callback ) throw(RuntimeException) @@ -401,7 +382,6 @@ void OInterfaceTest::setInOut( Reference< ::test::XCallMe >& callback ) call(); } - void OInterfaceTest::getOut( Reference< ::test::XCallMe >& callback ) throw(RuntimeException) { @@ -423,7 +403,6 @@ void OInterfaceTest::call() } } - Any OTestFactory::queryInterface( const Type & aType ) throw ( RuntimeException ) { Any a = ::cppu::queryInterface( aType, @@ -449,9 +428,6 @@ Reference< ::test::XInterfaceTest > SAL_CALL OTestFactory::createInterfaceTest( return Reference < XInterfaceTest > ( (XInterfaceTest * ) new OInterfaceTest() ); } - - - // class OInstanceProvider : // public ::cppu::OWeakObject, // public XInstanceProvider @@ -472,13 +448,6 @@ Reference< ::test::XInterfaceTest > SAL_CALL OTestFactory::createInterfaceTest( // ::com::sun::star::uno::RuntimeException); // }; - - - - - - - double getCallsPerSec( const Reference < XCallMe > &rCall , int nLoops, int nToDo ) { TimeValue aStartTime, aEndTime; @@ -742,11 +711,6 @@ void testRemote( const Reference< XInterface > &rRemote ) } - - - - - Reference <XInterface > createComponent( const OUString &sService , const OUString &sDllName, const Reference < XMultiServiceFactory > &rSMgr ) @@ -782,5 +746,4 @@ Reference <XInterface > createComponent( const OUString &sService , return rInterface; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |