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>

22 files changed, 51 insertions, 37 deletions

diff --git a/dbaccess/qa/extras/dialog-save.cxx b/dbaccess/qa/extras/dialog-save.cxx
index af7b9fda3f8e..5eac41e67041 100644
--- a/dbaccess/qa/extras/dialog-save.cxx
+++ b/dbaccess/qa/extras/dialog-save.cxx
@@ -55,7 +55,7 @@ void DialogSaveTest::test()
     // be locked anyway:
     SolarMutexReleaser rel;
 
-    const OUString aFileName(m_directories.getURLFromWorkdir("CppunitTest/testDialogSave.odb"));
+    const OUString aFileName(m_directories.getURLFromWorkdir(u"CppunitTest/testDialogSave.odb"));
     {
         uno::Reference< lang::XComponent > xComponent = loadFromDesktop(aFileName);
         CPPUNIT_ASSERT(xComponent.is());
diff --git a/dbaccess/qa/extras/empty-stdlib-save.cxx b/dbaccess/qa/extras/empty-stdlib-save.cxx
index ea9c660a4e87..aa7dd293004f 100644
--- a/dbaccess/qa/extras/empty-stdlib-save.cxx
+++ b/dbaccess/qa/extras/empty-stdlib-save.cxx
@@ -53,7 +53,7 @@ void DialogSaveTest::test()
     // be locked anyway:
     SolarMutexReleaser rel;
 
-    const OUString aFileName(m_directories.getURLFromWorkdir("CppunitTest/testEmptyStdlibSave.odb"));
+    const OUString aFileName(m_directories.getURLFromWorkdir(u"CppunitTest/testEmptyStdlibSave.odb"));
     {
         uno::Reference< lang::XComponent > xComponent = loadFromDesktop(aFileName);
         CPPUNIT_ASSERT(xComponent.is());
diff --git a/dbaccess/qa/extras/macros-test.cxx b/dbaccess/qa/extras/macros-test.cxx
index 5d65133664b3..e102c75896b3 100644
--- a/dbaccess/qa/extras/macros-test.cxx
+++ b/dbaccess/qa/extras/macros-test.cxx
@@ -35,7 +35,7 @@ DBAccessTest::DBAccessTest()
 void DBAccessTest::test()
 {
     OUString aFileName;
-    createFileURL("testdb.odb", aFileName);
+    createFileURL(u"testdb.odb", aFileName);
     uno::Reference<lang::XComponent> xComponent = loadFromDesktop(aFileName);
     CPPUNIT_ASSERT(xComponent.is());
     xComponent->dispose();
diff --git a/dbaccess/qa/extras/nolib-save.cxx b/dbaccess/qa/extras/nolib-save.cxx
index 5914511e6dbe..e191402425f9 100644
--- a/dbaccess/qa/extras/nolib-save.cxx
+++ b/dbaccess/qa/extras/nolib-save.cxx
@@ -53,7 +53,7 @@ void DialogSaveTest::test()
     // be locked anyway:
     SolarMutexReleaser rel;
 
-    const OUString aFileName(m_directories.getURLFromWorkdir("CppunitTest/testNolibSave.odb"));
+    const OUString aFileName(m_directories.getURLFromWorkdir(u"CppunitTest/testNolibSave.odb"));
     {
         uno::Reference< lang::XComponent > xComponent = loadFromDesktop(aFileName);
         CPPUNIT_ASSERT(xComponent.is());
diff --git a/dbaccess/qa/extras/rowsetclones.cxx b/dbaccess/qa/extras/rowsetclones.cxx
index f62314205be3..d4637c5d8ae6 100644
--- a/dbaccess/qa/extras/rowsetclones.cxx
+++ b/dbaccess/qa/extras/rowsetclones.cxx
@@ -48,7 +48,7 @@ RowSetClones::RowSetClones()
 
 void RowSetClones::test()
 {
-    const OUString sFilePath(m_directories.getURLFromWorkdir("CppunitTest/RowSetClones.odb"));
+    const OUString sFilePath(m_directories.getURLFromWorkdir(u"CppunitTest/RowSetClones.odb"));
 
     uno::Reference< lang::XComponent > xComponent (loadFromDesktop(sFilePath));
     CPPUNIT_ASSERT(xComponent.is());
diff --git a/dbaccess/qa/unit/dbaccess-dialogs-test.cxx b/dbaccess/qa/unit/dbaccess-dialogs-test.cxx
index 49eff86ecd9a..0551b31187a5 100644
--- a/dbaccess/qa/unit/dbaccess-dialogs-test.cxx
+++ b/dbaccess/qa/unit/dbaccess-dialogs-test.cxx
@@ -51,7 +51,7 @@ VclPtr<VclAbstractDialog> DbaccessDialogsTest::createDialogByID(sal_uInt32 /*nID
 void DbaccessDialogsTest::openAnyDialog()
 {
     /// process input file containing the UXMLDescriptions of the dialogs to dump
-    processDialogBatchFile("dbaccess/qa/unit/data/dbaccess-dialogs-test.txt");
+    processDialogBatchFile(u"dbaccess/qa/unit/data/dbaccess-dialogs-test.txt");
 }
 
 CPPUNIT_TEST_SUITE_REGISTRATION(DbaccessDialogsTest);
diff --git a/dbaccess/qa/unit/dbtest_base.cxx b/dbaccess/qa/unit/dbtest_base.cxx
index f0b276cbb1ea..caee25fa70ac 100644
--- a/dbaccess/qa/unit/dbtest_base.cxx
+++ b/dbaccess/qa/unit/dbtest_base.cxx
@@ -9,6 +9,8 @@
 
 #include <sal/config.h>
 
+#include <string_view>
+
 #include <cppunit/TestAssert.h>
 
 #include <test/unoapi_test.hxx>
@@ -28,10 +30,10 @@ class DBTestBase
 public:
     DBTestBase() : UnoApiTest("dbaccess/qa/unit/data") {};
 
-    utl::TempFile createTempCopy(OUString const & pathname);
+    utl::TempFile createTempCopy(std::u16string_view pathname);
 
     uno::Reference< XOfficeDatabaseDocument >
-        getDocumentForFileName(const OUString &sFileName);
+        getDocumentForFileName(std::u16string_view sFileName);
 
     uno::Reference<XOfficeDatabaseDocument> getDocumentForUrl(OUString const & url);
 
@@ -40,7 +42,7 @@ public:
             uno::Reference< XOfficeDatabaseDocument > const & xDocument);
 };
 
-utl::TempFile DBTestBase::createTempCopy(OUString const & pathname) {
+utl::TempFile DBTestBase::createTempCopy(std::u16string_view pathname) {
     OUString url;
     createFileURL(pathname, url);
     utl::TempFile tmp;
@@ -56,7 +58,7 @@ utl::TempFile DBTestBase::createTempCopy(OUString const & pathname) {
 }
 
 uno::Reference< XOfficeDatabaseDocument >
-    DBTestBase::getDocumentForFileName(const OUString &sFileName)
+    DBTestBase::getDocumentForFileName(std::u16string_view sFileName)
 {
     OUString sFilePath;
     createFileURL(sFileName, sFilePath);
diff --git a/dbaccess/qa/unit/embeddeddb_performancetest.cxx b/dbaccess/qa/unit/embeddeddb_performancetest.cxx
index abd72db66fe4..e4119804d3b1 100644
--- a/dbaccess/qa/unit/embeddeddb_performancetest.cxx
+++ b/dbaccess/qa/unit/embeddeddb_performancetest.cxx
@@ -125,7 +125,7 @@ public:
 SvFileStream* EmbeddedDBPerformanceTest::getWordListStream()
 {
     OUString wlPath;
-    createFileURL("wordlist", wlPath);
+    createFileURL(u"wordlist", wlPath);
     return new SvFileStream(wlPath, StreamMode::READ);
 }
 
diff --git a/dbaccess/qa/unit/firebird-regression.cxx b/dbaccess/qa/unit/firebird-regression.cxx
index faf0a834b9c4..d5c53b93a64d 100644
--- a/dbaccess/qa/unit/firebird-regression.cxx
+++ b/dbaccess/qa/unit/firebird-regression.cxx
@@ -43,7 +43,7 @@ void FirebirdTest::testEmptyDBConnection()
 #ifdef OSL_BIGENDIAN
     auto const tmp = createTempCopy("firebird_empty_be.odb");
 #else
-    auto const tmp = createTempCopy("firebird_empty_le.odb");
+    auto const tmp = createTempCopy(u"firebird_empty_le.odb");
 #endif
     uno::Reference< XOfficeDatabaseDocument > xDocument =
         getDocumentForUrl(tmp.GetURL());
@@ -64,7 +64,7 @@ void FirebirdTest::testIntegerDatabase()
         getDocumentForFileName("firebird_integer_be_ods12.odb");
 #else
     uno::Reference< XOfficeDatabaseDocument > xDocument =
-        getDocumentForFileName("firebird_integer_le_ods12.odb");
+        getDocumentForFileName(u"firebird_integer_le_ods12.odb");
 #endif
 
     uno::Reference< XConnection > xConnection =
diff --git a/dbaccess/qa/unit/firebird.cxx b/dbaccess/qa/unit/firebird.cxx
index 95581332466a..e67a4d10c097 100644
--- a/dbaccess/qa/unit/firebird.cxx
+++ b/dbaccess/qa/unit/firebird.cxx
@@ -40,7 +40,7 @@ public:
  */
 void FirebirdTest::testEmptyDBConnection()
 {
-    auto const tmp = createTempCopy("firebird_empty.odb");
+    auto const tmp = createTempCopy(u"firebird_empty.odb");
     uno::Reference< XOfficeDatabaseDocument > xDocument =
         getDocumentForUrl(tmp.GetURL());
 
@@ -56,7 +56,7 @@ void FirebirdTest::testEmptyDBConnection()
 void FirebirdTest::testIntegerDatabase()
 {
     uno::Reference< XOfficeDatabaseDocument > xDocument =
-        getDocumentForFileName("firebird_integer_ods12.odb");
+        getDocumentForFileName(u"firebird_integer_ods12.odb");
 
     uno::Reference< XConnection > xConnection =
         getConnectionForDocument(xDocument);
diff --git a/dbaccess/qa/unit/hsql_binary_import.cxx b/dbaccess/qa/unit/hsql_binary_import.cxx
index 842e03e74621..4eac0cdc4130 100644
--- a/dbaccess/qa/unit/hsql_binary_import.cxx
+++ b/dbaccess/qa/unit/hsql_binary_import.cxx
@@ -46,7 +46,7 @@ void HsqlBinaryImportTest::testBinaryImport()
     }
 
     // the migration requires the file to be writable
-    utl::TempFile const temp(createTempCopy("hsqldb_migration_test.odb"));
+    utl::TempFile const temp(createTempCopy(u"hsqldb_migration_test.odb"));
     uno::Reference<XOfficeDatabaseDocument> const xDocument = getDocumentForUrl(temp.GetURL());
 
     uno::Reference<XConnection> xConnection = getConnectionForDocument(xDocument);
diff --git a/dbaccess/qa/unit/hsqldb.cxx b/dbaccess/qa/unit/hsqldb.cxx
index 0e3c2494bc5b..5ee011af276e 100644
--- a/dbaccess/qa/unit/hsqldb.cxx
+++ b/dbaccess/qa/unit/hsqldb.cxx
@@ -32,7 +32,7 @@ public:
  */
 void HSQLDBTest::testEmptyDBConnection()
 {
-    auto const file = createTempCopy("hsqldb_empty.odb");
+    auto const file = createTempCopy(u"hsqldb_empty.odb");
     uno::Reference<XOfficeDatabaseDocument> xDocument = getDocumentForUrl(file.GetURL());
 
     getConnectionForDocument(xDocument);
diff --git a/dbaccess/qa/unit/tdf119625.cxx b/dbaccess/qa/unit/tdf119625.cxx
index 632089f94e9e..22fb5849305e 100644
--- a/dbaccess/qa/unit/tdf119625.cxx
+++ b/dbaccess/qa/unit/tdf119625.cxx
@@ -66,7 +66,7 @@ void Tdf119625Test::testTime()
     }
 
     // the migration requires the file to be writable
-    utl::TempFile const temp(createTempCopy("tdf119625.odb"));
+    utl::TempFile const temp(createTempCopy(u"tdf119625.odb"));
     uno::Reference<XOfficeDatabaseDocument> const xDocument = getDocumentForUrl(temp.GetURL());
 
     uno::Reference<XConnection> xConnection = getConnectionForDocument(xDocument);
diff --git a/dbaccess/qa/unit/tdf126268.cxx b/dbaccess/qa/unit/tdf126268.cxx
index 5cba7c1923f7..a4ed9dc3b868 100644
--- a/dbaccess/qa/unit/tdf126268.cxx
+++ b/dbaccess/qa/unit/tdf126268.cxx
@@ -60,7 +60,7 @@ void Tdf126268Test::testNumbers()
     }
 
     // the migration requires the file to be writable
-    utl::TempFile const temp(createTempCopy("tdf126268.odb"));
+    utl::TempFile const temp(createTempCopy(u"tdf126268.odb"));
     uno::Reference<XOfficeDatabaseDocument> const xDocument = getDocumentForUrl(temp.GetURL());
 
     uno::Reference<XConnection> xConnection = getConnectionForDocument(xDocument);
diff --git a/dbaccess/source/core/api/KeySet.cxx b/dbaccess/source/core/api/KeySet.cxx
index 21c1ff0ef9a7..e61259bf61b1 100644
--- a/dbaccess/source/core/api/KeySet.cxx
+++ b/dbaccess/source/core/api/KeySet.cxx
@@ -18,6 +18,8 @@
  */
 
 #include <memory>
+#include <string_view>
+
 #include "KeySet.hxx"
 #include <sal/log.hxx>
 #include <core_resource.hxx>
@@ -209,13 +211,13 @@ void OKeySet::findTableColumnsMatching_throw(   const Any& i_aTable,
 
 namespace
 {
-    void appendOneKeyColumnClause( const OUString &tblName, const OUString &colName, const connectivity::ORowSetValue &_rValue, OUStringBuffer &o_buf )
+    void appendOneKeyColumnClause( std::u16string_view tblName, const OUString &colName, const connectivity::ORowSetValue &_rValue, OUStringBuffer &o_buf )
     {
         OUString fullName;
-        if (tblName.isEmpty())
+        if (tblName.empty())
             fullName = colName;
         else
-            fullName = tblName + "." + colName;
+            fullName = OUString::Concat(tblName) + "." + colName;
         if ( _rValue.isNull() )
         {
             o_buf.append(fullName).append(" IS NULL ");
diff --git a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
index 6ca83d6d9879..f3f401b3cb99 100644
--- a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
+++ b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
@@ -611,7 +611,7 @@ void SAL_CALL OSingleSelectQueryComposer::setElementaryQuery( const OUString& _r
 namespace
 {
     OUString getComposedClause( const OUString& _rElementaryClause, const OUString& _rAdditionalClause,
-        TokenComposer& _rComposer, const OUString& _rKeyword )
+        TokenComposer& _rComposer, std::u16string_view _rKeyword )
     {
         _rComposer.clear();
         _rComposer.append( _rElementaryClause );
diff --git a/dbaccess/source/filter/hsqldb/parseschema.cxx b/dbaccess/source/filter/hsqldb/parseschema.cxx
index e1d794cdca8b..3e615428f2d4 100644
--- a/dbaccess/source/filter/hsqldb/parseschema.cxx
+++ b/dbaccess/source/filter/hsqldb/parseschema.cxx
@@ -17,6 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <sal/config.h>
+
+#include <string_view>
+
 #include "parseschema.hxx"
 #include "fbcreateparser.hxx"
 #include "fbalterparser.hxx"
@@ -89,9 +93,9 @@ public:
     }
 };
 
-OUString lcl_createAlterForeign(const OUString& sForeignPart, const OUString& sTableName)
+OUString lcl_createAlterForeign(std::u16string_view sForeignPart, std::u16string_view sTableName)
 {
-    return "ALTER TABLE " + sTableName + " ADD " + sForeignPart;
+    return OUString::Concat("ALTER TABLE ") + sTableName + " ADD " + sForeignPart;
 }
 
 } // anonymous namespace
diff --git a/dbaccess/source/ui/app/DocumentInfoPreview.cxx b/dbaccess/source/ui/app/DocumentInfoPreview.cxx
index d112c7fb0427..d00a77899572 100644
--- a/dbaccess/source/ui/app/DocumentInfoPreview.cxx
+++ b/dbaccess/source/ui/app/DocumentInfoPreview.cxx
@@ -117,13 +117,13 @@ namespace
 }
 
 void ODocumentInfoPreview::insertEntry(
-    OUString const & title, OUString const & value)
+    std::u16string_view title, OUString const & value)
 {
     if (!m_xEditEngine->GetText().isEmpty()) {
         m_xEditEngine->QuickInsertText("\n\n", InsertAtEnd(*m_xEditEngine));
     }
 
-    OUString caption(title + ":\n");
+    OUString caption(OUString::Concat(title) + ":\n");
     m_xEditEngine->QuickInsertText(caption, InsertAtEnd(*m_xEditEngine));
 
     SfxItemSet aSet(m_xEditEngine->GetEmptyItemSet());
diff --git a/dbaccess/source/ui/app/DocumentInfoPreview.hxx b/dbaccess/source/ui/app/DocumentInfoPreview.hxx
index 9fb69af4d0f3..0c9548d0a759 100644
--- a/dbaccess/source/ui/app/DocumentInfoPreview.hxx
+++ b/dbaccess/source/ui/app/DocumentInfoPreview.hxx
@@ -20,6 +20,9 @@
 #pragma once
 
 #include <sal/config.h>
+
+#include <string_view>
+
 #include <svx/weldeditview.hxx>
 
 namespace com :: sun :: star :: uno { template <typename > class Reference; }
@@ -44,7 +47,7 @@ public:
     void fill(css::uno::Reference< css::document::XDocumentProperties > const & xDocProps);
 
 private:
-    void insertEntry(OUString const & title, OUString const & value);
+    void insertEntry(std::u16string_view title, OUString const & value);
 
     void insertNonempty(tools::Long id, OUString const & value);
 
diff --git a/dbaccess/source/ui/dlg/directsql.cxx b/dbaccess/source/ui/dlg/directsql.cxx
index ffd174ba1d29..fc8191707c44 100644
--- a/dbaccess/source/ui/dlg/directsql.cxx
+++ b/dbaccess/source/ui/dlg/directsql.cxx
@@ -194,7 +194,8 @@ namespace dbaui
                         display(xRS);
                 }
                 else
-                    addOutputText(OUString::number(xMR->getUpdateCount()) + " rows updated\n");
+                    addOutputText(
+                        OUString(OUString::number(xMR->getUpdateCount()) + " rows updated\n"));
                 for (;;)
                 {
                     hasRS = xMR->getMoreResults();
@@ -219,7 +220,7 @@ namespace dbaui
                 else
                 {
                     sal_Int32 resultCount = xStatement->executeUpdate(_rStatement);
-                    addOutputText(OUString::number(resultCount) + " rows updated\n");
+                    addOutputText(OUString(OUString::number(resultCount) + " rows updated\n"));
                 }
             }
             // successful
@@ -270,7 +271,7 @@ namespace dbaui
         }
     }
 
-    void DirectSQLDialog::addStatusText(const OUString& _rMessage)
+    void DirectSQLDialog::addStatusText(std::u16string_view _rMessage)
     {
         OUString sAppendMessage = OUString::number(m_nStatusCount++) + ": " + _rMessage + "\n\n";
 
@@ -280,9 +281,9 @@ namespace dbaui
         m_xStatus->select_region(sCompleteMessage.getLength(), sCompleteMessage.getLength());
     }
 
-    void DirectSQLDialog::addOutputText(const OUString& _rMessage)
+    void DirectSQLDialog::addOutputText(std::u16string_view _rMessage)
     {
-        OUString sAppendMessage = _rMessage + "\n";
+        OUString sAppendMessage = OUString::Concat(_rMessage) + "\n";
 
         OUString sCompleteMessage = m_xOutput->get_text() + sAppendMessage;
         m_xOutput->set_text(sCompleteMessage);
diff --git a/dbaccess/source/ui/inc/directsql.hxx b/dbaccess/source/ui/inc/directsql.hxx
index b67ad6d264fc..b9f419d9a686 100644
--- a/dbaccess/source/ui/inc/directsql.hxx
+++ b/dbaccess/source/ui/inc/directsql.hxx
@@ -24,6 +24,7 @@
 #include <sal/log.hxx>
 #include <vcl/weld.hxx>
 #include <deque>
+#include <string_view>
 
 #include <com/sun/star/sdbc/XConnection.hpp>
 #include <unotools/eventlisteneradapter.hxx>
@@ -94,10 +95,10 @@ namespace dbaui
         void implExecuteStatement(const OUString& _rStatement);
 
         /// adds a status text to the status list
-        void addStatusText(const OUString& _rMessage);
+        void addStatusText(std::u16string_view _rMessage);
 
         /// adds a status text to the output list
-        void addOutputText(const OUString& _rMessage);
+        void addOutputText(std::u16string_view _rMessage);
 
         /// displays resultset
         void display(const css::uno::Reference< css::sdbc::XResultSet >& xRS);
diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
index b8aa3f7c4b81..e2f338b30737 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
@@ -49,6 +49,7 @@
 #include <unotools/syslocale.hxx>
 #include <memory>
 #include <set>
+#include <string_view>
 
 using namespace ::dbaui;
 using namespace ::utl;
@@ -368,7 +369,7 @@ namespace
     }
     OUString BuildJoin(  const Reference< XConnection>& _xConnection,
                                 const OUString& rLh,
-                                const OUString& rRh,
+                                std::u16string_view rRh,
                                 const OQueryTableConnectionData* pData)
     {
 
@@ -395,7 +396,7 @@ namespace
                 aErg += " FULL OUTER ";
                 break;
         }
-        aErg += "JOIN " + rRh;
+        aErg += OUString::Concat("JOIN ") + rRh;
         if ( CROSS_JOIN != pData->GetJoinType() && !pData->isNatural() )
         {
             aErg += " ON " + BuildJoinCriteria(_xConnection,&pData->GetConnLineDataList(),pData);