automated removal of RTL_CONSTASCII_USTRINGPARAM for quoted OUStrings

Done with a perl regex:

s/OUString\s*\(\s*RTL_CONSTASCII_USTRINGPARAM\s*\((\s*"[^")]*?"\s*)\)\s*\)/OUString\($1\)/gms

Change-Id: Idf28320817cdcbea6d0f7ec06a9bf51bd2c3b3ec
Reviewed-on: https://gerrit.libreoffice.org/2832
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Tested-by: Thomas Arnhold <thomas@arnhold.org>

9 files changed, 66 insertions, 66 deletions

diff --git a/bridges/test/java_uno/acquire/testacquire.cxx b/bridges/test/java_uno/acquire/testacquire.cxx
index fddc097edb42..47a2a0bd0767 100644
--- a/bridges/test/java_uno/acquire/testacquire.cxx
+++ b/bridges/test/java_uno/acquire/testacquire.cxx
@@ -478,12 +478,12 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const & arguments)
 }
 
 rtl::OUString Service::getImplementationName_static() {
-    return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.test.bridges.testacquire.impl" ));
+    return rtl::OUString( "com.sun.star.test.bridges.testacquire.impl" );
 }
 
 css::uno::Sequence< rtl::OUString > Service::getSupportedServiceNames_static() {
     css::uno::Sequence< rtl::OUString > names(1);
-    names[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.test.bridges.testacquire" ));
+    names[0] = rtl::OUString( "com.sun.star.test.bridges.testacquire" );
     return names;
 }
 
@@ -519,7 +519,7 @@ bool writeInfo(void * registryKey, rtl::OUString const & implementationName,
                css::uno::Sequence< rtl::OUString > const & serviceNames) {
     rtl::OUString keyName( RTL_CONSTASCII_USTRINGPARAM( "/" ));
     keyName += implementationName;
-    keyName += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES" ));
+    keyName += rtl::OUString( "/UNO/SERVICES" );
     css::uno::Reference< css::registry::XRegistryKey > key;
     try {
         key = static_cast< css::registry::XRegistryKey * >(registryKey)->
diff --git a/bridges/test/java_uno/equals/testequals.cxx b/bridges/test/java_uno/equals/testequals.cxx
index 106e0a318c48..dc3936f77f80 100644
--- a/bridges/test/java_uno/equals/testequals.cxx
+++ b/bridges/test/java_uno/equals/testequals.cxx
@@ -110,7 +110,7 @@ void Service::connect(rtl::OUString const & rConnection,
         css::connection::Connector::create(m_xContext)->connect(rConnection));
     css::uno::Reference< css::bridge::XBridgeFactory > xBridgeFactory(
         m_xContext->getServiceManager()->createInstanceWithContext(
-            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.bridge.BridgeFactory" )),
+            rtl::OUString( "com.sun.star.bridge.BridgeFactory" ),
             m_xContext),
         css::uno::UNO_QUERY);
     m_xBridge = xBridgeFactory->createBridge(rtl::OUString(), rProtocol,
@@ -126,7 +126,7 @@ Service::get(rtl::OUString const & rName) throw (css::uno::RuntimeException)
 css::uno::Sequence< rtl::OUString > Service::getSupportedServiceNames_static()
 {
     css::uno::Sequence< rtl::OUString > aNames(1);
-    aNames[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.test.bridges.testequals" ));
+    aNames[0] = rtl::OUString( "com.sun.star.test.bridges.testequals" );
     return aNames;
 }
 
@@ -179,7 +179,7 @@ bool writeInfo(void * pRegistryKey, sal_Char const * pImplementationName,
 {
     rtl::OUString aKeyName( RTL_CONSTASCII_USTRINGPARAM( "/" ));
     aKeyName += rtl::OUString::createFromAscii(pImplementationName);
-    aKeyName += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES" ));
+    aKeyName += rtl::OUString( "/UNO/SERVICES" );
     css::uno::Reference< css::registry::XRegistryKey > xKey;
     try
     {
diff --git a/bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx b/bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx
index df0991c245ac..907b4b41f2bd 100644
--- a/bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx
+++ b/bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx
@@ -75,27 +75,27 @@ sal_Int32 Client::run(css::uno::Sequence< rtl::OUString > const &)
         context->getServiceManager());
     if (!factory.is()) {
         throw new css::uno::RuntimeException(
-            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "no component context service manager" )),
+            rtl::OUString( "no component context service manager" ),
             static_cast< cppu::OWeakObject * >(this));
     }
     css::uno::Reference< test::javauno::nativethreadpool::XRelay > relay;
     try {
         relay = css::uno::Reference< test::javauno::nativethreadpool::XRelay >(
             factory->createInstanceWithContext(
-                rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "test.javauno.nativethreadpool.Relay" )),
+                rtl::OUString( "test.javauno.nativethreadpool.Relay" ),
                 context),
             css::uno::UNO_QUERY_THROW);
     } catch (css::uno::RuntimeException &) {
         throw;
     } catch (css::uno::Exception & e) {
         throw css::lang::WrappedTargetRuntimeException(
-            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "creating test.javauno.nativethreadpool.Relay service" )),
+            rtl::OUString( "creating test.javauno.nativethreadpool.Relay service" ),
             static_cast< cppu::OWeakObject * >(this), css::uno::makeAny(e));
     }
     relay->start(this);
     if (!data.setData(reinterpret_cast< void * >(12345))) {
         throw new css::uno::RuntimeException(
-            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "osl::ThreadData::setData failed" )),
+            rtl::OUString( "osl::ThreadData::setData failed" ),
             static_cast< cppu::OWeakObject * >(this));
     }
     css::uno::Reference< test::javauno::nativethreadpool::XSource > source;
