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>

27 files changed, 44 insertions, 44 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;
         }