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>

11 files changed, 71 insertions, 71 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() )
     {
diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
index 0527a827156d..290020883ee1 100644
--- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
+++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
@@ -906,7 +906,7 @@ uno::Sequence<rtl::OUString> SAL_CALL SalGtkFilePicker::getSelectedFiles() throw
             if( !bExtensionTypedIn && ( sToken != "*" ) )
             {
                 //if the filename does not already have the auto extension, stick it on
-                OUString sExtension = OUString(RTL_CONSTASCII_USTRINGPARAM( "." )) + sToken;
+                OUString sExtension = OUString( "." ) + sToken;
                 OUString &rBase = aSelectedFiles[nIndex];
                 sal_Int32 nExtensionIdx = rBase.getLength() - sExtension.getLength();
                 OSL_TRACE( "idx are %d %d", rBase.lastIndexOf( sExtension ), nExtensionIdx );
@@ -1469,7 +1469,7 @@ void SalGtkFilePicker::implChangeType( GtkTreeSelection *selection )
     {
         gchar *title;
         gtk_tree_model_get (model, &iter, 2, &title, -1);
-        aLabel += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ": " ));
+        aLabel += rtl::OUString( ": " );
         aLabel += rtl::OUString( title, strlen(title), RTL_TEXTENCODING_UTF8 );
         g_free (title);
     }
@@ -1604,7 +1604,7 @@ void SAL_CALL SalGtkFilePicker::initialize( const uno::Sequence<uno::Any>& aArgu
     uno::Any aAny;
     if( 0 == aArguments.getLength() )
         throw lang::IllegalArgumentException(
-            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "no arguments" )),
+            rtl::OUString( "no arguments" ),
             static_cast<XFilePicker2*>( this ), 1 );
 
     aAny = aArguments[0];
@@ -1612,7 +1612,7 @@ void SAL_CALL SalGtkFilePicker::initialize( const uno::Sequence<uno::Any>& aArgu
     if( ( aAny.getValueType() != ::getCppuType( ( sal_Int16* )0 ) ) &&
          (aAny.getValueType() != ::getCppuType( ( sal_Int8* )0 ) ) )
          throw lang::IllegalArgumentException(
-            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "invalid argument type" )),
+            rtl::OUString( "invalid argument type" ),
             static_cast<XFilePicker2*>( this ), 1 );
 
     sal_Int16 templateId = -1;
@@ -1701,7 +1701,7 @@ void SAL_CALL SalGtkFilePicker::initialize( const uno::Sequence<uno::Any>& aArgu
                 break;
         default:
                 throw lang::IllegalArgumentException(
-                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Unknown template" )),
+                rtl::OUString( "Unknown template" ),
                 static_cast< XFilePicker2* >( this ),
                 1 );
     }
