summaryrefslogtreecommitdiff
path: root/bridges/test
diff options
context:
space:
mode:
authorAlexandre Vicenzi <vicenzi.alexandre@gmail.com>2014-02-05 23:57:38 -0200
committerMarcos Souza <marcos.souza.org@gmail.com>2014-02-06 15:47:54 +0000
commitf139c10fd357c1c07f857a1d277f39d9cbc39d1f (patch)
tree242d722ae6b27e273e61a17baf79b22ef010eaae /bridges/test
parent61e28e86ed30fb37df96c7fd0807b5aaeacf5eea (diff)
fdo#54938 Convert oox, sc, vcl, svtools... to cppu::supportsService
Change-Id: I6268bc57417d53b9810c81071fbcd604e2a19507 Reviewed-on: https://gerrit.libreoffice.org/7886 Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org> Reviewed-by: Marcos Souza <marcos.souza.org@gmail.com>
Diffstat (limited to 'bridges/test')
-rw-r--r--bridges/test/testcomp.cxx14
1 files changed, 3 insertions, 11 deletions
diff --git a/bridges/test/testcomp.cxx b/bridges/test/testcomp.cxx
index c588663a8dd4..ebf097197c6b 100644
--- a/bridges/test/testcomp.cxx
+++ b/bridges/test/testcomp.cxx
@@ -30,6 +30,7 @@
#include <com/sun/star/test/performance/XPerformanceTest.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <cppuhelper/weak.hxx>
+#include <cppuhelper/supportsservice.hxx>
using namespace ::test;
using namespace ::com::sun::star::uno;
@@ -252,10 +253,10 @@ OUString ServiceImpl::getImplementationName()
return OUString( );
}
-sal_Bool ServiceImpl::supportsService( const OUString & /* rServiceName */)
+sal_Bool ServiceImpl::supportsService( const OUString & rServiceName )
throw (RuntimeException)
{
- return sal_False;
+ return cppu::supportsService(this, rServiceName);
}
Sequence< OUString > ServiceImpl::getSupportedServiceNames()
@@ -610,7 +611,6 @@ void testAllTypes( const Reference < XCallMe > & rRCallMe )
OSL_ASSERT( types.Interface == retTypes.Interface );
OSL_ASSERT( types.Any == retTypes.Any );
}
-
}
void testRemote( const Reference< XInterface > &rRemote )
@@ -636,9 +636,7 @@ void testRemote( const Reference< XInterface > &rRemote )
printf( "Testing exception remote ...\n" );
testException( rRCallMe );
- //--------------------
// Test attributes
- //----------------------
OUString ow( "dum didel dum dideldei" );
rLCallMe->setsAttribute( ow );
OSL_ASSERT( rLCallMe->getsAttribute() == ow );
@@ -646,15 +644,11 @@ void testRemote( const Reference< XInterface > &rRemote )
rRCallMe->setsAttribute( ow );
OSL_ASSERT( rRCallMe->getsAttribute() == ow );
- //-------------------
// Performance test
- //-------------------
testPerformance( rRCallMe , rLCallMe );
testOnewayPerformanceOnTwoInterfaces( rRFact->createCallMe(), rRCallMe );
- //----------------
// Test sequence
- //----------------
testSequenceOfCalls( rRCallMe );
@@ -704,9 +698,7 @@ void testRemote( const Reference< XInterface > &rRemote )
// test empty references
rRTest->setIn( Reference < XCallMe > () );
- //--------------------------------
// test thread deadlocking
- //--------------------------------
rLCallMe->callAgain( rRCallMe, 20 );
}