Improved loplugin:stringconstant (now that GCC 7 supports it): connectivity

Change-Id: I80dab66757b1f541d448a642a5ecddc876f55c7b
Reviewed-on: https://gerrit.libreoffice.org/76689
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>

51 files changed, 191 insertions, 194 deletions

diff --git a/connectivity/source/commontools/ConnectionWrapper.cxx b/connectivity/source/commontools/ConnectionWrapper.cxx
index 448ed296111a..bf882ee1bdd6 100644
--- a/connectivity/source/commontools/ConnectionWrapper.cxx
+++ b/connectivity/source/commontools/ConnectionWrapper.cxx
@@ -109,7 +109,7 @@ OConnectionWrapper::~OConnectionWrapper()
 
 OUString SAL_CALL OConnectionWrapper::getImplementationName(  )
 {
-    return OUString( "com.sun.star.sdbc.drivers.OConnectionWrapper" );
+    return "com.sun.star.sdbc.drivers.OConnectionWrapper";
 }
 
 
diff --git a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
index 68c71a299f4b..ce61da75cb20 100644
--- a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
+++ b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
@@ -844,7 +844,7 @@ void SAL_CALL ODatabaseMetaDataResultSet::initialize( const Sequence< Any >& _aA
 
     OUString ODatabaseMetaDataResultSet::getImplementationName_Static(  )
     {
-        return OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet");
+        return "org.openoffice.comp.helper.DatabaseMetaDataResultSet";
     }
 
     Sequence< OUString > ODatabaseMetaDataResultSet::getSupportedServiceNames_Static(  )
diff --git a/connectivity/source/commontools/ParameterSubstitution.cxx b/connectivity/source/commontools/ParameterSubstitution.cxx
index a8efa6c6a694..a5796261c995 100644
--- a/connectivity/source/commontools/ParameterSubstitution.cxx
+++ b/connectivity/source/commontools/ParameterSubstitution.cxx
@@ -42,7 +42,7 @@ namespace connectivity
 
     OUString ParameterSubstitution::getImplementationName_Static(  )
     {
-        return OUString("org.openoffice.comp.helper.ParameterSubstitution");
+        return "org.openoffice.comp.helper.ParameterSubstitution";
     }
 
     OUString SAL_CALL ParameterSubstitution::getImplementationName(  )
diff --git a/connectivity/source/commontools/TKeys.cxx b/connectivity/source/commontools/TKeys.cxx
index 9d4beb6b2a89..d9e217c37a72 100644
--- a/connectivity/source/commontools/TKeys.cxx
+++ b/connectivity/source/commontools/TKeys.cxx
@@ -257,7 +257,7 @@ sdbcx::ObjectType OKeysHelper::appendObject( const OUString& _rForName, const Re
 
 OUString OKeysHelper::getDropForeignKey() const
 {
-    return OUString(" DROP CONSTRAINT ");
+    return " DROP CONSTRAINT ";
 }
 
 // XDrop
diff --git a/connectivity/source/commontools/dbexception.cxx b/connectivity/source/commontools/dbexception.cxx
index 31503a724a01..c5557ac43e24 100644
--- a/connectivity/source/commontools/dbexception.cxx
+++ b/connectivity/source/commontools/dbexception.cxx
@@ -461,17 +461,17 @@ OUString getStandardSQLState( StandardSQLState _eState )
 {
     switch ( _eState )
     {
-    case StandardSQLState::INVALID_DESCRIPTOR_INDEX:  return OUString("07009");
-    case StandardSQLState::INVALID_CURSOR_STATE:      return OUString("24000");
-    case StandardSQLState::COLUMN_NOT_FOUND:          return OUString("42S22");
-    case StandardSQLState::GENERAL_ERROR:             return OUString("HY000");
-    case StandardSQLState::INVALID_SQL_DATA_TYPE:     return OUString("HY004");
-    case StandardSQLState::FUNCTION_SEQUENCE_ERROR:   return OUString("HY010");
-    case StandardSQLState::INVALID_CURSOR_POSITION:   return OUString("HY109");
-    case StandardSQLState::FEATURE_NOT_IMPLEMENTED:   return OUString("HYC00");
-    case StandardSQLState::FUNCTION_NOT_SUPPORTED:    return OUString("IM001");
-    case StandardSQLState::CONNECTION_DOES_NOT_EXIST: return OUString("08003");
-    default:                                          return OUString("HY001"); // General Error
+    case StandardSQLState::INVALID_DESCRIPTOR_INDEX:  return "07009";
+    case StandardSQLState::INVALID_CURSOR_STATE:      return "24000";
+    case StandardSQLState::COLUMN_NOT_FOUND:          return "42S22";
+    case StandardSQLState::GENERAL_ERROR:             return "HY000";
+    case StandardSQLState::INVALID_SQL_DATA_TYPE:     return "HY004";
+    case StandardSQLState::FUNCTION_SEQUENCE_ERROR:   return "HY010";
+    case StandardSQLState::INVALID_CURSOR_POSITION:   return "HY109";
+    case StandardSQLState::FEATURE_NOT_IMPLEMENTED:   return "HYC00";
+    case StandardSQLState::FUNCTION_NOT_SUPPORTED:    return "IM001";
+    case StandardSQLState::CONNECTION_DOES_NOT_EXIST: return "08003";
+    default:                                          return "HY001"; // General Error
     }
 }
 
diff --git a/connectivity/source/commontools/dbtools2.cxx b/connectivity/source/commontools/dbtools2.cxx
index ca91c1401749..5c8d50cc7a52 100644
--- a/connectivity/source/commontools/dbtools2.cxx
+++ b/connectivity/source/commontools/dbtools2.cxx
@@ -942,17 +942,17 @@ sal_Int32 DBTypeConversion::convertUnicodeStringToLength( const OUString& _rSour
 }
 static OUString lcl_getReportEngines()
 {
-    return OUString("org.openoffice.Office.DataAccess/ReportEngines");
+    return "org.openoffice.Office.DataAccess/ReportEngines";
 }
 
 static OUString lcl_getDefaultReportEngine()
 {
-    return OUString("DefaultReportEngine");
+    return "DefaultReportEngine";
 }
 
 static OUString lcl_getReportEngineNames()
 {
-    return OUString("ReportEngineNames");
+    return "ReportEngineNames";
 }
 
 OUString getDefaultReportEngineServiceName(const Reference< XComponentContext >& _rxORB)
@@ -979,10 +979,10 @@ OUString getDefaultReportEngineServiceName(const Reference< XComponentContext >&
             }
         }
         else
-            return OUString("org.libreoffice.report.pentaho.SOReportJobFactory");
+            return "org.libreoffice.report.pentaho.SOReportJobFactory";
     }
     else
-        return OUString("org.libreoffice.report.pentaho.SOReportJobFactory");
+        return "org.libreoffice.report.pentaho.SOReportJobFactory";
     return OUString();
 }
 
diff --git a/connectivity/source/commontools/sqlerror.cxx b/connectivity/source/commontools/sqlerror.cxx
index b07c1a3cffc3..11d672929094 100644
--- a/connectivity/source/commontools/sqlerror.cxx
+++ b/connectivity/source/commontools/sqlerror.cxx
@@ -142,9 +142,9 @@ namespace connectivity
             switch (_eCondition)
             {
                 case css::sdb::ErrorCondition::DB_NOT_CONNECTED:
-                    return OUString(STR_DB_NOT_CONNECTED_STATE);
+                    return STR_DB_NOT_CONNECTED_STATE;
                 case css::sdb::ErrorCondition::DATA_CANNOT_SELECT_UNFILTERED:
-                    return OUString(STR_DATA_CANNOT_SELECT_UNFILTERED_STATE);
+                    return STR_DATA_CANNOT_SELECT_UNFILTERED_STATE;
             }
             return OUString();
         }
diff --git a/connectivity/source/cpool/ZPoolCollection.cxx b/connectivity/source/cpool/ZPoolCollection.cxx
index ba07e52962e8..4295f714690e 100644
--- a/connectivity/source/cpool/ZPoolCollection.cxx
+++ b/connectivity/source/cpool/ZPoolCollection.cxx
@@ -46,27 +46,27 @@ using namespace connectivity;
 
 static OUString getConnectionPoolNodeName()
 {
-    return OUString(  "org.openoffice.Office.DataAccess/ConnectionPool" );
+    return "org.openoffice.Office.DataAccess/ConnectionPool";
 }
 
 static OUString getEnablePoolingNodeName()
 {
-    return OUString(  "EnablePooling" );
+    return "EnablePooling";
 }
 
 static OUString getDriverNameNodeName()
 {
-    return OUString(  "DriverName" );
+    return "DriverName";
 }
 
 static OUString getDriverSettingsNodeName()
 {
-    return OUString(  "DriverSettings" );
+    return "DriverSettings";
 }
 
 static OUString getEnableNodeName()
 {
-    return OUString(  "Enable" );
+    return "Enable";
 }
 
 