@@ -1855,7 +1855,7 @@ GtkFileFilter* SalGtkFilePicker::implAddFilter( const OUString& rFilter, const O
             if (!aToken.isEmpty())
             {
                 if (!aTokens.isEmpty())
-                    aTokens += OUString(RTL_CONSTASCII_USTRINGPARAM(","));
+                    aTokens += OUString(",");
                 aTokens = aTokens += aToken;
                 gtk_file_filter_add_custom (filter, GTK_FILE_FILTER_URI,
                     case_insensitive_filter,
diff --git a/vcl/unx/gtk/fpicker/SalGtkPicker.cxx b/vcl/unx/gtk/fpicker/SalGtkPicker.cxx
index 6d5a9c68bcce..3f8b67bbacd3 100644
--- a/vcl/unx/gtk/fpicker/SalGtkPicker.cxx
+++ b/vcl/unx/gtk/fpicker/SalGtkPicker.cxx
@@ -66,7 +66,7 @@ rtl::OUString SalGtkPicker::uritounicode(const gchar* pIn)
         }
         else
         {
-            OUString aNewURL = uno::Reference<uri::XExternalUriReferenceTranslator>(uno::Reference<XMultiComponentFactory>(comphelper::getProcessServiceFactory(), UNO_QUERY_THROW)->createInstanceWithContext(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uri.ExternalUriReferenceTranslator")), m_xContext), UNO_QUERY_THROW)->translateToInternal(sURL);
+            OUString aNewURL = uno::Reference<uri::XExternalUriReferenceTranslator>(uno::Reference<XMultiComponentFactory>(comphelper::getProcessServiceFactory(), UNO_QUERY_THROW)->createInstanceWithContext(OUString("com.sun.star.uri.ExternalUriReferenceTranslator"), m_xContext), UNO_QUERY_THROW)->translateToInternal(sURL);
             if( !aNewURL.isEmpty() )
                 sURL = aNewURL;
         }
@@ -82,7 +82,7 @@ rtl::OString SalGtkPicker::unicodetouri(const rtl::OUString &rURL)
     INetURLObject aURL(rURL);
     if (INET_PROT_FILE == aURL.GetProtocol())
     {
-        OUString aNewURL = uno::Reference<uri::XExternalUriReferenceTranslator>(uno::Reference<XMultiComponentFactory>(comphelper::getProcessServiceFactory(), UNO_QUERY_THROW)->createInstanceWithContext(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uri.ExternalUriReferenceTranslator")), m_xContext ), UNO_QUERY_THROW)->translateToExternal( rURL );
+        OUString aNewURL = uno::Reference<uri::XExternalUriReferenceTranslator>(uno::Reference<XMultiComponentFactory>(comphelper::getProcessServiceFactory(), UNO_QUERY_THROW)->createInstanceWithContext(OUString("com.sun.star.uri.ExternalUriReferenceTranslator"), m_xContext ), UNO_QUERY_THROW)->translateToExternal( rURL );
 
         if( !aNewURL.isEmpty() )
         {
diff --git a/vcl/unx/gtk/gdi/gtkprintwrapper.cxx b/vcl/unx/gtk/gdi/gtkprintwrapper.cxx
index 904b47b1cb4a..83c92b2cf792 100644
--- a/vcl/unx/gtk/gdi/gtkprintwrapper.cxx
+++ b/vcl/unx/gtk/gdi/gtkprintwrapper.cxx
@@ -80,9 +80,9 @@ GtkPrintWrapper::~GtkPrintWrapper()
 
 void GtkPrintWrapper::impl_load()
 {
-    m_aModule.load(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("libgtk-x11-2.0.so.0")));
+    m_aModule.load(rtl::OUString("libgtk-x11-2.0.so.0"));
     if (!m_aModule.is())
-        m_aModule.load(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("libgtk-x11-2.0.so")));
+        m_aModule.load(rtl::OUString("libgtk-x11-2.0.so"));
     if (!m_aModule.is())
         return;
 
diff --git a/vcl/unx/gtk/gdi/salprn-gtk.cxx b/vcl/unx/gtk/gdi/salprn-gtk.cxx
index a0e4ac4aa7f3..025373488f71 100644
--- a/vcl/unx/gtk/gdi/salprn-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salprn-gtk.cxx
@@ -798,7 +798,7 @@ GtkPrintDialog::impl_initPrintContent(uno::Sequence<sal_Bool> const& i_rDisabled
     }
 
     beans::PropertyValue* const pPrintContent(
-            m_rController.getValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PrintContent"))));
+            m_rController.getValue(rtl::OUString("PrintContent")));
 
     if (pPrintContent)
     {
@@ -944,7 +944,7 @@ void GtkPrintDialog::ExportAsPDF(const rtl::OUString &rFileURL, GtkPrintSettings
         xFrame = uno::Reference < XFrame >(xDesktop, UNO_QUERY);
 
     uno::Reference < XFilter > xFilter(
-        ::comphelper::getProcessServiceFactory()->createInstance(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.PDFFilter"))),
+        ::comphelper::getProcessServiceFactory()->createInstance(rtl::OUString("com.sun.star.document.PDFFilter")),
         UNO_QUERY);
 
     if (xFilter.is())
@@ -962,9 +962,9 @@ void GtkPrintDialog::ExportAsPDF(const rtl::OUString &rFileURL, GtkPrintSettings
         uno::Reference< XExporter > xExport(xFilter, UNO_QUERY);
         xExport->setSourceDocument(xDoc);
         uno::Sequence<beans::PropertyValue> aFilterData(2);
-        aFilterData[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PageLayout"));
+        aFilterData[0].Name = rtl::OUString("PageLayout");
         aFilterData[0].Value <<= sal_Int32(0);
-        aFilterData[1].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FirstPageOnLeft"));
+        aFilterData[1].Name = rtl::OUString("FirstPageOnLeft");
         aFilterData[1].Value <<= sal_False;
 
 
@@ -987,7 +987,7 @@ void GtkPrintDialog::ExportAsPDF(const rtl::OUString &rFileURL, GtkPrintSettings
                     aRangeText.AppendAscii(",");
             }
             aFilterData.realloc(aFilterData.getLength()+1);
-            aFilterData[aFilterData.getLength()-1].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PageRange"));
+            aFilterData[aFilterData.getLength()-1].Name = rtl::OUString("PageRange");
             aFilterData[aFilterData.getLength()-1].Value <<= rtl::OUString(aRangeText);
         }
         else if (pStr && !strcmp(pStr, "current"))
@@ -1027,7 +1027,7 @@ void GtkPrintDialog::ExportAsPDF(const rtl::OUString &rFileURL, GtkPrintSettings
                        if (i < xSheets->getCount())
                        {
                             aFilterData.realloc(aFilterData.getLength()+1);
-                            aFilterData[aFilterData.getLength()-1].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PageRange"));
+                            aFilterData[aFilterData.getLength()-1].Name = rtl::OUString("PageRange");
                             aFilterData[aFilterData.getLength()-1].Value <<= rtl::OUString(OUString::number(i + 1));
                        }
                    }
@@ -1053,15 +1053,15 @@ void GtkPrintDialog::ExportAsPDF(const rtl::OUString &rFileURL, GtkPrintSettings
             if (aSelection.hasValue())
             {
                 aFilterData.realloc(aFilterData.getLength()+1);
-                aFilterData[aFilterData.getLength()-1].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Selection"));
+                aFilterData[aFilterData.getLength()-1].Name = rtl::OUString("Selection");
                 aFilterData[aFilterData.getLength()-1].Value <<= aSelection;
             }
         }
 #endif
         uno::Sequence<beans::PropertyValue> aArgs(2);
-        aArgs[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FilterData"));
+        aArgs[0].Name = rtl::OUString("FilterData");
         aArgs[0].Value <<= aFilterData;
-        aArgs[1].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("OutputStream"));
+        aArgs[1].Name = rtl::OUString("OutputStream");
         aArgs[1].Value <<= xOStm;
         xFilter->filter(aArgs);
     }
@@ -1076,9 +1076,9 @@ GtkPrintDialog::updateControllerPrintRange()
     // TODO: use get_print_pages
     if (const gchar* const pStr = m_pWrapper->print_settings_get(pSettings, GTK_PRINT_SETTINGS_PRINT_PAGES))
     {
-        beans::PropertyValue* pVal = m_rController.getValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PrintRange")));
+        beans::PropertyValue* pVal = m_rController.getValue(rtl::OUString("PrintRange"));
         if (!pVal)
-            pVal = m_rController.getValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PrintContent")));
+            pVal = m_rController.getValue(rtl::OUString("PrintContent"));
         SAL_WARN_IF(!pVal, "vcl.gtk", "Nothing to map standard print options to!");
         if (pVal)
         {
@@ -1093,7 +1093,7 @@ GtkPrintDialog::updateControllerPrintRange()
 
             if (nVal == 1)
             {
-                pVal = m_rController.getValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PageRange")));
+                pVal = m_rController.getValue(rtl::OUString("PageRange"));
                 SAL_WARN_IF(!pVal, "vcl.gtk", "PageRange doesn't exist!");
                 if (pVal)
                 {
@@ -1135,9 +1135,9 @@ GtkPrintDialog::impl_readFromSettings()
 
     const rtl::OUString aPrintDialogStr(RTL_CONSTASCII_USTRINGPARAM("PrintDialog"));
     const rtl::OUString aCopyCount(pItem->getValue(aPrintDialogStr,
-                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CopyCount"))));
+                rtl::OUString("CopyCount")));
     const rtl::OUString aCollate(pItem->getValue(aPrintDialogStr,
-                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Collate"))));
+                rtl::OUString("Collate")));
 
     bool bChanged(false);
 
@@ -1173,13 +1173,13 @@ const
 
     const rtl::OUString aPrintDialogStr(RTL_CONSTASCII_USTRINGPARAM("PrintDialog"));
     pItem->setValue(aPrintDialogStr,
-            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CopyCount")),
+            rtl::OUString("CopyCount"),
             rtl::OUString::valueOf(sal_Int32(m_pWrapper->print_settings_get_n_copies(pSettings))));
     pItem->setValue(aPrintDialogStr,
-            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Collate")),
+            rtl::OUString("Collate"),
             m_pWrapper->print_settings_get_collate(pSettings)
-                ? rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("true"))
-                : rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("false")))
+                ? rtl::OUString("true")
+                : rtl::OUString("false"))
         ;
     // pItem->setValue(aPrintDialog, rtl::OUString::createFromAscii("ToFile"), );
     g_object_unref(G_OBJECT(pSettings));
diff --git a/vcl/unx/kde/UnxFilePicker.cxx b/vcl/unx/kde/UnxFilePicker.cxx
index 2bd096ae3901..d9cf2f0c6e01 100644
--- a/vcl/unx/kde/UnxFilePicker.cxx
+++ b/vcl/unx/kde/UnxFilePicker.cxx
@@ -71,12 +71,12 @@ namespace
     uno::Sequence<rtl::OUString> SAL_CALL FilePicker_getSupportedServiceNames()
     {
         uno::Sequence<rtl::OUString> aRet(3);
-        aRet[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.dialogs.FilePicker"));
-        aRet[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.dialogs.SystemFilePicker"));
+        aRet[0] = rtl::OUString("com.sun.star.ui.dialogs.FilePicker");
+        aRet[1] = rtl::OUString("com.sun.star.ui.dialogs.SystemFilePicker");
 #ifdef ENABLE_TDE
-        aRet[2] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.dialogs.TDEFilePicker"));
+        aRet[2] = rtl::OUString("com.sun.star.ui.dialogs.TDEFilePicker");
 #else // ENABLE_TDE
-        aRet[2] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.dialogs.KDEFilePicker"));
+        aRet[2] = rtl::OUString("com.sun.star.ui.dialogs.KDEFilePicker");
 #endif // ENABLE_TDE
         return aRet;
     }
@@ -101,7 +101,7 @@ UnxFilePicker::~UnxFilePicker()
 {
     if ( m_nFilePickerPid > 0 )
     {
-        sendCommand( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "exit" )) );
+        sendCommand( ::rtl::OUString( "exit" ) );
         waitpid( m_nFilePickerPid, NULL, 0 );
     }
 
@@ -170,7 +170,7 @@ sal_Int16 SAL_CALL UnxFilePicker::execute()
     // this is _not_ an osl::Condition, see i#93366
     m_pCommandThread->execCondition().reset();
 
-    sendCommand( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "exec" ) ));
+    sendCommand( ::rtl::OUString( "exec" ));
 
     m_pCommandThread->execCondition().wait();
 
@@ -184,8 +184,8 @@ void SAL_CALL UnxFilePicker::setMultiSelectionMode( sal_Bool bMode )
     ::osl::MutexGuard aGuard( m_aMutex );
 
     ::rtl::OUString aString = bMode?
-        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "setMultiSelection true" )):
-        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "setMultiSelection false" ));
+        ::rtl::OUString( "setMultiSelection true" ):
+        ::rtl::OUString( "setMultiSelection false" );
 
     sendCommand( aString );
 }
@@ -224,7 +224,7 @@ rtl::OUString SAL_CALL UnxFilePicker::getDisplayDirectory()
     checkFilePicker();
     ::osl::MutexGuard aGuard( m_aMutex );
 
-    sendCommand( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "getDirectory" )),
+    sendCommand( ::rtl::OUString( "getDirectory" ),
                  m_pCommandThread->getDirectoryCondition() );
 
     return m_pCommandThread->getDirectory();
@@ -236,7 +236,7 @@ uno::Sequence< ::rtl::OUString > SAL_CALL UnxFilePicker::getFiles()
     checkFilePicker();
     ::osl::MutexGuard aGuard( m_aMutex );
 
-    sendCommand( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "getFiles" )),
+    sendCommand( ::rtl::OUString( "getFiles" ),
                  m_pCommandThread->getFilesCondition() );
 
     return m_pCommandThread->getFiles();
@@ -278,7 +278,7 @@ rtl::OUString SAL_CALL UnxFilePicker::getCurrentFilter()
     checkFilePicker();
     ::osl::MutexGuard aGuard( m_aMutex );
 
-    sendCommand( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "getCurrentFilter" )),
+    sendCommand( ::rtl::OUString( "getCurrentFilter" ),
                  m_pCommandThread->getCurrentFilterCondition() );
 
     return m_pCommandThread->getCurrentFilter();
@@ -531,14 +531,14 @@ void SAL_CALL UnxFilePicker::initialize( const uno::Sequence<uno::Any> &rArgumen
     uno::Any aAny;
     if ( 0 == rArguments.getLength( ) )
         throw lang::IllegalArgumentException(
-                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "no arguments" )),
+                rtl::OUString( "no arguments" ),
                 static_cast< XFilePicker2* >( this ), 1 );
 
     aAny = rArguments[0];
 
     if ( ( aAny.getValueType() != ::getCppuType( (sal_Int16*)0 ) ) && ( aAny.getValueType() != ::getCppuType( (sal_Int8*)0 ) ) )
         throw lang::IllegalArgumentException(
-                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "invalid argument type" )),
+                rtl::OUString( "invalid argument type" ),
                 static_cast< XFilePicker2* >( this ), 1 );
 
     sal_Int16 templateId = -1;
