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

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

8 files changed, 18 insertions, 18 deletions

diff --git a/svl/source/crypto/cryptosign.cxx b/svl/source/crypto/cryptosign.cxx
index 2ace6a9fbee0..c85b5d5870d4 100644
--- a/svl/source/crypto/cryptosign.cxx
+++ b/svl/source/crypto/cryptosign.cxx
@@ -358,12 +358,12 @@ OUString PKIStatusToString(int n)
 {
     switch (n)
     {
-    case 0: return OUString("granted");
-    case 1: return OUString("grantedWithMods");
-    case 2: return OUString("rejection");
-    case 3: return OUString("waiting");
-    case 4: return OUString("revocationWarning");
-    case 5: return OUString("revocationNotification");
+    case 0: return "granted";
+    case 1: return "grantedWithMods";
+    case 2: return "rejection";
+    case 3: return "waiting";
+    case 4: return "revocationWarning";
+    case 5: return "revocationNotification";
     default: return "unknown (" + OUString::number(n) + ")";
     }
 }
diff --git a/svl/source/fsstor/fsfactory.cxx b/svl/source/fsstor/fsfactory.cxx
index 980113267806..1b4174fb9558 100644
--- a/svl/source/fsstor/fsfactory.cxx
+++ b/svl/source/fsstor/fsfactory.cxx
@@ -45,7 +45,7 @@ uno::Sequence< OUString > FSStorageFactory::impl_staticGetSupportedServiceNames(
 
 OUString FSStorageFactory::impl_staticGetImplementationName()
 {
-    return OUString("com.sun.star.comp.embed.FileSystemStorageFactory");
+    return "com.sun.star.comp.embed.FileSystemStorageFactory";
 }
 
 uno::Reference< uno::XInterface > SAL_CALL FSStorageFactory::impl_staticCreateSelfInstance(
diff --git a/svl/source/items/macitem.cxx b/svl/source/items/macitem.cxx
index 4eeaa823e2a3..5f923774b513 100644
--- a/svl/source/items/macitem.cxx
+++ b/svl/source/items/macitem.cxx
@@ -41,15 +41,15 @@ OUString SvxMacro::GetLanguage()const
 {
     if(eType==STARBASIC)
     {
-        return OUString(SVX_MACRO_LANGUAGE_STARBASIC);
+        return SVX_MACRO_LANGUAGE_STARBASIC;
     }
     else if(eType==JAVASCRIPT)
     {
-        return OUString(SVX_MACRO_LANGUAGE_JAVASCRIPT);
+        return SVX_MACRO_LANGUAGE_JAVASCRIPT;
     }
     else if(eType==EXTENDED_STYPE)
     {
-        return OUString(SVX_MACRO_LANGUAGE_SF);
+        return SVX_MACRO_LANGUAGE_SF;
 
     }
     return aLibName;
diff --git a/svl/source/misc/inettype.cxx b/svl/source/misc/inettype.cxx
index f92db768ddcb..9c620694e36f 100644
--- a/svl/source/misc/inettype.cxx
+++ b/svl/source/misc/inettype.cxx
@@ -293,7 +293,7 @@ OUString INetContentTypes::GetContentType(INetContentType eTypeID)
     if (aTypeName.isEmpty())
     {
         OSL_FAIL("INetContentTypes::GetContentType(): Bad ID");
-        return OUString(CONTENT_TYPE_STR_APP_OCTSTREAM);
+        return CONTENT_TYPE_STR_APP_OCTSTREAM;
     }
     return aTypeName;
 }
diff --git a/svl/source/numbers/numfmuno.cxx b/svl/source/numbers/numfmuno.cxx
index 66ed4aae0359..aa0d08584f12 100644
--- a/svl/source/numbers/numfmuno.cxx
+++ b/svl/source/numbers/numfmuno.cxx
@@ -331,7 +331,7 @@ sal_Int32 SAL_CALL SvNumberFormatterServiceObj::queryPreviewColorForNumber( cons
 
 OUString SAL_CALL SvNumberFormatterServiceObj::getImplementationName()
 {
-    return OUString("com.sun.star.uno.util.numbers.SvNumberFormatterServiceObject");
+    return "com.sun.star.uno.util.numbers.SvNumberFormatterServiceObject";
 }
 
 sal_Bool SAL_CALL SvNumberFormatterServiceObj::supportsService( const OUString& ServiceName )
@@ -571,7 +571,7 @@ sal_Int32 SAL_CALL SvNumberFormatsObj::getFormatForLocale( sal_Int32 nKey, const
 
 OUString SAL_CALL SvNumberFormatsObj::getImplementationName()
 {
-    return OUString("SvNumberFormatsObj");
+    return "SvNumberFormatsObj";
 }
 
 sal_Bool SAL_CALL SvNumberFormatsObj::supportsService( const OUString& ServiceName )
@@ -781,7 +781,7 @@ void SAL_CALL SvNumberFormatObj::setPropertyValues( const uno::Sequence<beans::P
 
 OUString SAL_CALL SvNumberFormatObj::getImplementationName()
 {
-    return OUString("SvNumberFormatObj");
+    return "SvNumberFormatObj";
 }
 
 sal_Bool SAL_CALL SvNumberFormatObj::supportsService( const OUString& ServiceName )
@@ -907,7 +907,7 @@ void SAL_CALL SvNumberFormatSettingsObj::removeVetoableChangeListener( const OUS
 
 OUString SAL_CALL SvNumberFormatSettingsObj::getImplementationName()
 {
-    return OUString("SvNumberFormatSettingsObj");
+    return "SvNumberFormatSettingsObj";
 }
 
 sal_Bool SAL_CALL SvNumberFormatSettingsObj::supportsService( const OUString& ServiceName )
diff --git a/svl/source/numbers/supservs.cxx b/svl/source/numbers/supservs.cxx
index 77bbd449e88e..bbdf1dc7c70d 100644
--- a/svl/source/numbers/supservs.cxx
+++ b/svl/source/numbers/supservs.cxx
@@ -98,7 +98,7 @@ void SAL_CALL SvNumberFormatsSupplierServiceObject::initialize( const Sequence<
 
 OUString SAL_CALL SvNumberFormatsSupplierServiceObject::getImplementationName(  )
 {
-    return OUString("com.sun.star.uno.util.numbers.SvNumberFormatsSupplierServiceObject");
+    return "com.sun.star.uno.util.numbers.SvNumberFormatsSupplierServiceObject";
 }
 
 sal_Bool SAL_CALL SvNumberFormatsSupplierServiceObject::supportsService( const OUString& _rServiceName )
diff --git a/svl/source/passwordcontainer/passwordcontainer.cxx b/svl/source/passwordcontainer/passwordcontainer.cxx
index a8dfd1bc0f29..0c6c1b29abde 100644
--- a/svl/source/passwordcontainer/passwordcontainer.cxx
+++ b/svl/source/passwordcontainer/passwordcontainer.cxx
@@ -1315,7 +1315,7 @@ Sequence< OUString > PasswordContainer::impl_getStaticSupportedServiceNames(  )
 
 OUString PasswordContainer::impl_getStaticImplementationName()
 {
-    return OUString("stardiv.svl.PasswordContainer");
+    return "stardiv.svl.PasswordContainer";
 }
 
 Reference< XInterface > SAL_CALL PasswordContainer::impl_createInstance( const Reference< XMultiServiceFactory >& xServiceManager )
diff --git a/svl/source/uno/pathservice.cxx b/svl/source/uno/pathservice.cxx
index 8017379c9c97..6b428b160f64 100644
--- a/svl/source/uno/pathservice.cxx
+++ b/svl/source/uno/pathservice.cxx
@@ -40,7 +40,7 @@ public:
 
     virtual OUString SAL_CALL getImplementationName() override
         {
-            return OUString("com.sun.star.comp.svl.PathService");
+            return "com.sun.star.comp.svl.PathService";
         }
 
     virtual sal_Bool SAL_CALL supportsService (