diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2020-12-22 14:08:08 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2020-12-27 11:26:32 +0100 |
| commit | 9013dc1650aa8400f63da5f584df9058b1740eb3 (patch) | |
| tree | a1ba4f196070459d5d823d942e5a0a121b09ea3d /framework/inc | |
| parent | db97e00893c204226a2eab2d95c9837bce3cddb0 (diff) | |
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>
Diffstat (limited to 'framework/inc')
| -rw-r--r-- | framework/inc/uielement/menubarmerger.hxx | 6 | ||||
| -rw-r--r-- | framework/inc/uielement/statusbarmerger.hxx | 4 | ||||
| -rw-r--r-- | framework/inc/uielement/toolbarmerger.hxx | 12 |
3 files changed, 13 insertions, 9 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, |