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>

5 files changed, 68 insertions, 74 deletions

diff --git a/testtools/source/bridgetest/bridgetest.cxx b/testtools/source/bridgetest/bridgetest.cxx
index f14a641f1af7..4f268434d321 100644
--- a/testtools/source/bridgetest/bridgetest.cxx
+++ b/testtools/source/bridgetest/bridgetest.cxx
@@ -570,7 +570,7 @@ static sal_Bool performTest(
                 bRet &= check(tps1.member == 12345, "transportPolyHyper");
                 Sequence< Any > seq(2);
                 seq[0] <<= static_cast< sal_uInt32 >(33);
-                seq[1] <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ABC"));
+                seq[1] <<= rtl::OUString("ABC");
                 TestPolyStruct< Sequence< Any > > tps2(seq);
                 TestPolyStruct< Sequence< Any > > tps3;
                 xLBT->transportPolySequence(tps2, tps3);
@@ -595,8 +595,7 @@ static sal_Bool performTest(
                 bRet &= check(
                     (((nullAny.getValueTypeName() ==
                        rtl::OUString(
-                           RTL_CONSTASCII_USTRINGPARAM(
-                               "com.sun.star.uno.XInterface"))) &&
+                               "com.sun.star.uno.XInterface")) &&
                       !static_cast< Reference< XInterface > const * >(
                           nullAny.getValue())->is())
                      || nullAny == Any()),
@@ -658,9 +657,9 @@ static sal_Bool performTest(
         float _arFloat[] = { 1.1f, 2.2f, 3.3f };
         double _arDouble[] = { 1.11, 2.22, 3.33 };
         OUString _arString[] = {
-            OUString(RTL_CONSTASCII_USTRINGPARAM("String 1")),
-            OUString(RTL_CONSTASCII_USTRINGPARAM("String 2")),
-            OUString(RTL_CONSTASCII_USTRINGPARAM("String 3")) };
+            OUString("String 1"),
+            OUString("String 2"),
+            OUString("String 3") };
         sal_Bool _aBool = true;
         sal_Int32 _aInt = 0xBABEBABE;
         float _aFloat = 3.14f;
@@ -1200,15 +1199,15 @@ sal_Int32 TestBridgeImpl::run( const Sequence< OUString > & rArgs )
         if (! xOriginal.is())
         {
             throw RuntimeException(
-                OUString( RTL_CONSTASCII_USTRINGPARAM(
-                              "cannot get test object!") ),
+                OUString(
+                              "cannot get test object!"),
                 Reference< XInterface >() );
         }
         Reference< XBridgeTest > xTest( xOriginal, UNO_QUERY );
         if (! xTest.is())
         {
             throw RuntimeException(
-                OUString( RTL_CONSTASCII_USTRINGPARAM("test object does not implement XBridgeTest!") ),
+                OUString("test object does not implement XBridgeTest!"),
                 Reference< XInterface >() );
         }
 
@@ -1223,7 +1222,7 @@ sal_Int32 TestBridgeImpl::run( const Sequence< OUString > & rArgs )
         if (! bRet)
         {
             throw RuntimeException(
-                OUString( RTL_CONSTASCII_USTRINGPARAM("error: test failed!") ),
+                OUString("error: test failed!"),
                 Reference< XInterface >() );
         }
     }
