loplugin:stringviewparam: operator +

Change-Id: I044dd21b63d7eb03224675584fa143009c6b6008
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108418
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>

47 files changed, 157 insertions, 81 deletions

diff --git a/include/avmedia/mediaitem.hxx b/include/avmedia/mediaitem.hxx
index b30689c6fe30..7246c9e7e2a1 100644
--- a/include/avmedia/mediaitem.hxx
+++ b/include/avmedia/mediaitem.hxx
@@ -24,6 +24,8 @@
 #include <com/sun/star/media/ZoomLevel.hpp>
 #include <avmedia/avmediadllapi.h>
 #include <memory>
+#include <string_view>
+
 #include <o3tl/typed_flags_set.hxx>
 
 namespace com::sun::star::embed { class XStorage; }
@@ -135,7 +137,7 @@ bool AVMEDIA_DLLPUBLIC EmbedMedia(
 bool AVMEDIA_DLLPUBLIC CreateMediaTempFile(
         ::css::uno::Reference<::css::io::XInputStream> const& xInStream,
         OUString& o_rTempFileURL,
-        const OUString& rDesiredExtension);
+        std::u16string_view rDesiredExtension);
 
 OUString GetFilename(OUString const& rSourceURL);
 
diff --git a/include/codemaker/commoncpp.hxx b/include/codemaker/commoncpp.hxx
index dc1b61c6b32c..9c55fcc6a5d5 100644
--- a/include/codemaker/commoncpp.hxx
+++ b/include/codemaker/commoncpp.hxx
@@ -53,7 +53,7 @@ enum class IdentifierTranslationMode {
 };
 
 rtl::OString translateUnoToCppIdentifier(
-    rtl::OString const & identifier, rtl::OString const & prefix,
+    rtl::OString const & identifier, std::string_view prefix,
     IdentifierTranslationMode transmode = IdentifierTranslationMode::Global,
     rtl::OString const * forbidden = nullptr);
 
diff --git a/include/codemaker/commonjava.hxx b/include/codemaker/commonjava.hxx
index 11e1446bf64a..10d7c28ba576 100644
--- a/include/codemaker/commonjava.hxx
+++ b/include/codemaker/commonjava.hxx
@@ -22,6 +22,8 @@
 
 #include <sal/config.h>
 
+#include <string_view>
+
 #include <codemaker/unotype.hxx>
 
 namespace rtl { class OString; }
@@ -33,7 +35,7 @@ rtl::OString translateUnoToJavaType(
     bool referenceType);
 
 rtl::OString translateUnoToJavaIdentifier(
-    rtl::OString const & identifier, rtl::OString const & prefix);
+    rtl::OString const & identifier, std::string_view prefix);
 
 }
 
diff --git a/include/codemaker/typemanager.hxx b/include/codemaker/typemanager.hxx
index f76fbb4ca7ea..3e6f67fe4b3f 100644
--- a/include/codemaker/typemanager.hxx
+++ b/include/codemaker/typemanager.hxx
@@ -52,7 +52,7 @@ public:
         rtl::Reference< unoidl::MapCursor > * cursor = nullptr) const;
 
     codemaker::UnoType::Sort decompose(
-        OUString const & name, bool resolveTypedefs, OUString * nucleus,
+        std::u16string_view name, bool resolveTypedefs, OUString * nucleus,
         sal_Int32 * rank, std::vector< OUString > * arguments,
         rtl::Reference< unoidl::Entity > * entity) const;
 
diff --git a/include/comphelper/DirectoryHelper.hxx b/include/comphelper/DirectoryHelper.hxx
index 61b0287e9f77..e614252beaf4 100644
--- a/include/comphelper/DirectoryHelper.hxx
+++ b/include/comphelper/DirectoryHelper.hxx
@@ -14,6 +14,7 @@
 #include <comphelper/comphelperdllapi.h>
 #include <rtl/ustring.hxx>
 #include <set>
+#include <string_view>
 
 namespace comphelper
 {
@@ -26,7 +27,7 @@ public:
     static void scanDirsAndFiles(const OUString& rDirURL, std::set<OUString>& rDirs,
                                  std::set<std::pair<OUString, OUString>>& rFiles);
     static bool deleteDirRecursively(const OUString& rDirURL);
-    static bool moveDirContent(const OUString& rSourceDirURL, const OUString& rTargetDirURL,
+    static bool moveDirContent(const OUString& rSourceDirURL, std::u16string_view rTargetDirURL,
                                const std::set<OUString>& rExcludeList);
 };
 }
diff --git a/include/comphelper/backupfilehelper.hxx b/include/comphelper/backupfilehelper.hxx
index e0a2ca244fb0..abf8044a28ca 100644
--- a/include/comphelper/backupfilehelper.hxx
+++ b/include/comphelper/backupfilehelper.hxx
@@ -15,6 +15,7 @@
 #include <comphelper/comphelperdllapi.h>
 #include <rtl/ustring.hxx>
 #include <set>
+#include <string_view>
 #include <vector>
 
 namespace comphelper
@@ -189,21 +190,21 @@ namespace comphelper
         static const std::vector< OUString >& getCustomizationFileNames();
 
         // file push helpers
-        bool tryPush_Files(const std::set< OUString >& rDirs, const std::set< std::pair< OUString, OUString > >& rFiles, const OUString& rSourceURL, const OUString& rTargetURL);
-        bool tryPush_file(const OUString& rSourceURL, const OUString& rTargetURL, const OUString& rName, const OUString& rExt);
+        bool tryPush_Files(const std::set< OUString >& rDirs, const std::set< std::pair< OUString, OUString > >& rFiles, std::u16string_view rSourceURL, const OUString& rTargetURL);
+        bool tryPush_file(std::u16string_view rSourceURL, std::u16string_view rTargetURL, std::u16string_view rName, std::u16string_view rExt);
 
         // file pop possibilities helper
-        bool isPopPossible_files(const std::set< OUString >& rDirs, const std::set< std::pair< OUString, OUString > >& rFiles, const OUString& rSourceURL, const OUString& rTargetURL);
-        static bool isPopPossible_file(const OUString& rSourceURL, const OUString& rTargetURL, const OUString& rName, const OUString& rExt);
+        bool isPopPossible_files(const std::set< OUString >& rDirs, const std::set< std::pair< OUString, OUString > >& rFiles, std::u16string_view rSourceURL, std::u16string_view rTargetURL);
+        static bool isPopPossible_file(std::u16string_view rSourceURL, std::u16string_view rTargetURL, std::u16string_view rName, std::u16string_view rExt);
 
         // file pop helpers
