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>

9 files changed, 32 insertions, 12 deletions

diff --git a/extensions/source/bibliography/general.cxx b/extensions/source/bibliography/general.cxx
index deaaafa4d9dc..1d2f66517a10 100644
--- a/extensions/source/bibliography/general.cxx
+++ b/extensions/source/bibliography/general.cxx
@@ -423,7 +423,7 @@ void BibGeneralPage::CommitActiveControl()
 }
 
 void BibGeneralPage::AddControlWithError( const OUString& rColumnName, FixedText &rLabel,
-    OUString& rErrorString, const OString& sHelpId, sal_uInt16 nIndexInFTArray, std::vector<vcl::Window*> &rChildren)
+    OUString& rErrorString, std::string_view sHelpId, sal_uInt16 nIndexInFTArray, std::vector<vcl::Window*> &rChildren)
 {
     const OUString aColumnUIName(rLabel.GetText());
     // adds also the XControl and creates a map entry in nFT2CtrlMap[] for mapping between control and FT
@@ -448,7 +448,7 @@ void BibGeneralPage::AddControlWithError( const OUString& rColumnName, FixedText
 
 bool  BibGeneralPage::AddXControl(
         const OUString& rName,
-        FixedText& rLabel, const OString& sHelpId, sal_Int16& rIndex,
+        FixedText& rLabel, std::string_view sHelpId, sal_Int16& rIndex,
         std::vector<vcl::Window*>& rChildren)
 {
     uno::Reference< awt::XControlModel >  xCtrModel;
diff --git a/extensions/source/bibliography/general.hxx b/extensions/source/bibliography/general.hxx
index 8a5ac2127c16..107f40fe2bc6 100644
--- a/extensions/source/bibliography/general.hxx
+++ b/extensions/source/bibliography/general.hxx
@@ -20,6 +20,10 @@
 #ifndef INCLUDED_EXTENSIONS_SOURCE_BIBLIOGRAPHY_GENERAL_HXX
 #define INCLUDED_EXTENSIONS_SOURCE_BIBLIOGRAPHY_GENERAL_HXX
 
+#include <sal/config.h>
+
+#include <string_view>
+
 #include <com/sun/star/awt/XFocusListener.hpp>
 #include <com/sun/star/awt/XControlContainer.hpp>
 #include <com/sun/star/form/XBoundComponent.hpp>
@@ -124,12 +128,12 @@ class BibGeneralPage : public TabPage
     BibDataManager*     pDatMan;
 
     bool
-                                AddXControl( const OUString& rName, FixedText& rLabel, const OString& sHelpId,
+                                AddXControl( const OUString& rName, FixedText& rLabel, std::string_view sHelpId,
                                             sal_Int16& rIndex, std::vector<vcl::Window*>& rChildren );
 
     void                        AddControlWithError( const OUString& rColumnName, FixedText& rLabel,
                                             OUString& rErrorString,
-                                            const OString& sHelpId, sal_uInt16 nIndexInFTArray, std::vector<vcl::Window*>& rChildren );
+                                            std::string_view sHelpId, sal_uInt16 nIndexInFTArray, std::vector<vcl::Window*>& rChildren );
 
 protected:
     void                        InitFixedTexts();     // create mnemonics and set text an all fixed texts
diff --git a/extensions/source/logging/loghandler.cxx b/extensions/source/logging/loghandler.cxx
index e52a807db24f..afc33605b9fc 100644
--- a/extensions/source/logging/loghandler.cxx
+++ b/extensions/source/logging/loghandler.cxx
@@ -109,7 +109,7 @@ namespace logging
     }
 
 
-    bool LogHandlerHelper::setEncoding( const OUString& _rEncoding )
+    bool LogHandlerHelper::setEncoding( std::u16string_view _rEncoding )
     {
         OString sAsciiEncoding( OUStringToOString( _rEncoding, RTL_TEXTENCODING_ASCII_US ) );
         rtl_TextEncoding eEncoding = rtl_getTextEncodingFromMimeCharset( sAsciiEncoding.getStr() );
diff --git a/extensions/source/logging/loghandler.hxx b/extensions/source/logging/loghandler.hxx
index 89248c811c22..1e0feaa06c7c 100644
--- a/extensions/source/logging/loghandler.hxx
+++ b/extensions/source/logging/loghandler.hxx
@@ -20,6 +20,10 @@
 #ifndef INCLUDED_EXTENSIONS_SOURCE_LOGGING_LOGHANDLER_HXX
 #define INCLUDED_EXTENSIONS_SOURCE_LOGGING_LOGHANDLER_HXX
 
+#include <sal/config.h>
+
+#include <string_view>
+
 #include <com/sun/star/logging/XLogFormatter.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/logging/LogRecord.hpp>
@@ -59,7 +63,7 @@ namespace logging
         void    setIsInitialized() { m_bInitialized = true; }
 
         bool    getEncoding(        OUString& _out_rEncoding ) const;
-        bool    setEncoding( const  OUString& _rEncoding     );
+        bool    setEncoding( std::u16string_view _rEncoding  );
 
         rtl_TextEncoding
                 getTextEncoding() const { return m_eEncoding; }
diff --git a/extensions/source/propctrlr/pcrcommon.cxx b/extensions/source/propctrlr/pcrcommon.cxx
index 90924d7fc7e4..b6c826b61a5e 100644
--- a/extensions/source/propctrlr/pcrcommon.cxx
+++ b/extensions/source/propctrlr/pcrcommon.cxx
@@ -44,7 +44,7 @@ namespace pcr
     }
 
 
-    OUString HelpIdUrl::getHelpURL( const OString& sHelpId )
+    OUString HelpIdUrl::getHelpURL( std::string_view sHelpId )
     {
         OUStringBuffer aBuffer;
         OUString aTmp( OStringToOUString(sHelpId, RTL_TEXTENCODING_UTF8) );
diff --git a/extensions/source/propctrlr/pcrcommon.hxx b/extensions/source/propctrlr/pcrcommon.hxx
index e200396a6c7e..4544ba244c4c 100644
--- a/extensions/source/propctrlr/pcrcommon.hxx
+++ b/extensions/source/propctrlr/pcrcommon.hxx
@@ -23,6 +23,10 @@
 #define EDITOR_LIST_APPEND              (SAL_MAX_UINT16)
 #define EDITOR_LIST_ENTRY_NOTFOUND      (SAL_MAX_UINT16)
 
+#include <sal/config.h>
+
+#include <string_view>
+
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/beans/XPropertyChangeListener.hpp>
 #include <com/sun/star/beans/PropertyChangeEvent.hpp>
@@ -66,7 +70,7 @@ namespace pcr
     {
     public:
         static OString getHelpId( const OUString& _rHelpURL );
-        static OUString getHelpURL( const OString& );
+        static OUString getHelpURL( std::string_view );
     };
 
 
diff --git a/extensions/source/scanner/sane.cxx b/extensions/source/scanner/sane.cxx
index f8f85de5d9e1..839602458e6e 100644
--- a/extensions/source/scanner/sane.cxx
+++ b/extensions/source/scanner/sane.cxx
@@ -414,7 +414,7 @@ void Sane::SetOptionValue( int n, bool bSet )
     ControlOption( n, SANE_ACTION_SET_VALUE, &nRet );
 }
 
-void Sane::SetOptionValue( int n, const OUString& rSet )
+void Sane::SetOptionValue( int n, std::u16string_view rSet )
 {
     if( ! maHandle  ||  mppOptions[n]->type != SANE_TYPE_STRING )
         return;
diff --git a/extensions/source/scanner/sane.hxx b/extensions/source/scanner/sane.hxx
index 7963e677128a..a0e631942a02 100644
--- a/extensions/source/scanner/sane.hxx
+++ b/extensions/source/scanner/sane.hxx
@@ -18,6 +18,10 @@
  */
 #pragma once
 
+#include <sal/config.h>
+
+#include <string_view>
+
 #include <cppuhelper/implbase.hxx>
 #include <osl/thread.h>
 #include <osl/module.h>
@@ -144,7 +148,7 @@ public:
     bool            GetOptionValue( int, double* );
 
     void            SetOptionValue( int, bool );
-    void            SetOptionValue( int, const OUString& );
+    void            SetOptionValue( int, std::u16string_view );
     void            SetOptionValue( int, double, int nElement = 0 );
     void            SetOptionValue( int, double const * );
 
diff --git a/extensions/source/update/check/download.cxx b/extensions/source/update/check/download.cxx
index 436f48b78416..3e8ad4e2c09c 100644
--- a/extensions/source/update/check/download.cxx
+++ b/extensions/source/update/check/download.cxx
@@ -17,6 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <sal/config.h>
+
+#include <string_view>
 
 #include <curl/curl.h>
 
@@ -70,7 +73,8 @@ static void openFile( OutData& out )
     sal_Int32 nIndex = aURL.lastIndexOf('/');
     if( nIndex > 0 )
     {
-        out.File = out.DestinationDir + OStringToOUString(aURL.copy(nIndex), RTL_TEXTENCODING_UTF8);
+        out.File = out.DestinationDir
+            + OStringToOUString(aURL.subView(nIndex), RTL_TEXTENCODING_UTF8);
 
         oslFileError rc;
 
@@ -206,7 +210,7 @@ Download::getProxyForURL(const OUString& rURL, OString& rHost, sal_Int32& rPort)
 }
 
 
-static bool curl_run(const OUString& rURL, OutData& out, const OString& aProxyHost, sal_Int32 nProxyPort)
+static bool curl_run(std::u16string_view rURL, OutData& out, const OString& aProxyHost, sal_Int32 nProxyPort)
 {
     /* Need to investigate further whether it is necessary to call
      * curl_global_init or not - leave it for now (as the ftp UCB content