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>

1 files changed, 22 insertions, 22 deletions

diff --git a/dbaccess/source/ui/dlg/DriverSettings.cxx b/dbaccess/source/ui/dlg/DriverSettings.cxx
index 1176326d0dc5..e60236d7608b 100644
--- a/dbaccess/source/ui/dlg/DriverSettings.cxx
+++ b/dbaccess/source/ui/dlg/DriverSettings.cxx
@@ -68,28 +68,28 @@ void ODriversSettings::getSupportedIndirectSettings( const ::rtl::OUString& _sUR
     }
 #endif
     typedef ::std::pair<sal_uInt16, ::rtl::OUString> TProperties;
-    TProperties aProps[] = { TProperties(DSID_SHOWDELETEDROWS,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ShowDeleted")))
-                            ,TProperties(DSID_CHARSET,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharSet")))
-                            ,TProperties(DSID_FIELDDELIMITER,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FieldDelimiter")))
-                            ,TProperties(DSID_TEXTDELIMITER,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("StringDelimiter")))
-                            ,TProperties(DSID_DECIMALDELIMITER,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DecimalDelimiter")))
-                            ,TProperties(DSID_THOUSANDSDELIMITER,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ThousandDelimiter")))
-                            ,TProperties(DSID_TEXTFILEEXTENSION,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Extension")))
-                            ,TProperties(DSID_TEXTFILEHEADER,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HeaderLine")))
-                            ,TProperties(DSID_ADDITIONALOPTIONS,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SystemDriverSettings")))
-                            ,TProperties(DSID_CONN_SHUTSERVICE,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ShutdownDatabase")))
-                            ,TProperties(DSID_CONN_DATAINC,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DataCacheSizeIncrement")))
-                            ,TProperties(DSID_CONN_CACHESIZE,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DataCacheSize")))
-                            ,TProperties(DSID_CONN_CTRLUSER,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ControlUser")))
-                            ,TProperties(DSID_CONN_CTRLPWD,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ControlPassword")))
-                            ,TProperties(DSID_USECATALOG,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UseCatalog")))
-                            ,TProperties(DSID_CONN_SOCKET,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LocalSocket")))
-                            ,TProperties(DSID_NAMED_PIPE,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NamedPipe")))
-                            ,TProperties(DSID_JDBCDRIVERCLASS,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("JavaDriverClass")))
-                            ,TProperties(DSID_CONN_LDAP_BASEDN,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BaseDN")))
-                            ,TProperties(DSID_CONN_LDAP_ROWCOUNT,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MaxRowCount")))
-                            ,TProperties(DSID_CONN_LDAP_USESSL,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UseSSL")))
-                            ,TProperties(DSID_IGNORECURRENCY,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IgnoreCurrency")))
+    TProperties aProps[] = { TProperties(DSID_SHOWDELETEDROWS,::rtl::OUString("ShowDeleted"))
+                            ,TProperties(DSID_CHARSET,::rtl::OUString("CharSet"))
+                            ,TProperties(DSID_FIELDDELIMITER,::rtl::OUString("FieldDelimiter"))
+                            ,TProperties(DSID_TEXTDELIMITER,::rtl::OUString("StringDelimiter"))
+                            ,TProperties(DSID_DECIMALDELIMITER,::rtl::OUString("DecimalDelimiter"))
+                            ,TProperties(DSID_THOUSANDSDELIMITER,::rtl::OUString("ThousandDelimiter"))
+                            ,TProperties(DSID_TEXTFILEEXTENSION,::rtl::OUString("Extension"))
+                            ,TProperties(DSID_TEXTFILEHEADER,::rtl::OUString("HeaderLine"))
+                            ,TProperties(DSID_ADDITIONALOPTIONS,::rtl::OUString("SystemDriverSettings"))
+                            ,TProperties(DSID_CONN_SHUTSERVICE,::rtl::OUString("ShutdownDatabase"))
+                            ,TProperties(DSID_CONN_DATAINC,::rtl::OUString("DataCacheSizeIncrement"))
+                            ,TProperties(DSID_CONN_CACHESIZE,::rtl::OUString("DataCacheSize"))
+                            ,TProperties(DSID_CONN_CTRLUSER,::rtl::OUString("ControlUser"))
+                            ,TProperties(DSID_CONN_CTRLPWD,::rtl::OUString("ControlPassword"))
+                            ,TProperties(DSID_USECATALOG,::rtl::OUString("UseCatalog"))
+                            ,TProperties(DSID_CONN_SOCKET,::rtl::OUString("LocalSocket"))
+                            ,TProperties(DSID_NAMED_PIPE,::rtl::OUString("NamedPipe"))
+                            ,TProperties(DSID_JDBCDRIVERCLASS,::rtl::OUString("JavaDriverClass"))
+                            ,TProperties(DSID_CONN_LDAP_BASEDN,::rtl::OUString("BaseDN"))
+                            ,TProperties(DSID_CONN_LDAP_ROWCOUNT,::rtl::OUString("MaxRowCount"))
+                            ,TProperties(DSID_CONN_LDAP_USESSL,::rtl::OUString("UseSSL"))
+                            ,TProperties(DSID_IGNORECURRENCY,::rtl::OUString("IgnoreCurrency"))
                             ,TProperties(0,::rtl::OUString())
     };
     // TODO: This mapping between IDs and property names already exists - in ODbDataSourceAdministrationHelper::ODbDataSourceAdministrationHelper.