targeted string re-work

Change-Id: I6b23bd671c3c090a7c3b60d5301c59da5f9354d5

2 files changed, 42 insertions, 42 deletions

diff --git a/sal/test/unloading/samplelib1.cxx b/sal/test/unloading/samplelib1.cxx
index 78835cdcc7fe..19ec2e28c6e1 100644
--- a/sal/test/unloading/samplelib1.cxx
+++ b/sal/test/unloading/samplelib1.cxx
@@ -106,29 +106,29 @@ static Reference<XInterface> SAL_CALL test1_createInstance(const Reference<XMult
         throw (RuntimeException)
 {
     return Reference<XInterface>( static_cast<XWeak*>( new TestService(
-        OUString( RTL_CONSTASCII_USTRINGPARAM( IMPLNAME1)),
-        OUString( RTL_CONSTASCII_USTRINGPARAM( SERVICENAME1)) )), UNO_QUERY);
+        OUString(  IMPLNAME1),
+        OUString(  SERVICENAME1) )), UNO_QUERY);
 }
 static Reference<XInterface> SAL_CALL test2_createInstance(const Reference<XMultiServiceFactory> & rSMgr)
         throw (RuntimeException)
 {
     return Reference<XInterface>( static_cast<XWeak*>( new TestService(
-        OUString( RTL_CONSTASCII_USTRINGPARAM( IMPLNAME2)),
-        OUString( RTL_CONSTASCII_USTRINGPARAM( SERVICENAME2)) )), UNO_QUERY);
+        OUString(  IMPLNAME2),
+        OUString(  SERVICENAME2) )), UNO_QUERY);
 }
 static Reference<XInterface> SAL_CALL test3_createInstance(const Reference<XMultiServiceFactory> & rSMgr)
         throw (RuntimeException)
 {
     return Reference<XInterface>( static_cast<XWeak*>( new TestService(
-        OUString( RTL_CONSTASCII_USTRINGPARAM( IMPLNAME3)),
-        OUString( RTL_CONSTASCII_USTRINGPARAM( SERVICENAME3)) )), UNO_QUERY);
+        OUString(  IMPLNAME3),
+        OUString(  SERVICENAME3) )), UNO_QUERY);
 }
 static Reference<XInterface> SAL_CALL test4_createInstance(const Reference<XMultiServiceFactory> & rSMgr)
         throw (RuntimeException)
 {
     return Reference<XInterface>( static_cast<XWeak*>( new TestService(
-        OUString( RTL_CONSTASCII_USTRINGPARAM( IMPLNAME4)),
-        OUString( RTL_CONSTASCII_USTRINGPARAM( SERVICENAME4)) )), UNO_QUERY);
+        OUString(  IMPLNAME4),
+        OUString(  SERVICENAME4) )), UNO_QUERY);
 }
 
 
@@ -142,26 +142,26 @@ extern "C" {
             {
                 Reference< XRegistryKey > xNewKey(
                     reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey(
-                        OUString(RTL_CONSTASCII_USTRINGPARAM( "/" IMPLNAME1 "/UNO/SERVICES" )) ) );
+                        OUString( "/" IMPLNAME1 "/UNO/SERVICES" ) ) );
 
-                xNewKey->createKey( OUString( RTL_CONSTASCII_USTRINGPARAM( SERVICENAME1)));
+                xNewKey->createKey( OUString(  SERVICENAME1));
 
                 xNewKey=
                     reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey(
-                        OUString(RTL_CONSTASCII_USTRINGPARAM( "/" IMPLNAME2 "/UNO/SERVICES" )) );
+                        OUString( "/" IMPLNAME2 "/UNO/SERVICES" ) );
 
-                xNewKey->createKey(OUString( RTL_CONSTASCII_USTRINGPARAM( SERVICENAME2)));
+                xNewKey->createKey(OUString(  SERVICENAME2));
                 xNewKey=
                     reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey(
-                        OUString(RTL_CONSTASCII_USTRINGPARAM( "/" IMPLNAME3 "/UNO/SERVICES" ))   );
+                        OUString( "/" IMPLNAME3 "/UNO/SERVICES" )   );
 
-                xNewKey->createKey(OUString( RTL_CONSTASCII_USTRINGPARAM( SERVICENAME3)));
+                xNewKey->createKey(OUString(  SERVICENAME3));
 
                 xNewKey=
                     reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey(
-                        OUString(RTL_CONSTASCII_USTRINGPARAM( "/" IMPLNAME4 "/UNO/SERVICES" ))   );
+                        OUString( "/" IMPLNAME4 "/UNO/SERVICES" )   );
 
-                xNewKey->createKey(OUString( RTL_CONSTASCII_USTRINGPARAM( SERVICENAME4)));
+                xNewKey->createKey(OUString(  SERVICENAME4));
                 return sal_True;
             }
             catch (const InvalidRegistryException &)
