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>

8 files changed, 21 insertions, 11 deletions

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.