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>

4 files changed, 16 insertions, 17 deletions

diff --git a/vcl/ios/source/app/salsys.cxx b/vcl/ios/source/app/salsys.cxx
index c5dfabb9fd34..37ac4e4d99b1 100644
--- a/vcl/ios/source/app/salsys.cxx
+++ b/vcl/ios/source/app/salsys.cxx
@@ -108,12 +108,12 @@ static NSString* getStandardString( int nButtonId, bool bUseResources )
     {
         switch( nButtonId )
         {
-        case BUTTON_OK:         aText = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "OK" ) );break;
-        case BUTTON_ABORT:      aText = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Abort" ) );break;
-        case BUTTON_CANCEL:     aText = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Cancel" ) );break;
-        case BUTTON_RETRY:      aText = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Retry" ) );break;
-        case BUTTON_YES:        aText = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Yes" ) );break;
-        case BUTTON_NO :        aText = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "No" ) );break;
+        case BUTTON_OK:         aText = rtl::OUString( "OK" );break;
+        case BUTTON_ABORT:      aText = rtl::OUString( "Abort" );break;
+        case BUTTON_CANCEL:     aText = rtl::OUString( "Cancel" );break;
+        case BUTTON_RETRY:      aText = rtl::OUString( "Retry" );break;
+        case BUTTON_YES:        aText = rtl::OUString( "Yes" );break;
+        case BUTTON_NO :        aText = rtl::OUString( "No" );break;
         }
     }
     return aText.getLength() ? CreateNSString( aText) : nil;
diff --git a/vcl/ios/source/dtrans/iOSTransferable.cxx b/vcl/ios/source/dtrans/iOSTransferable.cxx
index 1f335403d1ff..2ff71156c01d 100644
--- a/vcl/ios/source/dtrans/iOSTransferable.cxx
+++ b/vcl/ios/source/dtrans/iOSTransferable.cxx
@@ -66,11 +66,11 @@ Any SAL_CALL iOSTransferable::getTransferData( const DataFlavor& aFlavor )
 {
   if (!isValidFlavor(aFlavor) || !isDataFlavorSupported(aFlavor))
     {
-      throw UnsupportedFlavorException(OUString(RTL_CONSTASCII_USTRINGPARAM("IosClipboard: Unsupported data flavor")),
+      throw UnsupportedFlavorException(OUString("IosClipboard: Unsupported data flavor"),
                                        static_cast<XTransferable*>(this));
     }
 
-  throw UnsupportedFlavorException(OUString(RTL_CONSTASCII_USTRINGPARAM("IosClipboard: Unsupported data flavor")),
+  throw UnsupportedFlavorException(OUString("IosClipboard: Unsupported data flavor"),
                                    static_cast<XTransferable*>(this));
   // ???
   return Any();
@@ -107,7 +107,7 @@ void iOSTransferable::initClipboardItemList()
 
   if (pboardFormats == NULL)
     {
-      throw RuntimeException(OUString(RTL_CONSTASCII_USTRINGPARAM("IosClipboard: Cannot get clipboard data")),
+      throw RuntimeException(OUString("IosClipboard: Cannot get clipboard data"),
                              static_cast<XTransferable*>(this));
     }
 
diff --git a/vcl/ios/source/dtrans/ios_clipboard.cxx b/vcl/ios/source/dtrans/ios_clipboard.cxx
index 03e493713bef..a7fc7af8ff9d 100644
--- a/vcl/ios/source/dtrans/ios_clipboard.cxx
+++ b/vcl/ios/source/dtrans/ios_clipboard.cxx
@@ -71,12 +71,12 @@ using ::rtl::OUString;
 
 OUString clipboard_getImplementationName()
 {
-  return OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.datatransfer.clipboard.IosClipboard"));
+  return OUString("com.sun.star.datatransfer.clipboard.IosClipboard");
 }
 
 Sequence<OUString> clipboard_getSupportedServiceNames()
 {
-  return makeSequence(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.datatransfer.clipboard.SystemClipboard")));
+  return makeSequence(OUString("com.sun.star.datatransfer.clipboard.SystemClipboard"));
 }
 
 
@@ -103,8 +103,7 @@ IosClipboard::IosClipboard(UIPasteboard* pasteboard, bool bUseSystemPasteboard)
 
       if (mPasteboard == nil)
         {
-          throw RuntimeException(OUString(
-                RTL_CONSTASCII_USTRINGPARAM("IosClipboard: Cannot create pasteboard")),
+          throw RuntimeException(OUString("IosClipboard: Cannot create pasteboard"),
                 static_cast<XClipboardEx*>(this));
         }
     }
@@ -118,7 +117,7 @@ IosClipboard::IosClipboard(UIPasteboard* pasteboard, bool bUseSystemPasteboard)
       [mPasteboard release];
 
       throw RuntimeException(
-            OUString(RTL_CONSTASCII_USTRINGPARAM("IosClipboard: Cannot create pasteboard change listener")),
+            OUString("IosClipboard: Cannot create pasteboard change listener"),
             static_cast<XClipboardEx*>(this));
     }
 
@@ -216,7 +215,7 @@ void SAL_CALL IosClipboard::addClipboardListener(const Reference< XClipboardList
   MutexGuard aGuard(m_aMutex);
 
   if (!listener.is())
-     throw IllegalArgumentException(OUString(RTL_CONSTASCII_USTRINGPARAM("empty reference")),
+     throw IllegalArgumentException(OUString("empty reference"),
                                    static_cast<XClipboardEx*>(this), 1);
 
   mClipboardListeners.push_back(listener);
@@ -229,7 +228,7 @@ void SAL_CALL IosClipboard::removeClipboardListener(const Reference< XClipboardL
   MutexGuard aGuard(m_aMutex);
 
   if (!listener.is())
-     throw IllegalArgumentException(OUString(RTL_CONSTASCII_USTRINGPARAM("empty reference")),
+     throw IllegalArgumentException(OUString("empty reference"),
                                    static_cast<XClipboardEx*>(this), 1);
 
   mClipboardListeners.remove(listener);
diff --git a/vcl/ios/source/window/salframe.cxx b/vcl/ios/source/window/salframe.cxx
index e619111ac768..43cc7ba24a45 100644
--- a/vcl/ios/source/window/salframe.cxx
+++ b/vcl/ios/source/window/salframe.cxx
@@ -635,7 +635,7 @@ rtl::OUString IosSalFrame::GetKeyName( sal_uInt16 nKeyCode )
         aKeyMap[ KEY_PAGEUP ]   = rtl::OUString( sal_Unicode( 0x21de ) );
         aKeyMap[ KEY_PAGEDOWN ] = rtl::OUString( sal_Unicode( 0x21df ) );
         aKeyMap[ KEY_RETURN ]   = rtl::OUString( sal_Unicode( 0x21a9 ) );
-        aKeyMap[ KEY_ESCAPE ]   = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "esc" ) );
+        aKeyMap[ KEY_ESCAPE ]   = rtl::OUString( "esc" );
         aKeyMap[ KEY_TAB ]      = rtl::OUString( sal_Unicode( 0x21e5 ) );
         aKeyMap[ KEY_BACKSPACE ]= rtl::OUString( sal_Unicode( 0x232b ) );
         aKeyMap[ KEY_SPACE ]    = rtl::OUString( sal_Unicode( 0x2423 ) );