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>

8 files changed, 29 insertions, 30 deletions

diff --git a/vcl/aqua/source/app/salsys.cxx b/vcl/aqua/source/app/salsys.cxx
index 60bd5b42d599..7cf724ccf539 100644
--- a/vcl/aqua/source/app/salsys.cxx
+++ b/vcl/aqua/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.isEmpty() ? nil : CreateNSString( aText);
diff --git a/vcl/aqua/source/dtrans/DragSource.cxx b/vcl/aqua/source/dtrans/DragSource.cxx
index f4b2df42b87b..36b6a9fca71c 100644
--- a/vcl/aqua/source/dtrans/DragSource.cxx
+++ b/vcl/aqua/source/dtrans/DragSource.cxx
@@ -63,12 +63,12 @@ bool DragSource::g_DropSuccess = false;
 
 OUString dragSource_getImplementationName()
 {
-  return OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.datatransfer.dnd.OleDragSource_V1"));
+  return OUString("com.sun.star.comp.datatransfer.dnd.OleDragSource_V1");
 }
 
 Sequence<OUString> dragSource_getSupportedServiceNames()
 {
-  return makeSequence(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.datatransfer.dnd.OleDragSource")));
+  return makeSequence(OUString("com.sun.star.datatransfer.dnd.OleDragSource"));
 }
 
 
@@ -179,7 +179,7 @@ void SAL_CALL DragSource::initialize(const Sequence< Any >& aArguments)
 {
   if (aArguments.getLength() < 2)
     {
-      throw Exception(OUString(RTL_CONSTASCII_USTRINGPARAM("DragSource::initialize: Not enough parameter.")),
+      throw Exception(OUString("DragSource::initialize: Not enough parameter."),
                       static_cast<OWeakObject*>(this));
     }
 
@@ -197,13 +197,13 @@ void SAL_CALL DragSource::initialize(const Sequence< Any >& aArguments)
   if (![mView respondsToSelector: @selector(registerMouseEventListener:)] ||
       ![mView respondsToSelector: @selector(unregisterMouseEventListener:)])
     {
-      throw Exception(OUString(RTL_CONSTASCII_USTRINGPARAM("DragSource::initialize: Provided view doesn't support mouse listener")),
+      throw Exception(OUString("DragSource::initialize: Provided view doesn't support mouse listener"),
                       static_cast<OWeakObject*>(this));
     }
   NSWindow* pWin = [mView window];
   if( ! pWin || ![pWin respondsToSelector: @selector(getSalFrame)] )
   {
-      throw Exception(OUString(RTL_CONSTASCII_USTRINGPARAM("DragSource::initialize: Provided view is not attached to a vcl frame")),
+      throw Exception(OUString("DragSource::initialize: Provided view is not attached to a vcl frame"),
                       static_cast<OWeakObject*>(this));
   }
   mpFrame = (AquaSalFrame*)[pWin performSelector: @selector(getSalFrame)];
@@ -212,7 +212,7 @@ void SAL_CALL DragSource::initialize(const Sequence< Any >& aArguments)
 
   if (mDragSourceHelper == nil)
     {
-      throw Exception(OUString(RTL_CONSTASCII_USTRINGPARAM("DragSource::initialize: Cannot initialize DragSource")),
+      throw Exception(OUString("DragSource::initialize: Cannot initialize DragSource"),
                       static_cast<OWeakObject*>(this));
     }
 
diff --git a/vcl/aqua/source/dtrans/DropTarget.cxx b/vcl/aqua/source/dtrans/DropTarget.cxx
index 1b4751877c7c..1eeebc520186 100644
--- a/vcl/aqua/source/dtrans/DropTarget.cxx
+++ b/vcl/aqua/source/dtrans/DropTarget.cxx
@@ -56,13 +56,13 @@ using ::rtl::OUString;
 
 OUString dropTarget_getImplementationName()
 {
-  return OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.datatransfer.dnd.OleDropTarget_V1"));
+  return OUString("com.sun.star.comp.datatransfer.dnd.OleDropTarget_V1");
 }
 
 
 Sequence<OUString> dropTarget_getSupportedServiceNames()
 {
-  return makeSequence(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.datatransfer.dnd.OleDropTarget")));
+  return makeSequence(OUString("com.sun.star.datatransfer.dnd.OleDropTarget"));
 }
 
 
@@ -385,7 +385,7 @@ void DropTarget::concludeDragOperation(id /*sender*/)
   {
     if (aArguments.getLength() < 2)
       {
-        throw RuntimeException(OUString(RTL_CONSTASCII_USTRINGPARAM("DropTarget::initialize: Cannot install window event handler")),
+        throw RuntimeException(OUString("DropTarget::initialize: Cannot install window event handler"),
                                static_cast<OWeakObject*>(this));
       }
 
diff --git a/vcl/aqua/source/dtrans/OSXTransferable.cxx b/vcl/aqua/source/dtrans/OSXTransferable.cxx
index 6d7ef1b8ed15..5d541972f82b 100644
--- a/vcl/aqua/source/dtrans/OSXTransferable.cxx
+++ b/vcl/aqua/source/dtrans/OSXTransferable.cxx
@@ -70,7 +70,7 @@ Any SAL_CALL OSXTransferable::getTransferData( const DataFlavor& aFlavor )
 {
   if (!isValidFlavor(aFlavor) || !isDataFlavorSupported(aFlavor))
     {
-      throw UnsupportedFlavorException(OUString(RTL_CONSTASCII_USTRINGPARAM("AquaClipboard: Unsupported data flavor")),
+      throw UnsupportedFlavorException(OUString("AquaClipboard: Unsupported data flavor"),
                                        static_cast<XTransferable*>(this));
     }
 
@@ -93,7 +93,7 @@ Any SAL_CALL OSXTransferable::getTransferData( const DataFlavor& aFlavor )
 
   if (dp.get() == NULL)
     {
-      throw UnsupportedFlavorException(OUString(RTL_CONSTASCII_USTRINGPARAM("AquaClipboard: Unsupported data flavor")),
+      throw UnsupportedFlavorException(OUString("AquaClipboard: Unsupported data flavor"),
                                        static_cast<XTransferable*>(this));
     }
 
@@ -131,7 +131,7 @@ void OSXTransferable::initClipboardItemList()
 
   if (pboardFormats == NULL)
     {
-      throw RuntimeException(OUString(RTL_CONSTASCII_USTRINGPARAM("AquaClipboard: Cannot get clipboard data")),
+      throw RuntimeException(OUString("AquaClipboard: Cannot get clipboard data"),
                              static_cast<XTransferable*>(this));
     }
 
diff --git a/vcl/aqua/source/dtrans/aqua_clipboard.cxx b/vcl/aqua/source/dtrans/aqua_clipboard.cxx
index 87a7b6d10f74..0db1318695de 100644
--- a/vcl/aqua/source/dtrans/aqua_clipboard.cxx
+++ b/vcl/aqua/source/dtrans/aqua_clipboard.cxx
@@ -72,12 +72,12 @@ using ::rtl::OUString;
 
 OUString clipboard_getImplementationName()
 {
-  return OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.datatransfer.clipboard.AquaClipboard"));
+  return OUString("com.sun.star.datatransfer.clipboard.AquaClipboard");
 }
 
 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 @@ AquaClipboard::AquaClipboard(NSPasteboard* pasteboard, bool bUseSystemPasteboard
 
       if (mPasteboard == nil)
         {
-          throw RuntimeException(OUString(
-                RTL_CONSTASCII_USTRINGPARAM("AquaClipboard: Cannot create Cocoa pasteboard")),
+          throw RuntimeException(OUString("AquaClipboard: Cannot create Cocoa pasteboard"),
                 static_cast<XClipboardEx*>(this));
         }
     }
@@ -118,7 +117,7 @@ AquaClipboard::AquaClipboard(NSPasteboard* pasteboard, bool bUseSystemPasteboard
       [mPasteboard release];
 
       throw RuntimeException(
-            OUString(RTL_CONSTASCII_USTRINGPARAM("AquaClipboard: Cannot create pasteboard change listener")),
+            OUString("AquaClipboard: Cannot create pasteboard change listener"),
             static_cast<XClipboardEx*>(this));
     }
 
@@ -215,7 +214,7 @@ void SAL_CALL AquaClipboard::addClipboardListener(const Reference< XClipboardLis
   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);
@@ -228,7 +227,7 @@ void SAL_CALL AquaClipboard::removeClipboardListener(const Reference< XClipboard
   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/aqua/source/gdi/salprn.cxx b/vcl/aqua/source/gdi/salprn.cxx
index dab0bb9a9ecf..d27361a81f7d 100644
--- a/vcl/aqua/source/gdi/salprn.cxx
+++ b/vcl/aqua/source/gdi/salprn.cxx
@@ -400,7 +400,7 @@ sal_Bool AquaSalInfoPrinter::StartJob( const rtl::OUString* i_pFileName,
 
     // do we want a progress panel ?
     sal_Bool bShowProgressPanel = sal_True;
-    beans::PropertyValue* pMonitor = i_rController.getValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MonitorVisible" ) ) );
+    beans::PropertyValue* pMonitor = i_rController.getValue( rtl::OUString( "MonitorVisible" ) );
     if( pMonitor )
         pMonitor->Value >>= bShowProgressPanel;
     if( ! i_rController.isShowDialogs() )
@@ -408,7 +408,7 @@ sal_Bool AquaSalInfoPrinter::StartJob( const rtl::OUString* i_pFileName,
 
     // possibly create one job for collated output
     sal_Bool bSinglePrintJobs = sal_False;
-    beans::PropertyValue* pSingleValue = i_rController.getValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintCollateAsSingleJobs" ) ) );
+    beans::PropertyValue* pSingleValue = i_rController.getValue( rtl::OUString( "PrintCollateAsSingleJobs" ) );
     if( pSingleValue )
     {
         pSingleValue->Value >>= bSinglePrintJobs;
diff --git a/vcl/aqua/source/window/salframe.cxx b/vcl/aqua/source/window/salframe.cxx
index da36cfab633f..10eb3c24e067 100644
--- a/vcl/aqua/source/window/salframe.cxx
+++ b/vcl/aqua/source/window/salframe.cxx
@@ -1079,7 +1079,7 @@ rtl::OUString AquaSalFrame::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 ) );
diff --git a/vcl/aqua/source/window/salmenu.cxx b/vcl/aqua/source/window/salmenu.cxx
index 953c38653772..72cd828c3628 100644
--- a/vcl/aqua/source/window/salmenu.cxx
+++ b/vcl/aqua/source/window/salmenu.cxx
@@ -63,9 +63,9 @@ const AquaSalMenu* AquaSalMenu::pCurrentMenuBar = NULL;
     {
         rtl::OUString aDialog;
         if( nDialog == SHOWDIALOG_ID_ABOUT )
-            aDialog = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ABOUT"));
+            aDialog = rtl::OUString("ABOUT");
         else if( nDialog == SHOWDIALOG_ID_PREFERENCES )
-            aDialog = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PREFERENCES"));
+            aDialog = rtl::OUString("PREFERENCES");
         const ApplicationEvent* pAppEvent = new ApplicationEvent(
             ApplicationEvent::TYPE_SHOWDIALOG, aDialog);
         AquaSalInstance::aAppEventList.push_back( pAppEvent );