@@ -103,19 +103,19 @@ sal_Int32 Client::run(css::uno::Sequence< rtl::OUString > const &)
         source
             = css::uno::Reference< test::javauno::nativethreadpool::XSource >(
                 css::bridge::UnoUrlResolver::create(context)->resolve(
-                    rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "uno:socket,host=localhost,port=3830;urp;test" ))),
+                    rtl::OUString( "uno:socket,host=localhost,port=3830;urp;test" )),
                 css::uno::UNO_QUERY_THROW);
     } catch (css::connection::NoConnectException & e) {
         throw css::lang::WrappedTargetRuntimeException(
-            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.uno.UnoUrlResolver.resolve" )),
+            rtl::OUString( "com.sun.star.uno.UnoUrlResolver.resolve" ),
             static_cast< cppu::OWeakObject * >(this), css::uno::makeAny(e));
     } catch (css::connection::ConnectionSetupException & e) {
         throw css::lang::WrappedTargetRuntimeException(
-            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.uno.UnoUrlResolver.resolve" )),
+            rtl::OUString( "com.sun.star.uno.UnoUrlResolver.resolve" ),
             static_cast< cppu::OWeakObject * >(this), css::uno::makeAny(e));
     } catch (css::lang::IllegalArgumentException & e) {
         throw css::lang::WrappedTargetRuntimeException(
-            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.uno.UnoUrlResolver.resolve" )),
+            rtl::OUString( "com.sun.star.uno.UnoUrlResolver.resolve" ),
             static_cast< cppu::OWeakObject * >(this), css::uno::makeAny(e));
     }
     bool success = source->get() == 12345;
@@ -135,7 +135,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL create(
 }
 
 rtl::OUString SAL_CALL getImplementationName() {
-    return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "test.javauno.nativethreadpool.client" ));
+    return rtl::OUString( "test.javauno.nativethreadpool.client" );
 }
 
 css::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() {
diff --git a/bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx b/bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx
index 607a05414c2e..6b7490b7732a 100644
--- a/bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx
+++ b/bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx
@@ -64,7 +64,7 @@ sal_Int32 Server::get() throw (css::uno::RuntimeException) {
         context->getServiceManager());
     if (!factory.is()) {
         throw new css::uno::RuntimeException(
-            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "no component context service manager" )),
+            rtl::OUString( "no component context service manager" ),
             static_cast< cppu::OWeakObject * >(this));
     }
     css::uno::Reference< test::javauno::nativethreadpool::XSource > source;
