loplugin:stringviewparam: operator +

Change-Id: I044dd21b63d7eb03224675584fa143009c6b6008
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108418
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>

5 files changed, 18 insertions, 9 deletions

diff --git a/include/test/helper/form.hxx b/include/test/helper/form.hxx
index 0fbcd2c7b06a..d3b80544d7b5 100644
--- a/include/test/helper/form.hxx
+++ b/include/test/helper/form.hxx
@@ -10,12 +10,15 @@
 #ifndef INCLUDED_TEST_HELPER_FORM_HXX
 #define INCLUDED_TEST_HELPER_FORM_HXX
 
+#include <sal/config.h>
+
+#include <string_view>
+
 #include <com/sun/star/drawing/XControlShape.hpp>
 #include <com/sun/star/lang/XComponent.hpp>
 
 #include <com/sun/star/uno/Reference.hxx>
 
-#include <sal/config.h>
 #include <sal/types.h>
 #include <test/testdllapi.hxx>
 
@@ -49,7 +52,7 @@ css::uno::Reference<css::drawing::XControlShape> OOO_DLLPUBLIC_TEST createComman
  * @return  The created XControlShape.
  */
 css::uno::Reference<css::drawing::XControlShape> OOO_DLLPUBLIC_TEST createControlShape(
-    const css::uno::Reference<css::lang::XComponent>& r_xComponent, const OUString& r_aKind,
+    const css::uno::Reference<css::lang::XComponent>& r_xComponent, std::u16string_view r_aKind,
     const sal_Int32 nX, const sal_Int32 nY, const sal_Int32 nHeight, const sal_Int32 nWidth);
 
 } // namespace form
diff --git a/include/test/helper/shape.hxx b/include/test/helper/shape.hxx
index 341a9fad93fc..dbf3745219e9 100644
--- a/include/test/helper/shape.hxx
+++ b/include/test/helper/shape.hxx
@@ -11,6 +11,9 @@
 #define INCLUDED_TEST_HELPER_SHAPE_HXX
 
 #include <sal/config.h>
+
+#include <string_view>
+
 #include <sal/types.h>
 #include <test/testdllapi.hxx>
 
@@ -76,10 +79,9 @@ createRectangle(const css::uno::Reference<css::lang::XComponent>& r_xComponent,
  * @param nWidth        The width of the shape.
  * @return  The created XShape.
  */
-css::uno::Reference<css::drawing::XShape>
-    OOO_DLLPUBLIC_TEST createShape(const css::uno::Reference<css::lang::XComponent>& r_xComponent,
-                                   const OUString& r_aKind, const sal_Int32 nX, const sal_Int32 nY,
-                                   const sal_Int32 nWidth, const sal_Int32 nHeight);
+css::uno::Reference<css::drawing::XShape> OOO_DLLPUBLIC_TEST createShape(
+    const css::uno::Reference<css::lang::XComponent>& r_xComponent, std::u16string_view r_aKind,
+    const sal_Int32 nX, const sal_Int32 nY, const sal_Int32 nWidth, const sal_Int32 nHeight);
 
 } // namespace shape
 } // namespace helper
diff --git a/include/test/screenshot_test.hxx b/include/test/screenshot_test.hxx
index 2c0bbe25eb23..ae0a2a8c14e6 100644
--- a/include/test/screenshot_test.hxx
+++ b/include/test/screenshot_test.hxx
@@ -85,7 +85,7 @@ public:
     /// - lines starting with '#' are treated as comment
     /// - all other lines should contain a *.ui filename in the same
     ///   notation as in the dialog constructors(see code)
-    void processDialogBatchFile(const OUString& rFile);
+    void processDialogBatchFile(std::u16string_view rFile);
 
     /// const access to known dialogs
     const mapType& getKnownDialogs() const { return maKnownDialogs; }
diff --git a/include/test/unoapi_test.hxx b/include/test/unoapi_test.hxx
index b4a09b4a28cd..82f04cf465eb 100644
--- a/include/test/unoapi_test.hxx
+++ b/include/test/unoapi_test.hxx
@@ -11,6 +11,9 @@
 #define INCLUDED_TEST_UNOAPI_TEST_HXX
 
 #include <sal/config.h>
+
+#include <string_view>
+
 #include <test/bootstrapfixture.hxx>
 #include <unotest/macros_test.hxx>
 #include <com/sun/star/lang/XComponent.hpp>
@@ -23,7 +26,7 @@ class OOO_DLLPUBLIC_TEST UnoApiTest : public test::BootstrapFixture, public unot
 public:
     UnoApiTest(const OUString& path);
 
-    void createFileURL(const OUString& aFileBase, OUString& rFilePath);
+    void createFileURL(std::u16string_view aFileBase, OUString& rFilePath);
 
     virtual void setUp() override;
 
diff --git a/include/test/xmltesttools.hxx b/include/test/xmltesttools.hxx
index cd5f30c064fe..f6bd17f0ae30 100644
--- a/include/test/xmltesttools.hxx
+++ b/include/test/xmltesttools.hxx
@@ -27,6 +27,7 @@
 
 #include <cppunit/TestAssert.h>
 
+#include <string_view>
 #include <vector>
 
 class OOO_DLLPUBLIC_TEST XmlTestTools
@@ -59,7 +60,7 @@ protected:
      * Get the position of the child named rName of the parent node specified by rXPath.
      * Useful for checking relative order of elements.
      */
-    int           getXPathPosition(const xmlDocUniquePtr& pXmlDoc, const OString& rXPath, const OString& rChildName);
+    int           getXPathPosition(const xmlDocUniquePtr& pXmlDoc, const OString& rXPath, std::string_view rChildName);
     /**
      * Assert that rXPath exists, and returns exactly one node.
      */