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>

5 files changed, 10 insertions, 10 deletions

diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx
index fe2a6a945d08..b303a221f52b 100644
--- a/vcl/unx/generic/app/saldisp.cxx
+++ b/vcl/unx/generic/app/saldisp.cxx
@@ -728,7 +728,7 @@ rtl::OUString SalDisplay::GetKeyNameFromKeySym( KeySym nKeySym ) const
     if( aKeyCode != 0 && aKeyCode != NoSymbol )
     {
         if( !nKeySym )
-            aRet = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "???" ) );
+            aRet = rtl::OUString( "???" );
         else
         {
             aRet = ::vcl_sal::getKeysymReplacementName( aLang, nKeySym );
diff --git a/vcl/unx/generic/app/wmadaptor.cxx b/vcl/unx/generic/app/wmadaptor.cxx
index 76ef59886ac4..b2de7a048333 100644
--- a/vcl/unx/generic/app/wmadaptor.cxx
+++ b/vcl/unx/generic/app/wmadaptor.cxx
@@ -888,8 +888,8 @@ bool WMAdaptor::getWMshouldSwitchWorkspace() const
 
         pWMA->m_bWMshouldSwitchWorkspace = true;
         vcl::SettingsConfigItem* pItem = vcl::SettingsConfigItem::get();
-        rtl::OUString aSetting( pItem->getValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "WM" ) ),
-                                                 rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ShouldSwitchWorkspace" ) ) ) );
+        rtl::OUString aSetting( pItem->getValue( rtl::OUString( "WM" ),
+                                                 rtl::OUString( "ShouldSwitchWorkspace" ) ) );
         if( aSetting.isEmpty() )
         {
             if( m_aWMName.EqualsAscii( "awesome" ) )
@@ -996,7 +996,7 @@ void WMAdaptor::setWMName( X11SalFrame* pFrame, const String& rWMName ) const
 
         if( !aCountry.isEmpty() )
         {
-            aLocaleString += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_"));
+            aLocaleString += ::rtl::OUString("_");
             aLocaleString += aCountry;
         }
         if( !aVariant.isEmpty() )
diff --git a/vcl/unx/generic/printer/ppdparser.cxx b/vcl/unx/generic/printer/ppdparser.cxx
index 80f6056006ed..1e621f18c2ae 100644
--- a/vcl/unx/generic/printer/ppdparser.cxx
+++ b/vcl/unx/generic/printer/ppdparser.cxx
@@ -476,7 +476,7 @@ void PPDParser::initPPDFiles()
         INetURLObject aPPDDir( *ppd_it, INET_PROT_FILE, INetURLObject::ENCODE_ALL );
         scanPPDDir( aPPDDir.GetMainURL( INetURLObject::NO_DECODE ) );
     }
-    if( rPPDCache.pAllPPDFiles->find( OUString( RTL_CONSTASCII_USTRINGPARAM( "SGENPRT" ) ) ) == rPPDCache.pAllPPDFiles->end() )
+    if( rPPDCache.pAllPPDFiles->find( OUString( "SGENPRT" ) ) == rPPDCache.pAllPPDFiles->end() )
     {
         // last try: search in directory of executable (mainly for setup)
         OUString aExe;
@@ -489,7 +489,7 @@ void PPDParser::initPPDFiles()
 #endif
             scanPPDDir( aDir.GetMainURL( INetURLObject::NO_DECODE ) );
 #ifdef DEBUG
-            fprintf( stderr, "SGENPRT %s\n", rPPDCache.pAllPPDFiles->find( OUString( RTL_CONSTASCII_USTRINGPARAM( "SGENPRT" ) ) ) == rPPDCache.pAllPPDFiles->end() ? "not found" : "found" );
+            fprintf( stderr, "SGENPRT %s\n", rPPDCache.pAllPPDFiles->find( OUString( "SGENPRT" ) ) == rPPDCache.pAllPPDFiles->end() ? "not found" : "found" );
 #endif
         }
     }
@@ -1978,7 +1978,7 @@ int PPDContext::getRenderResolution() const
 void PPDContext::getPageSize( rtl::OUString& rPaper, int& rWidth, int& rHeight ) const
 {
     // initialize to reasonable default, if parser is not set
-    rPaper  = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "A4" ) );
+    rPaper  = rtl::OUString( "A4" );
     rWidth  = 595;
     rHeight = 842;
     if( m_pParser )
diff --git a/vcl/unx/generic/printer/printerinfomanager.cxx b/vcl/unx/generic/printer/printerinfomanager.cxx
index 133a342ce282..3f3353259189 100644
--- a/vcl/unx/generic/printer/printerinfomanager.cxx
+++ b/vcl/unx/generic/printer/printerinfomanager.cxx
@@ -1244,8 +1244,8 @@ static void lpgetSysQueueTokenHandler(
     rtl_TextEncoding aEncoding = osl_getThreadTextEncoding();
     boost::unordered_set< OUString, OUStringHash > aUniqueSet;
     boost::unordered_set< OUString, OUStringHash > aOnlySet;
-    aUniqueSet.insert( OUString( RTL_CONSTASCII_USTRINGPARAM( "_all" ) ) );
-    aUniqueSet.insert( OUString( RTL_CONSTASCII_USTRINGPARAM( "_default" ) ) );
+    aUniqueSet.insert( OUString( "_all" ) );
+    aUniqueSet.insert( OUString( "_default" ) );
 
     // the eventual "all" attribute of the "_all" queue tells us, which
     // printers are to be used for this user at all
diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx
index 524717b558c1..6b284669ed30 100644
--- a/vcl/unx/generic/window/salframe.cxx
+++ b/vcl/unx/generic/window/salframe.cxx
@@ -2882,7 +2882,7 @@ void X11SalFrame::beginUnicodeSequence()
     if( !rSeq.isEmpty() )
         endUnicodeSequence();
 
-    rSeq = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "u" ) );
+    rSeq = rtl::OUString( "u" );
 
     if( ! aDeleteWatch.isDeleted() )
     {