diff --git a/testtools/source/bridgetest/constructors.cxx b/testtools/source/bridgetest/constructors.cxx
index 400b44bdaac1..a4cf91077601 100644
--- a/testtools/source/bridgetest/constructors.cxx
+++ b/testtools/source/bridgetest/constructors.cxx
@@ -434,7 +434,7 @@ void Impl2::setatt1( double _att1 )throw (::com::sun::star::uno::RuntimeExceptio
 ::rtl::OUString Impl2::fn12( const ::rtl::OUString& arg )
         throw (::com::sun::star::uno::RuntimeException)
 {
-    return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("12")) + arg;
+    return ::rtl::OUString("12") + arg;
 }
 
 css::uno::Reference< css::uno::XInterface > SAL_CALL create(
@@ -447,14 +447,12 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL create(
 
 ::rtl::OUString SAL_CALL getImplementationName() {
     return ::rtl::OUString(
-        RTL_CONSTASCII_USTRINGPARAM(
-            "comp.test.testtools.bridgetest.Constructors"));
+            "comp.test.testtools.bridgetest.Constructors");
 }
 
 css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() {
     css::uno::Sequence< ::rtl::OUString > s(1);
-    s[0] = ::rtl::OUString(
-        RTL_CONSTASCII_USTRINGPARAM("test.testtools.bridgetest.Constructors"));
+    s[0] = ::rtl::OUString("test.testtools.bridgetest.Constructors");
     return s;
 }
 
@@ -468,14 +466,12 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL create2(
 
 ::rtl::OUString SAL_CALL getImplementationName2() {
     return ::rtl::OUString(
-        RTL_CONSTASCII_USTRINGPARAM(
-            "comp.test.testtools.bridgetest.Constructors2"));
+            "comp.test.testtools.bridgetest.Constructors2");
 }
 
 css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames2() {
     css::uno::Sequence< ::rtl::OUString > s(1);
-    s[0] = ::rtl::OUString(
-        RTL_CONSTASCII_USTRINGPARAM("test.testtools.bridgetest.Constructors2"));
+    s[0] = ::rtl::OUString("test.testtools.bridgetest.Constructors2");
     return s;
 }
 
diff --git a/testtools/source/bridgetest/cppobj.cxx b/testtools/source/bridgetest/cppobj.cxx
index 58eae103cb91..9a0c0d7a6bfc 100644
--- a/testtools/source/bridgetest/cppobj.cxx
+++ b/testtools/source/bridgetest/cppobj.cxx
@@ -937,7 +937,7 @@ void Test_Impl::testConstructorsService(
     Sequence< double > arg23(1); arg23[0] = 0.456;
     Sequence< sal_Unicode > arg24(1); arg24[0] = 'X';
     Sequence< OUString > arg25(1);
-    arg25[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("test"));
+    arg25[0] = OUString("test");
     Sequence< Type > arg26(1); arg26[0] = UnoType< Any >::get();
     Sequence< Any > arg27(1); arg27[0] <<= true;
     Sequence< Sequence< sal_Bool > > arg28(1);
@@ -961,7 +961,7 @@ void Test_Impl::testConstructorsService(
         0.123f,
         0.456,
         'X',
-        OUString(RTL_CONSTASCII_USTRINGPARAM("test")),
+        OUString("test"),
         UnoType< Any >::get(),
         makeAny(true),
         arg14,
@@ -1003,7 +1003,7 @@ void Test_Impl::testConstructorsService(
     args[9] <<= 0.456;
     sal_Unicode arg10c = 'X';
     args[10].setValue(&arg10c, UnoType< UnoCharType >::get());
-    args[11] <<= OUString(RTL_CONSTASCII_USTRINGPARAM("test"));
+    args[11] <<= OUString("test");
     args[12] <<= UnoType< Any >::get();
     args[13] <<= true;
     args[14] <<= arg14;
@@ -1053,10 +1053,10 @@ void Test_Impl::testConstructorsService(
     Sequence<TestPolyStruct<TestPolyStruct2<TestPolyStruct2<sal_Unicode, Any>,OUString> > > argSeq8(1);
     argSeq8[0] = TestPolyStruct<TestPolyStruct2<TestPolyStruct2<sal_Unicode, Any>,OUString> > (
         TestPolyStruct2<TestPolyStruct2<sal_Unicode, Any>,OUString>(
-            TestPolyStruct2<sal_Unicode, Any>('X', Any(true)), OUString(RTL_CONSTASCII_USTRINGPARAM("test"))));
+            TestPolyStruct2<sal_Unicode, Any>('X', Any(true)), OUString("test")));
     Sequence<TestPolyStruct2<OUString, TestPolyStruct2<sal_Unicode, TestPolyStruct<Any> > > > argSeq9(1);
     argSeq9[0] = TestPolyStruct2<OUString, TestPolyStruct2<sal_Unicode, TestPolyStruct<Any> > >(
-        OUString(RTL_CONSTASCII_USTRINGPARAM("test")), TestPolyStruct2<sal_Unicode, TestPolyStruct<Any> >(
+        OUString("test"), TestPolyStruct2<sal_Unicode, TestPolyStruct<Any> >(
                      'X', TestPolyStruct<Any>(Any(true))));
     Sequence<TestPolyStruct2<TestPolyStruct2<sal_Unicode, Any>, TestPolyStruct<sal_Unicode> > > argSeq10(1);
     argSeq10[0] = TestPolyStruct2<TestPolyStruct2<sal_Unicode, Any>, TestPolyStruct<sal_Unicode> >(
@@ -1072,11 +1072,11 @@ void Test_Impl::testConstructorsService(
     argSeq13[0] = Sequence<TestPolyStruct<TestPolyStruct2<TestPolyStruct2<sal_Unicode,Any>,OUString> > >(1);
     argSeq13[0][0] = TestPolyStruct<TestPolyStruct2<TestPolyStruct2<sal_Unicode,Any>,OUString> >(
         TestPolyStruct2<TestPolyStruct2<sal_Unicode,Any>,OUString>(
-            TestPolyStruct2<sal_Unicode,Any>('X', Any(true)), OUString(RTL_CONSTASCII_USTRINGPARAM("test"))));
+            TestPolyStruct2<sal_Unicode,Any>('X', Any(true)), OUString("test")));
     Sequence<Sequence<TestPolyStruct2<OUString, TestPolyStruct2<sal_Unicode, TestPolyStruct<Any> > > > > argSeq14(1);
     argSeq14[0] = Sequence<TestPolyStruct2<OUString, TestPolyStruct2<sal_Unicode, TestPolyStruct<Any> > > >(1);
     argSeq14[0][0] = TestPolyStruct2<OUString, TestPolyStruct2<sal_Unicode, TestPolyStruct<Any> > >(
-        OUString(RTL_CONSTASCII_USTRINGPARAM("test")), TestPolyStruct2<sal_Unicode, TestPolyStruct<Any> >(
+        OUString("test"), TestPolyStruct2<sal_Unicode, TestPolyStruct<Any> >(
             'X', TestPolyStruct<Any>(Any(true))));
     Sequence<Sequence<TestPolyStruct2<TestPolyStruct2<sal_Unicode,Any>, TestPolyStruct<sal_Unicode> > > > argSeq15(1);
     argSeq15[0] = Sequence<TestPolyStruct2<TestPolyStruct2<sal_Unicode,Any>, TestPolyStruct<sal_Unicode> > >(1);
@@ -1093,7 +1093,7 @@ void Test_Impl::testConstructorsService(
         TestPolyStruct<sal_Int32>(SAL_MIN_INT32),
         TestPolyStruct<sal_Int64>(SAL_MIN_INT64),
         TestPolyStruct<sal_Unicode>('X'),
-        TestPolyStruct<OUString>(OUString(RTL_CONSTASCII_USTRINGPARAM("test"))),
+        TestPolyStruct<OUString>(OUString("test")),
         TestPolyStruct<float>(0.123f),
         TestPolyStruct<double>(0.456),
         TestPolyStruct<Reference<XInterface> >(static_cast<XBridgeTest2*>(this)),
@@ -1103,9 +1103,9 @@ void Test_Impl::testConstructorsService(
             TestPolyStruct2<sal_Unicode, Any>('X', Any(true))),
         TestPolyStruct<TestPolyStruct2<TestPolyStruct2<sal_Unicode, Any>,OUString> > (
             TestPolyStruct2<TestPolyStruct2<sal_Unicode, Any>,OUString>(
-                TestPolyStruct2<sal_Unicode, Any>('X', Any(true)), OUString(RTL_CONSTASCII_USTRINGPARAM("test")))),
+                TestPolyStruct2<sal_Unicode, Any>('X', Any(true)), OUString("test"))),
         TestPolyStruct2<OUString, TestPolyStruct2<sal_Unicode,TestPolyStruct<Any> > >(
-            OUString(RTL_CONSTASCII_USTRINGPARAM("test")),
+            OUString("test"),
             TestPolyStruct2<sal_Unicode, TestPolyStruct<Any> >('X', TestPolyStruct<Any>(Any(true)))),
         TestPolyStruct2<TestPolyStruct2<sal_Unicode, Any>, TestPolyStruct<sal_Unicode> >(
             TestPolyStruct2<sal_Unicode, Any>('X', Any(true)),
diff --git a/testtools/source/bridgetest/multi.hxx b/testtools/source/bridgetest/multi.hxx
index 0b306ed5fb7f..81f82af25fd5 100644
--- a/testtools/source/bridgetest/multi.hxx
+++ b/testtools/source/bridgetest/multi.hxx
@@ -50,7 +50,7 @@ public:
 
     virtual rtl::OUString SAL_CALL fn12(rtl::OUString const & arg)
         throw (com::sun::star::uno::RuntimeException)
-    { return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("12")) + arg; }
+    { return rtl::OUString("12") + arg; }
 
     virtual sal_Int32 SAL_CALL fn21(sal_Int32 arg)
         throw (com::sun::star::uno::RuntimeException)
@@ -58,7 +58,7 @@ public:
 
     virtual rtl::OUString SAL_CALL fn22(rtl::OUString const & arg)
         throw (com::sun::star::uno::RuntimeException)
-    { return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("22")) + arg; }
+    { return rtl::OUString("22") + arg; }
 
     virtual double SAL_CALL getatt3()
         throw (com::sun::star::uno::RuntimeException)
@@ -74,7 +74,7 @@ public:
 
     virtual rtl::OUString SAL_CALL fn32(rtl::OUString const & arg)
         throw (com::sun::star::uno::RuntimeException)
-    { return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("32")) + arg; }
+    { return rtl::OUString("32") + arg; }
 
     virtual sal_Int32 SAL_CALL fn33()
         throw (com::sun::star::uno::RuntimeException)
@@ -90,7 +90,7 @@ public:
 
     virtual rtl::OUString SAL_CALL fn62(rtl::OUString const & arg)
         throw (com::sun::star::uno::RuntimeException)
-    { return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("62")) + arg; }
+    { return rtl::OUString("62") + arg; }
 
     virtual sal_Int32 SAL_CALL fn71(sal_Int32 arg)
         throw (com::sun::star::uno::RuntimeException)
@@ -98,7 +98,7 @@ public:
 
     virtual rtl::OUString SAL_CALL fn72(rtl::OUString const & arg)
         throw (com::sun::star::uno::RuntimeException)
-    { return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("72")) + arg; }
+    { return rtl::OUString("72") + arg; }
 
     virtual sal_Int32 SAL_CALL fn73()
         throw (com::sun::star::uno::RuntimeException)