-        bool tryPop_files(const std::set< OUString >& rDirs, const std::set< std::pair< OUString, OUString > >& rFiles, const OUString& rSourceURL, const OUString& rTargetURL);
-        bool tryPop_file(const OUString& rSourceURL, const OUString& rTargetURL, const OUString& rName, const OUString& rExt);
+        bool tryPop_files(const std::set< OUString >& rDirs, const std::set< std::pair< OUString, OUString > >& rFiles, std::u16string_view rSourceURL, const OUString& rTargetURL);
+        bool tryPop_file(std::u16string_view rSourceURL, std::u16string_view rTargetURL, std::u16string_view rName, std::u16string_view rExt);
 
         // ExtensionInfo helpers
-        bool tryPush_extensionInfo(const OUString& rTargetURL);
-        static bool isPopPossible_extensionInfo(const OUString& rTargetURL);
-        bool tryPop_extensionInfo(const OUString& rTargetURL);
+        bool tryPush_extensionInfo(std::u16string_view rTargetURL);
+        static bool isPopPossible_extensionInfo(std::u16string_view rTargetURL);
+        bool tryPop_extensionInfo(std::u16string_view rTargetURL);
 
         // FileDirInfo helpers
         void fillDirFileInfo();
diff --git a/include/comphelper/configuration.hxx b/include/comphelper/configuration.hxx
index e56951281f9e..1ed37dcd45c3 100644
--- a/include/comphelper/configuration.hxx
+++ b/include/comphelper/configuration.hxx
@@ -13,6 +13,8 @@
 #include <sal/config.h>
 
 #include <optional>
+#include <string_view>
+
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Reference.h>
 #include <comphelper/comphelperdllapi.h>
@@ -102,7 +104,7 @@ public:
         OUString const & path, css::uno::Any const & value);
 
     css::uno::Any getLocalizedPropertyValue(
-        OUString const & path) const;
+        std::u16string_view path) const;
 
     static void setLocalizedPropertyValue(
         std::shared_ptr< ConfigurationChanges > const & batch,
diff --git a/include/comphelper/ofopxmlhelper.hxx b/include/comphelper/ofopxmlhelper.hxx
index 2fa651406411..fe778bf1e6ca 100644
--- a/include/comphelper/ofopxmlhelper.hxx
+++ b/include/comphelper/ofopxmlhelper.hxx
@@ -20,6 +20,10 @@
 #ifndef INCLUDED_COMPHELPER_OFOPXMLHELPER_HXX
 #define INCLUDED_COMPHELPER_OFOPXMLHELPER_HXX
 
+#include <sal/config.h>
+
+#include <string_view>
+
 #include <com/sun/star/uno/Sequence.h>
 
 #include <comphelper/comphelperdllapi.h>
@@ -40,7 +44,7 @@ namespace comphelper::OFOPXMLHelper {
     css::uno::Sequence< css::uno::Sequence< css::beans::StringPair > >
     ReadRelationsInfoSequence(
         const css::uno::Reference< css::io::XInputStream >& xInStream,
-        const OUString & aStreamName,
+        std::u16string_view aStreamName,
         const css::uno::Reference< css::uno::XComponentContext >& rContext );
 
     // returns sequence containing two entries of type sequence<StringPair>
diff --git a/include/connectivity/dbtools.hxx b/include/connectivity/dbtools.hxx
index 0aa999ae729a..f4f19b66f57e 100644
--- a/include/connectivity/dbtools.hxx
+++ b/include/connectivity/dbtools.hxx
@@ -752,8 +752,8 @@ namespace dbtools
     */
     OOO_DLLPUBLIC_DBTOOLS
     void collectColumnInformation(  const css::uno::Reference< css::sdbc::XConnection>& _xConnection,
-                                    const OUString& _sComposedTableName,
-                                    const OUString& _rName,
+                                    std::u16string_view _sComposedTableName,
+                                    std::u16string_view _rName,
                                     ColumnInformationMap& _rInfo);
 
 
diff --git a/include/filter/msfilter/mstoolbar.hxx b/include/filter/msfilter/mstoolbar.hxx
index 1f8069ba70c6..dacc21c3180b 100644
--- a/include/filter/msfilter/mstoolbar.hxx
+++ b/include/filter/msfilter/mstoolbar.hxx
@@ -10,6 +10,7 @@
 #define INCLUDED_FILTER_MSFILTER_MSTOOLBAR_HXX
 
 #include <memory>
+#include <string_view>
 #include <vector>
 
 #include <com/sun/star/uno/Any.hxx>
@@ -61,7 +62,7 @@ public:
     const css::uno::Reference< css::ui::XUIConfigurationManager >& getAppCfgManager() const { return m_xAppCfgMgr;}
 
 
-    static css::uno::Any createCommandFromMacro( const OUString& sCmd );
+    static css::uno::Any createCommandFromMacro( std::u16string_view sCmd );
 
     void addIcon( const css::uno::Reference< css::graphic::XGraphic >& xImage, const OUString& sString );
     void applyIcons();
diff --git a/include/filter/msfilter/msvbahelper.hxx b/include/filter/msfilter/msvbahelper.hxx
index 7bc7483b660c..d5cb1e96f533 100644
--- a/include/filter/msfilter/msvbahelper.hxx
+++ b/include/filter/msfilter/msvbahelper.hxx
@@ -19,6 +19,10 @@
 #ifndef INCLUDED_FILTER_MSFILTER_MSVBAHELPER_HXX
 #define INCLUDED_FILTER_MSFILTER_MSVBAHELPER_HXX
 
+#include <sal/config.h>
+
+#include <string_view>
+
 #include <com/sun/star/awt/KeyEvent.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
@@ -51,7 +55,7 @@ struct MSFILTER_DLLPUBLIC MacroResolvedInfo
     explicit MacroResolvedInfo( SfxObjectShell* pDocContext = nullptr ) : mpDocContext( pDocContext ), mbFound( false ) {}
 };
 
-MSFILTER_DLLPUBLIC OUString makeMacroURL( const OUString& sMacroName );
+MSFILTER_DLLPUBLIC OUString makeMacroURL( std::u16string_view sMacroName );
 MSFILTER_DLLPUBLIC OUString extractMacroName( const OUString& rMacroUrl );
 MSFILTER_DLLPUBLIC OUString getDefaultProjectName( SfxObjectShell const * pShell );
 MSFILTER_DLLPUBLIC OUString resolveVBAMacro( SfxObjectShell const * pShell, const OUString& rLibName, const OUString& rModuleName, const OUString& rMacroName );
diff --git a/include/helpcompiler/HelpIndexer.hxx b/include/helpcompiler/HelpIndexer.hxx
index 832780f6b1d2..2f8e7f32293a 100644
--- a/include/helpcompiler/HelpIndexer.hxx
+++ b/include/helpcompiler/HelpIndexer.hxx
@@ -14,6 +14,7 @@
 
 #include <rtl/ustring.hxx>
 #include <set>
+#include <string_view>
 
 // I assume that TCHAR is defined as wchar_t throughout
 
@@ -48,7 +49,7 @@ class L10N_DLLPUBLIC HelpIndexer {
      * @param outDir The directory to write the "module".idxl directory to
      */
         HelpIndexer(OUString const &lang, OUString const &module,
-            OUString const &srcDir, OUString const &outDir);
+            std::u16string_view srcDir, std::u16string_view outDir);
 
     /**
      * Run the indexer.
diff --git a/include/helpcompiler/compilehelp.hxx b/include/helpcompiler/compilehelp.hxx
index 6d2d99be2a24..8944257bd5c2 100644
--- a/include/helpcompiler/compilehelp.hxx
+++ b/include/helpcompiler/compilehelp.hxx
@@ -63,7 +63,7 @@ HELPLINKER_DLLPUBLIC bool compileExtensionHelp
 (
      const OUString& aOfficeHelpPath,
     std::u16string_view aExtensionName,
-    const OUString& aExtensionLanguageRoot,
+    std::u16string_view aExtensionLanguageRoot,
     sal_Int32 nXhpFileCount, const OUString* pXhpFiles,
     std::u16string_view aDestination,
     HelpProcessingErrorInfo& o_rHelpProcessingErrorInfo
diff --git a/include/i18nlangtag/languagetag.hxx b/include/i18nlangtag/languagetag.hxx
index 66b18d3faec7..d7c1c8787a53 100644
--- a/include/i18nlangtag/languagetag.hxx
+++ b/include/i18nlangtag/languagetag.hxx
@@ -18,6 +18,7 @@
 #include <i18nlangtag/lang.h>
 
 #include <memory>
+#include <string_view>
 #include <vector>
 
 /** The ISO 639-2 code reserved for local use used to indicate that a
@@ -99,7 +100,7 @@ public:
         distinct attributes.
      */
     explicit LanguageTag( const OUString& rBcp47, const OUString& rLanguage,
-                          const OUString& rScript, const OUString& rCountry );
+                          std::u16string_view rScript, const OUString& rCountry );
 
     /** Init LanguageTag with rtl_Locale.
 
diff --git a/include/oox/core/contexthandler.hxx b/include/oox/core/contexthandler.hxx
index 0d06e548ee32..503b36d0c083 100644
--- a/include/oox/core/contexthandler.hxx
+++ b/include/oox/core/contexthandler.hxx
@@ -21,6 +21,7 @@
 #define INCLUDED_OOX_CORE_CONTEXTHANDLER_HXX
 
 #include <memory>
+#include <string_view>
 
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Reference.hxx>
@@ -72,7 +73,7 @@ public:
     OUString     getFragmentPathFromRelId( const OUString& rRelId ) const;
     /** Returns the full fragment path for the first relation of the passed type. */
     OUString     getFragmentPathFromFirstType( std::u16string_view rType ) const;
