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

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

5 files changed, 17 insertions, 17 deletions

diff --git a/comphelper/source/misc/graphicmimetype.cxx b/comphelper/source/misc/graphicmimetype.cxx
index 78e216a941ae..4286c92f7a96 100644
--- a/comphelper/source/misc/graphicmimetype.cxx
+++ b/comphelper/source/misc/graphicmimetype.cxx
@@ -72,7 +72,7 @@ OUString GraphicMimeTypeHelper::GetMimeTypeForXGraphic(const Reference<XGraphic>
     {
         return aSourceMimeType;
     }
-    return OUString("");
+    return "";
 }
 
 OUString
@@ -94,29 +94,29 @@ OUString GraphicMimeTypeHelper::GetMimeTypeForConvertDataFormat(ConvertDataForma
     switch (convertDataFormat)
     {
         case ConvertDataFormat::BMP:
-            return OUString("image/bmp");
+            return "image/bmp";
         case ConvertDataFormat::GIF:
-            return OUString("image/gif");
+            return "image/gif";
         case ConvertDataFormat::JPG:
-            return OUString("image/jpeg");
+            return "image/jpeg";
         case ConvertDataFormat::PCT:
-            return OUString("image/x-pict");
+            return "image/x-pict";
         case ConvertDataFormat::PNG:
-            return OUString("image/png");
+            return "image/png";
         case ConvertDataFormat::SVM:
-            return OUString("image/x-svm");
+            return "image/x-svm";
         case ConvertDataFormat::TIF:
-            return OUString("image/tiff");
+            return "image/tiff";
         case ConvertDataFormat::WMF:
-            return OUString("image/x-wmf");
+            return "image/x-wmf";
         case ConvertDataFormat::EMF:
-            return OUString("image/x-emf");
+            return "image/x-emf";
         case ConvertDataFormat::SVG:
-            return OUString("image/svg+xml");
+            return "image/svg+xml";
         case ConvertDataFormat::MET: // What is this?
         case ConvertDataFormat::Unknown:
         default:
-            return OUString("");
+            return "";
     }
 }
 }
diff --git a/comphelper/source/misc/instancelocker.cxx b/comphelper/source/misc/instancelocker.cxx
index 21b165fe1d8a..31e55c20a6e0 100644
--- a/comphelper/source/misc/instancelocker.cxx
+++ b/comphelper/source/misc/instancelocker.cxx
@@ -176,7 +176,7 @@ void SAL_CALL OInstanceLocker::initialize( const uno::Sequence< uno::Any >& aArg
 // XServiceInfo
 OUString SAL_CALL OInstanceLocker::getImplementationName(  )
 {
-    return OUString( "com.sun.star.comp.embed.InstanceLocker" );
+    return "com.sun.star.comp.embed.InstanceLocker";
 }
 
 sal_Bool SAL_CALL OInstanceLocker::supportsService( const OUString& ServiceName )
diff --git a/comphelper/source/misc/mimeconfighelper.cxx b/comphelper/source/misc/mimeconfighelper.cxx
index 24e5626e4593..21126c4867ec 100644
--- a/comphelper/source/misc/mimeconfighelper.cxx
+++ b/comphelper/source/misc/mimeconfighelper.cxx
@@ -499,7 +499,7 @@ OUString MimeConfigurationHelper::GetFactoryNameByStringClassID( const OUString&
         {
             uno::Sequence< sal_Int8 > aClassID = GetSequenceClassIDRepresentation( aStringClassID );
             if ( ClassIDsEqual( aClassID, GetSequenceClassID( SO3_DUMMY_CLASSID ) ) )
-                return OUString( "com.sun.star.embed.OOoSpecialEmbeddedObjectFactory" );
+                return "com.sun.star.embed.OOoSpecialEmbeddedObjectFactory";
         }
     }
 
diff --git a/comphelper/source/misc/officerestartmanager.cxx b/comphelper/source/misc/officerestartmanager.cxx
index b2997c9fa867..f56486858522 100644
--- a/comphelper/source/misc/officerestartmanager.cxx
+++ b/comphelper/source/misc/officerestartmanager.cxx
@@ -131,7 +131,7 @@ void SAL_CALL OOfficeRestartManager::notify( const uno::Any& /* aData */ )
 
 OUString SAL_CALL OOfficeRestartManager::getImplementationName()
 {
-    return OUString("com.sun.star.comp.task.OfficeRestartManager");
+    return "com.sun.star.comp.task.OfficeRestartManager";
 }
 
 sal_Bool SAL_CALL OOfficeRestartManager::supportsService( const OUString& aServiceName )
diff --git a/comphelper/source/misc/xmlsechelper.cxx b/comphelper/source/misc/xmlsechelper.cxx
index 9b3b19249803..d0b4b3074ca9 100644
--- a/comphelper/source/misc/xmlsechelper.cxx
+++ b/comphelper/source/misc/xmlsechelper.cxx
@@ -35,9 +35,9 @@ namespace xmlsec
         switch (rKind)
         {
             case css::security::CertificateKind_X509:
-                return OUString("X.509");
+                return "X.509";
             case css::security::CertificateKind_OPENPGP:
-                return OUString("OpenPGP");
+                return "OpenPGP";
             default:
                 return OUString();
         }