@@ -622,7 +622,7 @@ void SAL_CALL UnxFilePicker::initialize( const uno::Sequence<uno::Any> &rArgumen
 
         default:
             throw lang::IllegalArgumentException(
-                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Unknown template" )),
+                    rtl::OUString( "Unknown template" ),
                     static_cast< XFilePicker2* >( this ),
                     1 );
     }
@@ -769,7 +769,7 @@ void UnxFilePicker::checkFilePicker() throw( ::com::sun::star::uno::RuntimeExcep
     else
     {
         throw uno::RuntimeException(
-                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "the external file picker does not run" )),
+                ::rtl::OUString( "the external file picker does not run" ),
                 *this );
     }
 }
@@ -779,7 +779,7 @@ void UnxFilePicker::sendCommand( const ::rtl::OUString &rCommand )
     if ( m_nFilePickerWrite < 0 )
         return;
 
-    ::rtl::OString aUtfString = OUStringToOString( rCommand + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "\n" )), RTL_TEXTENCODING_UTF8 );
+    ::rtl::OString aUtfString = OUStringToOString( rCommand + ::rtl::OUString( "\n" ), RTL_TEXTENCODING_UTF8 );
 
 #if OSL_DEBUG_LEVEL > 0
     ::std::cerr << "UnxFilePicker sent: \"" << aUtfString.getStr() << "\"" << ::std::endl;
