loplugin:stringviewparam extend to comparison operators

which means that some call sites have to change to use
unicode string literals i.e. u"foo" instead of "foo"

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

15 files changed, 61 insertions, 61 deletions

diff --git a/framework/inc/jobs/helponstartup.hxx b/framework/inc/jobs/helponstartup.hxx
index 4c070627dbae..d22e8b98071f 100644
--- a/framework/inc/jobs/helponstartup.hxx
+++ b/framework/inc/jobs/helponstartup.hxx
@@ -137,7 +137,7 @@ class HelpOnStartup final : public ::cppu::WeakImplHelper< css::lang::XServiceIn
                     sal_True if the given URL is any default one ...
                     sal_False otherwise.
          */
-        bool its_isHelpUrlADefaultOne(const OUString& sHelpURL);
+        bool its_isHelpUrlADefaultOne(std::u16string_view sHelpURL);
 
         /** @short  checks, if the help module should be shown automatically for the
                     currently opened office module.
diff --git a/framework/inc/targets.h b/framework/inc/targets.h
index a15db1e84851..b0bf251f0e8d 100644
--- a/framework/inc/targets.h
+++ b/framework/inc/targets.h
@@ -29,7 +29,7 @@ namespace framework{
 #define SPECIALTARGET_TOP             "_top"                              // Search at our parents for the first task (if any exist) or a frame without a parent.
 #define SPECIALTARGET_BLANK           "_blank"                            // Create a new task.
 #define SPECIALTARGET_DEFAULT         "_default"                          // Create a new task or recycle an existing one
-#define SPECIALTARGET_BEAMER          "_beamer"                           // special frame in hierarchy
+#define SPECIALTARGET_BEAMER          u"_beamer"                           // special frame in hierarchy
 #define SPECIALTARGET_HELPTASK        "OFFICE_HELP_TASK"                  // special name for our help task
 
 }       //  namespace framework
diff --git a/framework/inc/uielement/menubarmerger.hxx b/framework/inc/uielement/menubarmerger.hxx
index 8646563b86d8..910bc58f2014 100644
--- a/framework/inc/uielement/menubarmerger.hxx
+++ b/framework/inc/uielement/menubarmerger.hxx
@@ -66,7 +66,7 @@ namespace MenuBarMerger
         void       RetrieveReferencePath( const OUString&,
                                                  std::vector< OUString >& aReferencePath );
         ReferencePathInfo FindReferencePath( const std::vector< OUString >& aReferencePath, Menu* pMenu );
-        sal_uInt16 FindMenuItem( const OUString& rCmd,
+        sal_uInt16 FindMenuItem( std::u16string_view rCmd,
                                  Menu const * pMenu );
         void       GetMenuEntry( const css::uno::Sequence< css::beans::PropertyValue >& rAddonMenuEntry,
                                         AddonMenuItem& aAddonMenu );
diff --git a/framework/inc/uielement/statusbarmerger.hxx b/framework/inc/uielement/statusbarmerger.hxx
index 497862fae127..964559de777e 100644
--- a/framework/inc/uielement/statusbarmerger.hxx
+++ b/framework/inc/uielement/statusbarmerger.hxx
@@ -55,7 +55,7 @@ namespace StatusbarMerger
                                        AddonStatusbarItemContainer& rContainer );
 
     sal_uInt16 FindReferencePos( StatusBar* pStatusbar,
-                                        const OUString& rReferencePoint );
+                                        std::u16string_view rReferencePoint );
 
     bool ProcessMergeOperation( StatusBar* pStatusbar,
                                        sal_uInt16 nPos,
diff --git a/framework/inc/uielement/toolbarmerger.hxx b/framework/inc/uielement/toolbarmerger.hxx
index 03b9a1d8325e..482b730aa749 100644
--- a/framework/inc/uielement/toolbarmerger.hxx
+++ b/framework/inc/uielement/toolbarmerger.hxx
@@ -73,7 +73,7 @@ class ToolBarMerger
                                                    sal_uInt16& rWidth );
 
         static ReferenceToolbarPathInfo FindReferencePoint( const ToolBox* pToolbar,
-                                                            const OUString& rReferencePoint );
+                                                            std::u16string_view rReferencePoint );
 
         static bool       ProcessMergeOperation( ToolBox*                  pToolbar,
                                                  ToolBox::ImplToolItems::size_type nPos,
diff --git a/framework/source/classes/framecontainer.cxx b/framework/source/classes/framecontainer.cxx
index 4063ed938001..a23e3633e149 100644
--- a/framework/source/classes/framecontainer.cxx
+++ b/framework/source/classes/framecontainer.cxx
@@ -273,7 +273,7 @@ FrameContainer::searchOnAllChildrens(const OUString& sName) const
     @threadsafe yes
  *****************************************************************************************************************/
 css::uno::Reference<css::frame::XFrame>
