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

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

22 files changed, 23 insertions, 23 deletions

diff --git a/stoc/source/corereflection/crefl.cxx b/stoc/source/corereflection/crefl.cxx
index e76fd1c130fb..8ac22858c21a 100644
--- a/stoc/source/corereflection/crefl.cxx
+++ b/stoc/source/corereflection/crefl.cxx
@@ -117,7 +117,7 @@ void IdlReflectionServiceImpl::dispose()
 
 OUString IdlReflectionServiceImpl::getImplementationName()
 {
-    return OUString("com.sun.star.comp.stoc.CoreReflection");
+    return "com.sun.star.comp.stoc.CoreReflection";
 }
 
 sal_Bool IdlReflectionServiceImpl::supportsService( const OUString & rServiceName )
diff --git a/stoc/source/defaultregistry/defaultregistry.cxx b/stoc/source/defaultregistry/defaultregistry.cxx
index afa4d2ad6aa6..69cd40406944 100644
--- a/stoc/source/defaultregistry/defaultregistry.cxx
+++ b/stoc/source/defaultregistry/defaultregistry.cxx
@@ -1050,7 +1050,7 @@ sal_Bool SAL_CALL NestedRegistryImpl::hasElements(  )
 
 OUString SAL_CALL NestedRegistryImpl::getImplementationName(  )
 {
-    return OUString("com.sun.star.comp.stoc.NestedRegistry");
+    return "com.sun.star.comp.stoc.NestedRegistry";
 }
 
 sal_Bool SAL_CALL NestedRegistryImpl::supportsService( const OUString& ServiceName )
diff --git a/stoc/source/implementationregistration/implreg.cxx b/stoc/source/implementationregistration/implreg.cxx
index 5923e44a91c6..545e2cd6820b 100644
--- a/stoc/source/implementationregistration/implreg.cxx
+++ b/stoc/source/implementationregistration/implreg.cxx
@@ -1115,7 +1115,7 @@ ImplementationRegistration::ImplementationRegistration( const Reference < XCompo
 // XServiceInfo
 OUString ImplementationRegistration::getImplementationName()
 {
-    return OUString("com.sun.star.comp.stoc.ImplementationRegistration");
+    return "com.sun.star.comp.stoc.ImplementationRegistration";
 }
 
 // XServiceInfo
diff --git a/stoc/source/inspect/introspection.cxx b/stoc/source/inspect/introspection.cxx
index 474952f7cdd5..ecfd5684004e 100644
--- a/stoc/source/inspect/introspection.cxx
+++ b/stoc/source/inspect/introspection.cxx
@@ -1534,7 +1534,7 @@ private:
     }
 
     virtual OUString SAL_CALL getImplementationName() override
-    { return OUString("com.sun.star.comp.stoc.Introspection"); }
+    { return "com.sun.star.comp.stoc.Introspection"; }
 
     virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override
     { return cppu::supportsService(this, ServiceName); }
diff --git a/stoc/source/invocation/invocation.cxx b/stoc/source/invocation/invocation.cxx
index 694ffa2904b8..0969578620db 100644
--- a/stoc/source/invocation/invocation.cxx
+++ b/stoc/source/invocation/invocation.cxx
@@ -72,7 +72,7 @@ static Sequence< OUString > inv_getSupportedServiceNames()
 
 static OUString inv_getImplementationName()
 {
-    return OUString(IMPLNAME);
+    return IMPLNAME;
 }
 
 // TODO: Implement centrally
diff --git a/stoc/source/invocation_adapterfactory/iafactory.cxx b/stoc/source/invocation_adapterfactory/iafactory.cxx
index 7248a22b1e35..4a8c716dbeb4 100644
--- a/stoc/source/invocation_adapterfactory/iafactory.cxx
+++ b/stoc/source/invocation_adapterfactory/iafactory.cxx
@@ -65,7 +65,7 @@ static Sequence< OUString > invadp_getSupportedServiceNames()
 
 static OUString invadp_getImplementationName()
 {
-    return OUString(IMPLNAME);
+    return IMPLNAME;
 }
 
 struct hash_ptr
diff --git a/stoc/source/javaloader/javaloader.cxx b/stoc/source/javaloader/javaloader.cxx
index e980d7dddebe..4832b4c346d6 100644
--- a/stoc/source/javaloader/javaloader.cxx
+++ b/stoc/source/javaloader/javaloader.cxx
@@ -76,7 +76,7 @@ static Sequence< OUString > loader_getSupportedServiceNames()
 
 static OUString loader_getImplementationName()
 {
-    return OUString( "com.sun.star.comp.stoc.JavaComponentLoader" );
+    return "com.sun.star.comp.stoc.JavaComponentLoader";
 }
 
 class JavaComponentLoader : public WeakImplHelper<XImplementationLoader, XServiceInfo>