diff --git a/testtools/source/performance/ubtest.cxx b/testtools/source/performance/ubtest.cxx
index 838f252e2498..5550547e52b2 100644
--- a/testtools/source/performance/ubtest.cxx
+++ b/testtools/source/performance/ubtest.cxx
@@ -336,33 +336,33 @@ static void createInstance( Reference< T > & rxOut,
                 {
                     // acceptor
                     xSet->insert( makeAny( loadLibComponentFactory(
-                        OUString( RTL_CONSTASCII_USTRINGPARAM("acceptor") ),
-                        OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.stoc.Acceptor") ),
+                        OUString("acceptor"),
+                        OUString("com.sun.star.comp.stoc.Acceptor"),
                         xMgr, Reference< XRegistryKey >() ) ) );
                     // connector
                     xSet->insert( makeAny( loadLibComponentFactory(
-                        OUString( RTL_CONSTASCII_USTRINGPARAM("connectr") ),
-                        OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.stoc.Connector") ),
+                        OUString("connectr"),
+                        OUString("com.sun.star.comp.stoc.Connector"),
                         xMgr, Reference< XRegistryKey >() ) ) );
                     // iiop bridge
                     xSet->insert( makeAny( loadLibComponentFactory(
-                        OUString( RTL_CONSTASCII_USTRINGPARAM("remotebridge") ),
-                        OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.bridge.Bridge.various") ),
+                        OUString("remotebridge"),
+                        OUString("com.sun.star.bridge.Bridge.various"),
                         xMgr, Reference< XRegistryKey >() ) ) );
                     // bridge factory
                     xSet->insert( makeAny( loadLibComponentFactory(
-                        OUString( RTL_CONSTASCII_USTRINGPARAM("brdgfctr") ),
-                        OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.stoc.BridgeFactory") ),
+                        OUString("brdgfctr"),
+                        OUString("com.sun.star.comp.stoc.BridgeFactory"),
                         xMgr, Reference< XRegistryKey >() ) ) );
                     // uno url resolver
                     xSet->insert( makeAny( loadLibComponentFactory(
-                        OUString( RTL_CONSTASCII_USTRINGPARAM("uuresolver") ),
-                        OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.bridge.UnoUrlResolver") ),
+                        OUString("uuresolver"),
+                        OUString("com.sun.star.comp.bridge.UnoUrlResolver"),
                         xMgr, Reference< XRegistryKey >() ) ) );
                     // java loader
 //                      xSet->insert( makeAny( loadLibComponentFactory(
-//                          OUString( RTL_CONSTASCII_USTRINGPARAM("javaloader") ),
-//                          OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.stoc.JavaComponentLoader") ),
+//                          OUString("javaloader"),
+//                          OUString("com.sun.star.comp.stoc.JavaComponentLoader"),
 //                          xMgr, Reference< XRegistryKey >() ) ) );
                 }
                 s_bSet = sal_True;
@@ -478,11 +478,11 @@ Reference< XInterface > TestImpl::getDirect()
         if (! _xDirect.is())
         {
             Reference< XSingleServiceFactory > xFac( loadLibComponentFactory(
-                OUString( RTL_CONSTASCII_USTRINGPARAM("perfobj") ),
-                OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.performance.PerformanceTestObject") ),
+                OUString("perfobj"),
+                OUString("com.sun.star.comp.performance.PerformanceTestObject"),
                 _xSMgr, Reference< XRegistryKey >() ) );
             if (! xFac.is())
-                throw RuntimeException( OUString( RTL_CONSTASCII_USTRINGPARAM("no test object available!") ), Reference< XInterface >() );
+                throw RuntimeException( OUString("no test object available!"), Reference< XInterface >() );
             _xDirect = xFac->createInstance();
         }
     }
