diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2020-12-11 17:44:34 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2020-12-11 21:25:10 +0100 |
| commit | 35e471bb4d1388cf5afcdcee214cf5111edf44e3 (patch) | |
| tree | bb78f4f13f131f0cb206a9707cc3cfc495a3876a /comphelper/qa | |
| parent | 0c06e77c122f10a1842bc908bd6e25b1110ddbd2 (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 'comphelper/qa')
| -rw-r--r-- | comphelper/qa/string/test_string.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/comphelper/qa/string/test_string.cxx b/comphelper/qa/string/test_string.cxx index faedac30260f..10b69fbf8243 100644 --- a/comphelper/qa/string/test_string.cxx +++ b/comphelper/qa/string/test_string.cxx @@ -91,7 +91,7 @@ public: const OUString& str1, sal_Int32 off1, sal_Int32 len1, const OUString& str2, sal_Int32 off2, sal_Int32 len2) override { - return str1.copy(off1, len1).compareTo(str2.copy(off2, len2)); + return str1.copy(off1, len1).compareTo(str2.subView(off2, len2)); } virtual sal_Int32 SAL_CALL compareString( const OUString& str1, @@ -238,7 +238,7 @@ void TestString::testNatural() ); // Original behavior CPPUNIT_ASSERT( - OUString("Heading 9").compareTo("Heading 10") > 0 + OUString("Heading 9").compareTo(u"Heading 10") > 0 ); CPPUNIT_ASSERT( compareNatural("Heading 10", "Heading 9", xCollator, xBI, lang::Locale()) > 0 @@ -248,7 +248,7 @@ void TestString::testNatural() compareNatural("July, the 4th", "July, the 10th", xCollator, xBI, lang::Locale()) < 0 ); CPPUNIT_ASSERT( - OUString("July, the 4th").compareTo("July, the 10th") > 0 + OUString("July, the 4th").compareTo(u"July, the 10th") > 0 ); CPPUNIT_ASSERT( compareNatural("July, the 10th", "July, the 4th", xCollator, xBI, lang::Locale()) > 0 @@ -258,7 +258,7 @@ void TestString::testNatural() compareNatural("abc08", "abc010", xCollator, xBI, lang::Locale()) < 0 ); CPPUNIT_ASSERT( - OUString("abc08").compareTo("abc010") > 0 + OUString("abc08").compareTo(u"abc010") > 0 ); CPPUNIT_ASSERT( compareNatural("abc010", "abc08", xCollator, xBI, lang::Locale()) > 0 |