removal of RTL_CONSTASCII_USTRINGPARAM for quoted OUStrings declarations

s/(OUString\s+[a-zA-Z_][A-Za-z0-9_]*\s*)\(\s*RTL_CONSTASCII_USTRINGPARAM\s*\((\s*"[^")]*?"\s*)\)\s*\)/$1\($2\)/gms

Change-Id: Iad20f242c80c4bdc69df17e2d7a69d58ea53654b
Reviewed-on: https://gerrit.libreoffice.org/2835
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Tested-by: Thomas Arnhold <thomas@arnhold.org>

10 files changed, 31 insertions, 31 deletions

diff --git a/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm b/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm
index db4e94e6dc93..9ac7876bf98a 100644
--- a/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm
+++ b/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm
@@ -124,18 +124,18 @@ using namespace ::rtl;
 +(void)applyAttributesFrom:(Sequence < PropertyValue >)attributes toString:(NSMutableAttributedString *)string forRange:(NSRange)range storeDefaultsTo:(AquaA11yWrapper *)wrapperStore getDefaultsFrom:(AquaA11yWrapper *)wrapper {
     NSAutoreleasePool * pool = [ [ NSAutoreleasePool alloc ] init ];
     // constants
-    static const OUString attrUnderline(RTL_CONSTASCII_USTRINGPARAM("CharUnderline"));
-    static const OUString attrBold(RTL_CONSTASCII_USTRINGPARAM("CharWeight"));
-    static const OUString attrFontname(RTL_CONSTASCII_USTRINGPARAM("CharFontName"));
-    static const OUString attrItalic(RTL_CONSTASCII_USTRINGPARAM("CharPosture"));
-    static const OUString attrHeight(RTL_CONSTASCII_USTRINGPARAM("CharHeight"));
-    static const OUString attrStrikethrough(RTL_CONSTASCII_USTRINGPARAM("CharStrikeout"));
-    static const OUString attrShadow(RTL_CONSTASCII_USTRINGPARAM("CharShadowed"));
-    static const OUString attrUnderlineColor(RTL_CONSTASCII_USTRINGPARAM("CharUnderlineColor"));
-    static const OUString attrUnderlineHasColor(RTL_CONSTASCII_USTRINGPARAM("CharUnderlineHasColor"));
-    static const OUString attrForegroundColor(RTL_CONSTASCII_USTRINGPARAM("CharColor"));
-    static const OUString attrBackgroundColor(RTL_CONSTASCII_USTRINGPARAM("CharBackColor"));
-    static const OUString attrSuperscript(RTL_CONSTASCII_USTRINGPARAM("CharEscapement"));
+    static const OUString attrUnderline("CharUnderline");
+    static const OUString attrBold("CharWeight");
+    static const OUString attrFontname("CharFontName");
+    static const OUString attrItalic("CharPosture");
+    static const OUString attrHeight("CharHeight");
+    static const OUString attrStrikethrough("CharStrikeout");
+    static const OUString attrShadow("CharShadowed");
+    static const OUString attrUnderlineColor("CharUnderlineColor");
+    static const OUString attrUnderlineHasColor("CharUnderlineHasColor");
+    static const OUString attrForegroundColor("CharColor");
+    static const OUString attrBackgroundColor("CharBackColor");
+    static const OUString attrSuperscript("CharEscapement");
     // vars
     OUString fontname;
     int fonttraits = 0;
diff --git a/vcl/aqua/source/app/salinst.cxx b/vcl/aqua/source/app/salinst.cxx
index c0bc111e947f..40a0e5579062 100644
--- a/vcl/aqua/source/app/salinst.cxx
+++ b/vcl/aqua/source/app/salinst.cxx
@@ -265,7 +265,7 @@ void InitSalData()
 
 const ::rtl::OUString& SalGetDesktopEnvironment()
 {
-    static OUString aDesktopEnvironment(RTL_CONSTASCII_USTRINGPARAM( "MacOSX" ));
+    static OUString aDesktopEnvironment( "MacOSX" );
     return aDesktopEnvironment;
 }
 
diff --git a/vcl/aqua/source/gdi/atsui/salgdi.cxx b/vcl/aqua/source/gdi/atsui/salgdi.cxx
index 904ba91024aa..af86b28644a8 100644
--- a/vcl/aqua/source/gdi/atsui/salgdi.cxx
+++ b/vcl/aqua/source/gdi/atsui/salgdi.cxx
@@ -487,7 +487,7 @@ static bool AddLocalTempFontDirs( void )
 
     // add private font files
 
-    rtl::OUString aBrandStr( RTL_CONSTASCII_USTRINGPARAM( "$BRAND_BASE_DIR" ) );
+    rtl::OUString aBrandStr( "$BRAND_BASE_DIR" );
     rtl_bootstrap_expandMacros( &aBrandStr.pData );
     rtl::OUString aBrandSysPath;
     OSL_VERIFY( osl_getSystemPathFromFileURL( aBrandStr.pData, &aBrandSysPath.pData ) == osl_File_E_None );
diff --git a/vcl/ios/source/app/salinst.cxx b/vcl/ios/source/app/salinst.cxx
index d99a18f59f14..91dd16077d18 100644
--- a/vcl/ios/source/app/salinst.cxx
+++ b/vcl/ios/source/app/salinst.cxx
@@ -156,7 +156,7 @@ void InitSalData()
 
 const ::rtl::OUString& SalGetDesktopEnvironment()
 {
-    static OUString aDesktopEnvironment(RTL_CONSTASCII_USTRINGPARAM( "CocoaTouch" ));
+    static OUString aDesktopEnvironment( "CocoaTouch" );
     return aDesktopEnvironment;
 }
 
diff --git a/vcl/unx/generic/desktopdetect/desktopdetector.cxx b/vcl/unx/generic/desktopdetect/desktopdetector.cxx
index 8b7714dc030c..e98dfc2dce8f 100644
--- a/vcl/unx/generic/desktopdetect/desktopdetector.cxx
+++ b/vcl/unx/generic/desktopdetect/desktopdetector.cxx
@@ -246,7 +246,7 @@ static bool is_kde_desktop( Display* pDisplay )
             return true; // does not exist => KDE3
         }
 
-        rtl::OUString aVer( RTL_CONSTASCII_USTRINGPARAM( "3" ) );
+        rtl::OUString aVer( "3" );
         if ( aVer.equalsIgnoreAsciiCaseAscii( pVer ) )
         {
             return true;
@@ -263,7 +263,7 @@ static bool is_kde4_desktop( Display* pDisplay )
 {
     if ( NULL != getenv( "KDE_FULL_SESSION" ) )
     {
-        rtl::OUString aVer( RTL_CONSTASCII_USTRINGPARAM( "4" ) );
+        rtl::OUString aVer( "4" );
 
         const char *pVer = getenv( "KDE_SESSION_VERSION" );
         if ( pVer && aVer.equalsIgnoreAsciiCaseAscii( pVer ) )
diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
index 290020883ee1..40c78c997f14 100644
--- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
+++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
@@ -836,7 +836,7 @@ uno::Sequence<rtl::OUString> SAL_CALL SalGtkFilePicker::getSelectedFiles() throw
 
                     if( sExtension.getLength() >= 3 ) // 3 = typical/minimum extension length
                     {
-                        static const OUString aStarDot(RTL_CONSTASCII_USTRINGPARAM( "*." ));
+                        static const OUString aStarDot( "*." );
 
                         ::rtl::OUString aNewFilter;
                         ::rtl::OUString aOldFilter = getCurrentFilter();
@@ -1837,7 +1837,7 @@ GtkFileFilter* SalGtkFilePicker::implAddFilter( const OUString& rFilter, const O
     OString aFilterName = rtl::OUStringToOString( aShrunkName, RTL_TEXTENCODING_UTF8 );
     gtk_file_filter_set_name( filter, aFilterName.getStr() );
 
-    static const OUString aStarDot(RTL_CONSTASCII_USTRINGPARAM( "*." ));
+    static const OUString aStarDot( "*." );
     OUString aTokens;
 
     bool bAllGlob = !rType.compareToAscii( "*.*" ) || !rType.compareToAscii( "*" );
diff --git a/vcl/unx/gtk/fpicker/SalGtkPicker.cxx b/vcl/unx/gtk/fpicker/SalGtkPicker.cxx
index 3f8b67bbacd3..236a0dfa7354 100644
--- a/vcl/unx/gtk/fpicker/SalGtkPicker.cxx
+++ b/vcl/unx/gtk/fpicker/SalGtkPicker.cxx
@@ -189,7 +189,7 @@ void SalGtkPicker::setGtkLanguage()
 
     if (aBuffer.getLength() > 8)
     {
-        rtl::OUString envVar( RTL_CONSTASCII_USTRINGPARAM( "LANGUAGE" ) );
+        rtl::OUString envVar( "LANGUAGE" );
         osl_setEnvironment( envVar.pData, aBuffer.makeStringAndClear().pData );
     }
     bSet = true;
diff --git a/vcl/unx/gtk/gdi/salprn-gtk.cxx b/vcl/unx/gtk/gdi/salprn-gtk.cxx
index 3a8819382cf4..c97e16e01212 100644
--- a/vcl/unx/gtk/gdi/salprn-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salprn-gtk.cxx
@@ -1133,7 +1133,7 @@ GtkPrintDialog::impl_readFromSettings()
     vcl::SettingsConfigItem* const pItem(vcl::SettingsConfigItem::get());
     GtkPrintSettings* const pSettings(getSettings());
 
-    const rtl::OUString aPrintDialogStr(RTL_CONSTASCII_USTRINGPARAM("PrintDialog"));
+    const rtl::OUString aPrintDialogStr("PrintDialog");
     const rtl::OUString aCopyCount(pItem->getValue(aPrintDialogStr,
                 rtl::OUString("CopyCount")));
     const rtl::OUString aCollate(pItem->getValue(aPrintDialogStr,
@@ -1171,7 +1171,7 @@ const
     vcl::SettingsConfigItem* const pItem(vcl::SettingsConfigItem::get());
     GtkPrintSettings* const pSettings(getSettings());
 
-    const rtl::OUString aPrintDialogStr(RTL_CONSTASCII_USTRINGPARAM("PrintDialog"));
+    const rtl::OUString aPrintDialogStr("PrintDialog");
     pItem->setValue(aPrintDialogStr,
             rtl::OUString("CopyCount"),
             rtl::OUString::valueOf(sal_Int32(m_pWrapper->print_settings_get_n_copies(pSettings))));
diff --git a/vcl/unx/kde/UnxFilePicker.cxx b/vcl/unx/kde/UnxFilePicker.cxx
index d9cf2f0c6e01..914768a3852b 100644
--- a/vcl/unx/kde/UnxFilePicker.cxx
+++ b/vcl/unx/kde/UnxFilePicker.cxx
@@ -704,9 +704,9 @@ void UnxFilePicker::initFilePicker()
 
         // The executable name
 #ifdef ENABLE_TDE
-        rtl::OUString helperurl( RTL_CONSTASCII_USTRINGPARAM("${ORIGIN}/tdefilepicker"));
+        rtl::OUString helperurl("${ORIGIN}/tdefilepicker");
 #else // ENABLE_TDE
-        rtl::OUString helperurl( RTL_CONSTASCII_USTRINGPARAM("${ORIGIN}/kdefilepicker"));
+        rtl::OUString helperurl("${ORIGIN}/kdefilepicker");
 #endif // ENABLE_TDE
         rtl::Bootstrap::expandMacros( helperurl );
         rtl::OUString helperpath;
@@ -827,12 +827,12 @@ sal_Bool UnxFilePicker::controlIdInfo( sal_Int16 nControlId, ::rtl::OUString &rT
         sal_Int32 nTitle;
     } ElementToName;
 
-    const ::rtl::OUString aCheckBox( RTL_CONSTASCII_USTRINGPARAM(   "checkbox" ) );
-    const ::rtl::OUString aControl( RTL_CONSTASCII_USTRINGPARAM(    "control" ) );
-    const ::rtl::OUString aEdit( RTL_CONSTASCII_USTRINGPARAM(       "edit" ) );
-    const ::rtl::OUString aLabel( RTL_CONSTASCII_USTRINGPARAM(      "label" ) );
-    const ::rtl::OUString aListBox( RTL_CONSTASCII_USTRINGPARAM(    "listbox" ) );
-    const ::rtl::OUString aPushButton( RTL_CONSTASCII_USTRINGPARAM( "pushbutton" ) );
+    const ::rtl::OUString aCheckBox(   "checkbox" );
+    const ::rtl::OUString aControl(    "control" );
+    const ::rtl::OUString aEdit(       "edit" );
+    const ::rtl::OUString aLabel(      "label" );
+    const ::rtl::OUString aListBox(    "listbox" );
+    const ::rtl::OUString aPushButton( "pushbutton" );
 
     const ElementToName *pPtr;
     const ElementToName pArray[] =
diff --git a/vcl/win/source/app/salinst.cxx b/vcl/win/source/app/salinst.cxx
index 276c427e1136..9f301394bf9b 100644
--- a/vcl/win/source/app/salinst.cxx
+++ b/vcl/win/source/app/salinst.cxx
@@ -1062,7 +1062,7 @@ SalI18NImeStatus* WinSalInstance::CreateI18NImeStatus()
 
 const ::rtl::OUString& SalGetDesktopEnvironment()
 {
-    static ::rtl::OUString aDesktopEnvironment( RTL_CONSTASCII_USTRINGPARAM( "Windows" ) );
+    static ::rtl::OUString aDesktopEnvironment( "Windows" );
     return aDesktopEnvironment;
 }