@@ -883,17 +883,17 @@ sal_Bool UnxFilePicker::controlActionInfo( sal_Int16 nControlAction, ::rtl::OUSt
     const ElementToName *pPtr;
     const ElementToName pArray[] =
     {
-        { ControlActions::ADD_ITEM,                ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "addItem" ) ) },
-        { ControlActions::ADD_ITEMS,               ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "addItems" ) ) },
-        { ControlActions::DELETE_ITEM,             ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "deleteItem" ) ) },
-        { ControlActions::DELETE_ITEMS,            ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "deleteItems" ) ) },
-        { ControlActions::SET_SELECT_ITEM,         ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "setSelectedItem" ) ) },
-        { ControlActions::GET_ITEMS,               ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "getItems" ) ) },
-        { ControlActions::GET_SELECTED_ITEM,       ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "getSelectedItem" ) ) },
-        { ControlActions::GET_SELECTED_ITEM_INDEX, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "getSelectedItemIndex" ) ) },
-        { ControlActions::SET_HELP_URL,            ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "setHelpURL" ) ) },
-        { ControlActions::GET_HELP_URL,            ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "getHelpURL" ) ) },
-        { 0,                                       ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "noAction" ) ) }
+        { ControlActions::ADD_ITEM,                ::rtl::OUString( "addItem" ) },
+        { ControlActions::ADD_ITEMS,               ::rtl::OUString( "addItems" ) },
+        { ControlActions::DELETE_ITEM,             ::rtl::OUString( "deleteItem" ) },
+        { ControlActions::DELETE_ITEMS,            ::rtl::OUString( "deleteItems" ) },
+        { ControlActions::SET_SELECT_ITEM,         ::rtl::OUString( "setSelectedItem" ) },
+        { ControlActions::GET_ITEMS,               ::rtl::OUString( "getItems" ) },
+        { ControlActions::GET_SELECTED_ITEM,       ::rtl::OUString( "getSelectedItem" ) },
+        { ControlActions::GET_SELECTED_ITEM_INDEX, ::rtl::OUString( "getSelectedItemIndex" ) },
+        { ControlActions::SET_HELP_URL,            ::rtl::OUString( "setHelpURL" ) },
+        { ControlActions::GET_HELP_URL,            ::rtl::OUString( "getHelpURL" ) },
+        { 0,                                       ::rtl::OUString( "noAction" ) }
     };
 
     for ( pPtr = pArray; pPtr->nId && ( pPtr->nId != nControlAction ); ++pPtr )
