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

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

16 files changed, 34 insertions, 34 deletions

diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx
index 021aaecd550f..acc3b7034077 100644
--- a/desktop/source/app/officeipcthread.cxx
+++ b/desktop/source/app/officeipcthread.cxx
@@ -317,7 +317,7 @@ oslSignalAction SalMainPipeExchangeSignal_impl(SAL_UNUSED_PARAMETER void* /*pDat
 // XServiceInfo
 OUString SAL_CALL RequestHandlerController::getImplementationName()
 {
-    return OUString( "com.sun.star.comp.RequestHandlerController" );
+    return "com.sun.star.comp.RequestHandlerController";
 }
 
 sal_Bool RequestHandlerController::supportsService(
diff --git a/desktop/source/deployment/registry/component/dp_compbackenddb.cxx b/desktop/source/deployment/registry/component/dp_compbackenddb.cxx
index 3cd455bd1875..143b4c3d1685 100644
--- a/desktop/source/deployment/registry/component/dp_compbackenddb.cxx
+++ b/desktop/source/deployment/registry/component/dp_compbackenddb.cxx
@@ -50,22 +50,22 @@ ComponentBackendDb::ComponentBackendDb(
 
 OUString ComponentBackendDb::getDbNSName()
 {
-    return OUString(EXTENSION_REG_NS);
+    return EXTENSION_REG_NS;
 }
 
 OUString ComponentBackendDb::getNSPrefix()
 {
-    return OUString(NS_PREFIX);
+    return NS_PREFIX;
 }
 
 OUString ComponentBackendDb::getRootElementName()
 {
-    return OUString(ROOT_ELEMENT_NAME);
+    return ROOT_ELEMENT_NAME;
 }
 
 OUString ComponentBackendDb::getKeyElementName()
 {
-    return OUString(KEY_ELEMENT_NAME);
+    return KEY_ELEMENT_NAME;
 }
 
 void ComponentBackendDb::addEntry(OUString const & url, Data const & data)
diff --git a/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.cxx b/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.cxx
index ead87464821a..68a1f009d0bc 100644
--- a/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.cxx
+++ b/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.cxx
@@ -50,22 +50,22 @@ ConfigurationBackendDb::ConfigurationBackendDb(
 
 OUString ConfigurationBackendDb::getDbNSName()
 {
-    return OUString(EXTENSION_REG_NS);
+    return EXTENSION_REG_NS;
 }
 
 OUString ConfigurationBackendDb::getNSPrefix()
 {
-    return OUString(NS_PREFIX);
+    return NS_PREFIX;
 }
 
 OUString ConfigurationBackendDb::getRootElementName()
 {
-    return OUString(ROOT_ELEMENT_NAME);
+    return ROOT_ELEMENT_NAME;
 }
 
 OUString ConfigurationBackendDb::getKeyElementName()
 {
-    return OUString(KEY_ELEMENT_NAME);
+    return KEY_ELEMENT_NAME;
 }
 
 
diff --git a/desktop/source/deployment/registry/executable/dp_executablebackenddb.cxx b/desktop/source/deployment/registry/executable/dp_executablebackenddb.cxx
index 9e77c63854f9..e872ba181131 100644
--- a/desktop/source/deployment/registry/executable/dp_executablebackenddb.cxx
+++ b/desktop/source/deployment/registry/executable/dp_executablebackenddb.cxx
@@ -44,22 +44,22 @@ ExecutableBackendDb::ExecutableBackendDb(
 
 OUString ExecutableBackendDb::getDbNSName()
 {
-    return OUString(EXTENSION_REG_NS);
+    return EXTENSION_REG_NS;
 }
 
 OUString ExecutableBackendDb::getNSPrefix()
 {
-    return OUString(NS_PREFIX);
+    return NS_PREFIX;
 }
 
 OUString ExecutableBackendDb::getRootElementName()
 {
-    return OUString(ROOT_ELEMENT_NAME);
+    return ROOT_ELEMENT_NAME;
 }
 
 OUString ExecutableBackendDb::getKeyElementName()
 {
-    return OUString(ENTRY_NAME);
+    return ENTRY_NAME;
 }
 
 
diff --git a/desktop/source/deployment/registry/help/dp_helpbackenddb.cxx b/desktop/source/deployment/registry/help/dp_helpbackenddb.cxx
index e65f9e3644ad..59867dd54767 100644
--- a/desktop/source/deployment/registry/help/dp_helpbackenddb.cxx
+++ b/desktop/source/deployment/registry/help/dp_helpbackenddb.cxx
@@ -50,22 +50,22 @@ HelpBackendDb::HelpBackendDb(
 
 OUString HelpBackendDb::getDbNSName()
 {
-    return OUString(EXTENSION_REG_NS);
+    return EXTENSION_REG_NS;
 }
 
 OUString HelpBackendDb::getNSPrefix()
 {
-    return OUString(NS_PREFIX);
+    return NS_PREFIX;
 }
 
 OUString HelpBackendDb::getRootElementName()
 {
-    return OUString(ROOT_ELEMENT_NAME);
+    return ROOT_ELEMENT_NAME;
 }
 
 OUString HelpBackendDb::getKeyElementName()
 {
-    return OUString(KEY_ELEMENT_NAME);
+    return KEY_ELEMENT_NAME;
 }
 
 
diff --git a/desktop/source/deployment/registry/package/dp_extbackenddb.cxx b/desktop/source/deployment/registry/package/dp_extbackenddb.cxx
index 375bf1290f2b..e47138d6598a 100644
--- a/desktop/source/deployment/registry/package/dp_extbackenddb.cxx
+++ b/desktop/source/deployment/registry/package/dp_extbackenddb.cxx
@@ -49,22 +49,22 @@ ExtensionBackendDb::ExtensionBackendDb(
 
 OUString ExtensionBackendDb::getDbNSName()
 {
-    return OUString(EXTENSION_REG_NS);
+    return EXTENSION_REG_NS;
 }
 
 OUString ExtensionBackendDb::getNSPrefix()
 {
-    return OUString(NS_PREFIX);
+    return NS_PREFIX;
 }
 
 OUString ExtensionBackendDb::getRootElementName()
 {
-    return OUString(ROOT_ELEMENT_NAME);
+    return ROOT_ELEMENT_NAME;
 }
 
 OUString ExtensionBackendDb::getKeyElementName()
 {
-    return OUString(KEY_ELEMENT_NAME);
+    return KEY_ELEMENT_NAME;
 }
 
 void ExtensionBackendDb::addEntry(OUString const & url, Data const & data)
diff --git a/desktop/source/deployment/registry/package/dp_package.cxx b/desktop/source/deployment/registry/package/dp_package.cxx
index eba0652977fc..c5475cae55a0 100644
--- a/desktop/source/deployment/registry/package/dp_package.cxx
+++ b/desktop/source/deployment/registry/package/dp_package.cxx
@@ -304,7 +304,7 @@ void BackendImpl::disposing()
 // XServiceInfo
 OUString BackendImpl::getImplementationName()
 {
-    return OUString("com.sun.star.comp.deployment.bundle.PackageRegistryBackend");
+    return "com.sun.star.comp.deployment.bundle.PackageRegistryBackend";
 }
 
 sal_Bool BackendImpl::supportsService(OUString const & ServiceName)
diff --git a/desktop/source/deployment/registry/script/dp_scriptbackenddb.cxx b/desktop/source/deployment/registry/script/dp_scriptbackenddb.cxx
index 4c1690cf1d73..9f7d71363d1a 100644
--- a/desktop/source/deployment/registry/script/dp_scriptbackenddb.cxx
+++ b/desktop/source/deployment/registry/script/dp_scriptbackenddb.cxx
@@ -47,22 +47,22 @@ ScriptBackendDb::ScriptBackendDb(
 
 OUString ScriptBackendDb::getDbNSName()
 {
-    return OUString(EXTENSION_REG_NS);
+    return EXTENSION_REG_NS;
 }
 
 OUString ScriptBackendDb::getNSPrefix()
 {
-    return OUString(NS_PREFIX);
+    return NS_PREFIX;
 }
 
 OUString ScriptBackendDb::getRootElementName()
 {
-    return OUString(ROOT_ELEMENT_NAME);
+    return ROOT_ELEMENT_NAME;
 }
 
 OUString ScriptBackendDb::getKeyElementName()
 {
-    return OUString(KEY_ELEMENT_NAME);
+    return KEY_ELEMENT_NAME;
 }
 
 
diff --git a/desktop/source/lib/lokinteractionhandler.cxx b/desktop/source/lib/lokinteractionhandler.cxx
index f15ef67e0052..b41d17737b16 100644
--- a/desktop/source/lib/lokinteractionhandler.cxx
+++ b/desktop/source/lib/lokinteractionhandler.cxx
@@ -64,7 +64,7 @@ LOKInteractionHandler::~LOKInteractionHandler()
 
 OUString SAL_CALL LOKInteractionHandler::getImplementationName()
 {
-    return OUString("com.sun.star.comp.uui.LOKInteractionHandler");
+    return "com.sun.star.comp.uui.LOKInteractionHandler";
 }
 
 sal_Bool SAL_CALL LOKInteractionHandler::supportsService(OUString const & rServiceName)
diff --git a/desktop/source/migration/services/basicmigration.cxx b/desktop/source/migration/services/basicmigration.cxx
index 515a847cef1b..52388235f607 100644
--- a/desktop/source/migration/services/basicmigration.cxx
+++ b/desktop/source/migration/services/basicmigration.cxx
@@ -41,7 +41,7 @@ namespace migration
 
     OUString BasicMigration_getImplementationName()
     {
-        return OUString("com.sun.star.comp.desktop.migration.Basic");
+        return "com.sun.star.comp.desktop.migration.Basic";
     }
 
 
diff --git a/desktop/source/migration/services/jvmfwk.cxx b/desktop/source/migration/services/jvmfwk.cxx
index 24e0d50930c0..034a526a810f 100644
--- a/desktop/source/migration/services/jvmfwk.cxx
+++ b/desktop/source/migration/services/jvmfwk.cxx
@@ -147,7 +147,7 @@ JavaMigration::~JavaMigration()
 
 OUString jvmfwk_getImplementationName()
 {
-    return OUString(IMPL_NAME);
+    return IMPL_NAME;
 }
 
 css::uno::Sequence< OUString > jvmfwk_getSupportedServiceNames()
diff --git a/desktop/source/migration/services/oo3extensionmigration.cxx b/desktop/source/migration/services/oo3extensionmigration.cxx
index a001462afd62..d90d4e1c0f41 100644
--- a/desktop/source/migration/services/oo3extensionmigration.cxx
+++ b/desktop/source/migration/services/oo3extensionmigration.cxx
@@ -57,7 +57,7 @@ namespace migration
 
 OUString OO3ExtensionMigration_getImplementationName()
 {
-    return OUString( "com.sun.star.comp.desktop.migration.OOo3Extensions" );
+    return "com.sun.star.comp.desktop.migration.OOo3Extensions";
 }
 
 
diff --git a/desktop/source/migration/services/wordbookmigration.cxx b/desktop/source/migration/services/wordbookmigration.cxx
index b6f3ee0623b7..ea6d8923514c 100644
--- a/desktop/source/migration/services/wordbookmigration.cxx
+++ b/desktop/source/migration/services/wordbookmigration.cxx
@@ -35,7 +35,7 @@ namespace migration
 
     OUString WordbookMigration_getImplementationName()
     {
-        return OUString( "com.sun.star.comp.desktop.migration.Wordbooks" );
+        return "com.sun.star.comp.desktop.migration.Wordbooks";
     }
 
 
diff --git a/desktop/source/offacc/acceptor.cxx b/desktop/source/offacc/acceptor.cxx
index 9c7991a9df44..f687edfc758b 100644
--- a/desktop/source/offacc/acceptor.cxx
+++ b/desktop/source/offacc/acceptor.cxx
@@ -185,7 +185,7 @@ void Acceptor::initialize( const Sequence<Any>& aArguments )
 // XServiceInfo
 OUString Acceptor::impl_getImplementationName()
 {
-    return OUString("com.sun.star.office.comp.Acceptor");
+    return "com.sun.star.office.comp.Acceptor";
 }
 OUString Acceptor::getImplementationName()
 {
diff --git a/desktop/source/splash/splash.cxx b/desktop/source/splash/splash.cxx
index 39d67725695b..b5b3568e12e3 100644
--- a/desktop/source/splash/splash.cxx
+++ b/desktop/source/splash/splash.cxx
@@ -641,7 +641,7 @@ css::uno::Reference< css::uno::XInterface > desktop::splash::create(
 }
 
 OUString desktop::splash::getImplementationName() {
-    return OUString("com.sun.star.office.comp.SplashScreen");
+    return "com.sun.star.office.comp.SplashScreen";
 }
 
 css::uno::Sequence< OUString > desktop::splash::getSupportedServiceNames()
diff --git a/desktop/source/splash/unxsplash.cxx b/desktop/source/splash/unxsplash.cxx
index 0cc948ee121b..b068cfa28e5c 100644
--- a/desktop/source/splash/unxsplash.cxx
+++ b/desktop/source/splash/unxsplash.cxx
@@ -140,7 +140,7 @@ uno::Reference< uno::XInterface > UnxSplash_createInstance(const uno::Reference<
 
 OUString UnxSplash_getImplementationName()
 {
-    return OUString( "com.sun.star.office.comp.PipeSplashScreen" );
+    return "com.sun.star.office.comp.PipeSplashScreen";
 }
 
 uno::Sequence< OUString > UnxSplash_getSupportedServiceNames() throw()