Simplify loplugin:stringviewparam comparison operator handling

In practice, it works fine to look at all of them, regardless of actual argument
types.

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

8 files changed, 61 insertions, 49 deletions

diff --git a/framework/inc/uielement/menubarmerger.hxx b/framework/inc/uielement/menubarmerger.hxx
index 910bc58f2014..8de837c5e81e 100644
--- a/framework/inc/uielement/menubarmerger.hxx
+++ b/framework/inc/uielement/menubarmerger.hxx
@@ -75,14 +75,14 @@ namespace MenuBarMerger
         bool       ProcessMergeOperation( Menu*                     pMenu,
                                                  sal_uInt16                nPos,
                                                  sal_uInt16&               rItemId,
-                                                 const OUString&    rMergeCommand,
+                                                 std::u16string_view rMergeCommand,
                                                  const OUString&    rMergeCommandParameter,
                                                  const OUString&    rModuleIdentifier,
                                                  const AddonMenuContainer& rAddonMenuItems );
         bool       ProcessFallbackOperation( const ReferencePathInfo&                aRefPathInfo,
                                                     sal_uInt16&                             rItemId,
-                                                    const OUString&                  rMergeCommand,
-                                                    const OUString&                  rMergeFallback,
+                                                    std::u16string_view              rMergeCommand,
+                                                    std::u16string_view              rMergeFallback,
                                                     const ::std::vector< OUString >& rReferencePath,
                                                     std::u16string_view              rModuleIdentifier,
                                                     const AddonMenuContainer&               rAddonMenuItems );
diff --git a/framework/inc/uielement/statusbarmerger.hxx b/framework/inc/uielement/statusbarmerger.hxx
index d7fecfaa881e..ae7543be4360 100644
--- a/framework/inc/uielement/statusbarmerger.hxx
+++ b/framework/inc/uielement/statusbarmerger.hxx
@@ -60,13 +60,13 @@ namespace StatusbarMerger
     bool ProcessMergeOperation( StatusBar* pStatusbar,
                                        sal_uInt16 nPos,
                                        sal_uInt16& rItemId,
-                                       const OUString& rMergeCommand,
+                                       std::u16string_view rMergeCommand,
                                        const OUString& rMergeCommandParameter,
                                        const AddonStatusbarItemContainer& rItems );
 
     bool ProcessMergeFallback( StatusBar* pStatusbar,
                                       sal_uInt16& rItemId,
-                                      const OUString& rMergeCommand,
+                                      std::u16string_view rMergeCommand,
                                       std::u16string_view rMergeFallback,
                                       const AddonStatusbarItemContainer& rItems );
 }
diff --git a/framework/inc/uielement/toolbarmerger.hxx b/framework/inc/uielement/toolbarmerger.hxx
index 482b730aa749..b62e3be6972c 100644
--- a/framework/inc/uielement/toolbarmerger.hxx
+++ b/framework/inc/uielement/toolbarmerger.hxx
@@ -20,6 +20,10 @@
 #ifndef INCLUDED_FRAMEWORK_INC_UIELEMENT_TOOLBARMERGER_HXX
 #define INCLUDED_FRAMEWORK_INC_UIELEMENT_TOOLBARMERGER_HXX
 
+#include <sal/config.h>
+
+#include <string_view>
+
 #include <uielement/commandinfo.hxx>
 
 #include <com/sun/star/beans/PropertyValue.hpp>
@@ -80,7 +84,7 @@ class ToolBarMerger
                                                  sal_uInt16&               rItemId,
                                                  CommandToInfoMap&         rCommandMap,
                                                  std::u16string_view       rModuleIdentifier,
-                                                 const OUString&           rMergeCommand,
+                                                 std::u16string_view       rMergeCommand,
                                                  const OUString&           rMergeCommandParameter,
                                                  const AddonToolbarItemContainer& rItems );
 
@@ -88,8 +92,8 @@ class ToolBarMerger
                                                 sal_uInt16&                      rItemId,
                                                 CommandToInfoMap&                rCommandMap,
                                                 std::u16string_view       rModuleIdentifier,
