loplugin:stringviewparam convert methods using indexOf

.. and lastIndexOf, which convert to find and rfind

Change-Id: I6c4156cf904774c0d867f85a4c2785dba7593f62
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132445
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

9 files changed, 17 insertions, 19 deletions

diff --git a/framework/inc/addonmenu.hxx b/framework/inc/addonmenu.hxx
index 461f81af2fc6..d6f244cdca4a 100644
--- a/framework/inc/addonmenu.hxx
+++ b/framework/inc/addonmenu.hxx
@@ -41,7 +41,7 @@ class AddonMenuManager
         static bool       HasAddonMenuElements();
 
         // Check if the context string matches the provided xModel context
-        static bool IsCorrectContext(std::u16string_view rModuleIdentifier, const OUString& rContext);
+        static bool IsCorrectContext(std::u16string_view rModuleIdentifier, std::u16string_view rContext);
 
         // Create the Add-Ons menu
         static VclPtr<PopupMenu> CreateAddonMenu( const css::uno::Reference< css::frame::XFrame >& rFrame );
diff --git a/framework/inc/uielement/menubarmerger.hxx b/framework/inc/uielement/menubarmerger.hxx
index 8ff81de4580a..3e2d4addd408 100644
--- a/framework/inc/uielement/menubarmerger.hxx
+++ b/framework/inc/uielement/menubarmerger.hxx
@@ -60,7 +60,7 @@ struct ReferencePathInfo
 namespace MenuBarMerger
 {
         bool       IsCorrectContext(
-            const OUString& aContext, std::u16string_view aModuleIdentifier );
+            std::u16string_view aContext, std::u16string_view aModuleIdentifier );
 
         void       RetrieveReferencePath( const OUString&,
                                                  std::vector< OUString >& aReferencePath );
diff --git a/framework/inc/uielement/toolbarmerger.hxx b/framework/inc/uielement/toolbarmerger.hxx
index ccfa73ad4d9e..157e02170340 100644
--- a/framework/inc/uielement/toolbarmerger.hxx
+++ b/framework/inc/uielement/toolbarmerger.hxx
@@ -62,7 +62,7 @@ struct ReferenceToolbarPathInfo
 class ToolBarMerger
 {
     public:
-        static bool       IsCorrectContext( const OUString& aContext, std::u16string_view aModuleIdentifier );
+        static bool       IsCorrectContext( std::u16string_view aContext, std::u16string_view aModuleIdentifier );
 
         static void       ConvertSeqSeqToVector( const css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > >& rSequence,
                                                  AddonToolbarItemContainer& rContainer );
diff --git a/framework/source/fwe/classes/addonmenu.cxx b/framework/source/fwe/classes/addonmenu.cxx
index 582460a0ed2c..423a157f8be8 100644
--- a/framework/source/fwe/classes/addonmenu.cxx
+++ b/framework/source/fwe/classes/addonmenu.cxx
@@ -281,15 +281,14 @@ void AddonMenuManager::GetMenuEntry( const Sequence< PropertyValue >& rAddonMenu
 }
 
 // Check if the context string matches the provided xModel context
-bool AddonMenuManager::IsCorrectContext( std::u16string_view rModuleIdentifier, const OUString& rContext )
+bool AddonMenuManager::IsCorrectContext( std::u16string_view rModuleIdentifier, std::u16string_view rContext )
 {
-    if ( rContext.isEmpty() )
+    if ( rContext.empty() )
         return true;
 
     if ( !rModuleIdentifier.empty() )
     {
-        sal_Int32 nIndex = rContext.indexOf( rModuleIdentifier );
-        return ( nIndex >= 0 );
+        return rContext.find( rModuleIdentifier ) != std::u16string_view::npos;
     }
 
     return false;
diff --git a/framework/source/inc/loadenv/targethelper.hxx b/framework/source/inc/loadenv/targethelper.hxx
index e9eff6126174..1f0d93d7edce 100644
--- a/framework/source/inc/loadenv/targethelper.hxx
+++ b/framework/source/inc/loadenv/targethelper.hxx
@@ -82,7 +82,7 @@ class TargetHelper
             @param  sName
                     the new frame name, which should be checked.
          */
-        static bool isValidNameForFrame(const OUString& sName);
+        static bool isValidNameForFrame(std::u16string_view sName);
 };
 
 } // namespace framework
