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>

2 files changed, 20 insertions, 20 deletions

diff --git a/io/test/stm/pipetest.cxx b/io/test/stm/pipetest.cxx
index 67eef0311b5f..44f6244a0915 100644
--- a/io/test/stm/pipetest.cxx
+++ b/io/test/stm/pipetest.cxx
@@ -153,7 +153,7 @@ void OPipeTest::testInvariant( const OUString& TestName, const Reference < XInte
     {
         ERROR_ASSERT( info->supportsService( TestName ), "XServiceInfo test failed" );
         ERROR_ASSERT( ! info->supportsService(
-            OUString( RTL_CONSTASCII_USTRINGPARAM("bla bluzb") ) ), "XServiceInfo test failed" );
+            OUString("bla bluzb") ), "XServiceInfo test failed" );
     }
 
 }
@@ -165,7 +165,7 @@ sal_Int32 OPipeTest::test(
     sal_Int32 hTestHandle)
     throw  (    IllegalArgumentException, RuntimeException)
 {
-    if( OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.Pipe") ) == TestName )  {
+    if( OUString("com.sun.star.io.Pipe") == TestName )  {
         try
         {
             if( 0 == hTestHandle ) {
diff --git a/io/test/stm/testfactreg.cxx b/io/test/stm/testfactreg.cxx
index 4887a066718a..99f9a1404826 100644
--- a/io/test/stm/testfactreg.cxx
+++ b/io/test/stm/testfactreg.cxx
@@ -46,57 +46,57 @@ sal_Bool SAL_CALL component_writeInfo(
             Reference< XRegistryKey > xKey(
                 reinterpret_cast< XRegistryKey * >( pRegistryKey ) );
 
-            OUString str = OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) +
+            OUString str = OUString("/") +
                 OPipeTest_getImplementationName() +
-                OUString( RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES") );
+                OUString("/UNO/SERVICES");
             Reference< XRegistryKey >  xNewKey = xKey->createKey( str );
             xNewKey->createKey( OPipeTest_getServiceName() );
 
-            str = OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) +
+            str = OUString("/") +
                 OPumpTest_getImplementationName() +
-                OUString( RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES") );
+                OUString("/UNO/SERVICES");
             xNewKey = xKey->createKey( str );
             xNewKey->createKey( OPumpTest_getServiceName() );
 
-            str = OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) +
+            str = OUString("/") +
                 ODataStreamTest_getImplementationName(1) +
-                OUString( RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES") );
+                OUString("/UNO/SERVICES");
             xNewKey = xKey->createKey( str );
             xNewKey->createKey( ODataStreamTest_getServiceName(1) );
 
-            str = OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) +
+            str = OUString("/") +
                 ODataStreamTest_getImplementationName(2) +
-                OUString( RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES") );
+                OUString("/UNO/SERVICES");
             xNewKey = xKey->createKey( str );
             xNewKey->createKey( ODataStreamTest_getServiceName(2) );
 
-            str = OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) +
+            str = OUString("/") +
                 OObjectStreamTest_getImplementationName(1) +
-                OUString( RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES") );
+                OUString("/UNO/SERVICES");
             xNewKey = xKey->createKey( str );
             xNewKey->createKey( OObjectStreamTest_getServiceName(1) );
 
-            str = OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) +
+            str = OUString("/") +
                 OObjectStreamTest_getImplementationName(2) +
-                OUString( RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES") );
+                OUString("/UNO/SERVICES");
             xNewKey = xKey->createKey( str );
             xNewKey->createKey( OObjectStreamTest_getServiceName(2) );
 
-            str = OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) +
+            str = OUString("/") +
                 OMarkableOutputStreamTest_getImplementationName() +
-                OUString( RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES") );
+                OUString("/UNO/SERVICES");
             xNewKey = xKey->createKey( str );
             xNewKey->createKey( OMarkableOutputStreamTest_getServiceName() );
 
-            str = OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) +
+            str = OUString("/") +
                 OMarkableInputStreamTest_getImplementationName() +
-                OUString( RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES") );
+                OUString("/UNO/SERVICES");
             xNewKey = xKey->createKey( str );
             xNewKey->createKey( OMarkableInputStreamTest_getServiceName() );
 
-            str = OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) +
+            str = OUString("/") +
                 OMyPersistObject_getImplementationName() +
-                OUString( RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES") );
+                OUString("/UNO/SERVICES");
             xNewKey = xKey->createKey( str );
             xNewKey->createKey( OMyPersistObject_getServiceName() );