@@ -177,14 +177,14 @@ extern "C" {
         void * pRet = 0;
 
 
-        OUString implname1( RTL_CONSTASCII_USTRINGPARAM( IMPLNAME1) );
-        OUString serviceName1( RTL_CONSTASCII_USTRINGPARAM( SERVICENAME1) );
-        OUString implname2( RTL_CONSTASCII_USTRINGPARAM( IMPLNAME2) );
-        OUString serviceName2( RTL_CONSTASCII_USTRINGPARAM( SERVICENAME2) );
-        OUString implname3( RTL_CONSTASCII_USTRINGPARAM( IMPLNAME3) );
-        OUString serviceName3( RTL_CONSTASCII_USTRINGPARAM( SERVICENAME3) );
-        OUString implname4( RTL_CONSTASCII_USTRINGPARAM( IMPLNAME4) );
-        OUString serviceName4( RTL_CONSTASCII_USTRINGPARAM( SERVICENAME4) );
+        OUString implname1(  IMPLNAME1 );
+        OUString serviceName1(  SERVICENAME1 );
+        OUString implname2(  IMPLNAME2 );
+        OUString serviceName2(  SERVICENAME2 );
+        OUString implname3(  IMPLNAME3 );
+        OUString serviceName3(  SERVICENAME3 );
+        OUString implname4(  IMPLNAME4 );
+        OUString serviceName4(  SERVICENAME4 );
 
         if (implname1.equals( OUString::createFromAscii(pImplName)))
         {
diff --git a/sal/test/unloading/samplelib2.cxx b/sal/test/unloading/samplelib2.cxx
index 142472a04cb9..2e7be25aebe0 100644
--- a/sal/test/unloading/samplelib2.cxx
+++ b/sal/test/unloading/samplelib2.cxx
@@ -103,22 +103,22 @@ static Reference<XInterface> SAL_CALL test21_createInstance(const Reference<XMul
         throw (RuntimeException)
 {
     return Reference<XInterface>( static_cast<XWeak*>( new TestService(
-        OUString( RTL_CONSTASCII_USTRINGPARAM( IMPLNAME1)),
-        OUString( RTL_CONSTASCII_USTRINGPARAM( SERVICENAME1)) )), UNO_QUERY);
+        OUString(  IMPLNAME1),
+        OUString(  SERVICENAME1) )), UNO_QUERY);
 }
 static Reference<XInterface> SAL_CALL test22_createInstance(const Reference<XMultiServiceFactory> & rSMgr)
         throw (RuntimeException)
 {
     return Reference<XInterface>( static_cast<XWeak*>( new TestService(
-        OUString( RTL_CONSTASCII_USTRINGPARAM( IMPLNAME2)),
-        OUString( RTL_CONSTASCII_USTRINGPARAM( SERVICENAME2)) )), UNO_QUERY);
+        OUString(  IMPLNAME2),
+        OUString(  SERVICENAME2) )), UNO_QUERY);
 }
 static Reference<XInterface> SAL_CALL test23_createInstance(const Reference<XMultiServiceFactory> & rSMgr)
         throw (RuntimeException)
 {
     return Reference<XInterface>( static_cast<XWeak*>( new TestService(
-        OUString( RTL_CONSTASCII_USTRINGPARAM( IMPLNAME3)),
-        OUString( RTL_CONSTASCII_USTRINGPARAM( SERVICENAME3)) )), UNO_QUERY);
+        OUString(  IMPLNAME3),
+        OUString(  SERVICENAME3) )), UNO_QUERY);
 }
 
 
@@ -132,20 +132,20 @@ extern "C" {
             {
                 Reference< XRegistryKey > xNewKey(
                     reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey(
-                        OUString(RTL_CONSTASCII_USTRINGPARAM( "/" IMPLNAME1 "/UNO/SERVICES" )) ) );
+                        OUString( "/" IMPLNAME1 "/UNO/SERVICES" ) ) );
 
-                xNewKey->createKey( OUString( RTL_CONSTASCII_USTRINGPARAM( SERVICENAME1)));
+                xNewKey->createKey( OUString(  SERVICENAME1));
 
                 xNewKey=
                     reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey(
-                        OUString(RTL_CONSTASCII_USTRINGPARAM( "/" IMPLNAME2 "/UNO/SERVICES" )) );
+                        OUString( "/" IMPLNAME2 "/UNO/SERVICES" ) );
 
-                xNewKey->createKey(OUString( RTL_CONSTASCII_USTRINGPARAM( SERVICENAME2)));
+                xNewKey->createKey(OUString(  SERVICENAME2));
                 xNewKey=
                     reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey(
-                        OUString(RTL_CONSTASCII_USTRINGPARAM( "/" IMPLNAME3 "/UNO/SERVICES" ))   );
+                        OUString( "/" IMPLNAME3 "/UNO/SERVICES" )   );
 
-                xNewKey->createKey(OUString( RTL_CONSTASCII_USTRINGPARAM( SERVICENAME3)));
+                xNewKey->createKey(OUString(  SERVICENAME3));
 
                 return sal_True;
             }
@@ -162,12 +162,12 @@ extern "C" {
         void * pRet = 0;
 
 
-        OUString implname1( RTL_CONSTASCII_USTRINGPARAM( IMPLNAME1) );
-        OUString serviceName1( RTL_CONSTASCII_USTRINGPARAM( SERVICENAME1) );
-        OUString implname2( RTL_CONSTASCII_USTRINGPARAM( IMPLNAME2) );
-        OUString serviceName2( RTL_CONSTASCII_USTRINGPARAM( SERVICENAME2) );
-        OUString implname3( RTL_CONSTASCII_USTRINGPARAM( IMPLNAME3) );
-        OUString serviceName3( RTL_CONSTASCII_USTRINGPARAM( SERVICENAME3) );
+        OUString implname1(  IMPLNAME1 );
+        OUString serviceName1(  SERVICENAME1 );
+        OUString implname2(  IMPLNAME2 );
+        OUString serviceName2(  SERVICENAME2 );
+        OUString implname3(  IMPLNAME3 );
+        OUString serviceName3(  SERVICENAME3 );
 
         if (implname1.equals( OUString::createFromAscii(pImplName)))
         {