-    OUString     getFragmentPathFromFirstTypeFromOfficeDoc( const OUString& rType ) const;
+    OUString     getFragmentPathFromFirstTypeFromOfficeDoc( std::u16string_view rType ) const;
 
     // com.sun.star.xml.sax.XFastContextHandler interface ---------------------
 
diff --git a/include/oox/core/relations.hxx b/include/oox/core/relations.hxx
index 23d6a9320243..166652afe5e8 100644
--- a/include/oox/core/relations.hxx
+++ b/include/oox/core/relations.hxx
@@ -23,6 +23,7 @@
 #include <cstddef>
 #include <map>
 #include <memory>
+#include <string_view>
 
 #include <oox/dllapi.h>
 #include <rtl/ustring.hxx>
@@ -91,7 +92,7 @@ public:
     /** Returns the first relation with the passed type. */
     const Relation*     getRelationFromFirstType( std::u16string_view rType ) const;
     /** Finds all relations associated with the passed type. */
-    RelationsRef        getRelationsFromTypeFromOfficeDoc( const OUString& rType ) const;
+    RelationsRef        getRelationsFromTypeFromOfficeDoc( std::u16string_view rType ) const;
 
     /** Returns the external target of the relation with the passed relation identifier. */
     OUString     getExternalTargetFromRelId( const OUString& rRelId ) const;
@@ -104,7 +105,7 @@ public:
     OUString     getFragmentPathFromRelId( const OUString& rRelId ) const;
     /** Returns the full fragment path for the first relation of the passed type. */
     OUString     getFragmentPathFromFirstType( std::u16string_view rType ) const;
-    OUString     getFragmentPathFromFirstTypeFromOfficeDoc( const OUString& rType ) const;
+    OUString     getFragmentPathFromFirstTypeFromOfficeDoc( std::u16string_view rType ) const;
 
 private:
     ::std::map< OUString, Relation > maMap;
diff --git a/include/oox/core/xmlfilterbase.hxx b/include/oox/core/xmlfilterbase.hxx
index 99b73e5b18bd..ce8ab9e3ae47 100644
--- a/include/oox/core/xmlfilterbase.hxx
+++ b/include/oox/core/xmlfilterbase.hxx
@@ -21,6 +21,7 @@
 #define INCLUDED_OOX_CORE_XMLFILTERBASE_HXX
 
 #include <memory>
+#include <string_view>
 #include <vector>
 
 #include <com/sun/star/uno/Reference.hxx>
@@ -113,7 +114,7 @@ public:
     virtual ::oox::drawingml::table::TableStyleListPtr getTableStyles() = 0;
 
 