diff --git a/stoc/source/javavm/javavm.cxx b/stoc/source/javavm/javavm.cxx
index eaecc2a91174..71ffbb3fffb1 100644
--- a/stoc/source/javavm/javavm.cxx
+++ b/stoc/source/javavm/javavm.cxx
@@ -187,7 +187,7 @@ bool SingletonFactory::m_bDisposed = false;
 
 OUString serviceGetImplementationName()
 {
-    return OUString("com.sun.star.comp.stoc.JavaVirtualMachine");
+    return "com.sun.star.comp.stoc.JavaVirtualMachine";
 }
 
 css::uno::Sequence< OUString > serviceGetSupportedServiceNames()
diff --git a/stoc/source/loader/dllcomponentloader.cxx b/stoc/source/loader/dllcomponentloader.cxx
index 1935271d536c..fe88d1b74746 100644
--- a/stoc/source/loader/dllcomponentloader.cxx
+++ b/stoc/source/loader/dllcomponentloader.cxx
@@ -76,7 +76,7 @@ DllComponentLoader::DllComponentLoader( const Reference<XComponentContext> & xCt
 
 OUString SAL_CALL DllComponentLoader::getImplementationName(  )
 {
-    return OUString("com.sun.star.comp.stoc.DLLComponentLoader");
+    return "com.sun.star.comp.stoc.DLLComponentLoader";
 }
 
 sal_Bool SAL_CALL DllComponentLoader::supportsService( const OUString& ServiceName )
diff --git a/stoc/source/namingservice/namingservice.cxx b/stoc/source/namingservice/namingservice.cxx
index ddfc1af60a4f..8b35ec58b3c5 100644
--- a/stoc/source/namingservice/namingservice.cxx
+++ b/stoc/source/namingservice/namingservice.cxx
@@ -52,7 +52,7 @@ static Sequence< OUString > ns_getSupportedServiceNames()
 
 static OUString ns_getImplementationName()
 {
-    return OUString(IMPLNAME);
+    return IMPLNAME;
 }
 
 typedef std::unordered_map< OUString, Reference<XInterface > > HashMap_OWString_Interface;
diff --git a/stoc/source/proxy_factory/proxyfac.cxx b/stoc/source/proxy_factory/proxyfac.cxx
index f21868b48964..55d53661dccd 100644
--- a/stoc/source/proxy_factory/proxyfac.cxx
+++ b/stoc/source/proxy_factory/proxyfac.cxx
@@ -51,7 +51,7 @@ namespace
 
 OUString proxyfac_getImplementationName()
 {
-    return OUString(IMPL_NAME);
+    return IMPL_NAME;
 }
 
 Sequence< OUString > proxyfac_getSupportedServiceNames()
diff --git a/stoc/source/security/access_controller.cxx b/stoc/source/security/access_controller.cxx
index 534ac99256fe..08ba90a20670 100644
--- a/stoc/source/security/access_controller.cxx
+++ b/stoc/source/security/access_controller.cxx
@@ -838,7 +838,7 @@ Reference< security::XAccessControlContext > AccessController::getContext()
 
 OUString AccessController::getImplementationName()
 {
-    return OUString("com.sun.star.security.comp.stoc.AccessController");
+    return "com.sun.star.security.comp.stoc.AccessController";
 }
 
 sal_Bool AccessController::supportsService( OUString const & serviceName )
diff --git a/stoc/source/security/file_policy.cxx b/stoc/source/security/file_policy.cxx
index 70fd16f404d7..9d8edc2bf102 100644
--- a/stoc/source/security/file_policy.cxx
+++ b/stoc/source/security/file_policy.cxx
@@ -472,7 +472,7 @@ void FilePolicy::refresh()
 
 OUString FilePolicy::getImplementationName()
 {
-    return OUString(IMPL_NAME);
+    return IMPL_NAME;
 }
 
 sal_Bool FilePolicy::supportsService( OUString const & serviceName )
diff --git a/stoc/source/security/permissions.cxx b/stoc/source/security/permissions.cxx
index 92a957cc9a63..ab70ac1e051b 100644
--- a/stoc/source/security/permissions.cxx
+++ b/stoc/source/security/permissions.cxx
@@ -450,7 +450,7 @@ bool AllPermission::implies( Permission const & ) const
 
 OUString AllPermission::toString() const
 {
-    return OUString("com.sun.star.security.AllPermission");
+    return "com.sun.star.security.AllPermission";
 }
 
 
diff --git a/stoc/source/servicemanager/servicemanager.cxx b/stoc/source/servicemanager/servicemanager.cxx
index 000c7d0dc900..2af11198678a 100644
--- a/stoc/source/servicemanager/servicemanager.cxx
+++ b/stoc/source/servicemanager/servicemanager.cxx
@@ -894,7 +894,7 @@ void OServiceManager::initialize( Sequence< Any > const & )
 // XServiceInfo
 OUString OServiceManager::getImplementationName()
 {
-    return OUString("com.sun.star.comp.stoc.OServiceManager");
+    return "com.sun.star.comp.stoc.OServiceManager";
 }
 
 // XServiceInfo
@@ -1153,7 +1153,7 @@ public:
 
     // XServiceInfo
     OUString SAL_CALL getImplementationName() override
-        { return OUString("com.sun.star.comp.stoc.ORegistryServiceManager"); }
+        { return "com.sun.star.comp.stoc.ORegistryServiceManager"; }
 
     Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
diff --git a/stoc/source/simpleregistry/simpleregistry.cxx b/stoc/source/simpleregistry/simpleregistry.cxx
index ab2251cedc86..29c9011f6ef3 100644
--- a/stoc/source/simpleregistry/simpleregistry.cxx
+++ b/stoc/source/simpleregistry/simpleregistry.cxx
@@ -83,7 +83,7 @@ private:
         OUString const & aKeyName, OUString const & aUrl) override;
 
     virtual OUString SAL_CALL getImplementationName() override