-                                                const OUString&           rMergeCommand,
-                                                const OUString&           rMergeFallback,
+                                                std::u16string_view       rMergeCommand,
+                                                std::u16string_view       rMergeFallback,
                                                 const AddonToolbarItemContainer& rItems );
 
         static void       MergeItems( ToolBox*                  pToolbar,
@@ -118,7 +122,7 @@ class ToolBarMerger
             const OUString& rCommandURL,
             sal_uInt16      nId,
             sal_uInt16      nWidth,
-            const OUString& rControlType );
+            std::u16string_view rControlType );
 
         static void CreateToolbarItem( ToolBox* pToolbox,
                                        ToolBox::ImplToolItems::size_type nPos,
diff --git a/framework/source/accelerators/acceleratorconfiguration.cxx b/framework/source/accelerators/acceleratorconfiguration.cxx
index e813213a92a0..abb929be4230 100644
--- a/framework/source/accelerators/acceleratorconfiguration.cxx
+++ b/framework/source/accelerators/acceleratorconfiguration.cxx
@@ -1206,7 +1206,7 @@ void XCUBasedAcceleratorConfiguration::removeKeyFromConfiguration( const css::aw
     xContainer->removeByName(sKey);
 }
 
-void XCUBasedAcceleratorConfiguration::reloadChanged( const OUString& sPrimarySecondary, const OUString& sGlobalModules, const OUString& sModule, const OUString& sKey )
+void XCUBasedAcceleratorConfiguration::reloadChanged( const OUString& sPrimarySecondary, std::u16string_view sGlobalModules, const OUString& sModule, const OUString& sKey )
 {
     css::uno::Reference< css::container::XNameAccess > xAccess;
     css::uno::Reference< css::container::XNameContainer > xContainer;
diff --git a/framework/source/inc/accelerators/acceleratorconfiguration.hxx b/framework/source/inc/accelerators/acceleratorconfiguration.hxx
index 6f9daa38b14b..38d9eaff9e98 100644
--- a/framework/source/inc/accelerators/acceleratorconfiguration.hxx
+++ b/framework/source/inc/accelerators/acceleratorconfiguration.hxx
@@ -20,6 +20,10 @@
 #ifndef INCLUDED_FRAMEWORK_SOURCE_INC_ACCELERATORS_ACCELERATORCONFIGURATION_HXX
 #define INCLUDED_FRAMEWORK_SOURCE_INC_ACCELERATORS_ACCELERATORCONFIGURATION_HXX
 
+#include <sal/config.h>
+
+#include <string_view>
+
 #include <accelerators/presethandler.hxx>
 #include <accelerators/acceleratorcache.hxx>
 
@@ -299,7 +303,7 @@ class XCUBasedAcceleratorConfiguration : public  ::cppu::WeakImplHelper<
         void insertKeyToConfiguration(const css::awt::KeyEvent& aKeyEvent, const OUString& sCommand, const bool bPreferred);
         void removeKeyFromConfiguration(const css::awt::KeyEvent& aKeyEvent, const bool bPreferred);
 
-        void reloadChanged(const OUString& sPrimarySecondary, const OUString& sGlobalModules, const OUString& sModule, const OUString& sKey);
+        void reloadChanged(const OUString& sPrimarySecondary, std::u16string_view sGlobalModules, const OUString& sModule, const OUString& sKey);
         AcceleratorCache& impl_getCFG(bool bPreferred, bool bWriteAccessRequested = false);
 
 };
diff --git a/framework/source/uielement/menubarmerger.cxx b/framework/source/uielement/menubarmerger.cxx
index 1d59a7e152a6..b353fc954d56 100644
--- a/framework/source/uielement/menubarmerger.cxx
+++ b/framework/source/uielement/menubarmerger.cxx
@@ -25,13 +25,13 @@ using namespace ::com::sun::star;
 
 const char SEPARATOR_STRING[]               = "private:separator";
 
-const char MERGECOMMAND_ADDAFTER[]          = "AddAfter";
-const char MERGECOMMAND_ADDBEFORE[]         = "AddBefore";
-const char MERGECOMMAND_REPLACE[]           = "Replace";
-const char MERGECOMMAND_REMOVE[]            = "Remove";
+const char16_t MERGECOMMAND_ADDAFTER[]      = u"AddAfter";
+const char16_t MERGECOMMAND_ADDBEFORE[]     = u"AddBefore";
+const char16_t MERGECOMMAND_REPLACE[]       = u"Replace";
+const char16_t MERGECOMMAND_REMOVE[]        = u"Remove";
 
-const char MERGEFALLBACK_ADDPATH[]           = "AddPath";
-const char MERGEFALLBACK_IGNORE[]            = "Ignore";
+const char16_t MERGEFALLBACK_ADDPATH[]       = u"AddPath";
+const char16_t MERGEFALLBACK_IGNORE[]        = u"Ignore";
 
 namespace framework
 {
@@ -275,7 +275,7 @@ bool MenuBarMerger::ProcessMergeOperation(
     Menu*                     pMenu,
     sal_uInt16                nPos,
     sal_uInt16&               nItemId,
-    const OUString&    rMergeCommand,
+    std::u16string_view rMergeCommand,
     const OUString&    rMergeCommandParameter,
     const OUString&    rModuleIdentifier,
     const AddonMenuContainer& rAddonMenuItems )
@@ -307,8 +307,8 @@ bool MenuBarMerger::ProcessMergeOperation(
 bool MenuBarMerger::ProcessFallbackOperation(
     const ReferencePathInfo&                aRefPathInfo,
     sal_uInt16&                             rItemId,
-    const OUString&                  rMergeCommand,
-    const OUString&                  rMergeFallback,
+    std::u16string_view              rMergeCommand,
+    std::u16string_view              rMergeFallback,
     const ::std::vector< OUString >& rReferencePath,
     const std::u16string_view        rModuleIdentifier,
     const AddonMenuContainer&               rAddonMenuItems )
diff --git a/framework/source/uielement/statusbarmerger.cxx b/framework/source/uielement/statusbarmerger.cxx
index b9f21c5f8a89..38e266009aca 100644
--- a/framework/source/uielement/statusbarmerger.cxx
+++ b/framework/source/uielement/statusbarmerger.cxx
@@ -25,10 +25,10 @@ namespace framework
 {
 namespace {
 
-const char MERGECOMMAND_ADDAFTER[]       = "AddAfter";
-const char MERGECOMMAND_ADDBEFORE[]      = "AddBefore";
-const char MERGECOMMAND_REPLACE[]        = "Replace";
-const char MERGECOMMAND_REMOVE[]         = "Remove";
+const char16_t MERGECOMMAND_ADDAFTER[]   = u"AddAfter";
+const char16_t MERGECOMMAND_ADDBEFORE[]  = u"AddBefore";
+const char16_t MERGECOMMAND_REPLACE[]    = u"Replace";
+const char16_t MERGECOMMAND_REMOVE[]     = u"Remove";
 
 void lcl_ConvertSequenceToValues(
     const Sequence< PropertyValue > &rSequence,
@@ -189,7 +189,7 @@ bool StatusbarMerger::ProcessMergeOperation(
     StatusBar* pStatusbar,
     sal_uInt16 nPos,
     sal_uInt16& rItemId,
-    const OUString& rMergeCommand,
+    std::u16string_view rMergeCommand,
     const OUString& rMergeCommandParameter,
     const AddonStatusbarItemContainer& rItems )
 {
@@ -208,7 +208,7 @@ bool StatusbarMerger::ProcessMergeOperation(
 bool StatusbarMerger::ProcessMergeFallback(
     StatusBar* pStatusbar,
     sal_uInt16& rItemId,
-    const OUString& rMergeCommand,
+    std::u16string_view rMergeCommand,
     std::u16string_view rMergeFallback,
     const AddonStatusbarItemContainer& rItems )
 {
diff --git a/framework/source/uielement/toolbarmerger.cxx b/framework/source/uielement/toolbarmerger.cxx
index 89847cf47135..294e34cbc30f 100644
--- a/framework/source/uielement/toolbarmerger.cxx
+++ b/framework/source/uielement/toolbarmerger.cxx
@@ -17,6 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <sal/config.h>
+
+#include <string_view>
+
 #include <uielement/toolbarmerger.hxx>
 #include <framework/generictoolbarcontroller.hxx>
 
@@ -40,25 +44,25 @@ const char MERGE_TOOLBAR_TARGET[]          = "Target";
 const char MERGE_TOOLBAR_CONTROLTYPE[]     = "ControlType";
 const char MERGE_TOOLBAR_WIDTH[]           = "Width";
 
-const char MERGECOMMAND_ADDAFTER[]         = "AddAfter";
-const char MERGECOMMAND_ADDBEFORE[]        = "AddBefore";
-const char MERGECOMMAND_REPLACE[]          = "Replace";
-const char MERGECOMMAND_REMOVE[]           = "Remove";
-
-const char MERGEFALLBACK_ADDLAST[]         = "AddLast";
-const char MERGEFALLBACK_ADDFIRST[]        = "AddFirst";
-const char MERGEFALLBACK_IGNORE[]          = "Ignore";
-
-const char TOOLBARCONTROLLER_BUTTON[]      = "Button";
-const char TOOLBARCONTROLLER_COMBOBOX[]    = "Combobox";
-const char TOOLBARCONTROLLER_EDIT[]        = "Editfield";
-const char TOOLBARCONTROLLER_SPINFIELD[]   = "Spinfield";
-const char TOOLBARCONTROLLER_IMGBUTTON[]   = "ImageButton";
-const char TOOLBARCONTROLLER_DROPDOWNBOX[] = "Dropdownbox";
-const char TOOLBARCONTROLLER_DROPDOWNBTN[] = "DropdownButton";
-const char TOOLBARCONTROLLER_TOGGLEDDBTN[] = "ToggleDropdownButton";
-const char TOOLBARCONTROLLER_FIXEDIMAGE[]  = "FixedImage";
-const char TOOLBARCONTROLLER_FIXEDTEXT[]   = "FixedText";
+const char16_t MERGECOMMAND_ADDAFTER[]     = u"AddAfter";
+const char16_t MERGECOMMAND_ADDBEFORE[]    = u"AddBefore";
+const char16_t MERGECOMMAND_REPLACE[]      = u"Replace";
+const char16_t MERGECOMMAND_REMOVE[]       = u"Remove";
+
+const char16_t MERGEFALLBACK_ADDLAST[]     = u"AddLast";
+const char16_t MERGEFALLBACK_ADDFIRST[]    = u"AddFirst";
+const char16_t MERGEFALLBACK_IGNORE[]      = u"Ignore";
+
+const char16_t TOOLBARCONTROLLER_BUTTON[]  = u"Button";
+const char16_t TOOLBARCONTROLLER_COMBOBOX[] = u"Combobox";
+const char16_t TOOLBARCONTROLLER_EDIT[]    = u"Editfield";
+const char16_t TOOLBARCONTROLLER_SPINFIELD[] = u"Spinfield";
+const char16_t TOOLBARCONTROLLER_IMGBUTTON[] = u"ImageButton";
+const char16_t TOOLBARCONTROLLER_DROPDOWNBOX[] = u"Dropdownbox";
+const char16_t TOOLBARCONTROLLER_DROPDOWNBTN[] = u"DropdownButton";
+const char16_t TOOLBARCONTROLLER_TOGGLEDDBTN[] = u"ToggleDropdownButton";
+const char16_t TOOLBARCONTROLLER_FIXEDIMAGE[] = u"FixedImage";
+const char16_t TOOLBARCONTROLLER_FIXEDTEXT[] = u"FixedText";
 
 const char   TOOLBOXITEM_SEPARATOR_STR[]   = "private:separator";
 
@@ -302,7 +306,7 @@ bool ToolBarMerger::ProcessMergeOperation(
     sal_uInt16&                            rItemId,
     CommandToInfoMap&                      rCommandMap,
     std::u16string_view                    rModuleIdentifier,
-    const OUString&                        rMergeCommand,
+    std::u16string_view                    rMergeCommand,
     const OUString&                        rMergeCommandParameter,
     const AddonToolbarItemContainer&       rItems )
 {
@@ -365,8 +369,8 @@ bool ToolBarMerger::ProcessMergeFallback(
     sal_uInt16&                      rItemId,
     CommandToInfoMap&                rCommandMap,
     std::u16string_view       rModuleIdentifier,
-    const OUString&           rMergeCommand,
-    const OUString&           rMergeFallback,
+    std::u16string_view       rMergeCommand,
+    std::u16string_view       rMergeFallback,
     const AddonToolbarItemContainer& rItems )
 {
     if (( rMergeFallback == MERGEFALLBACK_IGNORE ) ||
@@ -585,7 +589,7 @@ void ToolBarMerger::RemoveItems(
     const OUString& rCommandURL,
     sal_uInt16             nId,
     sal_uInt16             nWidth,
-    const OUString& rControlType )
+    std::u16string_view rControlType )
 {
     ::cppu::OWeakObject* pResult( nullptr );