-    OUString getFragmentPathFromFirstTypeFromOfficeDoc( const OUString& rPart );
+    OUString getFragmentPathFromFirstTypeFromOfficeDoc( std::u16string_view rPart );
 
     /** Imports a fragment using the passed fragment handler, which contains
         the full path to the fragment stream.
diff --git a/include/oox/drawingml/shape.hxx b/include/oox/drawingml/shape.hxx
index fea94105b65d..eac27b68c7a5 100644
--- a/include/oox/drawingml/shape.hxx
+++ b/include/oox/drawingml/shape.hxx
@@ -22,6 +22,7 @@
 
 #include <map>
 #include <memory>
+#include <string_view>
 #include <vector>
 
 #include <com/sun/star/awt/Point.hpp>
@@ -209,7 +210,7 @@ public:
     void                setDiagramDoms(const css::uno::Sequence<css::beans::PropertyValue>& rDiagramDoms) { maDiagramDoms = rDiagramDoms; }
     void                setDiagramData(const DiagramDataPtr& pDiagramData) { mpDiagramData = pDiagramData; }
     css::uno::Sequence< css::uno::Sequence< css::uno::Any > >resolveRelationshipsOfTypeFromOfficeDoc(
-                                                                          core::XmlFilterBase& rFilter, const OUString& sFragment, const OUString& sType );
+                                                                          core::XmlFilterBase& rFilter, const OUString& sFragment, std::u16string_view sType );
     void                setLinkedTxbxAttributes(const LinkedTxbxAttr& rhs){ maLinkedTxbxAttr = rhs; };
     void                setTxbxHasLinkedTxtBox( const bool rhs){ mbHasLinkedTxbx = rhs; };
     const LinkedTxbxAttr&     getLinkedTxbxAttributes() const { return maLinkedTxbxAttr; };
diff --git a/include/oox/dump/dumperbase.hxx b/include/oox/dump/dumperbase.hxx
index 54bbb6f6af0f..bfdacf53b42c 100644
--- a/include/oox/dump/dumperbase.hxx
+++ b/include/oox/dump/dumperbase.hxx
@@ -1160,7 +1160,7 @@ protected:
 private:
     static OUString     getSysFileName(
                             const OUString& rStrmName,
-                            const OUString& rSysOutPath );
+                            std::u16string_view rSysOutPath );
 
     void                extractStream(
                             StorageBase& rStrg,
@@ -1176,7 +1176,7 @@ private:
                             const StorageRef& rxStrg,
                             const OUString& rStrgPath,
                             const OUString& rItemName,
-                            const OUString& rSysPath,
+                            std::u16string_view rSysPath,
                             bool bIsStrg, bool bIsStrm );
 
 private:
diff --git a/include/oox/export/drawingml.hxx b/include/oox/export/drawingml.hxx
index afd1d994eafd..022a0df00e4e 100644
--- a/include/oox/export/drawingml.hxx
+++ b/include/oox/export/drawingml.hxx
@@ -21,6 +21,7 @@
 #define INCLUDED_OOX_EXPORT_DRAWINGML_HXX
 
 #include <map>
+#include <string_view>
 #include <vector>
 
 #include <com/sun/star/beans/PropertyState.hpp>
@@ -294,7 +295,7 @@ public:
     void WriteDiagram(const css::uno::Reference<css::drawing::XShape>& rXShape, int nDiagramId);
     void writeDiagramRels(const css::uno::Sequence<css::uno::Sequence<css::uno::Any>>& xRelSeq,
                           const css::uno::Reference<css::io::XOutputStream>& xOutStream,
-                          const OUString& sGrabBagProperyName, int nDiagramId);
+                          std::u16string_view sGrabBagProperyName, int nDiagramId);
     static void WriteFromTo(const css::uno::Reference<css::drawing::XShape>& rXShape, const css::awt::Size& aPageSize,
                             const sax_fastparser::FSHelperPtr& pDrawing);
 
diff --git a/include/oox/export/vmlexport.hxx b/include/oox/export/vmlexport.hxx
index 9aea58378660..a1c79fda73a8 100644
--- a/include/oox/export/vmlexport.hxx
+++ b/include/oox/export/vmlexport.hxx
@@ -20,6 +20,10 @@
 #ifndef INCLUDED_OOX_EXPORT_VMLEXPORT_HXX
 #define INCLUDED_OOX_EXPORT_VMLEXPORT_HXX
 
+#include <sal/config.h>
+
+#include <string_view>
+
 #include <com/sun/star/uno/Reference.hxx>
 #include <editeng/outlobj.hxx>
 #include <filter/msfilter/escherex.hxx>
@@ -148,7 +152,7 @@ public:
     void    SetHashMarkForType(bool bUseHashMarkForType) { m_bUseHashMarkForType = bUseHashMarkForType; }
     void    OverrideShapeIDGen(bool bOverrideShapeIdGeneration,
                             const OString& sShapeIDPrefix = OString());
-    static OString GetVMLShapeTypeDefinition(const OString& sShapeID, const bool bIsPictureFrame);
+    static OString GetVMLShapeTypeDefinition(std::string_view sShapeID, const bool bIsPictureFrame);
 
 protected:
     /// Add an attribute to the generated <v:shape/> element.
diff --git a/include/oox/ole/vbaproject.hxx b/include/oox/ole/vbaproject.hxx
index e46db83d337f..4a9b3e1a4e5b 100644
--- a/include/oox/ole/vbaproject.hxx
+++ b/include/oox/ole/vbaproject.hxx
@@ -22,6 +22,7 @@
 
 #include <functional>
 #include <map>
+#include <string_view>
 
 #include <com/sun/star/uno/Reference.hxx>
 #include <oox/dllapi.h>
@@ -54,7 +55,7 @@ class VbaFilterConfig
 public:
     explicit            VbaFilterConfig(
                             const css::uno::Reference< css::uno::XComponentContext >& rxContext,
-                            const OUString& rConfigCompName );
+                            std::u16string_view rConfigCompName );
                         ~VbaFilterConfig();
 
     /** Returns true, if the VBA source code and forms should be imported. */
@@ -116,7 +117,7 @@ public:
     explicit            VbaProject(
                             const css::uno::Reference< css::uno::XComponentContext >& rxContext,
                             const css::uno::Reference< css::frame::XModel >& rxDocModel,
-                            const OUString& rConfigCompName );
+                            std::u16string_view rConfigCompName );
     virtual             ~VbaProject();
 
     /** Imports the entire VBA project from the passed storage.
diff --git a/include/sfx2/linkmgr.hxx b/include/sfx2/linkmgr.hxx
index deb9f00c0797..4a159e16df3e 100644
--- a/include/sfx2/linkmgr.hxx
+++ b/include/sfx2/linkmgr.hxx
@@ -25,6 +25,8 @@
 #include <sfx2/linksrc.hxx>
 #include <sfx2/lnkbase.hxx>
 #include <o3tl/sorted_vector.hxx>
+
+#include <string_view>
 #include <vector>
 
 class SfxObjectShell;
@@ -95,7 +97,7 @@ public:
     void        InsertDDELink( SvBaseLink*,
                         const OUString& rServer,
                         const OUString& rTopic,
-                        const OUString& rItem );
+                        std::u16string_view rItem );
 
     // if everything is already set at the link!
     void        InsertDDELink( SvBaseLink* );
@@ -175,7 +177,7 @@ const sal_Unicode cTokenSeparator = 0xFFFF;
 SFX2_DLLPUBLIC void MakeLnkName( OUString& rName,
                  const OUString* pType,       // Can also be null!!
                  const OUString& rFile,
-                 const OUString& rLink,
+                 std::u16string_view rLink,
                  const OUString* pFilter = nullptr );
 
 }
diff --git a/include/sfx2/lokhelper.hxx b/include/sfx2/lokhelper.hxx
index 6cc9c277ef53..847a6bc06c25 100644
--- a/include/sfx2/lokhelper.hxx
+++ b/include/sfx2/lokhelper.hxx
@@ -81,14 +81,14 @@ public:
     static void forEachOtherView(ViewShellType* pThisViewShell, FunctionType f);
 
     /// Invoke the LOK callback of all other views showing the same document as pThisView, with a payload of rKey-rPayload.
-    static void notifyOtherViews(const SfxViewShell* pThisView, int nType, const OString& rKey,
+    static void notifyOtherViews(const SfxViewShell* pThisView, int nType, std::string_view rKey,
                                  const OString& rPayload);
     /// Invoke the LOK callback of all views except pThisView, with a JSON payload created from the given property tree.
     static void notifyOtherViews(const SfxViewShell* pThisView, int nType,
                                  const boost::property_tree::ptree& rTree);
     /// Same as notifyOtherViews(), but works on a selected "other" view, not on all of them.
     static void notifyOtherView(const SfxViewShell* pThisView, SfxViewShell const* pOtherView,
-                                int nType, const OString& rKey, const OString& rPayload);
+                                int nType, std::string_view rKey, const OString& rPayload);
     /// Same as notifyOtherViews(), the property-tree version, but works on a selected "other" view, not on all of them.
     static void notifyOtherView(const SfxViewShell* pThisView, SfxViewShell const* pOtherView,
                                 int nType, const boost::property_tree::ptree& rTree);
diff --git a/include/sfx2/notebookbar/SfxNotebookBar.hxx b/include/sfx2/notebookbar/SfxNotebookBar.hxx
index acc5a9c50250..cb94dd2b4603 100644
--- a/include/sfx2/notebookbar/SfxNotebookBar.hxx
+++ b/include/sfx2/notebookbar/SfxNotebookBar.hxx
@@ -13,6 +13,7 @@
 #include <sfx2/dllapi.h>
 #include <rtl/ustring.hxx>
 #include <map>
+#include <string_view>
 
 namespace com::sun::star::frame
 {
@@ -45,11 +46,11 @@ public:
     static void ExecMethod(SfxBindings& rBindings, const OUString& rUIName);
 
     /// Function to be called from the sdi's StateMethod.
-    static bool StateMethod(SfxBindings& rBindings, const OUString& rUIFile,
+    static bool StateMethod(SfxBindings& rBindings, std::u16string_view rUIFile,
                             bool bReloadNotebookbar = false);
     static bool StateMethod(SystemWindow* pSysWindow,
                             const css::uno::Reference<css::frame::XFrame>& xFrame,
-                            const OUString& rUIFile, bool bReloadNotebookbar = false);
+                            std::u16string_view rUIFile, bool bReloadNotebookbar = false);
 
     /// Method temporarily blocks showing of the NotebookBar
     static void LockNotebookBar();
@@ -63,7 +64,7 @@ public:
     /** Show menu bar only in current frame */
     static void ShowMenubar(SfxViewFrame const* pViewFrame, bool bShow);
     static void ToggleMenubar();
