From 3457da6abe0fd03efd19442e9790fbd1aa04c160 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel.grandin@collabora.co.uk>
Date: Thu, 6 Aug 2020 10:55:58 +0200
Subject: loplugin:stringstatic also look for local statics

Add some API to O*StringLiteral, to make it easier
to use in some places that were using O*String

Change-Id: I1fb93bd47ac2065c9220d509aad3f4320326d99e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100270
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
---
 .../officeinstallationdirectories.cxx              |  4 +--
 comphelper/source/xml/ofopxmlhelper.cxx            | 36 +++++++++++-----------
 2 files changed, 20 insertions(+), 20 deletions(-)

(limited to 'comphelper/source')

diff --git a/comphelper/source/officeinstdir/officeinstallationdirectories.cxx b/comphelper/source/officeinstdir/officeinstallationdirectories.cxx
index 4090fda37ada..2a8bb326e6ae 100644
--- a/comphelper/source/officeinstdir/officeinstallationdirectories.cxx
+++ b/comphelper/source/officeinstdir/officeinstallationdirectories.cxx
@@ -75,8 +75,8 @@ static bool makeCanonicalFileURL( OUString & rURL )
 
 namespace comphelper {
 
-OUString const g_aOfficeBrandDirMacro("$(brandbaseurl)");
-OUString const g_aUserDirMacro("$(userdataurl)");
+OUStringLiteral const g_aOfficeBrandDirMacro("$(brandbaseurl)");
+OUStringLiteral const g_aUserDirMacro("$(userdataurl)");
 
 OfficeInstallationDirectories::OfficeInstallationDirectories(
         const uno::Reference< uno::XComponentContext > & xCtx )
diff --git a/comphelper/source/xml/ofopxmlhelper.cxx b/comphelper/source/xml/ofopxmlhelper.cxx
index 8045f9b767b6..325b2c85b147 100644
--- a/comphelper/source/xml/ofopxmlhelper.cxx
+++ b/comphelper/source/xml/ofopxmlhelper.cxx
@@ -196,12 +196,12 @@ void WriteContentSequence(
 
     xWriter->setOutputStream( xOutStream );
 
-    static const OUString aTypesElement("Types");
-    static const OUString aDefaultElement("Default");
-    static const OUString aOverrideElement("Override");
-    static const OUString aContentTypeAttr("ContentType");
-    static const OUString aCDATAString("CDATA");
-    static const OUString aWhiteSpace(" ");
+    static const OUStringLiteral aTypesElement("Types");
+    static const OUStringLiteral aDefaultElement("Default");
+    static const OUStringLiteral aOverrideElement("Override");
+    static const OUStringLiteral aContentTypeAttr("ContentType");
+    static const OUStringLiteral aCDATAString("CDATA");
+    static const OUStringLiteral aWhiteSpace(" ");
 
     // write the namespace
     AttributeList* pRootAttrList = new AttributeList;
@@ -269,20 +269,20 @@ uno::Sequence< uno::Sequence< beans::StringPair > > ReadSequence_Impl(
 } // namespace OFOPXMLHelper
 
 // Relations info related strings
-OUString const g_aRelListElement("Relationships");
-OUString const g_aRelElement( "Relationship" );
-OUString const g_aIDAttr( "Id" );
-OUString const g_aTypeAttr( "Type" );
-OUString const g_aTargetModeAttr( "TargetMode" );
-OUString const g_aTargetAttr( "Target" );
+OUStringLiteral const g_aRelListElement("Relationships");
+OUStringLiteral const g_aRelElement( "Relationship" );
+OUStringLiteral const g_aIDAttr( "Id" );
+OUStringLiteral const g_aTypeAttr( "Type" );
+OUStringLiteral const g_aTargetModeAttr( "TargetMode" );
+OUStringLiteral const g_aTargetAttr( "Target" );
 
 // ContentType related strings
-OUString const g_aTypesElement( "Types" );
-OUString const g_aDefaultElement( "Default" );
-OUString const g_aOverrideElement( "Override" );
-OUString const g_aExtensionAttr( "Extension" );
-OUString const g_aPartNameAttr( "PartName" );
-OUString const g_aContentTypeAttr( "ContentType" );
+OUStringLiteral const g_aTypesElement( "Types" );
+OUStringLiteral const g_aDefaultElement( "Default" );
+OUStringLiteral const g_aOverrideElement( "Override" );
+OUStringLiteral const g_aExtensionAttr( "Extension" );
+OUStringLiteral const g_aPartNameAttr( "PartName" );
+OUStringLiteral const g_aContentTypeAttr( "ContentType" );
 
 OFOPXMLHelper_Impl::OFOPXMLHelper_Impl( sal_uInt16 nFormat )
 : m_nFormat( nFormat )
-- 
cgit