-    { return OUString("com.sun.star.comp.stoc.SimpleRegistry"); }
+    { return "com.sun.star.comp.stoc.SimpleRegistry"; }
 
     virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override
     { return cppu::supportsService(this, ServiceName); }
diff --git a/stoc/source/typeconv/convert.cxx b/stoc/source/typeconv/convert.cxx
index 928629da4afa..5a13985f8687 100644
--- a/stoc/source/typeconv/convert.cxx
+++ b/stoc/source/typeconv/convert.cxx
@@ -264,7 +264,7 @@ TypeConverter_Impl::TypeConverter_Impl() {}
 // XServiceInfo
 OUString TypeConverter_Impl::getImplementationName()
 {
-    return OUString("com.sun.star.comp.stoc.TypeConverter");
+    return "com.sun.star.comp.stoc.TypeConverter";
 }
 
 // XServiceInfo
diff --git a/stoc/source/uriproc/ExternalUriReferenceTranslator.cxx b/stoc/source/uriproc/ExternalUriReferenceTranslator.cxx
index 5aec7c3595b2..f7b99bf9a8e7 100644
--- a/stoc/source/uriproc/ExternalUriReferenceTranslator.cxx
+++ b/stoc/source/uriproc/ExternalUriReferenceTranslator.cxx
@@ -70,7 +70,7 @@ private:
 
 OUString Translator::getImplementationName()
 {
-    return OUString("com.sun.star.comp.uri.ExternalUriReferenceTranslator");
+    return "com.sun.star.comp.uri.ExternalUriReferenceTranslator";
 }
 
 sal_Bool Translator::supportsService(OUString const & serviceName)
diff --git a/stoc/source/uriproc/UriReferenceFactory.cxx b/stoc/source/uriproc/UriReferenceFactory.cxx
index 2359bc31b403..d27d617074a3 100644
--- a/stoc/source/uriproc/UriReferenceFactory.cxx
+++ b/stoc/source/uriproc/UriReferenceFactory.cxx
@@ -287,7 +287,7 @@ private:
 
 OUString Factory::getImplementationName()
 {
-    return OUString("com.sun.star.comp.uri.UriReferenceFactory");
+    return "com.sun.star.comp.uri.UriReferenceFactory";
 }
 
 sal_Bool Factory::supportsService(OUString const & serviceName)
diff --git a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx
index 828ff085510a..105d00bb1e80 100644
--- a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx
+++ b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx
@@ -161,7 +161,7 @@ private:
 
 OUString Parser::getImplementationName()
 {
-    return OUString("com.sun.star.comp.uri.UriSchemeParser_vndDOTsunDOTstarDOTexpand");
+    return "com.sun.star.comp.uri.UriSchemeParser_vndDOTsunDOTstarDOTexpand";
 }
 
 sal_Bool Parser::supportsService(OUString const & serviceName)
diff --git a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx
index f12a74f3bdb8..2f4cb9e09071 100644
--- a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx
+++ b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx
@@ -375,7 +375,7 @@ private:
 
 OUString Parser::getImplementationName()
 {
-    return OUString("com.sun.star.comp.uri.UriSchemeParser_vndDOTsunDOTstarDOTscript");
+    return "com.sun.star.comp.uri.UriSchemeParser_vndDOTsunDOTstarDOTscript";
 }
 
 sal_Bool Parser::supportsService(OUString const & serviceName)
diff --git a/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx b/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx
index 8d1ea79b1901..e2b37db202df 100644
--- a/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx
+++ b/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx
@@ -70,7 +70,7 @@ private:
 
 OUString Factory::getImplementationName()
 {
-    return OUString("com.sun.star.comp.uri.VndSunStarPkgUrlReferenceFactory");
+    return "com.sun.star.comp.uri.VndSunStarPkgUrlReferenceFactory";
 }
 
 sal_Bool Factory::supportsService(OUString const & serviceName)