-    static void ReloadNotebookBar(const OUString& sUIPath);
+    static void ReloadNotebookBar(std::u16string_view sUIPath);
 
 private:
     static bool m_bLock;
diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx
index 42070bd4c090..a14ce7d39e11 100644
--- a/include/sfx2/objsh.hxx
+++ b/include/sfx2/objsh.hxx
@@ -38,6 +38,8 @@
 #include <comphelper/embeddedobjectcontainer.hxx>
 #include <memory>
 #include <set>
+#include <string_view>
+
 #include <o3tl/typed_flags_set.hxx>
 #include <functional>
 #include <sfx2/AccessibilityIssue.hxx>
@@ -467,7 +469,7 @@ public:
     void                        AvoidRecentDocs(bool bAvoid) { mbAvoidRecentDocs = bAvoid; }
 
     /// On first error ask user if import should continue; return saved answer.
-    bool                        IsContinueImportOnFilterExceptions(const OUString& aErrMessage);
+    bool                        IsContinueImportOnFilterExceptions(std::u16string_view aErrMessage);
 
     // Transfer IFace
     bool                        IsAbortingImport() const;
diff --git a/include/svl/lockfilecommon.hxx b/include/svl/lockfilecommon.hxx
index 77349c48a4a4..f94e41b6cb20 100644
--- a/include/svl/lockfilecommon.hxx
+++ b/include/svl/lockfilecommon.hxx
@@ -27,6 +27,8 @@
 #include <osl/mutex.hxx>
 #include <tools/urlobj.hxx>
 #include <o3tl/enumarray.hxx>
+
+#include <string_view>
 #include <vector>
 
 enum class LockFileComponent
@@ -48,7 +50,7 @@ protected:
     ::osl::Mutex m_aMutex;
 
     /// This method generates the URL of the lock file based on the document URL and the specified prefix.
-    static OUString GenerateOwnLockFileURL(const OUString& aOrigURL, const OUString& aPrefix);
+    static OUString GenerateOwnLockFileURL(const OUString& aOrigURL, std::u16string_view aPrefix);
 
 public:
     LockFileCommon(const OUString& aLockFileURL);
diff --git a/include/svtools/HtmlWriter.hxx b/include/svtools/HtmlWriter.hxx
index d6e0294cafce..e9939f712941 100644
--- a/include/svtools/HtmlWriter.hxx
+++ b/include/svtools/HtmlWriter.hxx
@@ -32,7 +32,7 @@ private:
     OString maNamespace;
 
 public:
-    HtmlWriter(SvStream& rStream, const OString& rNamespace = OString());
+    HtmlWriter(SvStream& rStream, std::string_view rNamespace = std::string_view());
     ~HtmlWriter();
 
     void prettyPrint(bool b);
diff --git a/include/svtools/parhtml.hxx b/include/svtools/parhtml.hxx
index 7915dc91a5db..02cdc2042645 100644
--- a/include/svtools/parhtml.hxx
+++ b/include/svtools/parhtml.hxx
@@ -23,6 +23,7 @@
 #include <svtools/svparser.hxx>
 #include <svtools/htmltokn.h>
 
+#include <string_view>
 #include <vector>
 
 namespace com :: sun :: star :: uno { template <class interface_type> class Reference; }
@@ -184,7 +185,7 @@ protected:
 
     void FinishHeader() { bIsInHeader = false; }
 
-    void SetNamespace(const OUString& rNamespace);
+    void SetNamespace(std::u16string_view rNamespace);
 
 public:
     HTMLParser( SvStream& rIn, bool bReadNewDoc = true );
diff --git a/include/svx/SmartTagMgr.hxx b/include/svx/SmartTagMgr.hxx
index b20f68a60002..510f5d53ae9e 100644
--- a/include/svx/SmartTagMgr.hxx
+++ b/include/svx/SmartTagMgr.hxx
@@ -30,6 +30,7 @@
 #include <vector>
 #include <map>
 #include <set>
