From c64e9ee263cf9150f12b45906ae21a553af06d9c Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Tue, 30 Jul 2019 17:56:58 +0200
Subject: [PATCH] Improved loplugin:stringconstant (now that GCC 7 supports
 it): cppuhelper

Change-Id: I6535fd0cf4f8b906c62fa51cb555da548c6e99ae
Reviewed-on: https://gerrit.libreoffice.org/76688
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
---
 cppuhelper/source/access_control.cxx | 2 +-
 cppuhelper/source/macro_expander.cxx | 2 +-
 cppuhelper/source/servicemanager.cxx | 4 ++--
 cppuhelper/source/typemanager.cxx    | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/cppuhelper/source/access_control.cxx b/cppuhelper/source/access_control.cxx
index 6af654408ed0..0e18ef78684a 100644
--- a/cppuhelper/source/access_control.cxx
+++ b/cppuhelper/source/access_control.cxx
@@ -34,7 +34,7 @@ namespace
 {
     OUString str_ac_singleton()
     {
-        return OUString("/singletons/com.sun.star.security.theAccessController");
+        return "/singletons/com.sun.star.security.theAccessController";
     }
 }
 
diff --git a/cppuhelper/source/macro_expander.cxx b/cppuhelper/source/macro_expander.cxx
index 47c324fa1902..483ca5712766 100644
--- a/cppuhelper/source/macro_expander.cxx
+++ b/cppuhelper/source/macro_expander.cxx
@@ -86,7 +86,7 @@ class theImplNames : public rtl::Static<ImplNames, theImplNames> {};
 
 OUString s_impl_name()
 {
-    return OUString(IMPL_NAME);
+    return IMPL_NAME;
 }
 
 Sequence< OUString > const & s_get_service_names()
diff --git a/cppuhelper/source/servicemanager.cxx b/cppuhelper/source/servicemanager.cxx
index d8fde789c429..9f235f4fe772 100644
--- a/cppuhelper/source/servicemanager.cxx
+++ b/cppuhelper/source/servicemanager.cxx
@@ -894,8 +894,8 @@ void cppuhelper::ServiceManager::initialize(
 
 OUString cppuhelper::ServiceManager::getImplementationName()
 {
-    return OUString(
-        "com.sun.star.comp.cppuhelper.bootstrap.ServiceManager");
+    return
+        "com.sun.star.comp.cppuhelper.bootstrap.ServiceManager";
 }
 
 sal_Bool cppuhelper::ServiceManager::supportsService(
diff --git a/cppuhelper/source/typemanager.cxx b/cppuhelper/source/typemanager.cxx
index 24fa88db309b..f3fa99ac9769 100644
--- a/cppuhelper/source/typemanager.cxx
+++ b/cppuhelper/source/typemanager.cxx
@@ -1886,8 +1886,8 @@ void cppuhelper::TypeManager::disposing() {} //TODO
 
 OUString cppuhelper::TypeManager::getImplementationName()
 {
-    return OUString(
-        "com.sun.star.comp.cppuhelper.bootstrap.TypeManager");
+    return
+        "com.sun.star.comp.cppuhelper.bootstrap.TypeManager";
 }
 
 sal_Bool cppuhelper::TypeManager::supportsService(