diff --git a/framework/source/loadenv/targethelper.cxx b/framework/source/loadenv/targethelper.cxx
index d531f81bc04f..7c06521da6d3 100644
--- a/framework/source/loadenv/targethelper.cxx
+++ b/framework/source/loadenv/targethelper.cxx
@@ -43,12 +43,12 @@ bool TargetHelper::matchSpecialTarget(std::u16string_view sCheckTarget  ,
     }
 }
 
-bool TargetHelper::isValidNameForFrame(const OUString& sName)
+bool TargetHelper::isValidNameForFrame(std::u16string_view sName)
 {
     // some special targets are really special ones :-)
     // E.g. the are really used to locate one frame inside the frame tree.
     if (
-        (sName.isEmpty()                                    ) ||
+        (sName.empty()                                    ) ||
         (TargetHelper::matchSpecialTarget(sName, ESpecialTarget::HelpTask)) ||
         (TargetHelper::matchSpecialTarget(sName, ESpecialTarget::Beamer)  )
        )
@@ -56,7 +56,7 @@ bool TargetHelper::isValidNameForFrame(const OUString& sName)
 
     // all other names must be checked more general
     // special targets starts with a "_".
-    return (sName.indexOf('_') != 0);
+    return (sName.find('_') != 0);
 }
 
 } // namespace framework
diff --git a/framework/source/uielement/menubarmerger.cxx b/framework/source/uielement/menubarmerger.cxx
index b353fc954d56..175cbe8bcde0 100644
--- a/framework/source/uielement/menubarmerger.cxx
+++ b/framework/source/uielement/menubarmerger.cxx
@@ -56,9 +56,9 @@ namespace framework
 
 */
 bool MenuBarMerger::IsCorrectContext(
-    const OUString& rContext, std::u16string_view rModuleIdentifier )
+    std::u16string_view rContext, std::u16string_view rModuleIdentifier )
 {
-    return ( rContext.isEmpty() || ( rContext.indexOf( rModuleIdentifier ) >= 0 ));
+    return ( rContext.empty() || ( rContext.find( rModuleIdentifier ) != std::u16string_view::npos ));
 }
 
 void MenuBarMerger::RetrieveReferencePath(
diff --git a/framework/source/uielement/toolbarmerger.cxx b/framework/source/uielement/toolbarmerger.cxx
index faba3cb4e8d9..9e434f672c2d 100644
--- a/framework/source/uielement/toolbarmerger.cxx
+++ b/framework/source/uielement/toolbarmerger.cxx
@@ -92,10 +92,10 @@ using namespace ::com::sun::star;
 
 */
 bool ToolBarMerger::IsCorrectContext(
-    const OUString& rContext,
+    std::u16string_view rContext,
     std::u16string_view rModuleIdentifier )
 {
-    return ( rContext.isEmpty() || ( rContext.indexOf( rModuleIdentifier ) >= 0 ));
+    return ( rContext.empty() || ( rContext.find( rModuleIdentifier ) != std::u16string_view::npos ));
 }
 
 /**
diff --git a/framework/source/uifactory/addonstoolbarfactory.cxx b/framework/source/uifactory/addonstoolbarfactory.cxx
index 655cf1843491..b9a1c95c90eb 100644
--- a/framework/source/uifactory/addonstoolbarfactory.cxx
+++ b/framework/source/uifactory/addonstoolbarfactory.cxx
@@ -83,15 +83,14 @@ AddonsToolBarFactory::AddonsToolBarFactory(
 {
 }
 
-bool IsCorrectContext( std::u16string_view rModuleIdentifier, const OUString& aContextList )
+bool IsCorrectContext( std::u16string_view rModuleIdentifier, std::u16string_view aContextList )
 {
-    if ( aContextList.isEmpty() )
+    if ( aContextList.empty() )
         return true;
 
     if ( !rModuleIdentifier.empty() )
     {
-        sal_Int32 nIndex = aContextList.indexOf( rModuleIdentifier );
-        return ( nIndex >= 0 );
+        return aContextList.find( rModuleIdentifier ) != std::u16string_view::npos;
     }
 
     return false;