+#include <string_view>
 
 namespace com::sun::star::uno {
     class XComponentContext;
@@ -103,7 +104,7 @@ private:
 
     /** Prepare configuration access.
     */
-    void PrepareConfiguration( const OUString& rConfigurationGroupName );
+    void PrepareConfiguration( std::u16string_view rConfigurationGroupName );
 
     /** Reads the configuration data.
     */
@@ -125,7 +126,7 @@ public:
     /** Triggers configuration reading, library loading and listener registration
         NOTE: MUST BE CALLED AFTER CONSTRUCTION!
     */
-    void Init( const OUString& rConfigurationGroupName );
+    void Init( std::u16string_view rConfigurationGroupName );
 
     /** Dispatches the recognize call to all installed smart tag recognizers
 
diff --git a/include/svx/xmlgrhlp.hxx b/include/svx/xmlgrhlp.hxx
index e72bae191b54..966339451c2f 100644
--- a/include/svx/xmlgrhlp.hxx
+++ b/include/svx/xmlgrhlp.hxx
@@ -24,6 +24,8 @@
 #include <osl/mutex.hxx>
 #include <vcl/graph.hxx>
 #include <rtl/ref.hxx>
+
+#include <string_view>
 #include <vector>
 #include <unordered_map>
 #include <utility>
@@ -82,7 +84,8 @@ private:
     virtual void SAL_CALL       disposing() override;
 
     SVX_DLLPRIVATE OUString implSaveGraphic(css::uno::Reference<css::graphic::XGraphic> const & rxGraphic,
-                                            OUString & rOutMimeType, OUString const & rRequestName);
+                                            OUString & rOutMimeType,
+                                            std::u16string_view rRequestName);
 
 public:
                                 SvXMLGraphicHelper( SvXMLGraphicHelperMode eCreateMode );
diff --git a/include/test/helper/form.hxx b/include/test/helper/form.hxx
index 0fbcd2c7b06a..d3b80544d7b5 100644
--- a/include/test/helper/form.hxx
+++ b/include/test/helper/form.hxx
@@ -10,12 +10,15 @@
 #ifndef INCLUDED_TEST_HELPER_FORM_HXX
 #define INCLUDED_TEST_HELPER_FORM_HXX
 
+#include <sal/config.h>
+
+#include <string_view>
+
 #include <com/sun/star/drawing/XControlShape.hpp>
 #include <com/sun/star/lang/XComponent.hpp>
 
 #include <com/sun/star/uno/Reference.hxx>
 
-#include <sal/config.h>
 #include <sal/types.h>
 #include <test/testdllapi.hxx>
 
@@ -49,7 +52,7 @@ css::uno::Reference<css::drawing::XControlShape> OOO_DLLPUBLIC_TEST createComman
  * @return  The created XControlShape.
  */
 css::uno::Reference<css::drawing::XControlShape> OOO_DLLPUBLIC_TEST createControlShape(
-    const css::uno::Reference<css::lang::XComponent>& r_xComponent, const OUString& r_aKind,
+    const css::uno::Reference<css::lang::XComponent>& r_xComponent, std::u16string_view r_aKind,
     const sal_Int32 nX, const sal_Int32 nY, const sal_Int32 nHeight, const sal_Int32 nWidth);
 
 } // namespace form
diff --git a/include/test/helper/shape.hxx b/include/test/helper/shape.hxx
index 341a9fad93fc..dbf3745219e9 100644
--- a/include/test/helper/shape.hxx
+++ b/include/test/helper/shape.hxx
@@ -11,6 +11,9 @@
 #define INCLUDED_TEST_HELPER_SHAPE_HXX
 
 #include <sal/config.h>
+
+#include <string_view>
+
 #include <sal/types.h>
 #include <test/testdllapi.hxx>
 
@@ -76,10 +79,9 @@ createRectangle(const css::uno::Reference<css::lang::XComponent>& r_xComponent,
  * @param nWidth        The width of the shape.
  * @return  The created XShape.
  */
-css::uno::Reference<css::drawing::XShape>
-    OOO_DLLPUBLIC_TEST createShape(const css::uno::Reference<css::lang::XComponent>& r_xComponent,
-                                   const OUString& r_aKind, const sal_Int32 nX, const sal_Int32 nY,
-                                   const sal_Int32 nWidth, const sal_Int32 nHeight);
+css::uno::Reference<css::drawing::XShape> OOO_DLLPUBLIC_TEST createShape(
+    const css::uno::Reference<css::lang::XComponent>& r_xComponent, std::u16string_view r_aKind,
+    const sal_Int32 nX, const sal_Int32 nY, const sal_Int32 nWidth, const sal_Int32 nHeight);
 
 } // namespace shape
 } // namespace helper
diff --git a/include/test/screenshot_test.hxx b/include/test/screenshot_test.hxx
index 2c0bbe25eb23..ae0a2a8c14e6 100644
--- a/include/test/screenshot_test.hxx
+++ b/include/test/screenshot_test.hxx
@@ -85,7 +85,7 @@ public:
     /// - lines starting with '#' are treated as comment
     /// - all other lines should contain a *.ui filename in the same
     ///   notation as in the dialog constructors(see code)
-    void processDialogBatchFile(const OUString& rFile);
+    void processDialogBatchFile(std::u16string_view rFile);
 
     /// const access to known dialogs
     const mapType& getKnownDialogs() const { return maKnownDialogs; }
diff --git a/include/test/unoapi_test.hxx b/include/test/unoapi_test.hxx
index b4a09b4a28cd..82f04cf465eb 100644
--- a/include/test/unoapi_test.hxx
+++ b/include/test/unoapi_test.hxx
@@ -11,6 +11,9 @@
 #define INCLUDED_TEST_UNOAPI_TEST_HXX
 
 #include <sal/config.h>
+
+#include <string_view>
+
 #include <test/bootstrapfixture.hxx>
 #include <unotest/macros_test.hxx>
 #include <com/sun/star/lang/XComponent.hpp>
@@ -23,7 +26,7 @@ class OOO_DLLPUBLIC_TEST UnoApiTest : public test::BootstrapFixture, public unot
 public:
     UnoApiTest(const OUString& path);
 
-    void createFileURL(const OUString& aFileBase, OUString& rFilePath);
+    void createFileURL(std::u16string_view aFileBase, OUString& rFilePath);
 
     virtual void setUp() override;
 
diff --git a/include/test/xmltesttools.hxx b/include/test/xmltesttools.hxx
index cd5f30c064fe..f6bd17f0ae30 100644
--- a/include/test/xmltesttools.hxx
+++ b/include/test/xmltesttools.hxx
@@ -27,6 +27,7 @@
 
 #include <cppunit/TestAssert.h>
 
+#include <string_view>
 #include <vector>
 
 class OOO_DLLPUBLIC_TEST XmlTestTools
@@ -59,7 +60,7 @@ protected:
      * Get the position of the child named rName of the parent node specified by rXPath.
      * Useful for checking relative order of elements.
      */
-    int           getXPathPosition(const xmlDocUniquePtr& pXmlDoc, const OString& rXPath, const OString& rChildName);
+    int           getXPathPosition(const xmlDocUniquePtr& pXmlDoc, const OString& rXPath, std::string_view rChildName);
     /**
      * Assert that rXPath exists, and returns exactly one node.
      */
