summaryrefslogtreecommitdiff
path: root/dbaccess/qa/unit
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2020-12-28 17:56:40 +0100
committerStephan Bergmann <sbergman@redhat.com>2020-12-29 16:42:33 +0100
commit042033f1e6da22616cb76c8d950c20c9efecbad5 (patch)
tree26b3f1f42d067506f44550b410f3fb9640616a5b /dbaccess/qa/unit
parentccfd8e9d09f9ac0a0ea92d0f378391006faaf934 (diff)
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>
Diffstat (limited to 'dbaccess/qa/unit')
-rw-r--r--dbaccess/qa/unit/dbaccess-dialogs-test.cxx2
-rw-r--r--dbaccess/qa/unit/dbtest_base.cxx10
-rw-r--r--dbaccess/qa/unit/embeddeddb_performancetest.cxx2
-rw-r--r--dbaccess/qa/unit/firebird-regression.cxx4
-rw-r--r--dbaccess/qa/unit/firebird.cxx4
-rw-r--r--dbaccess/qa/unit/hsql_binary_import.cxx2
-rw-r--r--dbaccess/qa/unit/hsqldb.cxx2
-rw-r--r--dbaccess/qa/unit/tdf119625.cxx2
-rw-r--r--dbaccess/qa/unit/tdf126268.cxx2
9 files changed, 16 insertions, 14 deletions
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);