loplugin:ostr in vcl

Change-Id: I5b6ee5bda0c5ff69d297f7f8e87d4c3f3d21791c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167470
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Jenkins

6 files changed, 24 insertions, 24 deletions

diff --git a/vcl/source/graphic/GraphicObject.cxx b/vcl/source/graphic/GraphicObject.cxx
index 109f55af2403..dccd0c959fbf 100644
--- a/vcl/source/graphic/GraphicObject.cxx
+++ b/vcl/source/graphic/GraphicObject.cxx
@@ -58,10 +58,10 @@ void SearchForGraphics(uno::Reference<uno::XInterface> const & xInterface,
     uno::Reference<beans::XPropertySet> xPropertySet(xInterface, UNO_QUERY);
     if (xPropertySet.is())
     {
-        if (xPropertySet->getPropertySetInfo()->hasPropertyByName("ImageURL"))
+        if (xPropertySet->getPropertySetInfo()->hasPropertyByName(u"ImageURL"_ustr))
         {
             OUString sURL;
-            xPropertySet->getPropertyValue("ImageURL") >>= sURL;
+            xPropertySet->getPropertyValue(u"ImageURL"_ustr) >>= sURL;
             if (!sURL.isEmpty() && !GraphicObject::isGraphicObjectUniqueIdURL(sURL))
             {
                 Graphic aGraphic = vcl::graphic::loadFromURL(sURL);
@@ -70,10 +70,10 @@ void SearchForGraphics(uno::Reference<uno::XInterface> const & xInterface,
                     raGraphicList.push_back(aGraphic.GetXGraphic());
                 }
             }
-        } else if (xPropertySet->getPropertySetInfo()->hasPropertyByName("Graphic"))
+        } else if (xPropertySet->getPropertySetInfo()->hasPropertyByName(u"Graphic"_ustr))
         {
             uno::Reference<css::graphic::XGraphic> xGraphic;
-            xPropertySet->getPropertyValue("Graphic") >>= xGraphic;
+            xPropertySet->getPropertyValue(u"Graphic"_ustr) >>= xGraphic;
             if (xGraphic.is())
             {
                 raGraphicList.push_back(xGraphic);
diff --git a/vcl/source/graphic/UnoGraphic.cxx b/vcl/source/graphic/UnoGraphic.cxx
index 9036f54452ba..2f360c8b40b7 100644
--- a/vcl/source/graphic/UnoGraphic.cxx
+++ b/vcl/source/graphic/UnoGraphic.cxx
@@ -78,7 +78,7 @@ void SAL_CALL Graphic::release() noexcept
 
 OUString SAL_CALL Graphic::getImplementationName()
 {
-    return "com.sun.star.comp.graphic.Graphic";
+    return u"com.sun.star.comp.graphic.Graphic"_ustr;
 }
 
 sal_Bool SAL_CALL Graphic::supportsService( const OUString& rServiceName )
@@ -89,7 +89,7 @@ sal_Bool SAL_CALL Graphic::supportsService( const OUString& rServiceName )
 uno::Sequence< OUString > SAL_CALL Graphic::getSupportedServiceNames()
 {
     uno::Sequence< OUString >    aRet( ::unographic::GraphicDescriptor::getSupportedServiceNames() );
-    const uno::Sequence< OUString >    aNew { "com.sun.star.graphic.Graphic" };
+    const uno::Sequence< OUString >    aNew { u"com.sun.star.graphic.Graphic"_ustr };
     sal_Int32                           nOldCount = aRet.getLength();
 
     aRet.realloc( nOldCount + aNew.getLength() );
diff --git a/vcl/source/graphic/UnoGraphicDescriptor.cxx b/vcl/source/graphic/UnoGraphicDescriptor.cxx
index 32ffe48fd68f..f36d04988be8 100644
--- a/vcl/source/graphic/UnoGraphicDescriptor.cxx
+++ b/vcl/source/graphic/UnoGraphicDescriptor.cxx
@@ -195,7 +195,7 @@ void SAL_CALL GraphicDescriptor::release()
 
 OUString SAL_CALL GraphicDescriptor::getImplementationName()
 {
-    return "com.sun.star.comp.graphic.GraphicDescriptor";
+    return u"com.sun.star.comp.graphic.GraphicDescriptor"_ustr;
 }
 
 sal_Bool SAL_CALL GraphicDescriptor::supportsService( const OUString& ServiceName )
@@ -206,7 +206,7 @@ sal_Bool SAL_CALL GraphicDescriptor::supportsService( const OUString& ServiceNam
 
 uno::Sequence< OUString > SAL_CALL GraphicDescriptor::getSupportedServiceNames()
 {
-    return { "com.sun.star.graphic.GraphicDescriptor" };
+    return { u"com.sun.star.graphic.GraphicDescriptor"_ustr };
 }
 
 
@@ -232,16 +232,16 @@ rtl::Reference<::comphelper::PropertySetInfo> GraphicDescriptor::createPropertyS
 {
     static ::comphelper::PropertyMapEntry const aEntries[] =
     {
-        { OUString( "GraphicType" ), static_cast< sal_Int32 >( UnoGraphicProperty::GraphicType ), cppu::UnoType< sal_Int8 >::get(), beans::PropertyAttribute::READONLY, 0 },
-        { OUString( "MimeType" ), static_cast< sal_Int32 >( UnoGraphicProperty::MimeType ), cppu::UnoType< OUString >::get(), beans::PropertyAttribute::READONLY, 0 },
-        { OUString( "SizePixel" ), static_cast< sal_Int32 >( UnoGraphicProperty::SizePixel ), cppu::UnoType< awt::Size >::get(), beans::PropertyAttribute::READONLY, 0 },
-        { OUString( "Size100thMM" ), static_cast< sal_Int32 >( UnoGraphicProperty::Size100thMM ), cppu::UnoType< awt::Size >::get(), beans::PropertyAttribute::READONLY, 0 },
-        { OUString( "BitsPerPixel" ), static_cast< sal_Int32 >( UnoGraphicProperty::BitsPerPixel ), cppu::UnoType< sal_Int8 >::get(), beans::PropertyAttribute::READONLY, 0 },
-        { OUString( "Transparent" ), static_cast< sal_Int32 >( UnoGraphicProperty::Transparent ), cppu::UnoType< sal_Bool >::get(), beans::PropertyAttribute::READONLY, 0 },
-        { OUString( "Alpha" ), static_cast< sal_Int32 >( UnoGraphicProperty::Alpha ), cppu::UnoType< sal_Bool >::get(), beans::PropertyAttribute::READONLY, 0 },
-        { OUString( "Animated" ), static_cast< sal_Int32 >( UnoGraphicProperty::Animated ), cppu::UnoType< sal_Bool >::get(), beans::PropertyAttribute::READONLY, 0 },
-        { OUString("Linked"), sal_Int32(UnoGraphicProperty::Linked), cppu::UnoType<sal_Bool>::get(), beans::PropertyAttribute::READONLY, 0 },
-        { OUString("OriginURL"), sal_Int32(UnoGraphicProperty::OriginURL), cppu::UnoType<OUString>::get(), beans::PropertyAttribute::READONLY, 0 },
+        { u"GraphicType"_ustr, static_cast< sal_Int32 >( UnoGraphicProperty::GraphicType ), cppu::UnoType< sal_Int8 >::get(), beans::PropertyAttribute::READONLY, 0 },
+        { u"MimeType"_ustr, static_cast< sal_Int32 >( UnoGraphicProperty::MimeType ), cppu::UnoType< OUString >::get(), beans::PropertyAttribute::READONLY, 0 },
+        { u"SizePixel"_ustr, static_cast< sal_Int32 >( UnoGraphicProperty::SizePixel ), cppu::UnoType< awt::Size >::get(), beans::PropertyAttribute::READONLY, 0 },
+        { u"Size100thMM"_ustr, static_cast< sal_Int32 >( UnoGraphicProperty::Size100thMM ), cppu::UnoType< awt::Size >::get(), beans::PropertyAttribute::READONLY, 0 },
+        { u"BitsPerPixel"_ustr, static_cast< sal_Int32 >( UnoGraphicProperty::BitsPerPixel ), cppu::UnoType< sal_Int8 >::get(), beans::PropertyAttribute::READONLY, 0 },
+        { u"Transparent"_ustr, static_cast< sal_Int32 >( UnoGraphicProperty::Transparent ), cppu::UnoType< sal_Bool >::get(), beans::PropertyAttribute::READONLY, 0 },
+        { u"Alpha"_ustr, static_cast< sal_Int32 >( UnoGraphicProperty::Alpha ), cppu::UnoType< sal_Bool >::get(), beans::PropertyAttribute::READONLY, 0 },
+        { u"Animated"_ustr, static_cast< sal_Int32 >( UnoGraphicProperty::Animated ), cppu::UnoType< sal_Bool >::get(), beans::PropertyAttribute::READONLY, 0 },
+        { u"Linked"_ustr, sal_Int32(UnoGraphicProperty::Linked), cppu::UnoType<sal_Bool>::get(), beans::PropertyAttribute::READONLY, 0 },
+        { u"OriginURL"_ustr, sal_Int32(UnoGraphicProperty::OriginURL), cppu::UnoType<OUString>::get(), beans::PropertyAttribute::READONLY, 0 },
     };
 
     return rtl::Reference<::comphelper::PropertySetInfo>( new ::comphelper::PropertySetInfo(aEntries) );
diff --git a/vcl/source/graphic/UnoGraphicMapper.cxx b/vcl/source/graphic/UnoGraphicMapper.cxx
index 6bde78097681..6a2e48552c1a 100644
--- a/vcl/source/graphic/UnoGraphicMapper.cxx
+++ b/vcl/source/graphic/UnoGraphicMapper.cxx
@@ -34,7 +34,7 @@ protected:
     // XServiceInfo
     OUString SAL_CALL getImplementationName() override
     {
-        return "com.sun.star.comp.graphic.GraphicMapper";
+        return u"com.sun.star.comp.graphic.GraphicMapper"_ustr;
     }
     sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override
     {
@@ -42,7 +42,7 @@ protected:
     }
     css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override
     {
-        return { "com.sun.star.graphic.GraphicMapper" };
+        return { u"com.sun.star.graphic.GraphicMapper"_ustr };
     }
 
     // XTypeProvider
diff --git a/vcl/source/graphic/UnoGraphicObject.cxx b/vcl/source/graphic/UnoGraphicObject.cxx
index 73bbcef3ec8e..b7700a391d4a 100644
--- a/vcl/source/graphic/UnoGraphicObject.cxx
+++ b/vcl/source/graphic/UnoGraphicObject.cxx
@@ -50,7 +50,7 @@ public:
 
     virtual OUString SAL_CALL getImplementationName() override
     {
-        return "com.sun.star.graphic.GraphicObject";
+        return u"com.sun.star.graphic.GraphicObject"_ustr;
     }
 
     virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override
@@ -60,7 +60,7 @@ public:
 
     virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override
     {
-        return { "com.sun.star.graphic.GraphicObject" };
+        return { u"com.sun.star.graphic.GraphicObject"_ustr };
     }
 };
 
diff --git a/vcl/source/graphic/UnoGraphicProvider.cxx b/vcl/source/graphic/UnoGraphicProvider.cxx
index 63916164eb4b..d472aaaadcfd 100644
--- a/vcl/source/graphic/UnoGraphicProvider.cxx
+++ b/vcl/source/graphic/UnoGraphicProvider.cxx
@@ -94,7 +94,7 @@ GraphicProvider::GraphicProvider()
 
 OUString SAL_CALL GraphicProvider::getImplementationName()
 {
-    return "com.sun.star.comp.graphic.GraphicProvider";
+    return u"com.sun.star.comp.graphic.GraphicProvider"_ustr;
 }
 
 sal_Bool SAL_CALL GraphicProvider::supportsService( const OUString& ServiceName )
@@ -104,7 +104,7 @@ sal_Bool SAL_CALL GraphicProvider::supportsService( const OUString& ServiceName
 
 uno::Sequence< OUString > SAL_CALL GraphicProvider::getSupportedServiceNames()
 {
-    return { "com.sun.star.graphic.GraphicProvider" };
+    return { u"com.sun.star.graphic.GraphicProvider"_ustr };
 }
 
 uno::Sequence< uno::Type > SAL_CALL GraphicProvider::getTypes()