From 692a116c27ea24d3245d38fe5063d8f84c07f7f2 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <stephan.bergmann@allotropia.de>
Date: Wed, 29 Nov 2023 14:36:42 +0100
Subject: Extended loplugin:ostr: xmlhelp

Change-Id: Ic8247396b1cd2152cdac6e3728d1828bea6f452c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160094
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <stephan.bergmann@allotropia.de>
---
 xmlhelp/source/cxxhelp/provider/urlparameter.cxx | 64 ++++++++++++------------
 1 file changed, 32 insertions(+), 32 deletions(-)

(limited to 'xmlhelp')

diff --git a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx
index 345693b2e7c8..c242c74add2d 100644
--- a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx
+++ b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx
@@ -720,60 +720,60 @@ InputStreamTransformer::InputStreamTransformer( URLParameter* urlParam,
         OString parString[46];
         int last = 0;
 
-        parString[last++] = "Program";
+        parString[last++] = "Program"_ostr;
         OString aPureProgramm( urlParam->getByName( "Program" ) );
         parString[last++] = "'" + aPureProgramm + "'";
-        parString[last++] = "Database";
+        parString[last++] = "Database"_ostr;
         parString[last++] = "'" + urlParam->getByName( "DatabasePar" ) + "'";
-        parString[last++] = "Id";
+        parString[last++] = "Id"_ostr;
         parString[last++] = "'" + urlParam->getByName( "Id" ) + "'";
-        parString[last++] = "Path";
+        parString[last++] = "Path"_ostr;
         OString aPath( urlParam->getByName( "Path" ) );
         parString[last++] = "'" + aPath + "'";
 
         OString aPureLanguage = urlParam->getByName( "Language" );
-        parString[last++] = "Language";
+        parString[last++] = "Language"_ostr;
         parString[last++] = "'" + aPureLanguage + "'";
-        parString[last++] = "System";
+        parString[last++] = "System"_ostr;
         parString[last++] = "'" + urlParam->getByName( "System" ) + "'";
-        parString[last++] = "productname";
+        parString[last++] = "productname"_ostr;
         parString[last++] = "'" + OUStringToOString(
             pDatabases->getProductName(),
             RTL_TEXTENCODING_UTF8 ) + "'";
-        parString[last++] = "productversion";
+        parString[last++] = "productversion"_ostr;
         parString[last++] = "'" +
             OUStringToOString(  pDatabases->getProductVersion(),
                           RTL_TEXTENCODING_UTF8 ) + "'";
 
-        parString[last++] = "imgtheme";
+        parString[last++] = "imgtheme"_ostr;
         parString[last++] = "'" + pDatabases->getImageTheme() + "'";
-        parString[last++] = "hp";
+        parString[last++] = "hp"_ostr;
         parString[last++] = "'" + urlParam->getByName( "HelpPrefix" ) + "'";
 
         if( !parString[last-1].isEmpty() )
         {
-            parString[last++] = "sm";
-            parString[last++] = "'vnd.sun.star.help%3A%2F%2F'";
-            parString[last++] = "qm";
-            parString[last++] = "'%3F'";
-            parString[last++] = "es";
-            parString[last++] = "'%3D'";
-            parString[last++] = "am";
-            parString[last++] = "'%26'";
-            parString[last++] = "cl";
-            parString[last++] = "'%3A'";
-            parString[last++] = "sl";
-            parString[last++] = "'%2F'";
-            parString[last++] = "hm";
-            parString[last++] = "'%23'";
-            parString[last++] = "cs";
-            parString[last++] = "'css'";
-
-            parString[last++] = "vendorname";
+            parString[last++] = "sm"_ostr;
+            parString[last++] = "'vnd.sun.star.help%3A%2F%2F'"_ostr;
+            parString[last++] = "qm"_ostr;
+            parString[last++] = "'%3F'"_ostr;
+            parString[last++] = "es"_ostr;
+            parString[last++] = "'%3D'"_ostr;
+            parString[last++] = "am"_ostr;
+            parString[last++] = "'%26'"_ostr;
+            parString[last++] = "cl"_ostr;
+            parString[last++] = "'%3A'"_ostr;
+            parString[last++] = "sl"_ostr;
+            parString[last++] = "'%2F'"_ostr;
+            parString[last++] = "hm"_ostr;
+            parString[last++] = "'%23'"_ostr;
+            parString[last++] = "cs"_ostr;
+            parString[last++] = "'css'"_ostr;
+
+            parString[last++] = "vendorname"_ostr;
             parString[last++] = "''"_ostr;
-            parString[last++] = "vendorversion";
+            parString[last++] = "vendorversion"_ostr;
             parString[last++] = "''"_ostr;
-            parString[last++] = "vendorshort";
+            parString[last++] = "vendorshort"_ostr;
             parString[last++] = "''"_ostr;
         }
 
@@ -808,7 +808,7 @@ InputStreamTransformer::InputStreamTransformer( URLParameter* urlParam,
             OUString aOUExpandedExtensionPath = Databases::expandURL( aExtensionRegistryPath, xContext );
             OString aExpandedExtensionPath = OUStringToOString( aOUExpandedExtensionPath, osl_getThreadTextEncoding() );
 
-            parString[last++] = "ExtensionPath";
+            parString[last++] = "ExtensionPath"_ostr;
             parString[last++] = "'" + aExpandedExtensionPath + "'";
 
             // ExtensionId
@@ -817,7 +817,7 @@ InputStreamTransformer::InputStreamTransformer( URLParameter* urlParam,
             if( iSlash != -1 )
                 aPureExtensionId = aPath.copy( 0, iSlash );
 
-            parString[last++] = "ExtensionId";
+            parString[last++] = "ExtensionId"_ostr;
             parString[last++] = "'" + aPureExtensionId + "'";
         }
 
-- 
cgit