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>

3 files changed, 23 insertions, 23 deletions

diff --git a/mysqlc/source/mysqlc_databasemetadata.cxx b/mysqlc/source/mysqlc_databasemetadata.cxx
index 898c1584adbd..22e94a0a983e 100644
--- a/mysqlc/source/mysqlc_databasemetadata.cxx
+++ b/mysqlc/source/mysqlc_databasemetadata.cxx
@@ -1497,7 +1497,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTableTypes()
     const char * table_types[] = {"TABLE", "VIEW"};
     sal_Int32 requiredVersion[] = {0, 50000};
 
-    Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.DatabaseMetaDataResultSet"))),UNO_QUERY);
+    Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet")),UNO_QUERY);
     std::vector< std::vector< Any > > rRows;
     rtl_TextEncoding encoding = m_rConnection.getConnectionEncoding();
 
@@ -1519,7 +1519,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTypeInfo()
     throw(SQLException, RuntimeException)
 {
     OSL_TRACE("ODatabaseMetaData::getTypeInfo");
-    Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.DatabaseMetaDataResultSet"))),UNO_QUERY);
+    Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet")),UNO_QUERY);
 
     std::vector< std::vector< Any > > rRows;
 
@@ -1563,7 +1563,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getCatalogs()
 {
     OSL_TRACE("ODatabaseMetaData::getCatalogs");
 
-    Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.DatabaseMetaDataResultSet"))),UNO_QUERY);
+    Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet")),UNO_QUERY);
     std::vector< std::vector< Any > > rRows;
 
     try {
@@ -1598,7 +1598,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getSchemas()
 {
     OSL_TRACE("ODatabaseMetaData::getSchemas");
 
-    Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.DatabaseMetaDataResultSet"))),UNO_QUERY);
+    Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet")),UNO_QUERY);
     std::vector< std::vector< Any > > rRows;
 
     try {
@@ -1643,7 +1643,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumnPrivileges(
     throw(SQLException, RuntimeException)
 {
     OSL_TRACE("ODatabaseMetaData::getColumnPrivileges");
-    Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.DatabaseMetaDataResultSet"))),UNO_QUERY);
+    Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet")),UNO_QUERY);
     std::vector< std::vector< Any > > rRows;
 
     std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""),
@@ -1686,7 +1686,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumns(
     throw(SQLException, RuntimeException)
 {
     OSL_TRACE("ODatabaseMetaData::getColumns");
-    Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.DatabaseMetaDataResultSet"))),UNO_QUERY);
+    Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet")),UNO_QUERY);
     std::vector< std::vector< Any > > rRows;
     std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""),
                 sPattern(OUStringToOString(schemaPattern, m_rConnection.getConnectionEncoding()).getStr()),
@@ -1739,7 +1739,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables(
 
     Reference< XResultSet > xResultSet(getOwnConnection().
         getDriver().getFactory()->createInstance(
-                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.DatabaseMetaDataResultSet"))),UNO_QUERY);
+                ::rtl::OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet")),UNO_QUERY);
     std::vector< std::vector< Any > > rRows;
 
     std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""),
@@ -1811,7 +1811,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getProcedures(
     throw(SQLException, RuntimeException)
 {
     OSL_TRACE("ODatabaseMetaData::getProcedures");
-    Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.DatabaseMetaDataResultSet"))),UNO_QUERY);
+    Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet")),UNO_QUERY);
     std::vector< std::vector< Any > > rRows;
 
     std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""),
@@ -1856,7 +1856,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getVersionColumns(
     throw(SQLException, RuntimeException)
 {
     OSL_TRACE("ODatabaseMetaData::getVersionColumns");
-    Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.DatabaseMetaDataResultSet"))),UNO_QUERY);
+    Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet")),UNO_QUERY);
     std::vector< std::vector< Any > > rRows;
     lcl_setRows_throw(xResultSet, 16,rRows);
     return xResultSet;
@@ -1872,7 +1872,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getExportedKeys(
     throw(SQLException, RuntimeException)
 {
     OSL_TRACE("ODatabaseMetaData::getExportedKeys");
-    Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.DatabaseMetaDataResultSet"))),UNO_QUERY);
+    Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet")),UNO_QUERY);
     std::vector< std::vector< Any > > rRows;
     std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""),
                 sch(OUStringToOString(schema, m_rConnection.getConnectionEncoding()).getStr()),
@@ -1913,7 +1913,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getImportedKeys(
 {
     OSL_TRACE("ODatabaseMetaData::getImportedKeys");
 
-    Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.DatabaseMetaDataResultSet"))),UNO_QUERY);
+    Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet")),UNO_QUERY);
     std::vector< std::vector< Any > > rRows;
 
     std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""),
@@ -1954,7 +1954,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getPrimaryKeys(
     throw(SQLException, RuntimeException)
 {
     OSL_TRACE("ODatabaseMetaData::getPrimaryKeys");
-    Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.DatabaseMetaDataResultSet"))),UNO_QUERY);
+    Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet")),UNO_QUERY);
     std::vector< std::vector< Any > > rRows;
 
     std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""),
@@ -1997,7 +1997,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getIndexInfo(
     throw(SQLException, RuntimeException)
 {
     OSL_TRACE("ODatabaseMetaData::getIndexInfo");
-    Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.DatabaseMetaDataResultSet"))),UNO_QUERY);
+    Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet")),UNO_QUERY);
     std::vector< std::vector< Any > > rRows;
 
     std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""),
@@ -2040,7 +2040,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getBestRowIdentifier(
     throw(SQLException, RuntimeException)
 {
     OSL_TRACE("ODatabaseMetaData::getBestRowIdentifier");
-    Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.DatabaseMetaDataResultSet"))),UNO_QUERY);
+    Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet")),UNO_QUERY);
     std::vector< std::vector< Any > > rRows;
 
     std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""),
@@ -2081,7 +2081,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges(
     throw(SQLException, RuntimeException)
 {
     OSL_TRACE("ODatabaseMetaData::getTablePrivileges");
-    Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.DatabaseMetaDataResultSet"))),UNO_QUERY);
+    Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet")),UNO_QUERY);
     std::vector< std::vector< Any > > rRows;
 
     std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""),
@@ -2146,7 +2146,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getCrossReference(
     throw(SQLException, RuntimeException)
 {
     OSL_TRACE("ODatabaseMetaData::getCrossReference");
-    Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.DatabaseMetaDataResultSet"))),UNO_QUERY);
+    Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet")),UNO_QUERY);
     std::vector< std::vector< Any > > rRows;
 
     std::string primaryCat(primaryCatalog.hasValue()? OUStringToOString(getStringFromAny(primaryCatalog), m_rConnection.getConnectionEncoding()).getStr():""),
diff --git a/mysqlc/source/mysqlc_general.cxx b/mysqlc/source/mysqlc_general.cxx
index 1ee31493a154..bda703152022 100644
--- a/mysqlc/source/mysqlc_general.cxx
+++ b/mysqlc/source/mysqlc_general.cxx
@@ -36,11 +36,11 @@ namespace mysqlc_sdbc_driver
 void throwFeatureNotImplementedException( const sal_Char* _pAsciiFeatureName, const Reference< XInterface >& _rxContext, const Any* _pNextException )
     throw (SQLException)
 {
-    const ::rtl::OUString sMessage = ::rtl::OUString::createFromAscii( _pAsciiFeatureName ) + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ": feature not implemented." ) );
+    const ::rtl::OUString sMessage = ::rtl::OUString::createFromAscii( _pAsciiFeatureName ) + ::rtl::OUString( ": feature not implemented." );
     throw SQLException(
         sMessage,
         _rxContext,
-        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HYC00")),
+        ::rtl::OUString("HYC00"),
         0,
         _pNextException ? *_pNextException : Any()
     );
@@ -50,11 +50,11 @@ void throwFeatureNotImplementedException( const sal_Char* _pAsciiFeatureName, co
 void throwInvalidArgumentException( const sal_Char* _pAsciiFeatureName, const Reference< XInterface >& _rxContext, const Any* _pNextException )
     throw (SQLException)
 {
-    const ::rtl::OUString sMessage = ::rtl::OUString::createFromAscii( _pAsciiFeatureName ) + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ": invalid arguments." ) );
+    const ::rtl::OUString sMessage = ::rtl::OUString::createFromAscii( _pAsciiFeatureName ) + ::rtl::OUString( ": invalid arguments." );
     throw SQLException(
         sMessage,
         _rxContext,
-        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HYC00")),
+        ::rtl::OUString("HYC00"),
         0,
         _pNextException ? *_pNextException : Any()
     );
diff --git a/mysqlc/source/mysqlc_resultset.cxx b/mysqlc/source/mysqlc_resultset.cxx
index e0659baf2d0d..c428dd7ab2ca 100644
--- a/mysqlc/source/mysqlc_resultset.cxx
+++ b/mysqlc/source/mysqlc_resultset.cxx
@@ -56,7 +56,7 @@ OUString SAL_CALL OResultSet::getImplementationName()
     throw (RuntimeException)
 {
     OSL_TRACE("OResultSet::getImplementationName");
-    return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sdbcx.mysqlc.ResultSet" ) );
+    return ::rtl::OUString( "com.sun.star.sdbcx.mysqlc.ResultSet" );
 }
 /* }}} */
 
@@ -67,8 +67,8 @@ Sequence< OUString > SAL_CALL OResultSet::getSupportedServiceNames()
 {
     OSL_TRACE("OResultSet::getSupportedServiceNames");
     Sequence< OUString > aSupported(2);
-    aSupported[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sdbc.ResultSet" ) );
-    aSupported[1] = OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sdbcx.ResultSet" ) );
+    aSupported[0] = OUString( "com.sun.star.sdbc.ResultSet" );
+    aSupported[1] = OUString( "com.sun.star.sdbcx.ResultSet" );
     return (aSupported);
 }
 /* }}} */