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

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

57 files changed, 110 insertions, 110 deletions

diff --git a/dbaccess/source/core/api/RowSet.cxx b/dbaccess/source/core/api/RowSet.cxx
index b2b9430f562e..b0249a27702b 100644
--- a/dbaccess/source/core/api/RowSet.cxx
+++ b/dbaccess/source/core/api/RowSet.cxx
@@ -468,7 +468,7 @@ Any SAL_CALL ORowSet::queryAggregation( const Type& rType )
 // css::XServiceInfo
 OUString SAL_CALL ORowSet::getImplementationName()
 {
-    return OUString("com.sun.star.comp.dba.ORowSet");
+    return "com.sun.star.comp.dba.ORowSet";
 }
 
 sal_Bool SAL_CALL ORowSet::supportsService( const OUString& _rServiceName )
@@ -2866,7 +2866,7 @@ void ORowSetClone::release() throw()
 // XServiceInfo
 OUString ORowSetClone::getImplementationName(  )
 {
-    return OUString("com.sun.star.sdb.ORowSetClone");
+    return "com.sun.star.sdb.ORowSetClone";
 }
 
 sal_Bool ORowSetClone::supportsService( const OUString& _rServiceName )
diff --git a/dbaccess/source/core/api/callablestatement.cxx b/dbaccess/source/core/api/callablestatement.cxx
index 2f888596d026..542e7089098d 100644
--- a/dbaccess/source/core/api/callablestatement.cxx
+++ b/dbaccess/source/core/api/callablestatement.cxx
@@ -73,7 +73,7 @@ void OCallableStatement::release() throw ()
 // XServiceInfo
 OUString OCallableStatement::getImplementationName(  )
 {
-    return OUString("com.sun.star.sdb.OCallableStatement");
+    return "com.sun.star.sdb.OCallableStatement";
 }
 
 Sequence< OUString > OCallableStatement::getSupportedServiceNames(  )
diff --git a/dbaccess/source/core/api/column.cxx b/dbaccess/source/core/api/column.cxx
index a7d857283986..8b96a438292e 100644
--- a/dbaccess/source/core/api/column.cxx
+++ b/dbaccess/source/core/api/column.cxx
@@ -88,7 +88,7 @@ IMPLEMENT_FORWARD_XINTERFACE2( OColumn, OColumnBase, ::comphelper::OPropertyCont
 // css::lang::XServiceInfo
 OUString OColumn::getImplementationName(  )
 {
-    return OUString("com.sun.star.sdb.OColumn");
+    return "com.sun.star.sdb.OColumn";
 }
 
 sal_Bool OColumn::supportsService( const OUString& _rServiceName )
@@ -180,7 +180,7 @@ OColumns::~OColumns()
 // XServiceInfo
 OUString OColumns::getImplementationName(  )
 {
-    return OUString("com.sun.star.sdb.OColumns");
+    return "com.sun.star.sdb.OColumns";
 }
 
 sal_Bool OColumns::supportsService( const OUString& _rServiceName )
diff --git a/dbaccess/source/core/api/datacolumn.cxx b/dbaccess/source/core/api/datacolumn.cxx
index cd4481b3c06c..bcf0f9450bfd 100644
--- a/dbaccess/source/core/api/datacolumn.cxx
+++ b/dbaccess/source/core/api/datacolumn.cxx
@@ -84,7 +84,7 @@ Any SAL_CALL ODataColumn::queryInterface( const Type & _rType )
 // XServiceInfo
 OUString ODataColumn::getImplementationName(  )
 {
-    return OUString("com.sun.star.sdb.ODataColumn");
+    return "com.sun.star.sdb.ODataColumn";
 }
 
 Sequence< OUString > ODataColumn::getSupportedServiceNames(  )
diff --git a/dbaccess/source/core/api/definitioncolumn.cxx b/dbaccess/source/core/api/definitioncolumn.cxx
index 520d8ca50958..8ca2c6fd9a6f 100644
--- a/dbaccess/source/core/api/definitioncolumn.cxx
+++ b/dbaccess/source/core/api/definitioncolumn.cxx
@@ -87,7 +87,7 @@ IMPLEMENT_GET_IMPLEMENTATION_ID( OTableColumnDescriptor )
 // css::lang::XServiceInfo
 OUString OTableColumnDescriptor::getImplementationName(  )
 {
-    return OUString("com.sun.star.sdb.OTableColumnDescriptor");
+    return "com.sun.star.sdb.OTableColumnDescriptor";
 }
 
 Sequence< OUString > OTableColumnDescriptor::getSupportedServiceNames(  )
@@ -146,7 +146,7 @@ IMPLEMENT_GET_IMPLEMENTATION_ID( OTableColumn )
 
 OUString OTableColumn::getImplementationName(  )
 {
-    return OUString("com.sun.star.sdb.OTableColumn");
+    return "com.sun.star.sdb.OTableColumn";
 }
 
 ::cppu::IPropertyArrayHelper& SAL_CALL OTableColumn::getInfoHelper()
@@ -287,7 +287,7 @@ IMPLEMENT_GET_IMPLEMENTATION_ID( OQueryColumn )
 
 OUString SAL_CALL OQueryColumn::getImplementationName(  )
 {
-    return OUString( "org.openoffice.comp.dbaccess.OQueryColumn"  );
+    return "org.openoffice.comp.dbaccess.OQueryColumn";
 }
 
 ::cppu::IPropertyArrayHelper& SAL_CALL OQueryColumn::getInfoHelper()
@@ -433,7 +433,7 @@ IMPLEMENT_GET_IMPLEMENTATION_ID( OTableColumnDescriptorWrapper )
 // css::lang::XServiceInfo
 OUString OTableColumnDescriptorWrapper::getImplementationName(  )
 {
-    return OUString("com.sun.star.sdb.OTableColumnDescriptorWrapper");
+    return "com.sun.star.sdb.OTableColumnDescriptorWrapper";
 }
 
 Sequence< OUString > OTableColumnDescriptorWrapper::getSupportedServiceNames(  )
@@ -594,7 +594,7 @@ IMPLEMENT_GET_IMPLEMENTATION_ID( OTableColumnWrapper )
 
 OUString OTableColumnWrapper::getImplementationName(  )
 {
-    return OUString("com.sun.star.sdb.OTableColumnWrapper" );
+    return "com.sun.star.sdb.OTableColumnWrapper";
 }
 
 Sequence< OUString > OTableColumnWrapper::getSupportedServiceNames(  )
diff --git a/dbaccess/source/core/api/preparedstatement.cxx b/dbaccess/source/core/api/preparedstatement.cxx
index 8a127d4137a1..1eb91f2615ec 100644
--- a/dbaccess/source/core/api/preparedstatement.cxx
+++ b/dbaccess/source/core/api/preparedstatement.cxx
@@ -109,7 +109,7 @@ void OPreparedStatement::release() throw ()
 // XServiceInfo
 OUString OPreparedStatement::getImplementationName(  )
 {
-    return OUString("com.sun.star.sdb.OPreparedStatement");
+    return "com.sun.star.sdb.OPreparedStatement";
 }
 
 sal_Bool OPreparedStatement::supportsService( const OUString& _rServiceName )
diff --git a/dbaccess/source/core/api/query.cxx b/dbaccess/source/core/api/query.cxx
index f9137575a78d..76cc0130cc94 100644
--- a/dbaccess/source/core/api/query.cxx
+++ b/dbaccess/source/core/api/query.cxx
@@ -355,7 +355,7 @@ void OQuery::registerProperties()
 
 OUString OQuery::determineContentType() const
 {
-    return OUString( "application/vnd.org.openoffice.DatabaseQuery" );
+    return "application/vnd.org.openoffice.DatabaseQuery";
 }
 
 }   // namespace dbaccess