@@ -73,19 +73,19 @@ sal_Int32 Server::get() throw (css::uno::RuntimeException) {
         source
             = css::uno::Reference< test::javauno::nativethreadpool::XSource >(
                 css::bridge::UnoUrlResolver::create(context)->resolve(
-                    rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "uno:socket,host=127.0.0.1,port=3831;urp;test" ))),
+                    rtl::OUString( "uno:socket,host=127.0.0.1,port=3831;urp;test" )),
                 css::uno::UNO_QUERY_THROW);
     } catch (css::connection::NoConnectException & e) {
         throw css::lang::WrappedTargetRuntimeException(
-            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.uno.UnoUrlResolver.resolve" )),
+            rtl::OUString( "com.sun.star.uno.UnoUrlResolver.resolve" ),
             static_cast< cppu::OWeakObject * >(this), css::uno::makeAny(e));
     } catch (css::connection::ConnectionSetupException & e) {
         throw css::lang::WrappedTargetRuntimeException(
-            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.uno.UnoUrlResolver.resolve" )),
+            rtl::OUString( "com.sun.star.uno.UnoUrlResolver.resolve" ),
             static_cast< cppu::OWeakObject * >(this), css::uno::makeAny(e));
     } catch (css::lang::IllegalArgumentException & e) {
         throw css::lang::WrappedTargetRuntimeException(
-            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.uno.UnoUrlResolver.resolve" )),
+            rtl::OUString( "com.sun.star.uno.UnoUrlResolver.resolve" ),
             static_cast< cppu::OWeakObject * >(this), css::uno::makeAny(e));
     }
     return source->get();