@@ -159,7 +159,7 @@ Reference< XInterface > OPoolCollection::CreateInstance(const Reference< XMultiS
 
 OUString OPoolCollection::getImplementationName_Static(  )
 {
-    return OUString("com.sun.star.sdbc.OConnectionPool");
+    return "com.sun.star.sdbc.OConnectionPool";
 }
 
 
diff --git a/connectivity/source/drivers/calc/CDriver.cxx b/connectivity/source/drivers/calc/CDriver.cxx
index 25c9fffc3322..3b53ebccd0b8 100644
--- a/connectivity/source/drivers/calc/CDriver.cxx
+++ b/connectivity/source/drivers/calc/CDriver.cxx
@@ -38,7 +38,7 @@ using namespace ::com::sun::star::lang;
 
 OUString ODriver::getImplementationName_Static(  )
 {
-    return OUString("com.sun.star.comp.sdbc.calc.ODriver");
+    return "com.sun.star.comp.sdbc.calc.ODriver";
 }
 
 OUString SAL_CALL ODriver::getImplementationName(  )
diff --git a/connectivity/source/drivers/component/CResultSet.cxx b/connectivity/source/drivers/component/CResultSet.cxx
index 3ac3508f758a..79d97a62d29f 100644
--- a/connectivity/source/drivers/component/CResultSet.cxx
+++ b/connectivity/source/drivers/component/CResultSet.cxx
@@ -46,7 +46,7 @@ OComponentResultSet::OComponentResultSet( OStatement_Base* pStmt,connectivity::O
 
 OUString SAL_CALL OComponentResultSet::getImplementationName(  )
 {
-    return OUString("com.sun.star.sdbcx.component.ResultSet");
+    return "com.sun.star.sdbcx.component.ResultSet";
 }
 
 Sequence< OUString > SAL_CALL OComponentResultSet::getSupportedServiceNames(  )
diff --git a/connectivity/source/drivers/dbase/DDriver.cxx b/connectivity/source/drivers/dbase/DDriver.cxx
index 376fd27c10c2..3da4c0ce608c 100644
--- a/connectivity/source/drivers/dbase/DDriver.cxx
+++ b/connectivity/source/drivers/dbase/DDriver.cxx
@@ -37,7 +37,7 @@ using namespace ::com::sun::star::lang;
 
 OUString ODriver::getImplementationName_Static(  )
 {
-    return OUString("com.sun.star.comp.sdbc.dbase.ODriver");
+    return "com.sun.star.comp.sdbc.dbase.ODriver";
 }
 
 
diff --git a/connectivity/source/drivers/dbase/DResultSet.cxx b/connectivity/source/drivers/dbase/DResultSet.cxx
index 025dbdd0ddb6..737a87bf559d 100644
--- a/connectivity/source/drivers/dbase/DResultSet.cxx
+++ b/connectivity/source/drivers/dbase/DResultSet.cxx
@@ -49,7 +49,7 @@ ODbaseResultSet::ODbaseResultSet( OStatement_Base* pStmt,connectivity::OSQLParse
 
 OUString SAL_CALL ODbaseResultSet::getImplementationName(  )
 {
-    return OUString("com.sun.star.sdbcx.dbase.ResultSet");
+    return "com.sun.star.sdbcx.dbase.ResultSet";
 }
 
 Sequence< OUString > SAL_CALL ODbaseResultSet::getSupportedServiceNames(  )
diff --git a/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx b/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
index da3aa438a359..4ec577c5874c 100644
--- a/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
@@ -196,9 +196,9 @@ namespace connectivity
         switch( getFieldType( nCol ) )
         {
             case DataType::BIT:
-                return OUString("BIT");
+                return "BIT";
             case DataType::VARCHAR:
-                return OUString("VARCHAR");
+                return "VARCHAR";
             default:
                 break;
         }
@@ -446,7 +446,7 @@ OUString SAL_CALL OEvoabDatabaseMetaData::getCatalogTerm(  )
 OUString OEvoabDatabaseMetaData::impl_getIdentifierQuoteString_throw(  )
 {
     // normally this is "
-    return OUString("\"");
+    return "\"";
 }
 
 OUString SAL_CALL OEvoabDatabaseMetaData::getExtraNameCharacters(  )
@@ -802,12 +802,12 @@ OUString SAL_CALL OEvoabDatabaseMetaData::getDriverName(  )
 
 OUString SAL_CALL OEvoabDatabaseMetaData::getDriverVersion()
 {
-    return OUString( "1" );
+    return "1";
 }
 
 OUString SAL_CALL OEvoabDatabaseMetaData::getDatabaseProductVersion(  )
 {
-    return OUString( "0" );
+    return "0";
 }
 
 OUString SAL_CALL OEvoabDatabaseMetaData::getDatabaseProductName(  )
diff --git a/connectivity/source/drivers/evoab2/NDriver.cxx b/connectivity/source/drivers/evoab2/NDriver.cxx
index c0e37f9f7beb..9cbb265fce2a 100644
--- a/connectivity/source/drivers/evoab2/NDriver.cxx
+++ b/connectivity/source/drivers/evoab2/NDriver.cxx
@@ -80,7 +80,7 @@ void OEvoabDriver::disposing()
 
 OUString OEvoabDriver::getImplementationName_Static(  )
 {
-    return OUString(EVOAB_DRIVER_IMPL_NAME);
+    return EVOAB_DRIVER_IMPL_NAME;
     // this name is referenced in the configuration and in the evoab.xml
     // Please take care when changing it.
 }
diff --git a/connectivity/source/drivers/evoab2/NResultSet.cxx b/connectivity/source/drivers/evoab2/NResultSet.cxx
index 38c51fa89375..0c438f650479 100644
--- a/connectivity/source/drivers/evoab2/NResultSet.cxx
+++ b/connectivity/source/drivers/evoab2/NResultSet.cxx
@@ -66,7 +66,7 @@ namespace ErrorCondition = ::com::sun::star::sdb::ErrorCondition;
 
 OUString SAL_CALL OEvoabResultSet::getImplementationName(  )
 {
-    return OUString("com.sun.star.sdbcx.evoab.ResultSet");
+    return "com.sun.star.sdbcx.evoab.ResultSet";
 }
 
  Sequence< OUString > SAL_CALL OEvoabResultSet::getSupportedServiceNames(  )
diff --git a/connectivity/source/drivers/file/FDatabaseMetaData.cxx b/connectivity/source/drivers/file/FDatabaseMetaData.cxx
index 07dc4ed1e57c..09fdbbf931bd 100644
--- a/connectivity/source/drivers/file/FDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/file/FDatabaseMetaData.cxx
@@ -498,7 +498,7 @@ OUString SAL_CALL ODatabaseMetaData::getCatalogTerm(  )
 
 OUString ODatabaseMetaData::impl_getIdentifierQuoteString_throw(  )
 {
-    return OUString("\"");
+    return "\"";
 }
 
 OUString SAL_CALL ODatabaseMetaData::getExtraNameCharacters(  )
@@ -851,7 +851,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92IntermediateSQL(  )
 
 OUString SAL_CALL ODatabaseMetaData::getURL(  )
 {
-    return OUString(  "sdbc:file:" );
+    return "sdbc:file:";
 }
 
 OUString SAL_CALL ODatabaseMetaData::getUserName(  )
@@ -916,12 +916,12 @@ OUString SAL_CALL ODatabaseMetaData::getSearchStringEscape(  )
 
 OUString SAL_CALL ODatabaseMetaData::getStringFunctions(  )
 {
-    return OUString("UCASE,LCASE,ASCII,LENGTH,OCTET_LENGTH,CHAR_LENGTH,CHARACTER_LENGTH,CHAR,CONCAT,LOCATE,SUBSTRING,LTRIM,RTRIM,SPACE,REPLACE,REPEAT,INSERT,LEFT,RIGHT");
+    return "UCASE,LCASE,ASCII,LENGTH,OCTET_LENGTH,CHAR_LENGTH,CHARACTER_LENGTH,CHAR,CONCAT,LOCATE,SUBSTRING,LTRIM,RTRIM,SPACE,REPLACE,REPEAT,INSERT,LEFT,RIGHT";
 }
 
 OUString SAL_CALL ODatabaseMetaData::getTimeDateFunctions(  )
 {
-    return OUString("DAYOFWEEK,DAYOFMONTH,DAYOFYEAR,MONTH,DAYNAME,MONTHNAME,QUARTER,WEEK,YEAR,HOUR,MINUTE,SECOND,CURDATE,CURTIME,NOW");
+    return "DAYOFWEEK,DAYOFMONTH,DAYOFYEAR,MONTH,DAYNAME,MONTHNAME,QUARTER,WEEK,YEAR,HOUR,MINUTE,SECOND,CURDATE,CURTIME,NOW";
 }
 
 OUString SAL_CALL ODatabaseMetaData::getSystemFunctions(  )
@@ -931,7 +931,7 @@ OUString SAL_CALL ODatabaseMetaData::getSystemFunctions(  )
 
 OUString SAL_CALL ODatabaseMetaData::getNumericFunctions(  )
 {
-    return OUString("ABS,SIGN,MOD,FLOOR,CEILING,ROUND,EXP,LN,LOG,LOG10,POWER,SQRT,PI,COS,SIN,TAN,ACOS,ASIN,ATAN,ATAN2,DEGREES,RADIANS");
+    return "ABS,SIGN,MOD,FLOOR,CEILING,ROUND,EXP,LN,LOG,LOG10,POWER,SQRT,PI,COS,SIN,TAN,ACOS,ASIN,ATAN,ATAN2,DEGREES,RADIANS";
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::supportsExtendedSQLGrammar(  )
diff --git a/connectivity/source/drivers/file/FDriver.cxx b/connectivity/source/drivers/file/FDriver.cxx
index e3a756672b65..584a0a08b95f 100644
--- a/connectivity/source/drivers/file/FDriver.cxx
+++ b/connectivity/source/drivers/file/FDriver.cxx
@@ -62,7 +62,7 @@ void OFileDriver::disposing()
 
 OUString OFileDriver::getImplementationName_Static(  )
 {
-    return OUString("com.sun.star.sdbc.driver.file.Driver");
+    return "com.sun.star.sdbc.driver.file.Driver";
 }
 
 Sequence< OUString > OFileDriver::getSupportedServiceNames_Static(  )
diff --git a/connectivity/source/drivers/firebird/Driver.cxx b/connectivity/source/drivers/firebird/Driver.cxx
index bb926d5494bb..6827d84868b5 100644
--- a/connectivity/source/drivers/firebird/Driver.cxx
+++ b/connectivity/source/drivers/firebird/Driver.cxx
@@ -138,7 +138,7 @@ void FirebirdDriver::disposing()
 //----- static ServiceInfo ---------------------------------------------------
 OUString FirebirdDriver::getImplementationName_Static()
 {
-    return OUString("com.sun.star.comp.sdbc.firebird.Driver");
+    return "com.sun.star.comp.sdbc.firebird.Driver";
 }
 
 Sequence< OUString > FirebirdDriver::getSupportedServiceNames_Static()
diff --git a/connectivity/source/drivers/firebird/ResultSet.cxx b/connectivity/source/drivers/firebird/ResultSet.cxx
index d0c19c6dacf9..dd0e56afb9af 100644
--- a/connectivity/source/drivers/firebird/ResultSet.cxx
+++ b/connectivity/source/drivers/firebird/ResultSet.cxx
@@ -872,7 +872,7 @@ uno::Reference< css::beans::XPropertySetInfo > SAL_CALL OResultSet::getPropertyS
 // ---- XServiceInfo -----------------------------------------------------------
 OUString SAL_CALL OResultSet::getImplementationName()
 {
-    return OUString("com.sun.star.sdbcx.firebird.ResultSet");
+    return "com.sun.star.sdbcx.firebird.ResultSet";
 }
 
 Sequence< OUString > SAL_CALL OResultSet::getSupportedServiceNames()
diff --git a/connectivity/source/drivers/firebird/Util.cxx b/connectivity/source/drivers/firebird/Util.cxx
index 6cc5d16484f9..eb7216e9d1c5 100644
--- a/connectivity/source/drivers/firebird/Util.cxx
+++ b/connectivity/source/drivers/firebird/Util.cxx
@@ -185,37 +185,37 @@ OUString firebird::ColumnTypeInfo::getColumnTypeName() const
     switch (aType)
     {
      case SQL_TEXT:
-         return OUString("SQL_TEXT");
+         return "SQL_TEXT";
      case SQL_VARYING:
-         return OUString("SQL_VARYING");
+         return "SQL_VARYING";
      case SQL_SHORT:
-         return OUString("SQL_SHORT");
+         return "SQL_SHORT";
      case SQL_LONG:
-         return OUString("SQL_LONG");
+         return "SQL_LONG";
      case SQL_FLOAT:
-         return OUString("SQL_FLOAT");
+         return "SQL_FLOAT";
      case SQL_DOUBLE:
-         return OUString("SQL_DOUBLE");
+         return "SQL_DOUBLE";
      case SQL_D_FLOAT:
-         return OUString("SQL_D_FLOAT");
+         return "SQL_D_FLOAT";
      case SQL_TIMESTAMP:
-         return OUString("SQL_TIMESTAMP");
+         return "SQL_TIMESTAMP";
      case SQL_BLOB:
-         return OUString("SQL_BLOB");
+         return "SQL_BLOB";
      case SQL_ARRAY:
-         return OUString("SQL_ARRAY");
+         return "SQL_ARRAY";
      case SQL_TYPE_TIME:
-         return OUString("SQL_TYPE_TIME");
+         return "SQL_TYPE_TIME";
      case SQL_TYPE_DATE:
-         return OUString("SQL_TYPE_DATE");
+         return "SQL_TYPE_DATE";
      case SQL_INT64:
-         return OUString("SQL_INT64");
+         return "SQL_INT64";
      case SQL_NULL:
-         return OUString("SQL_NULL");
+         return "SQL_NULL";
      case SQL_QUAD:
-         return OUString("SQL_QUAD");
+         return "SQL_QUAD";
      case SQL_BOOLEAN:
-         return OUString("SQL_BOOLEAN");
+         return "SQL_BOOLEAN";
      default:
          assert(false); // Should never happen
          return OUString();
diff --git a/connectivity/source/drivers/flat/EDriver.cxx b/connectivity/source/drivers/flat/EDriver.cxx
index 4c9ac55933e7..e10f29da7f6d 100644
--- a/connectivity/source/drivers/flat/EDriver.cxx
+++ b/connectivity/source/drivers/flat/EDriver.cxx
@@ -40,7 +40,7 @@ using namespace css::lang;
 
 OUString ODriver::getImplementationName_Static(  )
 {
-    return OUString("com.sun.star.comp.sdbc.flat.ODriver");
+    return "com.sun.star.comp.sdbc.flat.ODriver";
 }
 
 
diff --git a/connectivity/source/drivers/flat/EResultSet.cxx b/connectivity/source/drivers/flat/EResultSet.cxx
index 71b41a768e9e..9399be63e8f8 100644
--- a/connectivity/source/drivers/flat/EResultSet.cxx
+++ b/connectivity/source/drivers/flat/EResultSet.cxx
@@ -47,7 +47,7 @@ OFlatResultSet::OFlatResultSet( OStatement_Base* pStmt,connectivity::OSQLParseTr
 
 OUString SAL_CALL OFlatResultSet::getImplementationName(  )
 {
-    return OUString("com.sun.star.sdbcx.flat.ResultSet");
+    return "com.sun.star.sdbcx.flat.ResultSet";
 }
 
 Sequence< OUString > SAL_CALL OFlatResultSet::getSupportedServiceNames(  )
diff --git a/connectivity/source/drivers/hsqldb/HDriver.cxx b/connectivity/source/drivers/hsqldb/HDriver.cxx
index ce8eec444194..56c22443d0da 100644
--- a/connectivity/source/drivers/hsqldb/HDriver.cxx
+++ b/connectivity/source/drivers/hsqldb/HDriver.cxx
@@ -485,7 +485,7 @@ namespace connectivity
 
     OUString ODriverDelegator::getImplementationName_Static(  )
     {
-        return OUString("com.sun.star.sdbcx.comp.hsqldb.Driver");
+        return "com.sun.star.sdbcx.comp.hsqldb.Driver";
     }
 
     Sequence< OUString > ODriverDelegator::getSupportedServiceNames_Static(  )
diff --git a/connectivity/source/drivers/jdbc/JDriver.cxx b/connectivity/source/drivers/jdbc/JDriver.cxx
index 8e537c2d08e3..4934deb0d199 100644
--- a/connectivity/source/drivers/jdbc/JDriver.cxx
+++ b/connectivity/source/drivers/jdbc/JDriver.cxx
@@ -55,7 +55,7 @@ java_sql_Driver::~java_sql_Driver()
 
 OUString java_sql_Driver::getImplementationName_Static(  )
 {
-    return OUString("com.sun.star.comp.sdbc.JDBCDriver");
+    return "com.sun.star.comp.sdbc.JDBCDriver";
         // this name is referenced in the configuration and in the jdbc.xml
         // Please take care when changing it.
 }
diff --git a/connectivity/source/drivers/mork/MDatabaseMetaData.cxx b/connectivity/source/drivers/mork/MDatabaseMetaData.cxx
index 104a89c2d8c4..b2810d3612dc 100644
--- a/connectivity/source/drivers/mork/MDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/mork/MDatabaseMetaData.cxx
@@ -258,7 +258,7 @@ OUString SAL_CALL ODatabaseMetaData::getCatalogTerm(  )
 OUString ODatabaseMetaData::impl_getIdentifierQuoteString_throw(  )
 {
     // normally this is "
-    return OUString( "\"");
+    return "\"";
 }
 
 OUString SAL_CALL ODatabaseMetaData::getExtraNameCharacters(  )
diff --git a/connectivity/source/drivers/mork/MDriver.cxx b/connectivity/source/drivers/mork/MDriver.cxx
index aabfbb79db3b..0351b6c3e04f 100644
--- a/connectivity/source/drivers/mork/MDriver.cxx
+++ b/connectivity/source/drivers/mork/MDriver.cxx
@@ -33,7 +33,7 @@ MorkDriver::MorkDriver(const css::uno::Reference< css::uno::XComponentContext >&
 
 OUString SAL_CALL MorkDriver::getImplementationName()
 {
-    return OUString(MORK_DRIVER_IMPL_NAME);
+    return MORK_DRIVER_IMPL_NAME;
 }
 
 sal_Bool SAL_CALL MorkDriver::supportsService(const OUString& serviceName)
diff --git a/connectivity/source/drivers/mork/MResultSet.cxx b/connectivity/source/drivers/mork/MResultSet.cxx
index a0bfcf79b3f4..1ff055143f09 100644
--- a/connectivity/source/drivers/mork/MResultSet.cxx
+++ b/connectivity/source/drivers/mork/MResultSet.cxx
@@ -53,7 +53,7 @@ using namespace com::sun::star::util;
 //  IMPLEMENT_SERVICE_INFO(OResultSet,"com.sun.star.sdbcx.OResultSet","com.sun.star.sdbc.ResultSet");
 OUString SAL_CALL OResultSet::getImplementationName(  )
 {
-    return OUString("com.sun.star.sdbcx.mork.ResultSet");
+    return "com.sun.star.sdbcx.mork.ResultSet";
 }
 
  Sequence< OUString > SAL_CALL OResultSet::getSupportedServiceNames(  )
diff --git a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx
index 460d6d1c6ab4..615760506b08 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx
@@ -71,7 +71,7 @@ void MozillaBootstrap::disposing()
 
 OUString SAL_CALL MozillaBootstrap::getImplementationName(  )
 {
-    return OUString(MOZAB_MozillaBootstrap_IMPL_NAME);
+    return MOZAB_MozillaBootstrap_IMPL_NAME;
 }
 
 sal_Bool SAL_CALL MozillaBootstrap::supportsService( const OUString& _rServiceName )
diff --git a/connectivity/source/drivers/mysql_jdbc/YDriver.cxx b/connectivity/source/drivers/mysql_jdbc/YDriver.cxx
index 233313f6bd7d..356233ed3110 100644
--- a/connectivity/source/drivers/mysql_jdbc/YDriver.cxx
+++ b/connectivity/source/drivers/mysql_jdbc/YDriver.cxx
@@ -401,7 +401,7 @@ ODriverDelegator::getDataDefinitionByURL(const OUString& url, const Sequence<Pro
 
 OUString ODriverDelegator::getImplementationName_Static()
 {
-    return OUString("org.openoffice.comp.drivers.MySQL.Driver");
+    return "org.openoffice.comp.drivers.MySQL.Driver";
 }
 
 Sequence<OUString> ODriverDelegator::getSupportedServiceNames_Static()
diff --git a/connectivity/source/drivers/mysql_jdbc/YTable.cxx b/connectivity/source/drivers/mysql_jdbc/YTable.cxx
index e1556746c0e1..b3bd6c15a98b 100644
--- a/connectivity/source/drivers/mysql_jdbc/YTable.cxx
+++ b/connectivity/source/drivers/mysql_jdbc/YTable.cxx
@@ -57,7 +57,7 @@ namespace mysql
 class OMySQLKeysHelper : public OKeysHelper
 {
 protected:
-    virtual OUString getDropForeignKey() const override { return OUString(" DROP FOREIGN KEY "); }
+    virtual OUString getDropForeignKey() const override { return " DROP FOREIGN KEY "; }
 
 public:
     OMySQLKeysHelper(OTableHelper* _pTable, ::osl::Mutex& _rMutex,
@@ -286,7 +286,7 @@ void OMySQLTable::alterColumnType(sal_Int32 nNewType, const OUString& _rColName,
     executeStatement(sSql);
 }
 
-OUString OMySQLTable::getTypeCreatePattern() const { return OUString("(M,D)"); }
+OUString OMySQLTable::getTypeCreatePattern() const { return "(M,D)"; }
 
 void OMySQLTable::alterDefaultValue(const OUString& _sNewDefault, const OUString& _rColName)
 {
@@ -332,6 +332,6 @@ void OMySQLTable::executeStatement(const OUString& _rStatement)
     }
 }
 
-OUString OMySQLTable::getRenameStart() const { return OUString("RENAME TABLE "); }
+OUString OMySQLTable::getRenameStart() const { return "RENAME TABLE "; }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/mysqlc/mysqlc_connection.cxx b/connectivity/source/drivers/mysqlc/mysqlc_connection.cxx
index 2ad5b5f56962..10dd779cc8f6 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_connection.cxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_connection.cxx
@@ -202,7 +202,7 @@ void OConnection::construct(const OUString& url, const Sequence<PropertyValue>&
 
 OUString OConnection::getImplementationName()
 {
-    return OUString("com.sun.star.sdbc.drivers.mysqlc.OConnection");
+    return "com.sun.star.sdbc.drivers.mysqlc.OConnection";
 }
 
 css::uno::Sequence<OUString> OConnection::getSupportedServiceNames()
diff --git a/connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.cxx b/connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.cxx
index 3bdc27e7744b..be8dc496de2e 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.cxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.cxx
@@ -171,11 +171,11 @@ sal_Int32 SAL_CALL ODatabaseMetaData::getMaxIndexLength() { return 256; }
 
 sal_Bool SAL_CALL ODatabaseMetaData::supportsNonNullableColumns() { return true; }
 
-OUString SAL_CALL ODatabaseMetaData::getCatalogTerm() { return OUString("n/a"); }
+OUString SAL_CALL ODatabaseMetaData::getCatalogTerm() { return "n/a"; }
 
-OUString SAL_CALL ODatabaseMetaData::getIdentifierQuoteString() { return OUString("\""); }
+OUString SAL_CALL ODatabaseMetaData::getIdentifierQuoteString() { return "\""; }
 
-OUString SAL_CALL ODatabaseMetaData::getExtraNameCharacters() { return OUString("#@"); }
+OUString SAL_CALL ODatabaseMetaData::getExtraNameCharacters() { return "#@"; }
 
 sal_Bool SAL_CALL ODatabaseMetaData::supportsDifferentTableCorrelationNames() { return true; }
 
@@ -366,9 +366,9 @@ OUString SAL_CALL ODatabaseMetaData::getUserName()
     return OUString();
 }
 
-OUString SAL_CALL ODatabaseMetaData::getDriverName() { return OUString("MySQL Connector/OO.org"); }
+OUString SAL_CALL ODatabaseMetaData::getDriverName() { return "MySQL Connector/OO.org"; }
 
-OUString SAL_CALL ODatabaseMetaData::getDriverVersion() { return OUString("0.9.2"); }
+OUString SAL_CALL ODatabaseMetaData::getDriverVersion() { return "0.9.2"; }
 
 OUString SAL_CALL ODatabaseMetaData::getDatabaseProductVersion()
 {
@@ -376,11 +376,11 @@ OUString SAL_CALL ODatabaseMetaData::getDatabaseProductVersion()
                              m_rConnection.getConnectionEncoding());
 }
 
-OUString SAL_CALL ODatabaseMetaData::getDatabaseProductName() { return OUString("MySQL"); }
+OUString SAL_CALL ODatabaseMetaData::getDatabaseProductName() { return "MySQL"; }
 
-OUString SAL_CALL ODatabaseMetaData::getProcedureTerm() { return OUString("procedure"); }
+OUString SAL_CALL ODatabaseMetaData::getProcedureTerm() { return "procedure"; }
 
-OUString SAL_CALL ODatabaseMetaData::getSchemaTerm() { return OUString("database"); }
+OUString SAL_CALL ODatabaseMetaData::getSchemaTerm() { return "database"; }
 
 sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMajorVersion()
 {
@@ -404,85 +404,85 @@ sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMinorVersion()
 
 OUString SAL_CALL ODatabaseMetaData::getSQLKeywords()
 {
-    return OUString("ACCESSIBLE, ADD, ALL,"
-                    "ALTER, ANALYZE, AND, AS, ASC, ASENSITIVE, BEFORE,"
-                    "BETWEEN, BIGINT, BINARY, BLOB, BOTH, BY, CALL,"
-                    "CASCADE, CASE, CHANGE, CHAR, CHARACTER, CHECK,"
-                    "COLLATE, COLUMN, CONDITION, CONNECTION, CONSTRAINT,"
-                    "CONTINUE, CONVERT, CREATE, CROSS, CURRENT_DATE,"
-                    "CURRENT_TIME, CURRENT_TIMESTAMP, CURRENT_USER, CURSOR,"
-                    "DATABASE, DATABASES, DAY_HOUR, DAY_MICROSECOND,"
-                    "DAY_MINUTE, DAY_SECOND, DEC, DECIMAL, DECLARE,"
-                    "DEFAULT, DELAYED, DELETE, DESC, DESCRIBE,"
-                    "DETERMINISTIC, DISTINCT, DISTINCTROW, DIV, DOUBLE,"
-                    "DROP, DUAL, EACH, ELSE, ELSEIF, ENCLOSED,"
-                    "ESCAPED, EXISTS, EXIT, EXPLAIN, FALSE, FETCH,"
-                    "FLOAT, FLOAT4, FLOAT8, FOR, FORCE, FOREIGN, FROM,"
-                    "FULLTEXT, GRANT, GROUP, HAVING, HIGH_PRIORITY,"
-                    "HOUR_MICROSECOND, HOUR_MINUTE, HOUR_SECOND, IF,"
-                    "IGNORE, IN, INDEX, INFILE, INNER, INOUT,"
-                    "INSENSITIVE, INSERT, INT, INT1, INT2, INT3, INT4,"
-                    "INT8, INTEGER, INTERVAL, INTO, IS, ITERATE, JOIN,"
-                    "KEY, KEYS, KILL, LEADING, LEAVE, LEFT, LIKE,"
-                    "LOCALTIMESTAMP, LOCK, LONG, LONGBLOB, LONGTEXT,"
-                    "LOOP, LOW_PRIORITY, MATCH, MEDIUMBLOB, MEDIUMINT,"
-                    "MEDIUMTEXT, MIDDLEINT, MINUTE_MICROSECOND,"
-                    "MINUTE_SECOND, MOD, MODIFIES, NATURAL, NOT,"
-                    "NO_WRITE_TO_BINLOG, NULL, NUMERIC, ON, OPTIMIZE,"
-                    "OPTION, OPTIONALLY, OR, ORDER, OUT, OUTER,"
-                    "OUTFILE, PRECISION, PRIMARY, PROCEDURE, PURGE,"
-                    "RANGE, READ, READS, READ_ONLY, READ_WRITE, REAL,"
-                    "REFERENCES, REGEXP, RELEASE, RENAME, REPEAT,"
-                    "REPLACE, REQUIRE, RESTRICT, RETURN, REVOKE, RIGHT,"
-                    "RLIKE, SCHEMA, SCHEMAS, SECOND_MICROSECOND, SELECT,"
-                    "SENSITIVE, SEPARATOR, SET, SHOW, SMALLINT, SPATIAL,"
-                    "SPECIFIC, SQL, SQLEXCEPTION, SQLSTATE, SQLWARNING,"
-                    "SQL_BIG_RESULT, SQL_CALC_FOUND_ROWS, SQL_SMALL_RESULT,"
-                    "SSL, STARTING, STRAIGHT_JOIN, TABLE, TERMINATED,"
-                    "THEN, TINYBLOB, TINYINT, TINYTEXT, TO, TRAILING,"
-                    "TRIGGER, TRUE, UNDO, UNION, UNIQUE, UNLOCK,"
-                    "UNSIGNED, UPDATE, USAGE, USE, USING, UTC_DATE,"
-                    "UTC_TIME, UTC_TIMESTAMP, VALUES, VARBINARY, VARCHAR,"
-                    "VARCHARACTER, VARYING, WHEN, WHERE, WHILE, WITH,"
-                    "WRITE, X509, XOR, YEAR_MONTH, ZEROFILL"
-                    "GENERAL, IGNORE_SERVER_IDS, MASTER_HEARTBEAT_PERIOD,"
-                    "MAXVALUE, RESIGNAL, SIGNAL, SLOW");
+    return "ACCESSIBLE, ADD, ALL,"
+           "ALTER, ANALYZE, AND, AS, ASC, ASENSITIVE, BEFORE,"
+           "BETWEEN, BIGINT, BINARY, BLOB, BOTH, BY, CALL,"
+           "CASCADE, CASE, CHANGE, CHAR, CHARACTER, CHECK,"
+           "COLLATE, COLUMN, CONDITION, CONNECTION, CONSTRAINT,"
+           "CONTINUE, CONVERT, CREATE, CROSS, CURRENT_DATE,"
+           "CURRENT_TIME, CURRENT_TIMESTAMP, CURRENT_USER, CURSOR,"
+           "DATABASE, DATABASES, DAY_HOUR, DAY_MICROSECOND,"
+           "DAY_MINUTE, DAY_SECOND, DEC, DECIMAL, DECLARE,"
+           "DEFAULT, DELAYED, DELETE, DESC, DESCRIBE,"
+           "DETERMINISTIC, DISTINCT, DISTINCTROW, DIV, DOUBLE,"
+           "DROP, DUAL, EACH, ELSE, ELSEIF, ENCLOSED,"
+           "ESCAPED, EXISTS, EXIT, EXPLAIN, FALSE, FETCH,"
+           "FLOAT, FLOAT4, FLOAT8, FOR, FORCE, FOREIGN, FROM,"
+           "FULLTEXT, GRANT, GROUP, HAVING, HIGH_PRIORITY,"
+           "HOUR_MICROSECOND, HOUR_MINUTE, HOUR_SECOND, IF,"
+           "IGNORE, IN, INDEX, INFILE, INNER, INOUT,"
+           "INSENSITIVE, INSERT, INT, INT1, INT2, INT3, INT4,"
+           "INT8, INTEGER, INTERVAL, INTO, IS, ITERATE, JOIN,"
+           "KEY, KEYS, KILL, LEADING, LEAVE, LEFT, LIKE,"
+           "LOCALTIMESTAMP, LOCK, LONG, LONGBLOB, LONGTEXT,"
+           "LOOP, LOW_PRIORITY, MATCH, MEDIUMBLOB, MEDIUMINT,"
+           "MEDIUMTEXT, MIDDLEINT, MINUTE_MICROSECOND,"
+           "MINUTE_SECOND, MOD, MODIFIES, NATURAL, NOT,"
+           "NO_WRITE_TO_BINLOG, NULL, NUMERIC, ON, OPTIMIZE,"
+           "OPTION, OPTIONALLY, OR, ORDER, OUT, OUTER,"
+           "OUTFILE, PRECISION, PRIMARY, PROCEDURE, PURGE,"
+           "RANGE, READ, READS, READ_ONLY, READ_WRITE, REAL,"
+           "REFERENCES, REGEXP, RELEASE, RENAME, REPEAT,"
+           "REPLACE, REQUIRE, RESTRICT, RETURN, REVOKE, RIGHT,"
+           "RLIKE, SCHEMA, SCHEMAS, SECOND_MICROSECOND, SELECT,"
+           "SENSITIVE, SEPARATOR, SET, SHOW, SMALLINT, SPATIAL,"
+           "SPECIFIC, SQL, SQLEXCEPTION, SQLSTATE, SQLWARNING,"
+           "SQL_BIG_RESULT, SQL_CALC_FOUND_ROWS, SQL_SMALL_RESULT,"
+           "SSL, STARTING, STRAIGHT_JOIN, TABLE, TERMINATED,"
+           "THEN, TINYBLOB, TINYINT, TINYTEXT, TO, TRAILING,"
+           "TRIGGER, TRUE, UNDO, UNION, UNIQUE, UNLOCK,"
+           "UNSIGNED, UPDATE, USAGE, USE, USING, UTC_DATE,"
+           "UTC_TIME, UTC_TIMESTAMP, VALUES, VARBINARY, VARCHAR,"
+           "VARCHARACTER, VARYING, WHEN, WHERE, WHILE, WITH,"
+           "WRITE, X509, XOR, YEAR_MONTH, ZEROFILL"
+           "GENERAL, IGNORE_SERVER_IDS, MASTER_HEARTBEAT_PERIOD,"
+           "MAXVALUE, RESIGNAL, SIGNAL, SLOW";
 }
 
-OUString SAL_CALL ODatabaseMetaData::getSearchStringEscape() { return OUString("\\"); }
+OUString SAL_CALL ODatabaseMetaData::getSearchStringEscape() { return "\\"; }
 
 OUString SAL_CALL ODatabaseMetaData::getStringFunctions()
 {
-    return OUString("ASCII,BIN,BIT_LENGTH,CHAR,CHARACTER_LENGTH,CHAR_LENGTH,CONCAT,"
-                    "CONCAT_WS,CONV,ELT,EXPORT_SET,FIELD,FIND_IN_SET,HEX,INSERT,"
-                    "INSTR,LCASE,LEFT,LENGTH,LOAD_FILE,LOCATE,LOCATE,LOWER,LPAD,"
-                    "LTRIM,MAKE_SET,MATCH,MID,OCT,OCTET_LENGTH,ORD,POSITION,"
-                    "QUOTE,REPEAT,REPLACE,REVERSE,RIGHT,RPAD,RTRIM,SOUNDEX,"
-                    "SPACE,STRCMP,SUBSTRING,SUBSTRING,SUBSTRING,SUBSTRING,"
-                    "SUBSTRING_INDEX,TRIM,UCASE,UPPER");
+    return "ASCII,BIN,BIT_LENGTH,CHAR,CHARACTER_LENGTH,CHAR_LENGTH,CONCAT,"
+           "CONCAT_WS,CONV,ELT,EXPORT_SET,FIELD,FIND_IN_SET,HEX,INSERT,"
+           "INSTR,LCASE,LEFT,LENGTH,LOAD_FILE,LOCATE,LOCATE,LOWER,LPAD,"
+           "LTRIM,MAKE_SET,MATCH,MID,OCT,OCTET_LENGTH,ORD,POSITION,"
+           "QUOTE,REPEAT,REPLACE,REVERSE,RIGHT,RPAD,RTRIM,SOUNDEX,"
+           "SPACE,STRCMP,SUBSTRING,SUBSTRING,SUBSTRING,SUBSTRING,"
+           "SUBSTRING_INDEX,TRIM,UCASE,UPPER";
 }
 
 OUString SAL_CALL ODatabaseMetaData::getTimeDateFunctions()
 {
-    return OUString("DAYOFWEEK,WEEKDAY,DAYOFMONTH,DAYOFYEAR,MONTH,DAYNAME,"
-                    "MONTHNAME,QUARTER,WEEK,YEAR,HOUR,MINUTE,SECOND,PERIOD_ADD,"
-                    "PERIOD_DIFF,TO_DAYS,FROM_DAYS,DATE_FORMAT,TIME_FORMAT,"
-                    "CURDATE,CURRENT_DATE,CURTIME,CURRENT_TIME,NOW,SYSDATE,"
-                    "CURRENT_TIMESTAMP,UNIX_TIMESTAMP,FROM_UNIXTIME,"
-                    "SEC_TO_TIME,TIME_TO_SEC");
+    return "DAYOFWEEK,WEEKDAY,DAYOFMONTH,DAYOFYEAR,MONTH,DAYNAME,"
+           "MONTHNAME,QUARTER,WEEK,YEAR,HOUR,MINUTE,SECOND,PERIOD_ADD,"
+           "PERIOD_DIFF,TO_DAYS,FROM_DAYS,DATE_FORMAT,TIME_FORMAT,"
+           "CURDATE,CURRENT_DATE,CURTIME,CURRENT_TIME,NOW,SYSDATE,"
+           "CURRENT_TIMESTAMP,UNIX_TIMESTAMP,FROM_UNIXTIME,"
+           "SEC_TO_TIME,TIME_TO_SEC";
 }
 
 OUString SAL_CALL ODatabaseMetaData::getSystemFunctions()
 {
-    return OUString("DATABASE,USER,SYSTEM_USER,"
-                    "SESSION_USER,PASSWORD,ENCRYPT,LAST_INSERT_ID,VERSION");
+    return "DATABASE,USER,SYSTEM_USER,"
+           "SESSION_USER,PASSWORD,ENCRYPT,LAST_INSERT_ID,VERSION";
 }
 
 OUString SAL_CALL ODatabaseMetaData::getNumericFunctions()
 {
-    return OUString("ABS,ACOS,ASIN,ATAN,ATAN2,BIT_COUNT,CEILING,COS,"
-                    "COT,DEGREES,EXP,FLOOR,LOG,LOG10,MAX,MIN,MOD,PI,POW,"
-                    "POWER,RADIANS,RAND,ROUND,SIN,SQRT,TAN,TRUNCATE");
+    return "ABS,ACOS,ASIN,ATAN,ATAN2,BIT_COUNT,CEILING,COS,"
+           "COT,DEGREES,EXP,FLOOR,LOG,LOG10,MAX,MIN,MOD,PI,POW,"
+           "POWER,RADIANS,RAND,ROUND,SIN,SQRT,TAN,TRUNCATE";
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::supportsExtendedSQLGrammar() { return false; }
diff --git a/connectivity/source/drivers/mysqlc/mysqlc_driver.cxx b/connectivity/source/drivers/mysqlc/mysqlc_driver.cxx
index 0f6c90922e5f..ba06dcf6a860 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_driver.cxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_driver.cxx
@@ -56,7 +56,7 @@ void MysqlCDriver::disposing()
 // static ServiceInfo
 OUString MysqlCDriver::getImplementationName_Static()
 {
-    return OUString("com.sun.star.comp.sdbc.mysqlc.MysqlCDriver");
+    return "com.sun.star.comp.sdbc.mysqlc.MysqlCDriver";
 }
 
 Sequence<OUString> MysqlCDriver::getSupportedServiceNames_Static()
diff --git a/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx b/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx
index df5702605945..fbb167f79f72 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx
@@ -158,7 +158,7 @@ bool OPreparedResultSet::fetchResult()
 
 OUString SAL_CALL OPreparedResultSet::getImplementationName()
 {
-    return OUString("com.sun.star.sdbcx.mysqlc.ResultSet");
+    return "com.sun.star.sdbcx.mysqlc.ResultSet";
 }
 
 uno::Sequence<OUString> SAL_CALL OPreparedResultSet::getSupportedServiceNames()
diff --git a/connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.cxx b/connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.cxx
index 910825742cef..7622de7bf8d1 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.cxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.cxx
@@ -43,7 +43,7 @@ using ::osl::MutexGuard;
 
 OUString OPreparedStatement::getImplementationName()
 {
-    return OUString("com.sun.star.sdbcx.mysqlc.PreparedStatement");
+    return "com.sun.star.sdbcx.mysqlc.PreparedStatement";
 }
 
 css::uno::Sequence<OUString> OPreparedStatement::getSupportedServiceNames()
diff --git a/connectivity/source/drivers/mysqlc/mysqlc_resultset.cxx b/connectivity/source/drivers/mysqlc/mysqlc_resultset.cxx
index 0175dcd9cab9..5b6a3d34ffb5 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_resultset.cxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_resultset.cxx
@@ -98,7 +98,7 @@ bool OResultSet::checkNull(sal_Int32 column)
 
 OUString SAL_CALL OResultSet::getImplementationName()
 {
-    return OUString("com.sun.star.sdbcx.mysqlc.ResultSet");
+    return "com.sun.star.sdbcx.mysqlc.ResultSet";
 }
 
 uno::Sequence<OUString> SAL_CALL OResultSet::getSupportedServiceNames()
diff --git a/connectivity/source/drivers/mysqlc/mysqlc_statement.cxx b/connectivity/source/drivers/mysqlc/mysqlc_statement.cxx
index a789dc4996b6..f0f36fe35f79 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_statement.cxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_statement.cxx
@@ -326,7 +326,7 @@ void OCommonStatement::getFastPropertyValue(Any& _rValue, sal_Int32 nHandle) con
     }
 }
 
-OUString OStatement::getImplementationName() { return OUString("com.sun.star.sdbcx.OStatement"); }
+OUString OStatement::getImplementationName() { return "com.sun.star.sdbcx.OStatement"; }
 
 css::uno::Sequence<OUString> OStatement::getSupportedServiceNames()
 {
diff --git a/connectivity/source/drivers/odbc/ODriver.cxx b/connectivity/source/drivers/odbc/ODriver.cxx
index 642413bb82f0..81eecfa10ff1 100644
--- a/connectivity/source/drivers/odbc/ODriver.cxx
+++ b/connectivity/source/drivers/odbc/ODriver.cxx
@@ -59,7 +59,7 @@ void ODBCDriver::disposing()
 
 OUString ODBCDriver::getImplementationName_Static(  )
 {
-    return OUString("com.sun.star.comp.sdbc.ODBCDriver");
+    return "com.sun.star.comp.sdbc.ODBCDriver";
         // this name is referenced in the configuration and in the odbc.xml
         // Please take care when changing it.
 }
diff --git a/connectivity/source/drivers/odbc/OResultSet.cxx b/connectivity/source/drivers/odbc/OResultSet.cxx
index c9755e762140..80fd002adc05 100644
--- a/connectivity/source/drivers/odbc/OResultSet.cxx
+++ b/connectivity/source/drivers/odbc/OResultSet.cxx
@@ -65,7 +65,7 @@ namespace
 //  IMPLEMENT_SERVICE_INFO(OResultSet,"com.sun.star.sdbcx.OResultSet","com.sun.star.sdbc.ResultSet");
 OUString SAL_CALL OResultSet::getImplementationName(  )
 {
-    return OUString("com.sun.star.sdbcx.odbc.ResultSet");
+    return "com.sun.star.sdbcx.odbc.ResultSet";
 }
 
  Sequence< OUString > SAL_CALL OResultSet::getSupportedServiceNames(  )
diff --git a/connectivity/source/drivers/postgresql/pq_array.cxx b/connectivity/source/drivers/postgresql/pq_array.cxx
index 1f0ccfd1b6e8..12bc4bbea0c7 100644
--- a/connectivity/source/drivers/postgresql/pq_array.cxx
+++ b/connectivity/source/drivers/postgresql/pq_array.cxx
@@ -56,7 +56,7 @@ namespace pq_sdbc_driver
 
 OUString Array::getBaseTypeName(  )
 {
-    return OUString( "varchar" );
+    return "varchar";
 }
 
 sal_Int32 Array::getBaseType(  )
diff --git a/connectivity/source/drivers/postgresql/pq_connection.cxx b/connectivity/source/drivers/postgresql/pq_connection.cxx
index 21c310fef15e..34150abe2889 100644
--- a/connectivity/source/drivers/postgresql/pq_connection.cxx
+++ b/connectivity/source/drivers/postgresql/pq_connection.cxx
@@ -119,7 +119,7 @@ public:
 
 static OUString    ConnectionGetImplementationName()
 {
-    return OUString( "org.openoffice.comp.connectivity.pq.Connection.noext" );
+    return "org.openoffice.comp.connectivity.pq.Connection.noext";
 }
 static css::uno::Sequence<OUString> ConnectionGetSupportedServiceNames()
 {
diff --git a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
index 6f0d99f7fba9..4f89e807185a 100644
--- a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
+++ b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
@@ -182,7 +182,7 @@ sal_Bool DatabaseMetaData::nullsAreSortedAtEnd(  )
 
 OUString DatabaseMetaData::getDatabaseProductName(  )
 {
-    return OUString("PostgreSQL");
+    return "PostgreSQL";
 }
 
 OUString DatabaseMetaData::getDatabaseProductVersion(  )
@@ -191,12 +191,12 @@ OUString DatabaseMetaData::getDatabaseProductVersion(  )
 }
 OUString DatabaseMetaData::getDriverName(  )
 {
-    return OUString("postgresql-sdbc");
+    return "postgresql-sdbc";
 }
 
 OUString DatabaseMetaData::getDriverVersion(  )
 {
-    return OUString(PQ_SDBC_DRIVER_VERSION);
+    return PQ_SDBC_DRIVER_VERSION;
 }
 
 sal_Int32 DatabaseMetaData::getDriverMajorVersion(  )
@@ -272,7 +272,7 @@ sal_Bool DatabaseMetaData::storesMixedCaseQuotedIdentifiers(  )
 
 OUString DatabaseMetaData::getIdentifierQuoteString(  )
 {
-    return OUString("\"");
+    return "\"";
 }
 
 OUString DatabaseMetaData::getSQLKeywords(  )
@@ -282,7 +282,7 @@ OUString DatabaseMetaData::getSQLKeywords(  )
     // I understand this to mean "reserved keywords" only.
     // See http://www.postgresql.org/docs/current/static/sql-keywords-appendix.html
     // LEM TODO: consider using pg_get_keywords(), filter on catcode
-    return OUString(
+    return
         "ANALYSE,"
         "ANALYZE,"
         "ARRAY," //SQL:1999
@@ -308,7 +308,7 @@ OUString DatabaseMetaData::getSQLKeywords(  )
         "VARIADIC,"
         "VERBOSE,"
         "WINDOW" //SQL:2003
- );
+ ;
 }
 OUString DatabaseMetaData::getNumericFunctions(  )
 {
@@ -318,7 +318,7 @@ OUString DatabaseMetaData::getNumericFunctions(  )
     //           Currently this is just a list of supported functions in PostgreSQL, with PostgreSQL names.
     //           And it is my job to map from Open Group CLI names/syntax to PostgreSQL names/syntax. Where? By parsing the SQL???
     //           Should look at what the JDBC driver is doing.
-    return OUString(
+    return
         "abs,"
         "cbrt,"
         "ceil,"
@@ -348,13 +348,13 @@ OUString DatabaseMetaData::getNumericFunctions(  )
         "cot,"
         "sin,"
         "tan"
- );
+ ;
 }
 
 OUString DatabaseMetaData::getStringFunctions(  )
 {
     // See http://www.postgresql.org/docs/9.1/static/functions-string.html
-    return OUString(
+    return
         "bit_length,"
         "char_length,"
         "character_length,"
@@ -402,14 +402,14 @@ OUString DatabaseMetaData::getStringFunctions(  )
         "to_ascii,"
         "to_hex,"
         "translate"
- );
+ ;
 }
 
 OUString DatabaseMetaData::getSystemFunctions(  )
 {
     // See http://www.postgresql.org/docs/9.1/static/functions-info.html
     // and http://www.postgresql.org/docs/9.1/static/functions-admin.html
-    return OUString(
+    return
         "current_catalog,"
         "current_database,"
         "current_query,"
@@ -532,12 +532,12 @@ OUString DatabaseMetaData::getSystemFunctions(  )
         "pg_try_advisory_xact_lock,"
         "pg_try_advisory_xact_lock_shared,"
         "pg_sleep"
- );
+ ;
 }
 OUString DatabaseMetaData::getTimeDateFunctions(  )
 {
     // TODO
-    return OUString(
+    return
         "age,"
         "age,"
         "clock_timestamp,"
@@ -561,15 +561,15 @@ OUString DatabaseMetaData::getTimeDateFunctions(  )
         "statement_timestamp,"
         "timeofday,"
         "transaction_timestamp,"
- );
+ ;
 }
 OUString DatabaseMetaData::getSearchStringEscape(  )
 {
-    return OUString("\\");
+    return "\\";
 }
 OUString DatabaseMetaData::getExtraNameCharacters(  )
 {
-    return OUString("$");
+    return "$";
 }
 
 sal_Bool DatabaseMetaData::supportsAlterTableWithAddColumn(  )
@@ -724,17 +724,17 @@ sal_Bool DatabaseMetaData::supportsLimitedOuterJoins(  )
 
 OUString DatabaseMetaData::getSchemaTerm(  )
 {
-    return OUString("SCHEMA");
+    return "SCHEMA";
 }
 
 OUString DatabaseMetaData::getProcedureTerm(  )
 {
-    return OUString("function");
+    return "function";
 }
 
 OUString DatabaseMetaData::getCatalogTerm(  )
 {
-    return OUString("DATABASE");
+    return "DATABASE";
 }
 
 sal_Bool DatabaseMetaData::isCatalogAtStart(  )
@@ -744,7 +744,7 @@ sal_Bool DatabaseMetaData::isCatalogAtStart(  )
 
 OUString DatabaseMetaData::getCatalogSeparator(  )
 {
-    return OUString(".");
+    return ".";
 }
 
 sal_Bool DatabaseMetaData::supportsSchemasInDataManipulation(  )
diff --git a/connectivity/source/drivers/postgresql/pq_driver.cxx b/connectivity/source/drivers/postgresql/pq_driver.cxx
index 0a360e603d70..b11dc491d016 100644
--- a/connectivity/source/drivers/postgresql/pq_driver.cxx
+++ b/connectivity/source/drivers/postgresql/pq_driver.cxx
@@ -70,7 +70,7 @@ namespace pq_sdbc_driver
 
 static OUString DriverGetImplementationName()
 {
-    return OUString( "org.openoffice.comp.connectivity.pq.Driver.noext" );
+    return "org.openoffice.comp.connectivity.pq.Driver.noext";
 }
 
 static Sequence< OUString > DriverGetSupportedServiceNames()
diff --git a/connectivity/source/drivers/writer/WDriver.cxx b/connectivity/source/drivers/writer/WDriver.cxx
index 97bfbe6c18ee..75cae7f33200 100644
--- a/connectivity/source/drivers/writer/WDriver.cxx
+++ b/connectivity/source/drivers/writer/WDriver.cxx
@@ -32,10 +32,7 @@ namespace connectivity
 {
 namespace writer
 {
-OUString ODriver::getImplementationName_Static()
-{
-    return OUString("com.sun.star.comp.sdbc.writer.ODriver");
-}
+OUString ODriver::getImplementationName_Static() { return "com.sun.star.comp.sdbc.writer.ODriver"; }
 
 OUString SAL_CALL ODriver::getImplementationName() { return getImplementationName_Static(); }
 
diff --git a/connectivity/source/manager/mdrivermanager.cxx b/connectivity/source/manager/mdrivermanager.cxx
index 2a1a31f9d575..2a9f3e1de08f 100644
--- a/connectivity/source/manager/mdrivermanager.cxx
+++ b/connectivity/source/manager/mdrivermanager.cxx
@@ -525,7 +525,7 @@ Reference< XInterface > OSDBCDriverManager::Create( const Reference< XMultiServi
 
 OUString OSDBCDriverManager::getImplementationName_static(  )
 {
-    return OUString("com.sun.star.comp.sdbc.OSDBCDriverManager");
+    return "com.sun.star.comp.sdbc.OSDBCDriverManager";
 }
 
 
@@ -538,7 +538,7 @@ Sequence< OUString > OSDBCDriverManager::getSupportedServiceNames_static(  )
 
 OUString OSDBCDriverManager::getSingletonName_static(  )
 {
-    return OUString(  "com.sun.star.sdbc.DriverManager"  );
+    return "com.sun.star.sdbc.DriverManager";
 }
 
 
diff --git a/connectivity/source/sdbcx/VColumn.cxx b/connectivity/source/sdbcx/VColumn.cxx
index 78b223ef1f74..41a515266890 100644
--- a/connectivity/source/sdbcx/VColumn.cxx
+++ b/connectivity/source/sdbcx/VColumn.cxx
@@ -37,8 +37,8 @@ using namespace ::com::sun::star::sdbc;
 OUString SAL_CALL OColumn::getImplementationName(  )
 {
     if(isNew())
-        return OUString("com.sun.star.sdbcx.VColumnDescriptor");
-    return OUString("com.sun.star.sdbcx.VColumn");
+        return "com.sun.star.sdbcx.VColumnDescriptor";
+    return "com.sun.star.sdbcx.VColumn";
 }
 
 css::uno::Sequence< OUString > SAL_CALL OColumn::getSupportedServiceNames(  )
diff --git a/connectivity/source/sdbcx/VIndex.cxx b/connectivity/source/sdbcx/VIndex.cxx
index 67fb446b485f..e510195524ea 100644
--- a/connectivity/source/sdbcx/VIndex.cxx
+++ b/connectivity/source/sdbcx/VIndex.cxx
@@ -42,8 +42,8 @@ using namespace ::com::sun::star::lang;
 OUString SAL_CALL OIndex::getImplementationName(  )
 {
     if(isNew())
-        return OUString("com.sun.star.sdbcx.VIndexDescriptor");
-    return OUString("com.sun.star.sdbcx.VIndex");
+        return "com.sun.star.sdbcx.VIndexDescriptor";
+    return "com.sun.star.sdbcx.VIndex";
 }
 
 css::uno::Sequence< OUString > SAL_CALL OIndex::getSupportedServiceNames(  )
diff --git a/connectivity/source/sdbcx/VIndexColumn.cxx b/connectivity/source/sdbcx/VIndexColumn.cxx
index 744ffff5112d..6bda93ac2a01 100644
--- a/connectivity/source/sdbcx/VIndexColumn.cxx
+++ b/connectivity/source/sdbcx/VIndexColumn.cxx
@@ -30,8 +30,8 @@ using namespace ::com::sun::star::uno;
 OUString SAL_CALL OIndexColumn::getImplementationName(  )
 {
     if(isNew())
-        return OUString("com.sun.star.sdbcx.VIndexColumnDescriptor");
-    return OUString("com.sun.star.sdbcx.VIndexColumn");
+        return "com.sun.star.sdbcx.VIndexColumnDescriptor";
+    return "com.sun.star.sdbcx.VIndexColumn";
 }
 
 css::uno::Sequence< OUString > SAL_CALL OIndexColumn::getSupportedServiceNames(  )
diff --git a/connectivity/source/sdbcx/VKey.cxx b/connectivity/source/sdbcx/VKey.cxx
index 5a7bc636f7b0..f8ef22d52728 100644
--- a/connectivity/source/sdbcx/VKey.cxx
+++ b/connectivity/source/sdbcx/VKey.cxx
@@ -40,8 +40,8 @@ using namespace ::com::sun::star::lang;
 OUString SAL_CALL OKey::getImplementationName(  )
 {
     if(isNew())
-        return OUString("com.sun.star.sdbcx.VKeyDescriptor");
-    return OUString("com.sun.star.sdbcx.VKey");
+        return "com.sun.star.sdbcx.VKeyDescriptor";
+    return "com.sun.star.sdbcx.VKey";
 }
 
 css::uno::Sequence< OUString > SAL_CALL OKey::getSupportedServiceNames(  )
diff --git a/connectivity/source/sdbcx/VKeyColumn.cxx b/connectivity/source/sdbcx/VKeyColumn.cxx
index fd844bb17b96..902b907ee7f1 100644
--- a/connectivity/source/sdbcx/VKeyColumn.cxx
+++ b/connectivity/source/sdbcx/VKeyColumn.cxx
@@ -31,8 +31,8 @@ using namespace cppu;
 OUString SAL_CALL OKeyColumn::getImplementationName(  )
 {
     if(isNew())
-        return OUString("com.sun.star.sdbcx.VKeyColumnDescriptor");
-    return OUString("com.sun.star.sdbcx.VKeyColumn");
+        return "com.sun.star.sdbcx.VKeyColumnDescriptor";
+    return "com.sun.star.sdbcx.VKeyColumn";
 }
 
 css::uno::Sequence< OUString > SAL_CALL OKeyColumn::getSupportedServiceNames(  )
diff --git a/connectivity/source/sdbcx/VTable.cxx b/connectivity/source/sdbcx/VTable.cxx
index db60d4a0e928..2526f6f088c9 100644
--- a/connectivity/source/sdbcx/VTable.cxx
+++ b/connectivity/source/sdbcx/VTable.cxx
@@ -44,8 +44,8 @@ using namespace ::com::sun::star::lang;
 OUString SAL_CALL OTable::getImplementationName(  )
 {
     if(isNew())
-        return OUString("com.sun.star.sdbcx.VTableDescriptor");
-    return OUString("com.sun.star.sdbcx.Table");
+        return "com.sun.star.sdbcx.VTableDescriptor";
+    return "com.sun.star.sdbcx.Table";
 }