diff --git a/dbaccess/source/core/api/querycomposer.cxx b/dbaccess/source/core/api/querycomposer.cxx
index 41a0c628ba47..817ceb9dcafa 100644
--- a/dbaccess/source/core/api/querycomposer.cxx
+++ b/dbaccess/source/core/api/querycomposer.cxx
@@ -102,7 +102,7 @@ Any SAL_CALL OQueryComposer::queryInterface( const Type & rType )
 // XServiceInfo
 OUString OQueryComposer::getImplementationName(  )
 {
-    return OUString("com.sun.star.sdb.dbaccess.OQueryComposer");
+    return "com.sun.star.sdb.dbaccess.OQueryComposer";
 }
 
 sal_Bool OQueryComposer::supportsService( const OUString& _rServiceName )
diff --git a/dbaccess/source/core/api/querycontainer.cxx b/dbaccess/source/core/api/querycontainer.cxx
index 4e5ba761398b..8a88c48f1aea 100644
--- a/dbaccess/source/core/api/querycontainer.cxx
+++ b/dbaccess/source/core/api/querycontainer.cxx
@@ -335,7 +335,7 @@ void SAL_CALL OQueryContainer::disposing( const css::lang::EventObject& _rSource
 
 OUString OQueryContainer::determineContentType() const
 {
-    return OUString( "application/vnd.org.openoffice.DatabaseQueryContainer" );
+    return "application/vnd.org.openoffice.DatabaseQueryContainer";
 }
 
 Reference< XContent > OQueryContainer::implCreateWrapper(const OUString& _rName)
diff --git a/dbaccess/source/core/api/querydescriptor.cxx b/dbaccess/source/core/api/querydescriptor.cxx
index b506da57b13c..f38485cacd3e 100644
--- a/dbaccess/source/core/api/querydescriptor.cxx
+++ b/dbaccess/source/core/api/querydescriptor.cxx
@@ -213,7 +213,7 @@ Reference< XNameAccess > SAL_CALL OQueryDescriptor_Base::getColumns( )
 
 OUString SAL_CALL OQueryDescriptor_Base::getImplementationName(  )
 {
-    return OUString("com.sun.star.sdb.OQueryDescriptor");
+    return "com.sun.star.sdb.OQueryDescriptor";
 }
 
 sal_Bool SAL_CALL OQueryDescriptor_Base::supportsService( const OUString& _rServiceName )
diff --git a/dbaccess/source/core/api/resultcolumn.cxx b/dbaccess/source/core/api/resultcolumn.cxx
index 9e2205a512a2..69bdae0e1467 100644
--- a/dbaccess/source/core/api/resultcolumn.cxx
+++ b/dbaccess/source/core/api/resultcolumn.cxx
@@ -111,7 +111,7 @@ Sequence< sal_Int8 > OResultColumn::getImplementationId()
 // XServiceInfo
 OUString OResultColumn::getImplementationName(  )
 {
-    return OUString("com.sun.star.sdb.OResultColumn");
+    return "com.sun.star.sdb.OResultColumn";
 }
 
 Sequence< OUString > OResultColumn::getSupportedServiceNames(  )
diff --git a/dbaccess/source/core/api/resultset.cxx b/dbaccess/source/core/api/resultset.cxx
index 9eb66c68a1a4..7b2bc25e6096 100644
--- a/dbaccess/source/core/api/resultset.cxx
+++ b/dbaccess/source/core/api/resultset.cxx
@@ -169,7 +169,7 @@ void OResultSet::close()
 // XServiceInfo
 OUString OResultSet::getImplementationName(  )
 {
-    return OUString("com.sun.star.sdb.OResultSet");
+    return "com.sun.star.sdb.OResultSet";
 }
 
 sal_Bool OResultSet::supportsService( const OUString& _rServiceName )
diff --git a/dbaccess/source/core/api/statement.cxx b/dbaccess/source/core/api/statement.cxx
index beac6a16c13c..21921604d273 100644
--- a/dbaccess/source/core/api/statement.cxx
+++ b/dbaccess/source/core/api/statement.cxx
@@ -426,7 +426,7 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( OStatement, OStatementBase, OStatement_IFACE )
 // XServiceInfo
 OUString OStatement::getImplementationName(  )
 {
-    return OUString("com.sun.star.sdb.OStatement");
+    return "com.sun.star.sdb.OStatement";
 }
 
 sal_Bool OStatement::supportsService( const OUString& _rServiceName )
diff --git a/dbaccess/source/core/api/viewcontainer.cxx b/dbaccess/source/core/api/viewcontainer.cxx
index 3e29c4ae1dcc..35a00e4c8f04 100644
--- a/dbaccess/source/core/api/viewcontainer.cxx
+++ b/dbaccess/source/core/api/viewcontainer.cxx
@@ -243,7 +243,7 @@ void SAL_CALL OViewContainer::elementReplaced( const ContainerEvent& /*Event*/ )
 OUString OViewContainer::getTableTypeRestriction() const
 {
     // no restriction at all (other than the ones provided externally)
-    return OUString( "VIEW"  );
+    return "VIEW";
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/dataaccess/ComponentDefinition.cxx b/dbaccess/source/core/dataaccess/ComponentDefinition.cxx
index 1d0d30e88542..2114fe323939 100644
--- a/dbaccess/source/core/dataaccess/ComponentDefinition.cxx
+++ b/dbaccess/source/core/dataaccess/ComponentDefinition.cxx
@@ -146,7 +146,7 @@ IMPLEMENT_FORWARD_XINTERFACE3( OComponentDefinition,OContentHelper,ODataSettings
 
 OUString SAL_CALL OComponentDefinition::getImplementationName()
 {
-    return OUString("com.sun.star.comp.dba.OComponentDefinition");
+    return "com.sun.star.comp.dba.OComponentDefinition";
 }
 
 Sequence< OUString > SAL_CALL OComponentDefinition::getSupportedServiceNames()
diff --git a/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx b/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx
index 8964117b1c9a..85896cd3e8f0 100644
--- a/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx
+++ b/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx
@@ -67,7 +67,7 @@ OBookmarkContainer::~OBookmarkContainer()
 // XServiceInfo
 OUString SAL_CALL OBookmarkContainer::getImplementationName(  )
 {
-    return OUString("com.sun.star.comp.dba.OBookmarkContainer");
+    return "com.sun.star.comp.dba.OBookmarkContainer";
 }
 
 sal_Bool SAL_CALL OBookmarkContainer::supportsService( const OUString& _rServiceName )
diff --git a/dbaccess/source/core/dataaccess/commandcontainer.cxx b/dbaccess/source/core/dataaccess/commandcontainer.cxx
index 04d661b04502..9f75b5bcc67b 100644
--- a/dbaccess/source/core/dataaccess/commandcontainer.cxx
+++ b/dbaccess/source/core/dataaccess/commandcontainer.cxx
@@ -87,7 +87,7 @@ Reference< XInterface > SAL_CALL OCommandContainer::createInstance( )
 
 OUString OCommandContainer::determineContentType() const
 {
-    return OUString( "application/vnd.org.openoffice.DatabaseCommandDefinitionContainer" );
+    return "application/vnd.org.openoffice.DatabaseCommandDefinitionContainer";
 }
 
 }   // namespace dbaccess
diff --git a/dbaccess/source/core/dataaccess/commanddefinition.cxx b/dbaccess/source/core/dataaccess/commanddefinition.cxx
index 44d2011a83e2..f93f7d4d3346 100644
--- a/dbaccess/source/core/dataaccess/commanddefinition.cxx
+++ b/dbaccess/source/core/dataaccess/commanddefinition.cxx
@@ -88,7 +88,7 @@ IMPLEMENT_PROPERTYCONTAINER_DEFAULTS2(OCommandDefinition,OCommandDefinition_PROP
 
 OUString SAL_CALL OCommandDefinition::getImplementationName()
 {
-    return OUString("com.sun.star.comp.dba.OCommandDefinition");
+    return "com.sun.star.comp.dba.OCommandDefinition";
 }
 
 css::uno::Sequence<OUString> SAL_CALL OCommandDefinition::getSupportedServiceNames()
diff --git a/dbaccess/source/core/dataaccess/connection.cxx b/dbaccess/source/core/dataaccess/connection.cxx
index 0b075af8e5fb..313fac79f6f7 100644
--- a/dbaccess/source/core/dataaccess/connection.cxx
+++ b/dbaccess/source/core/dataaccess/connection.cxx
@@ -78,7 +78,7 @@ namespace dbaccess
 // XServiceInfo
 OUString OConnection::getImplementationName(  )
 {
-    return OUString("com.sun.star.comp.dbaccess.Connection");
+    return "com.sun.star.comp.dbaccess.Connection";
 }
 
 sal_Bool OConnection::supportsService( const OUString& _rServiceName )
diff --git a/dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx b/dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx
index 82a1538df885..e689c22f7f10 100644
--- a/dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx
+++ b/dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx
@@ -166,7 +166,7 @@ namespace
 
     OUString SAL_CALL DataAccessDescriptor::getImplementationName()
     {
-        return OUString( "com.sun.star.comp.dba.DataAccessDescriptor" );
+        return "com.sun.star.comp.dba.DataAccessDescriptor";
     }
 
     sal_Bool SAL_CALL DataAccessDescriptor::supportsService( const OUString& rServiceName )
@@ -219,7 +219,7 @@ namespace
 
     OUString SAL_CALL DataAccessDescriptorFactory::getImplementationName()
     {
-        return OUString( "com.sun.star.comp.dba.DataAccessDescriptorFactory" );
+        return "com.sun.star.comp.dba.DataAccessDescriptorFactory";
     }
 
     sal_Bool SAL_CALL DataAccessDescriptorFactory::supportsService( const OUString& rServiceName )
diff --git a/dbaccess/source/core/dataaccess/databasecontext.cxx b/dbaccess/source/core/dataaccess/databasecontext.cxx
index 6931feb3123d..447c85767979 100644
--- a/dbaccess/source/core/dataaccess/databasecontext.cxx
+++ b/dbaccess/source/core/dataaccess/databasecontext.cxx
@@ -206,7 +206,7 @@ ODatabaseContext::~ODatabaseContext()
 // Helper
 OUString ODatabaseContext::getImplementationName_static()
 {
-    return OUString("com.sun.star.comp.dba.ODatabaseContext");
+    return "com.sun.star.comp.dba.ODatabaseContext";
 }
 
 Reference< XInterface > ODatabaseContext::Create(const Reference< XComponentContext >& _rxContext)
diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx b/dbaccess/source/core/dataaccess/databasedocument.cxx
index b0904f969b58..1962247dee69 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.cxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.cxx
@@ -1874,7 +1874,7 @@ void SAL_CALL ODatabaseDocument::removeEventListener( const Reference< lang::XEv
 // XServiceInfo
 OUString ODatabaseDocument::getImplementationName()
 {
-    return OUString("com.sun.star.comp.dba.ODatabaseDocument");
+    return "com.sun.star.comp.dba.ODatabaseDocument";
 }
 
 Sequence< OUString > ODatabaseDocument::getSupportedServiceNames()
diff --git a/dbaccess/source/core/dataaccess/databaseregistrations.cxx b/dbaccess/source/core/dataaccess/databaseregistrations.cxx
index 2b0e70eba9cf..052226a3d921 100644
--- a/dbaccess/source/core/dataaccess/databaseregistrations.cxx
+++ b/dbaccess/source/core/dataaccess/databaseregistrations.cxx
@@ -54,17 +54,17 @@ namespace dbaccess
 
     static OUString getConfigurationRootPath()
     {
-        return OUString("org.openoffice.Office.DataAccess/RegisteredNames");
+        return "org.openoffice.Office.DataAccess/RegisteredNames";
     }
 
     static OUString getLocationNodeName()
     {
-        return OUString("Location");
+        return "Location";
     }
 
     static OUString getNameNodeName()
     {
-        return OUString("Name");
+        return "Name";
     }
 
     // DatabaseRegistrations - declaration
diff --git a/dbaccess/source/core/dataaccess/datasource.cxx b/dbaccess/source/core/dataaccess/datasource.cxx
index d2afd8cc78aa..25b3558d275b 100644
--- a/dbaccess/source/core/dataaccess/datasource.cxx
+++ b/dbaccess/source/core/dataaccess/datasource.cxx
@@ -548,7 +548,7 @@ void SAL_CALL ODatabaseSource::disposing( const css::lang::EventObject& Source )
 // XServiceInfo
 OUString ODatabaseSource::getImplementationName(  )
 {
-    return OUString("com.sun.star.comp.dba.ODatabaseSource");
+    return "com.sun.star.comp.dba.ODatabaseSource";
 }
 
 Sequence< OUString > ODatabaseSource::getSupportedServiceNames(  )
diff --git a/dbaccess/source/core/dataaccess/definitioncontainer.cxx b/dbaccess/source/core/dataaccess/definitioncontainer.cxx
index 1e0249f32c3b..bcaf7a36927f 100644
--- a/dbaccess/source/core/dataaccess/definitioncontainer.cxx
+++ b/dbaccess/source/core/dataaccess/definitioncontainer.cxx
@@ -147,7 +147,7 @@ css::uno::Sequence<sal_Int8> ODefinitionContainer::getImplementationId()
 // XServiceInfo
 OUString SAL_CALL ODefinitionContainer::getImplementationName(  )
 {
-    return OUString("com.sun.star.sdb.ODefinitionContainer");
+    return "com.sun.star.sdb.ODefinitionContainer";
 }
 
 Sequence< OUString > SAL_CALL ODefinitionContainer::getSupportedServiceNames(  )
diff --git a/dbaccess/source/core/misc/DatabaseDataProvider.cxx b/dbaccess/source/core/misc/DatabaseDataProvider.cxx
index 0cddb3301714..a0c60fbad1d8 100644
--- a/dbaccess/source/core/misc/DatabaseDataProvider.cxx
+++ b/dbaccess/source/core/misc/DatabaseDataProvider.cxx
@@ -107,7 +107,7 @@ uno::Any DatabaseDataProvider::queryInterface(uno::Type const & type)
 
 OUString DatabaseDataProvider::getImplementationName_Static(  )
 {
-    return OUString("com.sun.star.comp.dbaccess.DatabaseDataProvider");
+    return "com.sun.star.comp.dbaccess.DatabaseDataProvider";
 }
 
 // XServiceInfo
diff --git a/dbaccess/source/core/recovery/subcomponentrecovery.cxx b/dbaccess/source/core/recovery/subcomponentrecovery.cxx
index e4ccd72fd7c4..516aa863f6f2 100644
--- a/dbaccess/source/core/recovery/subcomponentrecovery.cxx
+++ b/dbaccess/source/core/recovery/subcomponentrecovery.cxx
@@ -87,13 +87,13 @@ namespace dbaccess
             switch ( i_eType )
             {
             case FORM:
-                return OUString("form");
+                return "form";
             case REPORT:
-                return OUString("report");
+                return "report";
             case TABLE:
-                return OUString("table");
+                return "table";
             case QUERY:
-                return OUString("query");
+                return "query";
             default:
                 break;
             }
@@ -343,15 +343,15 @@ namespace dbaccess
         switch ( i_eType )
         {
         case FORM:
-            return OUString("forms");
+            return "forms";
         case REPORT:
-            return OUString("reports");
+            return "reports";
         case TABLE:
-            return OUString("tables");
+            return "tables";
         case QUERY:
-            return OUString("queries");
+            return "queries";
         case RELATION_DESIGN:
-            return OUString("relations");
+            return "relations";
         default:
             break;
         }
diff --git a/dbaccess/source/ext/macromigration/macromigrationwizard.cxx b/dbaccess/source/ext/macromigration/macromigrationwizard.cxx
index 3edc266c71cf..1a3cc0c5a4f9 100644
--- a/dbaccess/source/ext/macromigration/macromigrationwizard.cxx
+++ b/dbaccess/source/ext/macromigration/macromigrationwizard.cxx
@@ -60,7 +60,7 @@ namespace dbmm
 
     OUString MacroMigrationDialogService::getImplementationName_static()
     {
-        return OUString( "com.sun.star.comp.dbaccess.macromigration.MacroMigrationDialogService" );
+        return "com.sun.star.comp.dbaccess.macromigration.MacroMigrationDialogService";
     }
 
     Sequence< OUString > MacroMigrationDialogService::getSupportedServiceNames_static()
diff --git a/dbaccess/source/ext/macromigration/migrationengine.cxx b/dbaccess/source/ext/macromigration/migrationengine.cxx
index 7a662e9b6b74..254eaaa9091a 100644
--- a/dbaccess/source/ext/macromigration/migrationengine.cxx
+++ b/dbaccess/source/ext/macromigration/migrationengine.cxx
@@ -159,10 +159,10 @@ namespace dbmm
         {
             switch ( _eType )
             {
-            case eBeanShell:    return OUString("beanshell");
-            case eJavaScript:   return OUString("javascript");
-            case ePython:       return OUString("python"); // TODO: is this correct?
-            case eJava:         return OUString("java");
+            case eBeanShell:    return "beanshell";
+            case eJavaScript:   return "javascript";
+            case ePython:       return "python"; // TODO: is this correct?
+            case eJava:         return "java";
             default:
                 break;
             }
diff --git a/dbaccess/source/filter/hsqldb/fbcreateparser.cxx b/dbaccess/source/filter/hsqldb/fbcreateparser.cxx
index 7a2e642670ae..756b2bd3d445 100644
--- a/dbaccess/source/filter/hsqldb/fbcreateparser.cxx
+++ b/dbaccess/source/filter/hsqldb/fbcreateparser.cxx
@@ -43,40 +43,40 @@ OUString lcl_DataTypetoFbTypeName(sal_Int32 eType)
     {
         case DataType::CHAR:
         case DataType::BINARY:
-            return OUString("CHAR");
+            return "CHAR";
         case DataType::VARCHAR:
         case DataType::VARBINARY:
-            return OUString("VARCHAR");
+            return "VARCHAR";
         case DataType::TINYINT: // no such type in Firebird
         case DataType::SMALLINT:
-            return OUString("SMALLINT");
+            return "SMALLINT";
         case DataType::INTEGER:
-            return OUString("INTEGER");
+            return "INTEGER";
         case DataType::BIGINT:
-            return OUString("BIGINT");
+            return "BIGINT";
         case DataType::NUMERIC:
-            return OUString("NUMERIC");
+            return "NUMERIC";
         case DataType::DECIMAL:
-            return OUString("DECIMAL");
+            return "DECIMAL";
         case DataType::BOOLEAN:
-            return OUString("BOOLEAN");
+            return "BOOLEAN";
         case DataType::LONGVARCHAR:
         case DataType::LONGVARBINARY:
         case DataType::CLOB:
         case DataType::BLOB:
         case DataType::OTHER:
-            return OUString("BLOB");
+            return "BLOB";
         case DataType::DATE:
-            return OUString("DATE");
+            return "DATE";
         case DataType::TIME:
-            return OUString("TIME");
+            return "TIME";
         case DataType::TIMESTAMP:
-            return OUString("TIMESTAMP");
+            return "TIMESTAMP";
         case DataType::DOUBLE:
         case DataType::REAL:
-            return OUString("DOUBLE PRECISION");
+            return "DOUBLE PRECISION";
         case DataType::FLOAT:
-            return OUString("FLOAT");
+            return "FLOAT";
         default:
             assert(false);
             return OUString();
@@ -91,12 +91,12 @@ OUString lcl_getTypeModifier(sal_Int32 eType)
     {
         case DataType::CLOB:
         case DataType::LONGVARCHAR:
-            return OUString("SUB_TYPE 1");
+            return "SUB_TYPE 1";
         case DataType::LONGVARBINARY:
-            return OUString("SUB_TYPE -9546");
+            return "SUB_TYPE -9546";
         case DataType::BINARY:
         case DataType::VARBINARY:
-            return OUString("CHARACTER SET OCTETS");
+            return "CHARACTER SET OCTETS";
         default:
             return OUString();
     }
diff --git a/dbaccess/source/filter/xml/dbloader2.cxx b/dbaccess/source/filter/xml/dbloader2.cxx
index dfc32198ac36..ee3478412a81 100644
--- a/dbaccess/source/filter/xml/dbloader2.cxx
+++ b/dbaccess/source/filter/xml/dbloader2.cxx
@@ -105,7 +105,7 @@ public:
     // static methods
     static OUString                 getImplementationName_Static() throw(  )
     {
-        return OUString("org.openoffice.comp.dbflt.DBTypeDetection");
+        return "org.openoffice.comp.dbflt.DBTypeDetection";
     }
     static Sequence< OUString> getSupportedServiceNames_Static() throw(  );
     static css::uno::Reference< css::uno::XInterface >
@@ -172,7 +172,7 @@ OUString SAL_CALL DBTypeDetection::detect( css::uno::Sequence< css::beans::Prope
                     }
                 }
 
-                return OUString("StarBase");
+                return "StarBase";
             }
             ::comphelper::disposeComponent(xStorageProperties);
         }
@@ -240,7 +240,7 @@ public:
     // static methods
     static OUString                 getImplementationName_Static() throw(  )
     {
-        return OUString("org.openoffice.comp.dbflt.DBContentLoader2");
+        return "org.openoffice.comp.dbflt.DBContentLoader2";
     }
     static Sequence< OUString > getSupportedServiceNames_Static() throw(  );
     static css::uno::Reference< css::uno::XInterface >
diff --git a/dbaccess/source/filter/xml/xmlExport.cxx b/dbaccess/source/filter/xml/xmlExport.cxx
index 3d54d0a57b27..cf9f3a75dff7 100644
--- a/dbaccess/source/filter/xml/xmlExport.cxx
+++ b/dbaccess/source/filter/xml/xmlExport.cxx
@@ -112,7 +112,7 @@ namespace dbaxml
 
     OUString ODBExportHelper::getImplementationName_Static(  )
     {
-        return OUString("com.sun.star.comp.sdb.XMLSettingsExporter");
+        return "com.sun.star.comp.sdb.XMLSettingsExporter";
     }
 
     Sequence< OUString > ODBExportHelper::getSupportedServiceNames_Static(  )
@@ -127,7 +127,7 @@ namespace dbaxml
     }
     OUString ODBFullExportHelper::getImplementationName_Static(  )
     {
-        return OUString("com.sun.star.comp.sdb.XMLFullExporter");
+        return "com.sun.star.comp.sdb.XMLFullExporter";
     }
     Sequence< OUString > ODBFullExportHelper::getSupportedServiceNames_Static(  )
     {
@@ -144,24 +144,24 @@ namespace dbaxml
         switch (_rType.getTypeClass())
         {
             case TypeClass_STRING:
-                return OUString("string");
+                return "string";
             case TypeClass_DOUBLE:
-                return OUString("double");
+                return "double";
             case TypeClass_BOOLEAN:
-                return OUString("boolean");
+                return "boolean";
             case TypeClass_BYTE:
             case TypeClass_SHORT:
-                return OUString("short");
+                return "short";
             case TypeClass_LONG:
-                return OUString("int");
+                return "int";
             case TypeClass_HYPER:
-                return OUString("long");
+                return "long";
             case TypeClass_ENUM:
-                return OUString("int");
+                return "int";
 
             default:
                 OSL_FAIL( "lcl_implGetPropertyXMLType: unsupported value type!" );
-                return OUString("double");
+                return "double";
         }
     }
 
@@ -252,7 +252,7 @@ ODBExport::ODBExport(const Reference< XComponentContext >& _rxContext, OUString
 
 OUString ODBExport::getImplementationName_Static()
 {
-    return OUString("com.sun.star.comp.sdb.DBExportFilter");
+    return "com.sun.star.comp.sdb.DBExportFilter";
 }
 
 css::uno::Sequence<OUString> ODBExport::getSupportedServiceNames_Static()
diff --git a/dbaccess/source/filter/xml/xmlfilter.cxx b/dbaccess/source/filter/xml/xmlfilter.cxx
index 355f9cafcf0b..93175e1d9f1a 100644
--- a/dbaccess/source/filter/xml/xmlfilter.cxx
+++ b/dbaccess/source/filter/xml/xmlfilter.cxx
@@ -225,7 +225,7 @@ ODBFilter::~ODBFilter() throw()
 
 OUString ODBFilter::getImplementationName_Static()
 {
-    return OUString("com.sun.star.comp.sdb.DBFilter");
+    return "com.sun.star.comp.sdb.DBFilter";
 }
 
 
diff --git a/dbaccess/source/inc/apitools.hxx b/dbaccess/source/inc/apitools.hxx
index ca5c4948d4a9..a3e4228f9913 100644
--- a/dbaccess/source/inc/apitools.hxx
+++ b/dbaccess/source/inc/apitools.hxx
@@ -63,7 +63,7 @@ public:
 #define IMPLEMENT_SERVICE_INFO_IMPLNAME(classname, implasciiname)   \
     OUString SAL_CALL classname::getImplementationName(  )   \
     {   \
-        return OUString(implasciiname); \
+        return implasciiname; \
     }   \
 
 #define IMPLEMENT_SERVICE_INFO_IMPLNAME_STATIC(classname, implasciiname)    \
@@ -73,7 +73,7 @@ public:
     }   \
     OUString classname::getImplementationName_Static(  )    \
     {   \
-        return OUString(implasciiname); \
+        return implasciiname; \
     }   \
 
 #define IMPLEMENT_SERVICE_INFO_SUPPORTS(classname)  \
diff --git a/dbaccess/source/sdbtools/connection/connectiontools.cxx b/dbaccess/source/sdbtools/connection/connectiontools.cxx
index 93a5a312eb5e..23e13e496447 100644
--- a/dbaccess/source/sdbtools/connection/connectiontools.cxx
+++ b/dbaccess/source/sdbtools/connection/connectiontools.cxx
@@ -106,7 +106,7 @@ namespace sdbtools
 
     OUString ConnectionTools::getImplementationName_static()
     {
-        return OUString( "com.sun.star.comp.dbaccess.ConnectionTools" );
+        return "com.sun.star.comp.dbaccess.ConnectionTools";
     }
 
     Sequence< OUString > ConnectionTools::getSupportedServiceNames_static()
diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx
index f9416733f635..3f528f8bc509 100644
--- a/dbaccess/source/ui/app/AppController.cxx
+++ b/dbaccess/source/ui/app/AppController.cxx
@@ -161,7 +161,7 @@ OUString SAL_CALL OApplicationController::getImplementationName()
 
 OUString OApplicationController::getImplementationName_Static()
 {
-    return OUString(SERVICE_SDB_APPLICATIONCONTROLLER);
+    return SERVICE_SDB_APPLICATIONCONTROLLER;
 }
 
 Sequence< OUString> OApplicationController::getSupportedServiceNames_Static()
@@ -2260,7 +2260,7 @@ void OApplicationController::onDeleteEntry()
 
 OUString OApplicationController::getContextMenuResourceName( Control& /*_rControl*/ ) const
 {
-    return OUString("edit");
+    return "edit";
 }
 
 IController& OApplicationController::getCommandController()
diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx
index a0e3374f4cdb..b972ead4cd73 100644
--- a/dbaccess/source/ui/browser/brwctrlr.cxx
+++ b/dbaccess/source/ui/browser/brwctrlr.cxx
@@ -431,7 +431,7 @@ void SAL_CALL SbaXDataBrowserController::FormControllerImpl::setMode( const OUSt
 
 OUString SAL_CALL SbaXDataBrowserController::FormControllerImpl::getMode(  )
 {
-    return OUString( "DataMode" );
+    return "DataMode";
 }
 
 Sequence< OUString > SAL_CALL SbaXDataBrowserController::FormControllerImpl::getSupportedModes(  )
diff --git a/dbaccess/source/ui/browser/dbloader.cxx b/dbaccess/source/ui/browser/dbloader.cxx
index 9d989c358553..a86fb44eb518 100644
--- a/dbaccess/source/ui/browser/dbloader.cxx
+++ b/dbaccess/source/ui/browser/dbloader.cxx
@@ -79,7 +79,7 @@ public:
     // static methods
     static OUString          getImplementationName_Static() throw(  )
     {
-        return OUString("org.openoffice.comp.dbu.DBContentLoader");
+        return "org.openoffice.comp.dbu.DBContentLoader";
     }
     static Sequence< OUString> getSupportedServiceNames_Static() throw(  );
     static css::uno::Reference< css::uno::XInterface >
diff --git a/dbaccess/source/ui/browser/exsrcbrw.cxx b/dbaccess/source/ui/browser/exsrcbrw.cxx
index 3dba644889f9..d835731c3df1 100644
--- a/dbaccess/source/ui/browser/exsrcbrw.cxx
+++ b/dbaccess/source/ui/browser/exsrcbrw.cxx
@@ -83,7 +83,7 @@ css::uno::Sequence<OUString> SAL_CALL SbaExternalSourceBrowser::getSupportedServ
 
 OUString SbaExternalSourceBrowser::getImplementationName_Static()
 {
-    return OUString("org.openoffice.comp.dbu.OFormGridView");
+    return "org.openoffice.comp.dbu.OFormGridView";
 }
 
 css::uno::Sequence<OUString> SbaExternalSourceBrowser::getSupportedServiceNames_Static()
diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx b/dbaccess/source/ui/browser/genericcontroller.cxx
index 29ccb0e642b7..394f0d8211f6 100644
--- a/dbaccess/source/ui/browser/genericcontroller.cxx
+++ b/dbaccess/source/ui/browser/genericcontroller.cxx
@@ -335,7 +335,7 @@ Reference<XSidebarProvider> SAL_CALL OGenericUnoController::getSidebar()
 
 OUString SAL_CALL OGenericUnoController::getViewControllerName()
 {
-    return OUString( "Default" );
+    return "Default";
 }
 
 Sequence< PropertyValue > SAL_CALL OGenericUnoController::getCreationArguments()
diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx
index ad891571fd46..1e022db90320 100644
--- a/dbaccess/source/ui/browser/sbagrid.cxx
+++ b/dbaccess/source/ui/browser/sbagrid.cxx
@@ -132,7 +132,7 @@ OUString SAL_CALL SbaXGridControl::getImplementationName()
 
 OUString SbaXGridControl::getImplementationName_Static()
 {
-    return OUString("com.sun.star.comp.dbu.SbaXGridControl");
+    return "com.sun.star.comp.dbu.SbaXGridControl";
 }
 
 Sequence< OUString> SbaXGridControl::getSupportedServiceNames_Static()
diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx
index 7f13583dd497..f28149f84284 100644
--- a/dbaccess/source/ui/browser/unodatbr.cxx
+++ b/dbaccess/source/ui/browser/unodatbr.cxx
@@ -195,7 +195,7 @@ css::uno::Sequence<OUString> SAL_CALL SbaTableQueryBrowser::getSupportedServiceN
 
 OUString SbaTableQueryBrowser::getImplementationName_Static()
 {
-    return OUString("org.openoffice.comp.dbu.ODatasourceBrowser");
+    return "org.openoffice.comp.dbu.ODatasourceBrowser";
 }
 
 css::uno::Sequence<OUString> SbaTableQueryBrowser::getSupportedServiceNames_Static()
@@ -3438,7 +3438,7 @@ OUString SbaTableQueryBrowser::getContextMenuResourceName( Control& _rControl )
     if ( &m_pTreeView->getListBox() != &_rControl )
         return OUString();
 
-    return OUString("explorer");
+    return "explorer";
 }
 
 IController& SbaTableQueryBrowser::getCommandController()
diff --git a/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx b/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx
index bd90d9688490..6aa5081c14e4 100644
--- a/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx
+++ b/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx
@@ -59,7 +59,7 @@ namespace dbaui
     }
     OUString SAL_CALL OConnectionLineAccess::getImplementationName()
     {
-        return OUString("org.openoffice.comp.dbu.ConnectionLineAccessibility");
+        return "org.openoffice.comp.dbu.ConnectionLineAccessibility";
     }
     // XAccessibleContext
     sal_Int32 SAL_CALL OConnectionLineAccess::getAccessibleChildCount(  )
@@ -100,7 +100,7 @@ namespace dbaui
     }
     OUString SAL_CALL OConnectionLineAccess::getAccessibleDescription(  )
     {
-        return OUString("Relation");
+        return "Relation";
     }
     Reference< XAccessibleRelationSet > SAL_CALL OConnectionLineAccess::getAccessibleRelationSet(  )
     {
diff --git a/dbaccess/source/ui/querydesign/JAccess.cxx b/dbaccess/source/ui/querydesign/JAccess.cxx
index 781592bbe016..f2459ee67d32 100644
--- a/dbaccess/source/ui/querydesign/JAccess.cxx
+++ b/dbaccess/source/ui/querydesign/JAccess.cxx
@@ -40,7 +40,7 @@ namespace dbaui
     }
     OUString SAL_CALL OJoinDesignViewAccess::getImplementationName()
     {
-        return OUString("org.openoffice.comp.dbu.JoinViewAccessibility");
+        return "org.openoffice.comp.dbu.JoinViewAccessibility";
     }
     void OJoinDesignViewAccess::clearTableView()
     {
diff --git a/dbaccess/source/ui/querydesign/TableWindowAccess.cxx b/dbaccess/source/ui/querydesign/TableWindowAccess.cxx
index 718449f4a982..f63e3d58e871 100644
--- a/dbaccess/source/ui/querydesign/TableWindowAccess.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindowAccess.cxx
@@ -70,7 +70,7 @@ namespace dbaui
     }
     OUString SAL_CALL OTableWindowAccess::getImplementationName()
     {
-        return OUString("org.openoffice.comp.dbu.TableWindowAccessibility");
+        return "org.openoffice.comp.dbu.TableWindowAccessibility";
     }
     Sequence< OUString > SAL_CALL OTableWindowAccess::getSupportedServiceNames()
     {
diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx
index eaeabf30ee86..fb1f875dce2f 100644
--- a/dbaccess/source/ui/querydesign/querycontroller.cxx
+++ b/dbaccess/source/ui/querydesign/querycontroller.cxx
@@ -113,7 +113,7 @@ namespace dbaui
         /// @throws RuntimeException
         static OUString getImplementationName_Static()
         {
-            return OUString("org.openoffice.comp.dbu.OViewDesign");
+            return "org.openoffice.comp.dbu.OViewDesign";
         }
         /// @throws RuntimeException
         static Sequence< OUString > getSupportedServiceNames_Static()
@@ -213,7 +213,7 @@ OUString SAL_CALL OQueryController::getImplementationName()
 
 OUString OQueryController::getImplementationName_Static()
 {
-    return OUString("org.openoffice.comp.dbu.OQueryDesign");
+    return "org.openoffice.comp.dbu.OQueryDesign";
 }
 
 Sequence< OUString> OQueryController::getSupportedServiceNames_Static()
diff --git a/dbaccess/source/ui/relationdesign/RelationController.cxx b/dbaccess/source/ui/relationdesign/RelationController.cxx
index 1ccb6d649d12..8ded88ed3c97 100644
--- a/dbaccess/source/ui/relationdesign/RelationController.cxx
+++ b/dbaccess/source/ui/relationdesign/RelationController.cxx
@@ -98,7 +98,7 @@ OUString SAL_CALL ORelationController::getImplementationName()
 
 OUString ORelationController::getImplementationName_Static()
 {
-    return OUString("org.openoffice.comp.dbu.ORelationDesign");
+    return "org.openoffice.comp.dbu.ORelationDesign";
 }
 
 Sequence< OUString> ORelationController::getSupportedServiceNames_Static()
diff --git a/dbaccess/source/ui/tabledesign/TableController.cxx b/dbaccess/source/ui/tabledesign/TableController.cxx
index 8c0470154a78..3aff255781d2 100644
--- a/dbaccess/source/ui/tabledesign/TableController.cxx
+++ b/dbaccess/source/ui/tabledesign/TableController.cxx
@@ -114,7 +114,7 @@ OUString SAL_CALL OTableController::getImplementationName()
 
 OUString OTableController::getImplementationName_Static()
 {
-    return OUString("org.openoffice.comp.dbu.OTableDesign");
+    return "org.openoffice.comp.dbu.OTableDesign";
 }
 
 Sequence< OUString> OTableController::getSupportedServiceNames_Static()
diff --git a/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx b/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx
index 7dc617977952..7309fa7fe9d2 100644
--- a/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx
+++ b/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx
@@ -92,7 +92,7 @@ namespace dbaui
 
     OUString OAdvancedSettingsDialog::getImplementationName_Static()
     {
-        return OUString("org.openoffice.comp.dbu.OAdvancedSettingsDialog");
+        return "org.openoffice.comp.dbu.OAdvancedSettingsDialog";
     }
 
     css::uno::Sequence<OUString> SAL_CALL OAdvancedSettingsDialog::getSupportedServiceNames()
diff --git a/dbaccess/source/ui/uno/ColumnControl.cxx b/dbaccess/source/ui/uno/ColumnControl.cxx
index e3fb806a0872..851773c78693 100644
--- a/dbaccess/source/ui/uno/ColumnControl.cxx
+++ b/dbaccess/source/ui/uno/ColumnControl.cxx
@@ -55,7 +55,7 @@ Reference< XInterface > OColumnControl::Create(const Reference< XMultiServiceFac
 
 OUString OColumnControl::GetComponentServiceName()
 {
-    return OUString("com.sun.star.sdb.ColumnDescriptorControl");
+    return "com.sun.star.sdb.ColumnDescriptorControl";
 }
 
 void SAL_CALL OColumnControl::createPeer(const Reference< XToolkit >& /*rToolkit*/, const Reference< XWindowPeer >& rParentPeer)
diff --git a/dbaccess/source/ui/uno/DBTypeWizDlg.cxx b/dbaccess/source/ui/uno/DBTypeWizDlg.cxx
index 44cac4ccf614..ebe98cfbb873 100644
--- a/dbaccess/source/ui/uno/DBTypeWizDlg.cxx
+++ b/dbaccess/source/ui/uno/DBTypeWizDlg.cxx
@@ -60,7 +60,7 @@ OUString SAL_CALL ODBTypeWizDialog::getImplementationName()
 
 OUString ODBTypeWizDialog::getImplementationName_Static()
 {
-    return OUString("org.openoffice.comp.dbu.ODBTypeWizDialog");
+    return "org.openoffice.comp.dbu.ODBTypeWizDialog";
 }
 
 css::uno::Sequence<OUString> SAL_CALL ODBTypeWizDialog::getSupportedServiceNames()
diff --git a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx
index b8631b62df71..f8d021055730 100644
--- a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx
+++ b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx
@@ -75,7 +75,7 @@ OUString SAL_CALL ODBTypeWizDialogSetup::getImplementationName()
 
 OUString ODBTypeWizDialogSetup::getImplementationName_Static()
 {
-    return OUString("org.openoffice.comp.dbu.ODBTypeWizDialogSetup");
+    return "org.openoffice.comp.dbu.ODBTypeWizDialogSetup";
 }
 
 css::uno::Sequence<OUString> SAL_CALL ODBTypeWizDialogSetup::getSupportedServiceNames()
diff --git a/dbaccess/source/ui/uno/TableFilterDlg.cxx b/dbaccess/source/ui/uno/TableFilterDlg.cxx
index e2d05c812366..bb753ab79005 100644
--- a/dbaccess/source/ui/uno/TableFilterDlg.cxx
+++ b/dbaccess/source/ui/uno/TableFilterDlg.cxx
@@ -61,7 +61,7 @@ OUString SAL_CALL OTableFilterDialog::getImplementationName()
 
 OUString OTableFilterDialog::getImplementationName_Static()
 {
-    return OUString("org.openoffice.comp.dbu.OTableFilterDialog");
+    return "org.openoffice.comp.dbu.OTableFilterDialog";
 }
 
 css::uno::Sequence<OUString> SAL_CALL OTableFilterDialog::getSupportedServiceNames()
diff --git a/dbaccess/source/ui/uno/UserSettingsDlg.cxx b/dbaccess/source/ui/uno/UserSettingsDlg.cxx
index 3ec72572f19f..1ed308c5d132 100644
--- a/dbaccess/source/ui/uno/UserSettingsDlg.cxx
+++ b/dbaccess/source/ui/uno/UserSettingsDlg.cxx
@@ -61,7 +61,7 @@ OUString SAL_CALL OUserSettingsDialog::getImplementationName()
 
 OUString OUserSettingsDialog::getImplementationName_Static()
 {
-    return OUString("org.openoffice.comp.dbu.OUserSettingsDialog");
+    return "org.openoffice.comp.dbu.OUserSettingsDialog";
 }
 
 css::uno::Sequence<OUString> SAL_CALL OUserSettingsDialog::getSupportedServiceNames()
diff --git a/dbaccess/source/ui/uno/admindlg.cxx b/dbaccess/source/ui/uno/admindlg.cxx
index 0702b8c66f21..92dc96ee9d5d 100644
--- a/dbaccess/source/ui/uno/admindlg.cxx
+++ b/dbaccess/source/ui/uno/admindlg.cxx
@@ -61,7 +61,7 @@ OUString SAL_CALL ODataSourcePropertyDialog::getImplementationName()
 
 OUString ODataSourcePropertyDialog::getImplementationName_Static()
 {
-    return OUString("org.openoffice.comp.dbu.ODatasourceAdministrationDialog");
+    return "org.openoffice.comp.dbu.ODatasourceAdministrationDialog";
 }
 
 css::uno::Sequence<OUString> SAL_CALL ODataSourcePropertyDialog::getSupportedServiceNames()
diff --git a/dbaccess/source/ui/uno/copytablewizard.cxx b/dbaccess/source/ui/uno/copytablewizard.cxx
index d17ce9ce5e67..3c2a25af6a14 100644
--- a/dbaccess/source/ui/uno/copytablewizard.cxx
+++ b/dbaccess/source/ui/uno/copytablewizard.cxx
@@ -420,7 +420,7 @@ OUString SAL_CALL CopyTableWizard::getImplementationName()
 
 OUString CopyTableWizard::getImplementationName_Static()
 {
-    return OUString( "org.openoffice.comp.dbu.CopyTableWizard" );
+    return "org.openoffice.comp.dbu.CopyTableWizard";
 }
 
 css::uno::Sequence<OUString> SAL_CALL CopyTableWizard::getSupportedServiceNames()
diff --git a/dbaccess/source/ui/uno/unosqlmessage.cxx b/dbaccess/source/ui/uno/unosqlmessage.cxx
index 620e10a86816..d9e02397bf78 100644
--- a/dbaccess/source/ui/uno/unosqlmessage.cxx
+++ b/dbaccess/source/ui/uno/unosqlmessage.cxx
@@ -76,7 +76,7 @@ OUString SAL_CALL OSQLMessageDialog::getImplementationName()
 
 OUString OSQLMessageDialog::getImplementationName_Static()
 {
-    return OUString("org.openoffice.comp.dbu.OSQLMessageDialog");
+    return "org.openoffice.comp.dbu.OSQLMessageDialog";
 }
 
 css::uno::Sequence<OUString> SAL_CALL OSQLMessageDialog::getSupportedServiceNames()