From 065c8b48a604b70140862d0d02deb584626d6994 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Thu, 29 Oct 2015 15:48:45 +0200 Subject: use uno::Reference::set method instead of assignment Change-Id: I58410209f32f988f258a588364e0b037c2790211 --- .../test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx | 5 ++--- .../test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx | 3 +-- bridges/test/testclient.cxx | 2 +- bridges/test/testcomp.cxx | 2 +- bridges/test/testsameprocess.cxx | 2 +- 5 files changed, 6 insertions(+), 8 deletions(-) (limited to 'bridges') diff --git a/bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx b/bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx index f36c35ea480c..005197b569a3 100644 --- a/bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx +++ b/bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx @@ -79,7 +79,7 @@ sal_Int32 Client::run(css::uno::Sequence< OUString > const &) } css::uno::Reference< test::javauno::nativethreadpool::XRelay > relay; try { - relay = css::uno::Reference< test::javauno::nativethreadpool::XRelay >( + relay.set( factory->createInstanceWithContext( OUString( "test.javauno.nativethreadpool.Relay" ), context), @@ -99,8 +99,7 @@ sal_Int32 Client::run(css::uno::Sequence< OUString > const &) } css::uno::Reference< test::javauno::nativethreadpool::XSource > source; try { - source - = css::uno::Reference< test::javauno::nativethreadpool::XSource >( + source.set( css::bridge::UnoUrlResolver::create(context)->resolve( OUString( "uno:socket,host=localhost,port=3830;urp;test" )), css::uno::UNO_QUERY_THROW); diff --git a/bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx b/bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx index 81a3d9b8d1f4..3ac084fb794e 100644 --- a/bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx +++ b/bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx @@ -69,8 +69,7 @@ sal_Int32 Server::get() throw (css::uno::RuntimeException) { css::uno::Reference< test::javauno::nativethreadpool::XSource > source; try { // Use "127.0.0.1" instead of "localhost", see #i32281#: - source - = css::uno::Reference< test::javauno::nativethreadpool::XSource >( + source.set( css::bridge::UnoUrlResolver::create(context)->resolve( OUString( "uno:socket,host=127.0.0.1,port=3831;urp;test" )), css::uno::UNO_QUERY_THROW); diff --git a/bridges/test/testclient.cxx b/bridges/test/testclient.cxx index 9e533a8d802d..b8a2a06bb7d2 100644 --- a/bridges/test/testclient.cxx +++ b/bridges/test/testclient.cxx @@ -203,7 +203,7 @@ int main( int argc, char *argv[] ) // Reference < XComponent > rComp( rBridge , UNO_QUERY ); // rComp->dispose(); - rInitialObject = Reference < XInterface > (); + rInitialObject.clear(); printf( "Waiting...\n" ); TimeValue value={bReverse ?1000 :2,0}; osl_waitThread( &value ); diff --git a/bridges/test/testcomp.cxx b/bridges/test/testcomp.cxx index 376dab71f6f9..f07760eaf0f7 100644 --- a/bridges/test/testcomp.cxx +++ b/bridges/test/testcomp.cxx @@ -591,7 +591,7 @@ void testAllTypes( const Reference < XCallMe > & rRCallMe ) types.Float = (float)123.239; types.Double = 1279.12490012; types.String = OUString("abcdefghijklmnopqrstuvwxyz"); - types.Interface = Reference< XInterface >( rRCallMe , UNO_QUERY); + types.Interface.set( rRCallMe , UNO_QUERY); types.Any <<= types.Double; TestTypes retTypes = rRCallMe->transport( types ); diff --git a/bridges/test/testsameprocess.cxx b/bridges/test/testsameprocess.cxx index 8009e2b1965b..a4f55377a16d 100644 --- a/bridges/test/testsameprocess.cxx +++ b/bridges/test/testsameprocess.cxx @@ -197,7 +197,7 @@ int main( int argc, char *argv[] ) rComp->dispose(); - rComp = Reference < XComponent > ( rSMgr , UNO_QUERY ); + rComp.set( rSMgr , UNO_QUERY ); rComp->dispose(); } return 0; -- cgit