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>

4 files changed, 44 insertions, 32 deletions

diff --git a/unotools/source/config/bootstrap.cxx b/unotools/source/config/bootstrap.cxx
index eccf92f696ad..2188e26aec26 100644
--- a/unotools/source/config/bootstrap.cxx
+++ b/unotools/source/config/bootstrap.cxx
@@ -17,6 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <sal/config.h>
+
+#include <string_view>
+
 #include <config_folders.h>
 
 #include <unotools/bootstrap.hxx>
@@ -45,7 +49,7 @@
 
 #define BOOTSTRAP_DEFAULT_BASEINSTALL       "$SYSBINDIR/.."
 
-#define BOOTSTRAP_DIRNAME_USERDIR           "user"
+#define BOOTSTRAP_DIRNAME_USERDIR           u"user"
 
 typedef char const * AsciiString;
 
@@ -303,13 +307,13 @@ static PathStatus checkStatusAndNormalizeURL(OUString & _sURL)
 static PathStatus getDerivedPath(
               OUString& _rURL,
               OUString const& _aBaseURL, PathStatus _aBaseStatus,
-              OUString const& _sRelativeURL,
+              std::u16string_view _sRelativeURL,
               rtl::Bootstrap const & _rData, OUString const& _sBootstrapParameter
           )
 {
     OUString sDerivedURL;
     OSL_PRECOND(!_rData.getFrom(_sBootstrapParameter,sDerivedURL),"Setting for derived path is already defined");
-    OSL_PRECOND(!_sRelativeURL.isEmpty() && _sRelativeURL[0] != cURLSeparator,"Invalid Relative URL");
+    OSL_PRECOND(!_sRelativeURL.empty() && _sRelativeURL[0] != cURLSeparator,"Invalid Relative URL");
 
     PathStatus aStatus = _aBaseStatus;
 
@@ -349,7 +353,7 @@ static PathStatus getDerivedPath(
 static PathStatus getDerivedPath(
                       OUString& _rURL,
                       Bootstrap::Impl::PathData const& _aBaseData,
-                      OUString const& _sRelativeURL,
+                      std::u16string_view _sRelativeURL,
                       rtl::Bootstrap const & _rData, OUString const& _sBootstrapParameter
               )
 {
diff --git a/unotools/source/config/dynamicmenuoptions.cxx b/unotools/source/config/dynamicmenuoptions.cxx
index b0d74c931deb..e89f23406ac4 100644
--- a/unotools/source/config/dynamicmenuoptions.cxx
+++ b/unotools/source/config/dynamicmenuoptions.cxx
@@ -204,7 +204,7 @@ class SvtDynamicMenuOptions_Impl : public ConfigItem
 
         static void impl_SortAndExpandPropertyNames( const Sequence< OUString >& lSource      ,
                                                      Sequence< OUString >& lDestination ,
-                                                     const OUString&             sSetNode     );
+                                                     std::u16string_view         sSetNode     );
 
     //  private member
 
@@ -414,8 +414,8 @@ Sequence< OUString > SvtDynamicMenuOptions_Impl::impl_GetPropertyNames( sal_uInt
 
     // Sort and expand all three list to result list ...
     Sequence< OUString > lProperties;
-    impl_SortAndExpandPropertyNames( lNewItems          , lProperties, SETNODE_NEWMENU       );
-    impl_SortAndExpandPropertyNames( lWizardItems       , lProperties, SETNODE_WIZARDMENU    );
+    impl_SortAndExpandPropertyNames( lNewItems          , lProperties, u"" SETNODE_NEWMENU   );
+    impl_SortAndExpandPropertyNames( lWizardItems       , lProperties, u"" SETNODE_WIZARDMENU );
 
     // Return result.
     return lProperties;
@@ -458,7 +458,7 @@ class SelectByPrefix
 
 void SvtDynamicMenuOptions_Impl::impl_SortAndExpandPropertyNames( const Sequence< OUString >& lSource      ,
                                                                         Sequence< OUString >& lDestination ,
-                                                                  const OUString&             sSetNode     )
+                                                                  std::u16string_view         sSetNode     )
 {
     vector< OUString >  lTemp;
     sal_Int32           nSourceCount     = lSource.getLength();
@@ -478,7 +478,7 @@ void SvtDynamicMenuOptions_Impl::impl_SortAndExpandPropertyNames( const Sequence
     // 4 supported sub properties.
     for( const auto& rItem : lTemp )
     {
-        OUString sFixPath(sSetNode + PATHDELIMITER + rItem + PATHDELIMITER);
+        OUString sFixPath(OUString::Concat(sSetNode) + PATHDELIMITER + rItem + PATHDELIMITER);
         lDestination[nDestinationStep++] = sFixPath + PROPERTYNAME_URL;
         lDestination[nDestinationStep++] = sFixPath + PROPERTYNAME_TITLE;
         lDestination[nDestinationStep++] = sFixPath + PROPERTYNAME_IMAGEIDENTIFIER;
diff --git a/unotools/source/config/moduleoptions.cxx b/unotools/source/config/moduleoptions.cxx
index 317f5261c76d..1468501220ec 100644
--- a/unotools/source/config/moduleoptions.cxx
+++ b/unotools/source/config/moduleoptions.cxx
@@ -17,6 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <sal/config.h>
+
+#include <string_view>
+
 #include <unotools/moduleoptions.hxx>
 #include <comphelper/sequenceashashmap.hxx>
 #include <unotools/configitem.hxx>
@@ -116,7 +120,7 @@ struct FactoryInfo
         // returns list of properties, which has changed only!
         // We use given value of sNodeBase to build full qualified paths ...
         // Last sign of it must be "/". because we use it directly, without any additional things!
-        css::uno::Sequence< css::beans::PropertyValue > getChangedProperties( const OUString& sNodeBase )
+        css::uno::Sequence< css::beans::PropertyValue > getChangedProperties( std::u16string_view sNodeBase )
         {
             // a) reserve memory for max. count of changed properties
             // b) add names and values of changed ones only and count it
@@ -126,7 +130,8 @@ struct FactoryInfo
 
             if( bChangedTemplateFile )
             {
-                lProperties[nRealyChanged].Name = sNodeBase + PROPERTYNAME_TEMPLATEFILE;
+                lProperties[nRealyChanged].Name
+                    = OUString::Concat(sNodeBase) + PROPERTYNAME_TEMPLATEFILE;
 
                 if ( !sTemplateFile.isEmpty() )
                 {
@@ -143,7 +148,8 @@ struct FactoryInfo
             }
             if( bChangedDefaultFilter )
             {
-                lProperties[nRealyChanged].Name    = sNodeBase + PROPERTYNAME_DEFAULTFILTER;
+                lProperties[nRealyChanged].Name
+                    = OUString::Concat(sNodeBase) + PROPERTYNAME_DEFAULTFILTER;
                 lProperties[nRealyChanged].Value <<= sDefaultFilter;
                 ++nRealyChanged;
             }
diff --git a/unotools/source/config/optionsdlg.cxx b/unotools/source/config/optionsdlg.cxx
index f5f453f160e7..52897278be7c 100644
--- a/unotools/source/config/optionsdlg.cxx
+++ b/unotools/source/config/optionsdlg.cxx
@@ -25,6 +25,7 @@
 
 #include "itemholder1.hxx"
 
+#include <string_view>
 #include <unordered_map>
 
 using namespace utl;
@@ -48,7 +49,7 @@ private:
     OptionNodeList  m_aOptionNodeList;
 
     enum NodeType{ NT_Group, NT_Page, NT_Option };
-    void            ReadNode( const OUString& _rNode, NodeType _eType );
+    void            ReadNode( std::u16string_view _rNode, NodeType _eType );
     bool        IsHidden( const OUString& _rPath ) const;
 
     virtual void    ImplCommit() override;
@@ -60,12 +61,12 @@ public:
 
     static ::osl::Mutex & getInitMutex();
 
-    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;
 };
 
 namespace
@@ -102,7 +103,7 @@ void SvtOptionsDlgOptions_Impl::Notify( const Sequence< OUString >& )
     // nothing to notify
 }
 
-void SvtOptionsDlgOptions_Impl::ReadNode( const OUString& _rNode, NodeType _eType )
+void SvtOptionsDlgOptions_Impl::ReadNode( std::u16string_view _rNode, NodeType _eType )
 {
     OUString sNode( _rNode + g_sPathDelimiter );
     OUString sSet;
@@ -152,17 +153,17 @@ void SvtOptionsDlgOptions_Impl::ReadNode( const OUString& _rNode, NodeType _eTyp
     }
 }
 
-static OUString getGroupPath( const OUString& _rGroup )
+static OUString getGroupPath( std::u16string_view _rGroup )
 {
-    return OUString( ROOT_NODE "/" + _rGroup + "/" );
+    return OUString( OUString::Concat(ROOT_NODE "/") + _rGroup + "/" );
 }
-static OUString getPagePath( const OUString& _rPage )
+static OUString getPagePath( std::u16string_view _rPage )
 {
-    return OUString( PAGES_NODE "/" + _rPage + "/" );
+    return OUString( OUString::Concat(PAGES_NODE "/") + _rPage + "/" );
 }
-static OUString getOptionPath( const OUString& _rOption )
+static OUString getOptionPath( std::u16string_view _rOption )
 {
-    return OUString( OPTIONS_NODE "/" + _rOption + "/" );
+    return OUString( OUString::Concat(OPTIONS_NODE "/") + _rOption + "/" );
 }
 
 bool SvtOptionsDlgOptions_Impl::IsHidden( const OUString& _rPath ) const
@@ -174,18 +175,18 @@ bool SvtOptionsDlgOptions_Impl::IsHidden( const OUString& _rPath ) const
     return bRet;
 }
 
-bool SvtOptionsDlgOptions_Impl::IsGroupHidden( const OUString& _rGroup ) const
+bool SvtOptionsDlgOptions_Impl::IsGroupHidden( std::u16string_view _rGroup ) const
 {
     return IsHidden( getGroupPath( _rGroup ) );
 }
 
-bool SvtOptionsDlgOptions_Impl::IsPageHidden( const OUString& _rPage, const OUString& _rGroup ) const
+bool SvtOptionsDlgOptions_Impl::IsPageHidden( std::u16string_view _rPage, std::u16string_view _rGroup ) const
 {
     return IsHidden( getGroupPath( _rGroup  ) + getPagePath( _rPage ) );
 }
 
 bool SvtOptionsDlgOptions_Impl::IsOptionHidden(
-    const OUString& _rOption, const OUString& _rPage, const OUString& _rGroup ) const
+    std::u16string_view _rOption, std::u16string_view _rPage, std::u16string_view _rGroup ) const
 {
     return IsHidden( getGroupPath( _rGroup  ) + getPagePath( _rPage ) + getOptionPath( _rOption ) );
 }
@@ -217,18 +218,19 @@ SvtOptionsDialogOptions::~SvtOptionsDialogOptions()
     }
 }
 
-bool SvtOptionsDialogOptions::IsGroupHidden( const OUString& _rGroup ) const
+bool SvtOptionsDialogOptions::IsGroupHidden( std::u16string_view _rGroup ) const
 {
     return m_pImp->IsGroupHidden( _rGroup );
 }
 
-bool SvtOptionsDialogOptions::IsPageHidden( const OUString& _rPage, const OUString& _rGroup ) const
+bool SvtOptionsDialogOptions::IsPageHidden(
+    std::u16string_view _rPage, std::u16string_view _rGroup ) const
 {
     return m_pImp->IsPageHidden( _rPage, _rGroup );
 }
 
 bool SvtOptionsDialogOptions::IsOptionHidden(
-    const OUString& _rOption, const OUString& _rPage, const OUString& _rGroup ) const
+    std::u16string_view _rOption, std::u16string_view _rPage, std::u16string_view _rGroup ) const
 {
     return m_pImp->IsOptionHidden( _rOption, _rPage, _rGroup );
 }