diff --git a/vcl/unx/kde4/KDE4FilePicker.cxx b/vcl/unx/kde4/KDE4FilePicker.cxx
index 86583d40529d..cd20d3da69e6 100644
--- a/vcl/unx/kde4/KDE4FilePicker.cxx
+++ b/vcl/unx/kde4/KDE4FilePicker.cxx
@@ -77,9 +77,9 @@ namespace
     uno::Sequence<rtl::OUString> SAL_CALL FilePicker_getSupportedServiceNames()
     {
         uno::Sequence<rtl::OUString> aRet(3);
-        aRet[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.dialogs.FilePicker"));
-        aRet[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.dialogs.SystemFilePicker"));
-        aRet[2] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.dialogs.KDE4FilePicker"));
+        aRet[0] = rtl::OUString("com.sun.star.ui.dialogs.FilePicker");
+        aRet[1] = rtl::OUString("com.sun.star.ui.dialogs.SystemFilePicker");
+        aRet[2] = rtl::OUString("com.sun.star.ui.dialogs.KDE4FilePicker");
         return aRet;
     }
 }
@@ -591,7 +591,7 @@ void SAL_CALL KDE4FilePicker::initialize( const uno::Sequence<uno::Any> &args )
     if (args.getLength() == 0)
     {
         throw lang::IllegalArgumentException(
-                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "no arguments" )),
+                rtl::OUString( "no arguments" ),
                 static_cast< XFilePicker2* >( this ), 1 );
     }
 
@@ -601,7 +601,7 @@ void SAL_CALL KDE4FilePicker::initialize( const uno::Sequence<uno::Any> &args )
         ( arg.getValueType() != ::getCppuType((sal_Int8*)0)))
     {
         throw lang::IllegalArgumentException(
-                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "invalid argument type" )),
+                rtl::OUString( "invalid argument type" ),
                 static_cast< XFilePicker2* >( this ), 1 );
     }
 
@@ -673,7 +673,7 @@ void SAL_CALL KDE4FilePicker::initialize( const uno::Sequence<uno::Any> &args )
 
         default:
             throw lang::IllegalArgumentException(
-                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Unknown template" )),
+                    rtl::OUString( "Unknown template" ),
                     static_cast< XFilePicker2* >( this ),
                     1 );
     }