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>

3 files changed, 14 insertions, 13 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
diff --git a/comphelper/source/misc/docpasswordhelper.cxx b/comphelper/source/misc/docpasswordhelper.cxx
index 4cc0f5c74269..bd8ce5d7de7f 100644
--- a/comphelper/source/misc/docpasswordhelper.cxx
+++ b/comphelper/source/misc/docpasswordhelper.cxx
@@ -20,6 +20,7 @@
 #include <config_gpgme.h>
 
 #include <algorithm>
+#include <string_view>
 
 #include <comphelper/docpasswordhelper.hxx>
 #include <comphelper/storagehelper.hxx>
@@ -56,11 +57,11 @@ using namespace ::com::sun::star;
 namespace comphelper {
 
 
-static uno::Sequence< sal_Int8 > GeneratePBKDF2Hash( const OUString& aPassword, const uno::Sequence< sal_Int8 >& aSalt, sal_Int32 nCount, sal_Int32 nHashLength )
+static uno::Sequence< sal_Int8 > GeneratePBKDF2Hash( std::u16string_view aPassword, const uno::Sequence< sal_Int8 >& aSalt, sal_Int32 nCount, sal_Int32 nHashLength )
 {
     uno::Sequence< sal_Int8 > aResult;
 
-    if ( !aPassword.isEmpty() && aSalt.hasElements() && nCount && nHashLength )
+    if ( !aPassword.empty() && aSalt.hasElements() && nCount && nHashLength )
     {
         OString aBytePass = OUStringToOString( aPassword, RTL_TEXTENCODING_UTF8 );
         // FIXME this is subject to the SHA1-bug tdf#114939 - see also
@@ -84,7 +85,7 @@ IDocPasswordVerifier::~IDocPasswordVerifier()
 }
 
 
-uno::Sequence< beans::PropertyValue > DocPasswordHelper::GenerateNewModifyPasswordInfo( const OUString& aPassword )
+uno::Sequence< beans::PropertyValue > DocPasswordHelper::GenerateNewModifyPasswordInfo( std::u16string_view aPassword )
 {
     uno::Sequence< beans::PropertyValue > aResult;
 
@@ -109,10 +110,10 @@ uno::Sequence< beans::PropertyValue > DocPasswordHelper::GenerateNewModifyPasswo
 }
 
 
-bool DocPasswordHelper::IsModifyPasswordCorrect( const OUString& aPassword, const uno::Sequence< beans::PropertyValue >& aInfo )
+bool DocPasswordHelper::IsModifyPasswordCorrect( std::u16string_view aPassword, const uno::Sequence< beans::PropertyValue >& aInfo )
 {
     bool bResult = false;
-    if ( !aPassword.isEmpty() && aInfo.hasElements() )
+    if ( !aPassword.empty() && aInfo.hasElements() )
     {
         OUString sAlgorithm;
         uno::Sequence< sal_Int8 > aSalt;
@@ -223,7 +224,7 @@ sal_uInt32 DocPasswordHelper::GetWordHashAsUINT32(
 
 
 sal_uInt16 DocPasswordHelper::GetXLHashAsUINT16(
-                const OUString& aUString,
+                std::u16string_view aUString,
                 rtl_TextEncoding nEnc )
 {
     sal_uInt16 nResult = 0;
@@ -248,7 +249,7 @@ sal_uInt16 DocPasswordHelper::GetXLHashAsUINT16(
 
 
 Sequence< sal_Int8 > DocPasswordHelper::GetXLHashAsSequence(
-                const OUString& aUString )
+                std::u16string_view aUString )
 {
     sal_uInt16 nHash = GetXLHashAsUINT16( aUString );
     return {sal_Int8(nHash >> 8), sal_Int8(nHash & 0xFF)};
diff --git a/comphelper/source/misc/storagehelper.cxx b/comphelper/source/misc/storagehelper.cxx
index 8308e9138514..43739da24c10 100644
--- a/comphelper/source/misc/storagehelper.cxx
+++ b/comphelper/source/misc/storagehelper.cxx
@@ -379,11 +379,11 @@ uno::Reference< embed::XStorage > OStorageHelper::GetStorageOfFormatFromStream(
 }
 
 
-uno::Sequence< beans::NamedValue > OStorageHelper::CreatePackageEncryptionData( const OUString& aPassword )
+uno::Sequence< beans::NamedValue > OStorageHelper::CreatePackageEncryptionData( std::u16string_view aPassword )
 {
     // TODO/LATER: Should not the method be part of DocPasswordHelper?
     uno::Sequence< beans::NamedValue > aEncryptionData;
-    if ( !aPassword.isEmpty() )
+    if ( !aPassword.empty() )
     {
         sal_Int32 nSha1Ind = 0;
         // generate SHA256 start key