diff --git a/include/unotest/directories.hxx b/include/unotest/directories.hxx
index 4fcf7fe3cbba..efdcd93a6acf 100644
--- a/include/unotest/directories.hxx
+++ b/include/unotest/directories.hxx
@@ -12,6 +12,8 @@
 
 #include <sal/config.h>
 
+#include <string_view>
+
 #include <rtl/ustring.hxx>
 #include <unotest/detail/unotestdllapi.hxx>
 
@@ -32,16 +34,16 @@ public:
     const OUString& getSrcRootPath() const { return m_aSrcRootPath; }
 
     // return a URL to a given path from the source directory
-    OUString getURLFromSrc(const OUString& rPath) const;
+    OUString getURLFromSrc(std::u16string_view rPath) const;
 
     // return a Path to a given path from the source directory
-    OUString getPathFromSrc(const OUString& rPath) const;
+    OUString getPathFromSrc(std::u16string_view rPath) const;
 
     // return a URL to a given path from the workdir directory
-    OUString getURLFromWorkdir(const OUString& rPath) const;
+    OUString getURLFromWorkdir(std::u16string_view rPath) const;
 
     // return a Path to a given path from the workdir directory
-    OUString getPathFromWorkdir(const OUString& rPath) const;
+    OUString getPathFromWorkdir(std::u16string_view rPath) const;
 };
 }
 
diff --git a/include/unotest/filters-test.hxx b/include/unotest/filters-test.hxx
index 5af991e04d47..01570b78637a 100644
--- a/include/unotest/filters-test.hxx
+++ b/include/unotest/filters-test.hxx
@@ -10,6 +10,10 @@
 #ifndef INCLUDED_UNOTEST_FILTERS_TEST_HXX
 #define INCLUDED_UNOTEST_FILTERS_TEST_HXX
 
+#include <sal/config.h>
+
+#include <string_view>
+
 #include <comphelper/documentconstants.hxx>
 #include <rtl/ustring.hxx>
 #include <unotest/detail/unotestdllapi.hxx>
@@ -39,7 +43,7 @@ public:
         //filter name
         const OUString &rFilter,
         //root dir of test files, must contain pass, fail, indeterminate
-        const OUString &rURL,
+        std::u16string_view rURL,
         //additional filter data for SfxFilter
         const OUString &rUserData = OUString(),
         //SfxFilterFlags for SfxFilter
diff --git a/include/unotest/gettestargument.hxx b/include/unotest/gettestargument.hxx
index 734b77e57b8a..3b6291725316 100644
--- a/include/unotest/gettestargument.hxx
+++ b/include/unotest/gettestargument.hxx
@@ -20,6 +20,10 @@
 #ifndef INCLUDED_UNOTEST_GETTESTARGUMENT_HXX
 #define INCLUDED_UNOTEST_GETTESTARGUMENT_HXX
 
+#include <sal/config.h>
+
+#include <string_view>
+
 #include <rtl/ustring.hxx>
 #include <unotest/detail/unotestdllapi.hxx>
 
@@ -29,7 +33,7 @@ namespace test {
 // Obtain the value of a test argument (tunneled in via an "arg-testarg.<name>"
 // bootstrap variable):
 OOO_DLLPUBLIC_UNOTEST bool getTestArgument(
-    OUString const & name, OUString * value);
+    std::u16string_view name, OUString * value);
 
 }
 
diff --git a/include/unotools/optionsdlg.hxx b/include/unotools/optionsdlg.hxx
index f20d2aa59d65..20e7789ea81d 100644
--- a/include/unotools/optionsdlg.hxx
+++ b/include/unotools/optionsdlg.hxx
@@ -19,6 +19,10 @@
 #ifndef INCLUDED_UNOTOOLS_OPTIONSDLG_HXX
 #define INCLUDED_UNOTOOLS_OPTIONSDLG_HXX
 
+#include <sal/config.h>
+
+#include <string_view>
+
 #include <unotools/unotoolsdllapi.h>
 #include <rtl/ustring.hxx>
 #include <unotools/options.hxx>
@@ -34,12 +38,12 @@ public:
                     SvtOptionsDialogOptions();
                     virtual ~SvtOptionsDialogOptions() override;
 
-    bool        IsGroupHidden   (   const OUString& _rGroup ) const;
-    bool        IsPageHidden    (   const OUString& _rPage,
-                                        const OUString& _rGroup ) const;
-    bool        IsOptionHidden  (   const OUString& _rOption,
-                                        const OUString& _rPage,
-                                        const OUString& _rGroup ) const;
+    bool        IsGroupHidden   (   std::u16string_view _rGroup ) const;
+    bool        IsPageHidden    (   std::u16string_view _rPage,
+                                        std::u16string_view _rGroup ) const;
+    bool        IsOptionHidden  (   std::u16string_view _rOption,
+                                        std::u16string_view _rPage,
+                                        std::u16string_view _rGroup ) const;
 };
 
 #endif
diff --git a/include/vbahelper/vbahelper.hxx b/include/vbahelper/vbahelper.hxx
index 60d8f0b85de4..fd4549cf99a8 100644
--- a/include/vbahelper/vbahelper.hxx
+++ b/include/vbahelper/vbahelper.hxx
@@ -20,6 +20,7 @@
 #define INCLUDED_VBAHELPER_VBAHELPER_HXX
 
 #include <memory>
+#include <string_view>
 
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
 #include <com/sun/star/uno/Any.hxx>
@@ -248,8 +249,8 @@ class VBAHELPER_DLLPUBLIC ContainerUtilities
 {
 
 public:
-    static OUString getUniqueName( const css::uno::Sequence< OUString >&  _slist, const OUString& _sElementName, const OUString& _sSuffixSeparator);
-    static OUString getUniqueName( const css::uno::Sequence< OUString >& _slist, const OUString& _sElementName, const OUString& _sSuffixSeparator, sal_Int32 _nStartSuffix );
+    static OUString getUniqueName( const css::uno::Sequence< OUString >&  _slist, const OUString& _sElementName, std::u16string_view _sSuffixSeparator);
+    static OUString getUniqueName( const css::uno::Sequence< OUString >& _slist, const OUString& _sElementName, std::u16string_view _sSuffixSeparator, sal_Int32 _nStartSuffix );
 
     static sal_Int32 FieldInList( const css::uno::Sequence< OUString >& SearchList, const OUString& SearchString );
 };
diff --git a/include/vbahelper/vbashapes.hxx b/include/vbahelper/vbashapes.hxx
index cc8cdcdf16fb..16d40566a686 100644
--- a/include/vbahelper/vbashapes.hxx
+++ b/include/vbahelper/vbashapes.hxx
@@ -20,6 +20,7 @@
 #define INCLUDED_VBAHELPER_VBASHAPES_HXX
 
 #include <exception>
