From 8b27d78b4afaa9c47ca0fda144c8060f2f14046b Mon Sep 17 00:00:00 2001
From: Thomas Arnhold <thomas@arnhold.org>
Date: Tue, 19 Mar 2013 09:22:44 +0100
Subject: 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>
---
 extensions/test/ole/cpnt/cpnt.cxx            | 12 ++++++------
 extensions/test/ole/unloading/unloadTest.cxx |  8 ++++----
 2 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'extensions/test')

diff --git a/extensions/test/ole/cpnt/cpnt.cxx b/extensions/test/ole/cpnt/cpnt.cxx
index 8079d76a58f4..9d7a0ce5f922 100644
--- a/extensions/test/ole/cpnt/cpnt.cxx
+++ b/extensions/test/ole/cpnt/cpnt.cxx
@@ -1045,7 +1045,7 @@ Reference<XInvocation > SAL_CALL OComponent::in_methodInvocation( const Referenc
     Sequence<sal_Int16> outIndex;
     Sequence<Any> outParams;
     try{
-    inv->invoke( OUString(RTL_CONSTASCII_USTRINGPARAM("disposing")),
+    inv->invoke( OUString("disposing"),
                 params, outIndex, outParams);
     }catch(IllegalArgumentException &) {
     }
@@ -1065,8 +1065,8 @@ SimpleStruct SAL_CALL OComponent::in_methodStruct( const SimpleStruct& aStruct )
         throw (RuntimeException)
 {
     SimpleStruct& s= const_cast<SimpleStruct&>(aStruct);
-    s.message= s.message + OUString(RTL_CONSTASCII_USTRINGPARAM(
-        "This string was set in OleTest"));
+    s.message= s.message + OUString(
+        "This string was set in OleTest");
     return aStruct;
 }
 void SAL_CALL OComponent::in_methodAll(
@@ -1493,7 +1493,7 @@ void SAL_CALL OComponent::testInterface(  const Reference< XCallback >& xCallbac
         if( any.getValueTypeClass() == TypeClass_STRUCT)
         {
             SimpleStruct* pStruct= ( SimpleStruct*) any.getValue();
-            pStruct->message= OUString(RTL_CONSTASCII_USTRINGPARAM("This struct was created in OleTest"));
+            pStruct->message= OUString("This struct was created in OleTest");
 
             SimpleStruct aStruct;
             any >>= aStruct;
@@ -1641,7 +1641,7 @@ void SAL_CALL OComponent::testInterface(  const Reference< XCallback >& xCallbac
             if( any.getValueTypeClass() == TypeClass_STRUCT)
             {
                 SimpleStruct* pStruct= ( SimpleStruct*) any.getValue();
-                pStruct->message= OUString(RTL_CONSTASCII_USTRINGPARAM("This struct was created in OleTest"));
+                pStruct->message= OUString("This struct was created in OleTest");
                 any >>= aStruct;
             }
         }
@@ -1797,7 +1797,7 @@ void SAL_CALL OComponent::testInterface(  const Reference< XCallback >& xCallbac
                 if( any.getValueTypeClass() == TypeClass_STRUCT)
                 {
                     SimpleStruct* pStruct= ( SimpleStruct*) any.getValue();
-                    pStruct->message= OUString(RTL_CONSTASCII_USTRINGPARAM("This struct was created in OleTest"));
+                    pStruct->message= OUString("This struct was created in OleTest");
                     any >>= aStruct;
                 }
             }
diff --git a/extensions/test/ole/unloading/unloadTest.cxx b/extensions/test/ole/unloading/unloadTest.cxx
index f07f8b48a059..435042c6f115 100644
--- a/extensions/test/ole/unloading/unloadTest.cxx
+++ b/extensions/test/ole/unloading/unloadTest.cxx
@@ -61,7 +61,7 @@ sal_Bool test1()
 {
     printf("\n Test1:  com.sun.star.bridge.oleautomation.BridgeSupplier\n");
     Reference<XSimpleRegistry> xreg= createSimpleRegistry();
-    xreg->open( OUString( RTL_CONSTASCII_USTRINGPARAM("services.rdb")),
+    xreg->open( OUString("services.rdb"),
                                sal_False, sal_False );
 
     Reference< XComponentContext > context= bootstrap_InitialComponentContext(xreg);
@@ -96,7 +96,7 @@ sal_Bool test2()
 {
     printf("Test2:  com.sun.star.bridge.OleBridgeSupplierVar1\n");
     Reference<XSimpleRegistry> xreg= createSimpleRegistry();
-    xreg->open( OUString( RTL_CONSTASCII_USTRINGPARAM("services.rdb")),
+    xreg->open( OUString("services.rdb"),
                                sal_False, sal_False );
 
     Reference< XComponentContext > context= bootstrap_InitialComponentContext(xreg);
@@ -129,7 +129,7 @@ sal_Bool test3()
 {
     printf("Test3:  com.sun.star.bridge.oleautomation.Factory\n");
     Reference<XSimpleRegistry> xreg= createSimpleRegistry();
-    xreg->open( OUString( RTL_CONSTASCII_USTRINGPARAM("services.rdb")),
+    xreg->open( OUString("services.rdb"),
                 sal_False, sal_False );
 
     Reference< XComponentContext > context= bootstrap_InitialComponentContext(xreg);
@@ -173,7 +173,7 @@ sal_Bool test4()
     {
     printf("Test4:  com.sun.star.bridge.oleautomation.ApplicationRegistration\n");
        Reference<XSimpleRegistry> xreg= createSimpleRegistry();
-    xreg->open( OUString( RTL_CONSTASCII_USTRINGPARAM("services.rdb")),
+    xreg->open( OUString("services.rdb"),
                                sal_False, sal_False );
 
     Reference< XComponentContext > context= bootstrap_InitialComponentContext(xreg);
-- 
cgit