@@ -495,7 +495,7 @@ Reference< XInterface > TestImpl::resolveObject( const OUString & rUnoUrl )
     Reference< XUnoUrlResolver > xResolver;
     createInstance(
         xResolver, _xSMgr,
-        OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.bridge.UnoUrlResolver") ) );
+        OUString("com.sun.star.bridge.UnoUrlResolver") );
 
     Reference< XInterface > xResolvedObject( xResolver->resolve( rUnoUrl ) );
 
@@ -569,7 +569,7 @@ static void benchmark(
 {
     Reference< XPerformanceTest > xBench( xInstance, UNO_QUERY );
     if (! xBench.is())
-        throw RuntimeException( OUString( RTL_CONSTASCII_USTRINGPARAM("illegal test object!") ), Reference< XInterface >() );
+        throw RuntimeException( OUString("illegal test object!"), Reference< XInterface >() );
 
     sal_Int64 i;
     sal_uInt32 tStart, tEnd;
@@ -969,7 +969,7 @@ sal_Int32 TestImpl::run( const Sequence< OUString > & rArgs )
 
     try
     {
-        OUString aLoopStr( extractParam( rArgs, OUString( RTL_CONSTASCII_USTRINGPARAM("loop") ) ) );
+        OUString aLoopStr( extractParam( rArgs, OUString("loop") ) );
         if (aLoopStr.getLength())
         {
             sal_Int64 n = aLoopStr.toInt64();
@@ -977,7 +977,7 @@ sal_Int32 TestImpl::run( const Sequence< OUString > & rArgs )
                 nLoop = n;
         }
 
-        OUString aDurationStr( extractParam( rArgs , OUString( RTL_CONSTASCII_USTRINGPARAM("duration" ) ) ) );
+        OUString aDurationStr( extractParam( rArgs , OUString("duration" ) ) );
         if( aDurationStr.getLength() )
         {
             sal_Int64 n = aDurationStr.toInt64();
@@ -985,7 +985,7 @@ sal_Int32 TestImpl::run( const Sequence< OUString > & rArgs )
                 nLoop = nMagicNumberDirect * n;
         }
 
-        OUString aLogStr( extractParam( rArgs, OUString( RTL_CONSTASCII_USTRINGPARAM("log") ) ) );
+        OUString aLogStr( extractParam( rArgs, OUString("log") ) );
         if (aLogStr.getLength())
         {
             if (aLogStr.compareToAscii( "stderr" ) == 0)
@@ -1011,7 +1011,7 @@ sal_Int32 TestImpl::run( const Sequence< OUString > & rArgs )
             }
         }
 
-        OUString aArgStr( extractParam( rArgs, OUString( RTL_CONSTASCII_USTRINGPARAM("opt") ) ) );
+        OUString aArgStr( extractParam( rArgs, OUString("opt") ) );
         if (aArgStr.getLength())
         {
             aArg = aArgStr;
@@ -1061,16 +1061,16 @@ sal_Int32 TestImpl::run( const Sequence< OUString > & rArgs )
                                    aCurrentLanguageBindingName.pData, 0 );
 
             // pseudo mapping uno<->uno: does nothing!
-            Mapping aMapping( aCppEnv.get(), aAnoCppEnv.get(), OUString( RTL_CONSTASCII_USTRINGPARAM("pseudo") ) );
+            Mapping aMapping( aCppEnv.get(), aAnoCppEnv.get(), OUString("pseudo") );
             if (! aMapping.is())
-                throw RuntimeException( OUString( RTL_CONSTASCII_USTRINGPARAM("no pseudo mapping available!") ), Reference< XInterface >() );
+                throw RuntimeException( OUString("no pseudo mapping available!"), Reference< XInterface >() );
 
             Reference< XInterface > xMapped;
             Reference< XInterface > xDirect( getDirect() );
             aMapping.mapInterface( reinterpret_cast< void ** >( &xMapped ), xDirect.get(),
                                    ::getCppuType( &xDirect ) );
             if (! xMapped.is())
-                throw RuntimeException( OUString( RTL_CONSTASCII_USTRINGPARAM("mapping object failed!") ), Reference< XInterface >() );
+                throw RuntimeException( OUString("mapping object failed!"), Reference< XInterface >() );
 
             sal_uInt32 nStart = getSystemTicks();
             benchmark( aSheets[ "mapped in process" ], xMapped, nLoop / 100 );
@@ -1085,22 +1085,22 @@ sal_Int32 TestImpl::run( const Sequence< OUString > & rArgs )
             // start server process
             oslSecurity hSecurity = osl_getCurrentSecurity();
             if (! hSecurity)
-                throw RuntimeException( OUString( RTL_CONSTASCII_USTRINGPARAM("cannot get current security handle!") ), Reference< XInterface >() );
+                throw RuntimeException( OUString("cannot get current security handle!"), Reference< XInterface >() );
 
             OUString aArgs[] = {
-                OUString( RTL_CONSTASCII_USTRINGPARAM("-c") ),
-                OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.performance.PerformanceTestObject") ),
-                OUString( RTL_CONSTASCII_USTRINGPARAM("-l") ),
+                OUString("-c"),
+                OUString("com.sun.star.comp.performance.PerformanceTestObject"),
+                OUString("-l"),
 #ifdef SAL_UNX
-                OUString( RTL_CONSTASCII_USTRINGPARAM("libperfobj.so") ),
+                OUString("libperfobj.so"),
 #else
-                OUString( RTL_CONSTASCII_USTRINGPARAM("perfobj.dll") ),
+                OUString("perfobj.dll"),
 #endif
-                OUString( RTL_CONSTASCII_USTRINGPARAM("-r") ),
-                OUString( RTL_CONSTASCII_USTRINGPARAM("applicat.rdb") ),
-                OUString( RTL_CONSTASCII_USTRINGPARAM("-u") ),
-                OUString( RTL_CONSTASCII_USTRINGPARAM("uno:socket,host=localhost,port=6000;iiop;TestRemoteObject") ),
-                OUString( RTL_CONSTASCII_USTRINGPARAM("--singleaccept") )
+                OUString("-r"),
+                OUString("applicat.rdb"),
+                OUString("-u"),
+                OUString("uno:socket,host=localhost,port=6000;iiop;TestRemoteObject"),
+                OUString("--singleaccept")
             };
             rtl_uString * pArgs[] = {
                 aArgs[0].pData,
@@ -1132,7 +1132,7 @@ sal_Int32 TestImpl::run( const Sequence< OUString > & rArgs )
 
             osl_freeSecurityHandle( hSecurity );
             if (! hProcess)
-                throw RuntimeException( OUString( RTL_CONSTASCII_USTRINGPARAM("cannot start server process!") ), Reference< XInterface >() );
+                throw RuntimeException( OUString("cannot start server process!"), Reference< XInterface >() );
             osl_freeProcessHandle( hProcess );
 
             // wait three seconds
@@ -1141,8 +1141,7 @@ sal_Int32 TestImpl::run( const Sequence< OUString > & rArgs )
             osl_waitThread( &threeSeconds );
 
             // connect and resolve outer process object
-            Reference< XInterface > xResolvedObject( resolveObject( OUString(
-                RTL_CONSTASCII_USTRINGPARAM("uno:socket,host=localhost,port=6000;iiop;TestRemoteObject") ) ) );
+            Reference< XInterface > xResolvedObject( resolveObject( OUString("uno:socket,host=localhost,port=6000;iiop;TestRemoteObject") ) );
 
             benchmark( aSheets[ "remote same host" ], xResolvedObject, nLoop / 300 );
         }
@@ -1152,7 +1151,7 @@ sal_Int32 TestImpl::run( const Sequence< OUString > & rArgs )
         if (aArg.indexOf( 'r' ) >= 0)
         {
             // remote
-            OUString aUnoUrl( extractParam( rArgs, OUString( RTL_CONSTASCII_USTRINGPARAM("url") ) ) );
+            OUString aUnoUrl( extractParam( rArgs, OUString("url") ) );
             if (! aUnoUrl.getLength())
                 throw RuntimeException( OUString( RTL_CONSTASCII_USTRINGPARAM("performance test r(emote) needs additional uno url!") ), Reference< XInterface >() );
 
@@ -1172,7 +1171,7 @@ sal_Int32 TestImpl::run( const Sequence< OUString > & rArgs )
         {
             // java
               benchmark( aSheets[ "java in process" ],
-                       _xSMgr->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.benchmark.JavaTestObject"))),
+                       _xSMgr->createInstance(OUString("com.sun.star.comp.benchmark.JavaTestObject")),
                        nLoop / 1000 );
         }