+#include <string_view>
 
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 #include <com/sun/star/uno/Any.hxx>
@@ -71,7 +72,7 @@ private:
     css::uno::Any AddEllipse( sal_Int32 startX, sal_Int32 startY, sal_Int32 nLineWidth, sal_Int32 nLineHeight );
     /// @throws css::uno::RuntimeException
     css::uno::Any AddTextboxInWriter( sal_Int32 _nLeft, sal_Int32 _nTop, sal_Int32 _nWidth, sal_Int32 _nHeight );
-    OUString createName( const OUString& sName );
+    OUString createName( std::u16string_view sName );
     //TODO helperapi using a writer document
     //css::awt::Point calculateTopLeftMargin( css::uno::Reference< ov::XHelperInterface > xDocument );
 
diff --git a/include/vcl/FilterConfigItem.hxx b/include/vcl/FilterConfigItem.hxx
index ae9e0f33c8c1..f1593b4db2c3 100644
--- a/include/vcl/FilterConfigItem.hxx
+++ b/include/vcl/FilterConfigItem.hxx
@@ -21,6 +21,10 @@
 #ifndef INCLUDED_VCL_FILTERCONFIGITEM_HXX
 #define INCLUDED_VCL_FILTERCONFIGITEM_HXX
 
+#include <sal/config.h>
+
+#include <string_view>
+
 #include <vcl/dllapi.h>
 
 #include <rtl/ustring.hxx>
@@ -45,7 +49,7 @@ class VCL_DLLPUBLIC FilterConfigItem
                             const css::uno::Reference< css::beans::XPropertySet >& rXPropSet,
                             const OUString& rPropName );
 
-    void     ImpInitTree( const OUString& rTree );
+    void     ImpInitTree( std::u16string_view rTree );
 
 
     static css::beans::PropertyValue* GetPropertyValue(
@@ -57,9 +61,9 @@ class VCL_DLLPUBLIC FilterConfigItem
 
 public:
 
-    FilterConfigItem( const OUString& rSubTree );
+    FilterConfigItem( std::u16string_view rSubTree );
     FilterConfigItem( css::uno::Sequence< css::beans::PropertyValue > const * pFilterData );
-    FilterConfigItem( const OUString& rSubTree, css::uno::Sequence< css::beans::PropertyValue > const * pFilterData );
+    FilterConfigItem( std::u16string_view rSubTree, css::uno::Sequence< css::beans::PropertyValue > const * pFilterData );
     /// Writes config in destructor
     ~FilterConfigItem();
     /// Writes config and sets unmodified state again.
diff --git a/include/vcl/embeddedfontshelper.hxx b/include/vcl/embeddedfontshelper.hxx
index a54785ea59eb..4802c13a2d8d 100644
--- a/include/vcl/embeddedfontshelper.hxx
+++ b/include/vcl/embeddedfontshelper.hxx
@@ -15,6 +15,8 @@
 #include <rtl/ustring.hxx>
 #include <tools/fontenum.hxx>
 #include <tools/long.hxx>
+
+#include <string_view>
 #include <vector>
 
 namespace com::sun::star::io { class XInputStream; }
@@ -49,7 +51,8 @@ public:
     /**
       Returns URL for a font file for the given font, or empty if it does not exist.
     */
-    static OUString fontFileUrl( const OUString& familyName, FontFamily family, FontItalic italic,
+    static OUString fontFileUrl(
+        std::u16string_view familyName, FontFamily family, FontItalic italic,
         FontWeight weight, FontPitch pitch, FontRights rights );
 
     /**
diff --git a/include/vcl/formatter.hxx b/include/vcl/formatter.hxx
index 946e7e77b727..1657d5be01ba 100644
--- a/include/vcl/formatter.hxx
+++ b/include/vcl/formatter.hxx
@@ -25,6 +25,7 @@
 #include <vcl/settings.hxx>
 #include <map>
 #include <memory>
+#include <string_view>
 
 class SvNumberFormatter;
 
@@ -64,7 +65,7 @@ namespace validation
     public:
         NumberValidator( const sal_Unicode _cThSep, const sal_Unicode _cDecSep );
 
-        bool isValidNumericFragment( const OUString& _rText );
+        bool isValidNumericFragment( std::u16string_view _rText );
 
     private:
         bool implValidateNormalized( const OUString& _rText );
diff --git a/include/vcl/opengl/OpenGLHelper.hxx b/include/vcl/opengl/OpenGLHelper.hxx
index a0e2d8436564..e85bb351fb2f 100644
--- a/include/vcl/opengl/OpenGLHelper.hxx
+++ b/include/vcl/opengl/OpenGLHelper.hxx
@@ -17,6 +17,7 @@
 
 #include <rtl/ustring.hxx>
 #include <sstream>
+#include <string_view>
 
 /// Helper to do a SAL_INFO as well as a GL log.
 #define VCL_GL_INFO(stream) \
@@ -47,10 +48,10 @@ struct VCL_DLLPUBLIC OpenGLHelper
 
 public:
 
-    static OString GetDigest(const OUString& rVertexShaderName, const OUString& rFragmentShaderName, const OString& preamble );
+    static OString GetDigest(const OUString& rVertexShaderName, const OUString& rFragmentShaderName, std::string_view preamble );
 
-    static GLint LoadShaders(const OUString& rVertexShaderName, const OUString& rFragmentShaderName, const OUString& rGeometryShaderName, const OString& preamble, const OString& rDigest );
-    static GLint LoadShaders(const OUString& rVertexShaderName, const OUString& rFragmentShaderName, const OString& preamble, const OString& rDigest );
+    static GLint LoadShaders(const OUString& rVertexShaderName, const OUString& rFragmentShaderName, const OUString& rGeometryShaderName, std::string_view preamble, std::string_view rDigest );
+    static GLint LoadShaders(const OUString& rVertexShaderName, const OUString& rFragmentShaderName, std::string_view preamble, std::string_view rDigest );
     static GLint LoadShaders(const OUString& rVertexShaderName, const OUString& rFragmentShaderName, const OUString& rGeometryShaderName);
     static GLint LoadShaders(const OUString& rVertexShaderName, const OUString& rFragmentShaderName);
 
diff --git a/include/xmloff/xmlimp.hxx b/include/xmloff/xmlimp.hxx
index 494de3cbcd26..2d5013e2fe4f 100644
--- a/include/xmloff/xmlimp.hxx
+++ b/include/xmloff/xmlimp.hxx
@@ -24,6 +24,7 @@
 
 #include <set>
 #include <stack>
+#include <string_view>
 
 #include <o3tl/deleter.hxx>
 #include <xmloff/dllapi.h>
@@ -416,7 +417,7 @@ public:
 
     bool IsPackageURL( const OUString& rURL ) const;
     OUString ResolveEmbeddedObjectURL( const OUString& rURL,
-                                       const OUString& rClassId );
+                                       std::u16string_view rClassId );
     css::uno::Reference< css::io::XOutputStream >
         GetStreamForEmbeddedObjectURLFromBase64() const;
     OUString ResolveEmbeddedObjectURLFromBase64();