-FrameContainer::searchOnDirectChildrens(const OUString& sName) const
+FrameContainer::searchOnDirectChildrens(std::u16string_view sName) const
 {
     SolarMutexGuard g;
     css::uno::Reference<css::frame::XFrame> xSearchedFrame;
diff --git a/framework/source/fwe/classes/addonmenu.cxx b/framework/source/fwe/classes/addonmenu.cxx
index c7a52f96747a..582460a0ed2c 100644
--- a/framework/source/fwe/classes/addonmenu.cxx
+++ b/framework/source/fwe/classes/addonmenu.cxx
@@ -70,7 +70,7 @@ sal_uInt16 AddonMenuManager::GetNextPos( sal_uInt16 nPos )
     return ( nPos == MENU_APPEND ) ? MENU_APPEND : ( nPos+1 );
 }
 
-static sal_uInt16 FindMenuId( Menu const * pMenu, const OUString& aCommand )
+static sal_uInt16 FindMenuId( Menu const * pMenu, std::u16string_view aCommand )
 {
     sal_uInt16 nPos = 0;
     OUString aCmd;
@@ -93,7 +93,7 @@ void AddonMenuManager::MergeAddonHelpMenu( const Reference< XFrame >& rFrame,
         return;
 
     PopupMenu* pHelpMenu(nullptr);
-    sal_uInt16 nId = FindMenuId(pMergeMenuBar, ".uno:HelpMenu");
+    sal_uInt16 nId = FindMenuId(pMergeMenuBar, u".uno:HelpMenu");
     if ( nId != USHRT_MAX )
         pHelpMenu = pMergeMenuBar->GetPopupMenu( nId );
 
@@ -107,7 +107,7 @@ void AddonMenuManager::MergeAddonHelpMenu( const Reference< XFrame >& rFrame,
     AddonsOptions aOptions;
 
     // try to detect the about menu item with the command URL
-    nId = FindMenuId(pHelpMenu, ".uno:About");
+    nId = FindMenuId(pHelpMenu, u".uno:About");
     sal_uInt16 nInsPos = pHelpMenu->GetItemPos( nId );
 
     const Sequence< Sequence< PropertyValue > >& rAddonHelpMenuEntries = aOptions.GetAddonsHelpMenu();
diff --git a/framework/source/jobs/helponstartup.cxx b/framework/source/jobs/helponstartup.cxx
index b78c4ed50dad..43b94cfa8021 100644
--- a/framework/source/jobs/helponstartup.cxx
+++ b/framework/source/jobs/helponstartup.cxx
@@ -233,9 +233,9 @@ OUString HelpOnStartup::its_getCurrentHelpURL()
     return sCurrentHelpURL;
 }
 
-bool HelpOnStartup::its_isHelpUrlADefaultOne(const OUString& sHelpURL)
+bool HelpOnStartup::its_isHelpUrlADefaultOne(std::u16string_view sHelpURL)
 {
-    if (sHelpURL.isEmpty())
+    if (sHelpURL.empty())
         return false;
 
     // SAFE ->
diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.cxx b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
index 912675147086..154374ee0d56 100644
--- a/framework/source/layoutmanager/toolbarlayoutmanager.cxx
+++ b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
@@ -661,7 +661,7 @@ void ToolbarLayoutManager::destroyToolbars()
     }
 }
 
-bool ToolbarLayoutManager::showToolbar( const OUString& rResourceURL )
+bool ToolbarLayoutManager::showToolbar( std::u16string_view rResourceURL )
 {
     UIElement aUIElement = implts_findToolbar( rResourceURL );
 
@@ -692,7 +692,7 @@ bool ToolbarLayoutManager::showToolbar( const OUString& rResourceURL )
     return false;
 }
 
-bool ToolbarLayoutManager::hideToolbar( const OUString& rResourceURL )
+bool ToolbarLayoutManager::hideToolbar( std::u16string_view rResourceURL )
 {
     UIElement aUIElement = implts_findToolbar( rResourceURL );
 
@@ -795,7 +795,7 @@ void ToolbarLayoutManager::setVisible( bool bVisible )
         resetDockingArea();
 }
 
-bool ToolbarLayoutManager::dockToolbar( const OUString& rResourceURL, ui::DockingArea eDockingArea, const awt::Point& aPos )
+bool ToolbarLayoutManager::dockToolbar( std::u16string_view rResourceURL, ui::DockingArea eDockingArea, const awt::Point& aPos )
 {
     UIElement aUIElement = implts_findToolbar( rResourceURL );
 
@@ -1614,7 +1614,7 @@ void ToolbarLayoutManager::implts_writeWindowStateData( const UIElement& rElemen
                         LOOKUP PART FOR TOOLBARS
 ******************************************************************************/
 
-UIElement& ToolbarLayoutManager::impl_findToolbar( const OUString& aName )
+UIElement& ToolbarLayoutManager::impl_findToolbar( std::u16string_view aName )
 {
     static UIElement aEmptyElement;
 
@@ -1628,7 +1628,7 @@ UIElement& ToolbarLayoutManager::impl_findToolbar( const OUString& aName )
     return aEmptyElement;
 }
 
-UIElement ToolbarLayoutManager::implts_findToolbar( const OUString& aName )
+UIElement ToolbarLayoutManager::implts_findToolbar( std::u16string_view aName )
 {
     SolarMutexGuard g;
     return impl_findToolbar( aName );
@@ -1655,7 +1655,7 @@ UIElement ToolbarLayoutManager::implts_findToolbar( const uno::Reference< uno::X
     return aToolbar;
 }
 
-uno::Reference< awt::XWindow > ToolbarLayoutManager::implts_getXWindow( const OUString& aName )
+uno::Reference< awt::XWindow > ToolbarLayoutManager::implts_getXWindow( std::u16string_view aName )
 {
     uno::Reference< awt::XWindow > xWindow;
 
@@ -1672,7 +1672,7 @@ uno::Reference< awt::XWindow > ToolbarLayoutManager::implts_getXWindow( const OU
     return xWindow;
 }
 
-vcl::Window* ToolbarLayoutManager::implts_getWindow( const OUString& aName )
+vcl::Window* ToolbarLayoutManager::implts_getWindow( std::u16string_view aName )
 {
     uno::Reference< awt::XWindow > xWindow = implts_getXWindow( aName );
     VclPtr<vcl::Window> pWindow = VCLUnoHelper::GetWindow( xWindow );
@@ -2138,7 +2138,7 @@ void ToolbarLayoutManager::implts_getDockingAreaElementInfoOnSingleRowCol( ui::D
     ui::DockingArea DockingArea,
     const SingleRowColumnWindowData& rRowColumnWindowData,
     const ::Point& rMousePos,
-    const OUString& rExcludeElementName )
+    std::u16string_view rExcludeElementName )
 {
     ::tools::Rectangle aWinRect;
 
@@ -2186,7 +2186,7 @@ void ToolbarLayoutManager::implts_getDockingAreaElementInfoOnSingleRowCol( ui::D
     ui::DockingArea        eDockingArea,
     sal_Int32              nRowCol,
     const ::tools::Rectangle&     rDockedElementRect,
-    const OUString& rMovedElementName,
+    std::u16string_view rMovedElementName,
     const ::tools::Rectangle&     rMovedElementRect )
 {
     SingleRowColumnWindowData aRowColumnWindowData;
@@ -3916,7 +3916,7 @@ void SAL_CALL ToolbarLayoutManager::elementReplaced( const ui::ConfigurationEven
         pParentLayouter->requestLayout();
 }
 
-uno::Reference< ui::XUIElement > ToolbarLayoutManager::getToolbar( const OUString& aName )
+uno::Reference< ui::XUIElement > ToolbarLayoutManager::getToolbar( std::u16string_view aName )
 {
     return implts_findToolbar( aName ).m_xUIElement;
 }
@@ -3943,7 +3943,7 @@ uno::Sequence< uno::Reference< ui::XUIElement > > ToolbarLayoutManager::getToolb
     return aSeq;
 }
 
-bool ToolbarLayoutManager::floatToolbar( const OUString& rResourceURL )
+bool ToolbarLayoutManager::floatToolbar( std::u16string_view rResourceURL )
 {
     UIElement aUIElement = implts_findToolbar( rResourceURL );
     if ( aUIElement.m_xUIElement.is() )
@@ -3970,7 +3970,7 @@ bool ToolbarLayoutManager::floatToolbar( const OUString& rResourceURL )
     return false;
 }
 
-bool ToolbarLayoutManager::lockToolbar( const OUString& rResourceURL )
+bool ToolbarLayoutManager::lockToolbar( std::u16string_view rResourceURL )
 {
     UIElement aUIElement = implts_findToolbar( rResourceURL );
     if ( aUIElement.m_xUIElement.is() )
@@ -3997,7 +3997,7 @@ bool ToolbarLayoutManager::lockToolbar( const OUString& rResourceURL )
     return false;
 }
 
-bool ToolbarLayoutManager::unlockToolbar( const OUString& rResourceURL )
+bool ToolbarLayoutManager::unlockToolbar( std::u16string_view rResourceURL )
 {
     UIElement aUIElement = implts_findToolbar( rResourceURL );
     if ( aUIElement.m_xUIElement.is() )
@@ -4024,30 +4024,30 @@ bool ToolbarLayoutManager::unlockToolbar( const OUString& rResourceURL )
     return false;
 }
 
-bool ToolbarLayoutManager::isToolbarVisible( const OUString& rResourceURL )
+bool ToolbarLayoutManager::isToolbarVisible( std::u16string_view rResourceURL )
 {
     uno::Reference< awt::XWindow2 > xWindow2( implts_getXWindow( rResourceURL ), uno::UNO_QUERY );
     return ( xWindow2.is() && xWindow2->isVisible() );
 }
 
-bool ToolbarLayoutManager::isToolbarFloating( const OUString& rResourceURL )
+bool ToolbarLayoutManager::isToolbarFloating( std::u16string_view rResourceURL )
 {
     uno::Reference< awt::XDockableWindow > xDockWindow( implts_getXWindow( rResourceURL ), uno::UNO_QUERY );
     return ( xDockWindow.is() && xDockWindow->isFloating() );
 }
 
-bool ToolbarLayoutManager::isToolbarDocked( const OUString& rResourceURL )
+bool ToolbarLayoutManager::isToolbarDocked( std::u16string_view rResourceURL )
 {
     return !isToolbarFloating( rResourceURL );
 }
 
-bool ToolbarLayoutManager::isToolbarLocked( const OUString& rResourceURL )
+bool ToolbarLayoutManager::isToolbarLocked( std::u16string_view rResourceURL )
 {
     uno::Reference< awt::XDockableWindow > xDockWindow( implts_getXWindow( rResourceURL ), uno::UNO_QUERY );
     return ( xDockWindow.is() && xDockWindow->isLocked() );
 }
 
-awt::Size ToolbarLayoutManager::getToolbarSize( const OUString& rResourceURL )
+awt::Size ToolbarLayoutManager::getToolbarSize( std::u16string_view rResourceURL )
 {
     vcl::Window* pWindow = implts_getWindow( rResourceURL );
 
@@ -4064,7 +4064,7 @@ awt::Size ToolbarLayoutManager::getToolbarSize( const OUString& rResourceURL )
     return awt::Size();
 }
 
-awt::Point ToolbarLayoutManager::getToolbarPos( const OUString& rResourceURL )
+awt::Point ToolbarLayoutManager::getToolbarPos( std::u16string_view rResourceURL )
 {
     awt::Point aPos;
     UIElement  aUIElement = implts_findToolbar( rResourceURL );
@@ -4085,7 +4085,7 @@ awt::Point ToolbarLayoutManager::getToolbarPos( const OUString& rResourceURL )
     return aPos;
 }
 
-void ToolbarLayoutManager::setToolbarSize( const OUString& rResourceURL, const awt::Size& aSize )
+void ToolbarLayoutManager::setToolbarSize( std::u16string_view rResourceURL, const awt::Size& aSize )
 {
     uno::Reference< awt::XWindow2 > xWindow( implts_getXWindow( rResourceURL ), uno::UNO_QUERY );
     uno::Reference< awt::XDockableWindow > xDockWindow( xWindow, uno::UNO_QUERY );
@@ -4101,7 +4101,7 @@ void ToolbarLayoutManager::setToolbarSize( const OUString& rResourceURL, const a
     }
 }
 
-void ToolbarLayoutManager::setToolbarPos( const OUString& rResourceURL, const awt::Point& aPos )
+void ToolbarLayoutManager::setToolbarPos( std::u16string_view rResourceURL, const awt::Point& aPos )
 {
     uno::Reference< awt::XWindow > xWindow( implts_getXWindow( rResourceURL ));
     uno::Reference< awt::XDockableWindow > xDockWindow( xWindow, uno::UNO_QUERY );
@@ -4117,7 +4117,7 @@ void ToolbarLayoutManager::setToolbarPos( const OUString& rResourceURL, const aw
     }
 }
 
-void ToolbarLayoutManager::setToolbarPosSize( const OUString& rResourceURL, const awt::Point& aPos, const awt::Size& aSize )
+void ToolbarLayoutManager::setToolbarPosSize( std::u16string_view rResourceURL, const awt::Point& aPos, const awt::Size& aSize )
 {
     setToolbarPos( rResourceURL, aPos );
     setToolbarSize( rResourceURL, aSize );
diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.hxx b/framework/source/layoutmanager/toolbarlayoutmanager.hxx
index 6a1df781dde3..96edbe157742 100644
--- a/framework/source/layoutmanager/toolbarlayoutmanager.hxx
+++ b/framework/source/layoutmanager/toolbarlayoutmanager.hxx
@@ -91,29 +91,29 @@ class ToolbarLayoutManager : public ::cppu::WeakImplHelper< css::awt::XDockableW
         bool destroyToolbar( const OUString& rResourceURL );
 
         // visibility
-        bool showToolbar( const OUString& rResourceURL );
-        bool hideToolbar( const OUString& rResourceURL );
+        bool showToolbar( std::u16string_view rResourceURL );
+        bool hideToolbar( std::u16string_view rResourceURL );
 
         void refreshToolbarsVisibility( bool bAutomaticToolbars );
         void setFloatingToolbarsVisibility( bool bVisible );
         void setVisible(bool bVisible);
 
         // docking and further functions
-        bool dockToolbar( const OUString& rResourceURL, css::ui::DockingArea eDockingArea, const css::awt::Point& aPos );
+        bool dockToolbar( std::u16string_view rResourceURL, css::ui::DockingArea eDockingArea, const css::awt::Point& aPos );
         bool dockAllToolbars();
-        bool floatToolbar( const OUString& rResourceURL );
-        bool lockToolbar( const OUString& rResourceURL );
-        bool unlockToolbar( const OUString& rResourceURL );
-        void setToolbarPos( const OUString& rResourceURL, const css::awt::Point& aPos );
-        void setToolbarSize( const OUString& rResourceURL, const css::awt::Size& aSize );
-        void setToolbarPosSize( const OUString& rResourceURL, const css::awt::Point& aPos, const css::awt::Size& aSize );
-        bool isToolbarVisible( const OUString& rResourceURL );
-        bool isToolbarFloating( const OUString& rResourceURL );
-        bool isToolbarDocked( const OUString& rResourceURL );
-        bool isToolbarLocked( const OUString& rResourceURL );
-        css::awt::Point getToolbarPos( const OUString& rResourceURL );
-        css::awt::Size getToolbarSize( const OUString& rResourceURL );
-        css::uno::Reference< css::ui::XUIElement > getToolbar( const OUString& aName );
+        bool floatToolbar( std::u16string_view rResourceURL );
+        bool lockToolbar( std::u16string_view rResourceURL );
+        bool unlockToolbar( std::u16string_view rResourceURL );
+        void setToolbarPos( std::u16string_view rResourceURL, const css::awt::Point& aPos );
+        void setToolbarSize( std::u16string_view rResourceURL, const css::awt::Size& aSize );
+        void setToolbarPosSize( std::u16string_view rResourceURL, const css::awt::Point& aPos, const css::awt::Size& aSize );
+        bool isToolbarVisible( std::u16string_view rResourceURL );
+        bool isToolbarFloating( std::u16string_view rResourceURL );
+        bool isToolbarDocked( std::u16string_view rResourceURL );
+        bool isToolbarLocked( std::u16string_view rResourceURL );
+        css::awt::Point getToolbarPos( std::u16string_view rResourceURL );
+        css::awt::Size getToolbarSize( std::u16string_view rResourceURL );
+        css::uno::Reference< css::ui::XUIElement > getToolbar( std::u16string_view aName );
         css::uno::Sequence< css::uno::Reference< css::ui::XUIElement > > getToolbars();
 
         // child window notifications
@@ -201,11 +201,11 @@ class ToolbarLayoutManager : public ::cppu::WeakImplHelper< css::awt::XDockableW
 
         // lookup/container methods
 
-        UIElement        implts_findToolbar( const OUString& aName );
+        UIElement        implts_findToolbar( std::u16string_view aName );
         UIElement        implts_findToolbar( const css::uno::Reference< css::uno::XInterface >& xToolbar );
-        UIElement&       impl_findToolbar( const OUString& aName );
-        css::uno::Reference< css::awt::XWindow > implts_getXWindow( const OUString& aName );
-        vcl::Window*     implts_getWindow( const OUString& aName );
+        UIElement&       impl_findToolbar( std::u16string_view aName );
+        css::uno::Reference< css::awt::XWindow > implts_getXWindow( std::u16string_view aName );
+        vcl::Window*     implts_getWindow( std::u16string_view aName );
         bool             implts_insertToolbar( const UIElement& rUIElement );
         void             implts_setToolbar( const UIElement& rUIElement );
         ::Size           implts_getTopBottomDockingAreaSizes();
@@ -216,11 +216,11 @@ class ToolbarLayoutManager : public ::cppu::WeakImplHelper< css::awt::XDockableW
         ::tools::Rectangle      implts_calcHotZoneRect( const ::tools::Rectangle& rRect, sal_Int32 nHotZoneOffset );
         void             implts_calcDockingPosSize( UIElement& aUIElement, DockingOperation& eDockOperation, ::tools::Rectangle& rTrackingRect, const Point& rMousePos );
         DockingOperation implts_determineDockingOperation( css::ui::DockingArea DockingArea, const ::tools::Rectangle& rRowColRect, const Point& rMousePos );
-        ::tools::Rectangle      implts_getWindowRectFromRowColumn( css::ui::DockingArea DockingArea, const SingleRowColumnWindowData& rRowColumnWindowData, const ::Point& rMousePos, const OUString& rExcludeElementName );
+        ::tools::Rectangle      implts_getWindowRectFromRowColumn( css::ui::DockingArea DockingArea, const SingleRowColumnWindowData& rRowColumnWindowData, const ::Point& rMousePos, std::u16string_view rExcludeElementName );
         ::tools::Rectangle      implts_determineFrontDockingRect( css::ui::DockingArea eDockingArea,
                                                            sal_Int32 nRowCol,
                                                            const ::tools::Rectangle& rDockedElementRect,
-                                                           const OUString& rMovedElementName,
+                                                           std::u16string_view rMovedElementName,
                                                            const ::tools::Rectangle& rMovedElementRect );
         ::tools::Rectangle      implts_calcTrackingAndElementRect( css::ui::DockingArea eDockingArea,
                                                             sal_Int32 nRowCol,
diff --git a/framework/source/uiconfiguration/ImageList.cxx b/framework/source/uiconfiguration/ImageList.cxx
index 8e775aeda62d..8aef25517fb4 100644
--- a/framework/source/uiconfiguration/ImageList.cxx
+++ b/framework/source/uiconfiguration/ImageList.cxx
@@ -139,9 +139,9 @@ sal_uInt16 ImageList::GetImageCount() const
     return static_cast< sal_uInt16 >( maImages.size() );
 }
 
-sal_uInt16 ImageList::GetImagePos( const OUString& rImageName ) const
+sal_uInt16 ImageList::GetImagePos( std::u16string_view rImageName ) const
 {
-    if( !rImageName.isEmpty() )
+    if( !rImageName.empty() )
     {
         for( size_t i = 0; i < maImages.size(); i++ )
         {
diff --git a/framework/source/uiconfiguration/ImageList.hxx b/framework/source/uiconfiguration/ImageList.hxx
index 946805f6cdd2..b91a9482c07b 100644
--- a/framework/source/uiconfiguration/ImageList.hxx
+++ b/framework/source/uiconfiguration/ImageList.hxx
@@ -53,7 +53,7 @@ public:
 
     Image           GetImage( const OUString& rImageName ) const;
 
-    sal_uInt16      GetImagePos( const OUString& rImageName ) const;
+    sal_uInt16      GetImagePos( std::u16string_view rImageName ) const;
 
     sal_uInt16      GetImageId( sal_uInt16 nPos ) const;
 
diff --git a/framework/source/uielement/menubarmerger.cxx b/framework/source/uielement/menubarmerger.cxx
index 532cab083b7d..1d59a7e152a6 100644
--- a/framework/source/uielement/menubarmerger.cxx
+++ b/framework/source/uielement/menubarmerger.cxx
@@ -144,7 +144,7 @@ ReferencePathInfo MenuBarMerger::FindReferencePath(
     return aResult;
 }
 
-sal_uInt16 MenuBarMerger::FindMenuItem( const OUString& rCmd, Menu const * pCurrMenu )
+sal_uInt16 MenuBarMerger::FindMenuItem( std::u16string_view rCmd, Menu const * pCurrMenu )
 {
     for ( sal_uInt16 i = 0; i < pCurrMenu->GetItemCount(); i++ )
     {
diff --git a/framework/source/uielement/statusbarmerger.cxx b/framework/source/uielement/statusbarmerger.cxx
index 5b3868e9a0ac..c2b9e3abca47 100644
--- a/framework/source/uielement/statusbarmerger.cxx
+++ b/framework/source/uielement/statusbarmerger.cxx
@@ -173,7 +173,7 @@ bool StatusbarMerger::ConvertSeqSeqToVector(
 
 sal_uInt16 StatusbarMerger::FindReferencePos(
     StatusBar* pStatusbar,
-    const OUString& rReferencePoint )
+    std::u16string_view rReferencePoint )
 {
     for ( sal_uInt16 nPos = 0; nPos < pStatusbar->GetItemCount(); nPos++ )
     {
diff --git a/framework/source/uielement/toolbarmerger.cxx b/framework/source/uielement/toolbarmerger.cxx
index 4a56afe933d9..89847cf47135 100644
--- a/framework/source/uielement/toolbarmerger.cxx
+++ b/framework/source/uielement/toolbarmerger.cxx
@@ -224,7 +224,7 @@ void ToolBarMerger::ConvertSequenceToValues(
 */
 ReferenceToolbarPathInfo ToolBarMerger::FindReferencePoint(
     const ToolBox*   pToolbar,
-    const OUString& rReferencePoint )
+    std::u16string_view rReferencePoint )
 {
     ReferenceToolbarPathInfo aResult;
     aResult.bResult  = false;