summaryrefslogtreecommitdiff
path: root/testtools/source
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2020-12-11 17:44:34 +0100
committerStephan Bergmann <sbergman@redhat.com>2020-12-11 21:25:10 +0100
commit35e471bb4d1388cf5afcdcee214cf5111edf44e3 (patch)
treebb78f4f13f131f0cb206a9707cc3cfc495a3876a /testtools/source
parent0c06e77c122f10a1842bc908bd6e25b1110ddbd2 (diff)
Adapt the remaining OUString functions to std string_view
...for LIBO_INTERNAL_ONLY. These had been missed by 1b43cceaea2084a0489db68cd0113508f34b6643 "Make many OUString functions take std::u16string_view parameters" because they did not match the multi-overload pattern that was addressed there, but they nevertheless benefit from being changed just as well (witness e.g. the various resulting changes from copy() to subView()). This showed a conversion from OStringChar to std::string_view to be missing (while the corresponding conversion form OUStringChar to std::u16string_view was already present). The improvement to loplugin:stringadd became necessary to fix > [CPT] compilerplugins/clang/test/stringadd.cxx > error: 'error' diagnostics expected but not seen: > File ~/lo/core/compilerplugins/clang/test/stringadd.cxx Line 43 (directive at ~/lo/core/compilerplugins/clang/test/stringadd.cxx:42): simplify by merging with the preceding assignment [loplugin:stringadd] > File ~/lo/core/compilerplugins/clang/test/stringadd.cxx Line 61 (directive at ~/lo/core/compilerplugins/clang/test/stringadd.cxx:60): simplify by merging with the preceding assignment [loplugin:stringadd] > 2 errors generated. Change-Id: Ie40de0616a66e60e289c1af0ca60aed6f9ecc279 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107602 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'testtools/source')
-rw-r--r--testtools/source/bridgetest/bridgetest.cxx6
-rw-r--r--testtools/source/bridgetest/multi.cxx3
2 files changed, 6 insertions, 3 deletions
diff --git a/testtools/source/bridgetest/bridgetest.cxx b/testtools/source/bridgetest/bridgetest.cxx
index f02a6c99f4b9..16f9bd199b24 100644
--- a/testtools/source/bridgetest/bridgetest.cxx
+++ b/testtools/source/bridgetest/bridgetest.cxx
@@ -20,6 +20,8 @@
#include <stdio.h>
#include <string.h>
+#include <string_view>
+
#include <o3tl/any.hxx>
#include <osl/diagnose.h>
#include <osl/diagnose.hxx>
@@ -89,8 +91,8 @@ static bool check( bool b , char const * message )
namespace {
-bool checkEmpty(OUString const & string, char const * message) {
- bool ok = string.isEmpty();
+bool checkEmpty(std::u16string_view string, char const * message) {
+ bool ok = string.empty();
if (!ok) {
fprintf(
stderr, "%s failed: %s\n", message,
diff --git a/testtools/source/bridgetest/multi.cxx b/testtools/source/bridgetest/multi.cxx
index ce149f154df4..4b98f92cdf22 100644
--- a/testtools/source/bridgetest/multi.cxx
+++ b/testtools/source/bridgetest/multi.cxx
@@ -27,6 +27,7 @@
#include <rtl/ustring.hxx>
#include <sstream>
+#include <string_view>
namespace {
@@ -43,7 +44,7 @@ template< typename T > void checkEqual(T const & value, T const & argument) {
s << value << " != " << argument;
throw CheckFailed(
OStringToOUString(
- OString(s.str().c_str()), RTL_TEXTENCODING_UTF8));
+ std::string_view(s.str()), RTL_TEXTENCODING_UTF8));
}
}