diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2022-10-11 10:23:28 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2022-10-11 12:46:01 +0200 |
| commit | 3d236177be255b2027a997bfc12fe0833ca9a2f7 (patch) | |
| tree | d67582e355bccb43cf133c1857f5dd6136be2f35 /unotest/source/cpp | |
| parent | 6c65c62c26a8aa4d04466545f8f04ec86b797012 (diff) | |
Deduplicate O(U)StringConcatenation
And use an overloaded helper function with a better (?) unified name
to show that the result is not an O(U)String.
Change-Id: I8956338b05d02bf46a6185828130ea8ef145d46b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141203
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'unotest/source/cpp')
| -rw-r--r-- | unotest/source/cpp/gettestargument.cxx | 2 | ||||
| -rw-r--r-- | unotest/source/cpp/macros_test.cxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/unotest/source/cpp/gettestargument.cxx b/unotest/source/cpp/gettestargument.cxx index 0fa181678b40..8d10b07ccaea 100644 --- a/unotest/source/cpp/gettestargument.cxx +++ b/unotest/source/cpp/gettestargument.cxx @@ -27,7 +27,7 @@ namespace test { bool getTestArgument(std::u16string_view name, OUString* value) { - return getArgument(OUStringConcatenation(OUString::Concat("testarg.") + name), value); + return getArgument(Concat2View(OUString::Concat("testarg.") + name), value); } } diff --git a/unotest/source/cpp/macros_test.cxx b/unotest/source/cpp/macros_test.cxx index 5a370d59ac13..55c34fed20e3 100644 --- a/unotest/source/cpp/macros_test.cxx +++ b/unotest/source/cpp/macros_test.cxx @@ -109,8 +109,8 @@ std::unique_ptr<SvStream> MacrosTest::parseExportStream(const utl::TempFileNamed void MacrosTest::setUpNssGpg(const test::Directories& rDirectories, const OUString& rTestName) { OUString aSourceDir = rDirectories.getURLFromSrc(u"/test/signing-keys/"); - OUString aTargetDir = rDirectories.getURLFromWorkdir( - OUStringConcatenation("CppunitTest/" + rTestName + ".test.user")); + OUString aTargetDir + = rDirectories.getURLFromWorkdir(Concat2View("CppunitTest/" + rTestName + ".test.user")); // Set up NSS database in workdir/CppunitTest/ osl::File::copy(aSourceDir + "cert9.db", aTargetDir + "/cert9.db"); |