@@ -99,7 +99,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL create(
 }
 
 rtl::OUString SAL_CALL getImplementationName() {
-    return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "test.javauno.nativethreadpool.server" ));
+    return rtl::OUString( "test.javauno.nativethreadpool.server" );
 }
 
 css::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() {
diff --git a/bridges/test/testclient.cxx b/bridges/test/testclient.cxx
index e7c29c9402a4..052f598ba5e2 100644
--- a/bridges/test/testclient.cxx
+++ b/bridges/test/testclient.cxx
@@ -127,11 +127,11 @@ int main( int argc, char *argv[] )
 
     {
         Reference< XMultiServiceFactory > rSMgr = createRegistryServiceFactory(
-            OUString( RTL_CONSTASCII_USTRINGPARAM("client.rdb")) );
+            OUString("client.rdb") );
 
 
           Reference < XConnector > rConnector(
-                createComponent( OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.connection.Connector")),
+                createComponent( OUString("com.sun.star.connection.Connector"),
                                  OUString( RTL_CONSTASCII_USTRINGPARAM("connector.uno" SAL_DLLEXTENSION)),
                                  rSMgr ),
                 UNO_QUERY );
@@ -154,12 +154,12 @@ int main( int argc, char *argv[] )
                 else
                 {
                     // just ensure that it is registered
-                    createComponent( OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.bridge.Bridge.iiop")),
+                    createComponent( OUString("com.sun.star.bridge.Bridge.iiop"),
                                      OUString( RTL_CONSTASCII_USTRINGPARAM("remotebridge.uno" SAL_DLLEXTENSION)),
                                      rSMgr );
 
                     Reference < XBridgeFactory > rFactory(
-                        createComponent( OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.bridge.BridgeFactory")),
+                        createComponent( OUString("com.sun.star.bridge.BridgeFactory"),
                                          OUString( RTL_CONSTASCII_USTRINGPARAM("bridgefac.uno" SAL_DLLEXTENSION)),
                                          rSMgr ),
                         UNO_QUERY );
@@ -168,13 +168,13 @@ int main( int argc, char *argv[] )
                     {
 
                         Reference < XBridge > rBridge = rFactory->createBridge(
-                            OUString( RTL_CONSTASCII_USTRINGPARAM("bla blub")),
+                            OUString("bla blub"),
                             sProtocol,
                             rConnection,
                             new OInstanceProvider );
                         {
                             // test the factory
-                              Reference < XBridge > rBridge2 = rFactory->getBridge( OUString( RTL_CONSTASCII_USTRINGPARAM("bla blub")) );
+                              Reference < XBridge > rBridge2 = rFactory->getBridge( OUString("bla blub") );
                               OSL_ASSERT( rBridge2.is() );
                               OSL_ASSERT( rBridge2->getDescription() == rBridge->getDescription( ) );
                               OSL_ASSERT( rBridge2->getName() == rBridge->getName() );
@@ -183,7 +183,7 @@ int main( int argc, char *argv[] )
 
 
                         Reference < XInterface > rInitialObject = rBridge->getInstance(
-                            OUString( RTL_CONSTASCII_USTRINGPARAM("bridges-testobject")) );
+                            OUString("bridges-testobject") );
 
                         if( rInitialObject.is() )
                         {
@@ -211,7 +211,7 @@ int main( int argc, char *argv[] )
                         printf( "Closing...\n" );
                     }
 
-                    Reference < XBridge > rBridge = rFactory->getBridge( OUString( RTL_CONSTASCII_USTRINGPARAM("bla blub")) );
+                    Reference < XBridge > rBridge = rFactory->getBridge( OUString("bla blub") );
 //                      OSL_ASSERT( ! rBridge.is() );
                 }
 
diff --git a/bridges/test/testcomp.cxx b/bridges/test/testcomp.cxx
index 053772b0d051..21eadd91b100 100644
--- a/bridges/test/testcomp.cxx
+++ b/bridges/test/testcomp.cxx
@@ -71,7 +71,7 @@ void parseCommandLine( char *argv[] ,
     if( -1 == nIndex )
     {
         *pConnection = sTemp;
-        *pProtocol    = OUString( RTL_CONSTASCII_USTRINGPARAM( "iiop" ) );
+        *pProtocol    = OUString( "iiop" );
     }
     else
     {
@@ -97,10 +97,10 @@ Any OInstanceProvider::queryInterface( const  Type & aType ) throw ( RuntimeExce
               ::com::sun::star::uno::RuntimeException)
 {
     // Tries to get the PerformanceTestObject
-    if( sObjectName == OUString( RTL_CONSTASCII_USTRINGPARAM( "TestRemoteObject" ) ) )
+    if( sObjectName == OUString( "TestRemoteObject" ) )
     {
         return m_rSMgr->createInstance(
-            OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.test.performance.PerformanceTestObject") ) );
+            OUString("com.sun.star.test.performance.PerformanceTestObject") );
     }
     return Reference < XInterface > ( (::cppu::OWeakObject * ) new OTestFactory() );
 }
@@ -421,7 +421,7 @@ void OInterfaceTest::call()
 {
     if( m_rCallMe.is() )
     {
-        m_rCallMe->call( OUString( RTL_CONSTASCII_USTRINGPARAM("This is my String during a callback!")) , 5);
+        m_rCallMe->call( OUString("This is my String during a callback!") , 5);
     }
 }
 
@@ -487,7 +487,7 @@ double getCallsPerSec( const Reference < XCallMe > &rCall , int nLoops, int nToD
     osl_getSystemTime( &aStartTime );
     for( sal_Int32 i = 0; i < nLoops; i ++ )
     {
-        rCall->call( OUString( RTL_CONSTASCII_USTRINGPARAM("Performance test string")) , nToDo );
+        rCall->call( OUString("Performance test string") , nToDo );
     }
     osl_getSystemTime( &aEndTime );
 
@@ -506,12 +506,12 @@ double getCallsPerSecOneway( const Reference < XCallMe > &rCall ,
     osl_getSystemTime( &aStartTime );
     for( sal_Int32 i = 0; i < nLoops; i ++ )
     {
-//          rCall->callOneway( OUString( RTL_CONSTASCII_USTRINGPARAM("Performance test string" )), 0 );
+//          rCall->callOneway( OUString("Performance test string" ), 0 );
           rCall->drawLine( 0 , 0 , 500 , 123 );
     }
     osl_getSystemTime( &aEndTime );
 
-    rCall->call( OUString( RTL_CONSTASCII_USTRINGPARAM("Performance test string")) , nToDo );
+    rCall->call( OUString("Performance test string") , nToDo );
     osl_getSystemTime( &aAfterExecution );
 
     double fStart = (double)aStartTime.Seconds + ((double)aStartTime.Nanosec / 1000000000.0);
@@ -577,7 +577,7 @@ void testPerformance( const Reference < XCallMe > &rRemote,
 void testException( const Reference < XCallMe > &r )
 {
     try {
-        r->call( OUString( RTL_CONSTASCII_USTRINGPARAM("dummy")) , -1 );
+        r->call( OUString("dummy") , -1 );
         OSL_ASSERT( ! "no exception flown !" );
     }
     catch( TestBridgeException  & e )
@@ -599,7 +599,7 @@ void testSequenceOfCalls( const Reference< XCallMe > & rRCallMe )
     printf( "Testing sequence of calls\n" );
     for( sal_Int32 i = 0 ; i < 800 ; i ++ )
     {
-        rRCallMe->callOneway( OUString( RTL_CONSTASCII_USTRINGPARAM("hifuj" )), 0 );
+        rRCallMe->callOneway( OUString("hifuj" ), 0 );
     }
 }
 
@@ -622,7 +622,7 @@ void testAllTypes( const Reference < XCallMe > & rRCallMe )
         types.UHyper = 1 << i*2;
         types.Float = (float)123.239;
         types.Double = 1279.12490012;
-        types.String = OUString( RTL_CONSTASCII_USTRINGPARAM("abcdefghijklmnopqrstuvwxyz"));
+        types.String = OUString("abcdefghijklmnopqrstuvwxyz");
         types.Interface = Reference< XInterface >( rRCallMe , UNO_QUERY);
         types.Any <<= types.Double;
 
@@ -761,7 +761,7 @@ Reference <XInterface > createComponent( const OUString &sService ,
         // erst registrieren
         Reference < XImplementationRegistration > rReg (
             rSMgr->createInstance(
-                OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.ImplementationRegistration" ))),
+                OUString( "com.sun.star.registry.ImplementationRegistration" )),
             UNO_QUERY );
 
         OSL_ASSERT( rReg.is() );
@@ -770,7 +770,7 @@ Reference <XInterface > createComponent( const OUString &sService ,
         try
         {
             rReg->registerImplementation(
-                OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.loader.SharedLibrary" )),
+                OUString( "com.sun.star.loader.SharedLibrary" ),
                 aDllName,
                 Reference< XSimpleRegistry > () );
             rInterface = rSMgr->createInstance( sService );
diff --git a/bridges/test/testoffice.cxx b/bridges/test/testoffice.cxx
index 55c28f4d1b0d..3f9157d01c3b 100644
--- a/bridges/test/testoffice.cxx
+++ b/bridges/test/testoffice.cxx
@@ -156,7 +156,7 @@ void testDocument( const Reference < XMultiServiceFactory > & rSmgr )
         Reference< XComponent > rComponent =
             rLoader->loadComponentFromURL(
                 OUString::createFromAscii( urls[i] ) ,
-                OUString( RTL_CONSTASCII_USTRINGPARAM("_blank")),
+                OUString("_blank"),
                 0 ,
                 Sequence < ::com::sun::star::beans::PropertyValue >() );
 
@@ -175,7 +175,7 @@ void doSomething( const  Reference < XInterface > &r )
     {
         printf( "got the remote naming service !\n" );
         Reference < XInterface > rXsmgr = rName->getRegisteredObject(
-            OUString( RTL_CONSTASCII_USTRINGPARAM( "StarOffice.ServiceManager" )) );
+            OUString( "StarOffice.ServiceManager" ) );
 
         Reference < XMultiServiceFactory > rSmgr( rXsmgr , UNO_QUERY );
         if( rSmgr.is() )
@@ -203,22 +203,22 @@ int main( int argc, char *argv[] )
     parseCommandLine( argv , &sConnectionString , &sProtocol , &bLatency , &bReverse );
     {
         Reference< XMultiServiceFactory > rSMgr = createRegistryServiceFactory(
-            OUString( RTL_CONSTASCII_USTRINGPARAM( "client.rdb" )  ) );
+            OUString( "client.rdb" ) );
 
         // just ensure that it is registered
 
         Reference < XConnector > rConnector(
-            createComponent( OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.connection.Connector")),
+            createComponent( OUString("com.sun.star.connection.Connector"),
                              OUString( RTL_CONSTASCII_USTRINGPARAM("connector.uno" SAL_DLLEXTENSION)),
                              rSMgr ),
             UNO_QUERY );
 
-        createComponent( OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.bridge.Bridge.iiop")),
+        createComponent( OUString("com.sun.star.bridge.Bridge.iiop"),
                          OUString( RTL_CONSTASCII_USTRINGPARAM("remotebridge.uno" SAL_DLLEXTENSION)),
                          rSMgr );
 
         Reference < XBridgeFactory > rFactory(
-            createComponent( OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.bridge.BridgeFactory")),
+            createComponent( OUString("com.sun.star.bridge.BridgeFactory"),
                              OUString( RTL_CONSTASCII_USTRINGPARAM("bridgefac.uno" SAL_DLLEXTENSION)),
                              rSMgr ),
             UNO_QUERY );
@@ -231,13 +231,13 @@ int main( int argc, char *argv[] )
                     rConnector->connect( sConnectionString );
 
                 Reference < XBridge > rBridge = rFactory->createBridge(
-                    OUString( RTL_CONSTASCII_USTRINGPARAM("bla blub")),
+                    OUString("bla blub"),
                     sProtocol,
                     rConnection,
                     Reference < XInstanceProvider > () );
 
                 Reference < XInterface > rInitialObject
-                    = rBridge->getInstance( OUString( RTL_CONSTASCII_USTRINGPARAM("NamingService")) );
+                    = rBridge->getInstance( OUString("NamingService") );
 
                 if( rInitialObject.is() )
                 {
diff --git a/bridges/test/testsameprocess.cxx b/bridges/test/testsameprocess.cxx
index 33781aaab08d..00d399b25400 100644
--- a/bridges/test/testsameprocess.cxx
+++ b/bridges/test/testsameprocess.cxx
@@ -94,7 +94,7 @@ void MyThread::run()
             Reference < XBridge > rBridge =
                 m_rBridgeFactory->createBridge(
                     OUString() ,
-                    OUString( RTL_CONSTASCII_USTRINGPARAM("iiop")) ,
+                    OUString("iiop") ,
                     rConnection ,
                     (XInstanceProvider * ) new OInstanceProvider );
 
@@ -119,27 +119,27 @@ int main( int argc, char *argv[] )
 
     {
         Reference< XMultiServiceFactory > rSMgr = createRegistryServiceFactory(
-            OUString( RTL_CONSTASCII_USTRINGPARAM( "client.rdb" )  ) );
+            OUString( "client.rdb" ) );
 
         Reference < XConnector > rConnector(
-            createComponent( OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.connection.Connector")),
+            createComponent( OUString("com.sun.star.connection.Connector"),
                              OUString( RTL_CONSTASCII_USTRINGPARAM("connector.uno" SAL_DLLEXTENSION)),
                              rSMgr ),
             UNO_QUERY );
 
         Reference < XAcceptor > rAcceptor(
-            createComponent( OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.connection.Acceptor")),
+            createComponent( OUString("com.sun.star.connection.Acceptor"),
                              OUString( RTL_CONSTASCII_USTRINGPARAM("acceptor.uno" SAL_DLLEXTENSION)),
                              rSMgr ),
             UNO_QUERY );
 
         // just ensure that it is registered
-//      createComponent( OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.bridge.Bridge.iiop")),
+//      createComponent( OUString("com.sun.star.bridge.Bridge.iiop"),
 //                       OUString( RTL_CONSTASCII_USTRINGPARAM("iiopbrdg" SAL_DLLEXTENSION)),
 //                       rSMgr );
 
         Reference < XBridgeFactory > rFactory(
-            createComponent( OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.bridge.BridgeFactory")),
+            createComponent( OUString("com.sun.star.bridge.BridgeFactory"),
                              OUString( RTL_CONSTASCII_USTRINGPARAM("bridgefac.uno" SAL_DLLEXTENSION)),
                              rSMgr ),
             UNO_QUERY );
@@ -163,13 +163,13 @@ int main( int argc, char *argv[] )
             {
 
                 Reference < XBridge > rBridge = rFactory->createBridge(
-                    OUString( RTL_CONSTASCII_USTRINGPARAM("bla blub")),
-                    OUString( RTL_CONSTASCII_USTRINGPARAM("iiop")),
+                    OUString("bla blub"),
+                    OUString("iiop"),
                     rConnection,
                     Reference < XInstanceProvider > () );
 
                 Reference < XInterface > rInitialObject
-                    = rBridge->getInstance( OUString( RTL_CONSTASCII_USTRINGPARAM("bla")) );
+                    = rBridge->getInstance( OUString("bla") );
 
                 if( rInitialObject.is() )
                 {
@@ -182,7 +182,7 @@ int main( int argc, char *argv[] )
             }
 
             Reference < XBridge > rBridge = rFactory->getBridge(
-                OUString( RTL_CONSTASCII_USTRINGPARAM("bla blub")) );
+                OUString("bla blub") );
             OSL_ASSERT( ! rBridge.is() );
 
         }
diff --git a/bridges/test/testserver.cxx b/bridges/test/testserver.cxx
index d021294da6b0..4617b2350739 100644
--- a/bridges/test/testserver.cxx
+++ b/bridges/test/testserver.cxx
@@ -139,17 +139,17 @@ void MyThread::run()
                 {
                     printf( "doing reverse callme test (test is ok, when on each line a +- appears\n" );
                     Reference < XInterface > r = rBridge->getInstance(
-                        OUString( RTL_CONSTASCII_USTRINGPARAM("blubber"  )));
+                        OUString("blubber"  ));
                     Reference < XTestFactory > rFactory( r , UNO_QUERY );
                     Reference < XCallMe > rCallMe = rFactory->createCallMe();
 
                     for( sal_Int32 i = 0 ; i < 1  ; i ++ )
                     {
                         rCallMe->callOneway(
-                            OUString( RTL_CONSTASCII_USTRINGPARAM("my test string")) , 2 );
+                            OUString("my test string") , 2 );
                     }
                     printf( "all oneway are send\n" );
-                    rCallMe->call( OUString( RTL_CONSTASCII_USTRINGPARAM( "reverse call me test finished" )) , 0 );
+                    rCallMe->call( OUString( "reverse call me test finished" ) , 0 );
                 printf( "revers callme test finished\n" );
                 }
             }
@@ -190,22 +190,22 @@ int main( int argc, char *argv[] )
 
     {
         Reference< XMultiServiceFactory > rSMgr = createRegistryServiceFactory(
-            OUString( RTL_CONSTASCII_USTRINGPARAM( "server.rdb" )  ) );
+            OUString( "server.rdb" ) );
 
         Reference < XBridgeFactory > rBridgeFactory ( createComponent(
-            OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.bridge.BridgeFactory")),
+            OUString("com.sun.star.bridge.BridgeFactory"),
             OUString( RTL_CONSTASCII_USTRINGPARAM("bridgefac.uno" SAL_DLLEXTENSION )),
             rSMgr ),
                                                      UNO_QUERY );
 
 
-        createComponent( OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.bridge.Bridge.iiop")),
+        createComponent( OUString("com.sun.star.bridge.Bridge.iiop"),
                          OUString( RTL_CONSTASCII_USTRINGPARAM("remotebridge.uno" SAL_DLLEXTENSION)),
                          rSMgr );
 
 
         Reference < XAcceptor > rAcceptor(
-            createComponent( OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.connection.Acceptor")),
+            createComponent( OUString("com.sun.star.connection.Acceptor"),
                              OUString( RTL_CONSTASCII_USTRINGPARAM("acceptor.uno" SAL_DLLEXTENSION)),
                              rSMgr ) ,
             UNO_QUERY );