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>

20 files changed, 43 insertions, 43 deletions

diff --git a/svx/inc/galbrws2.hxx b/svx/inc/galbrws2.hxx
index bbf13cff5c3f..0ee663835a74 100644
--- a/svx/inc/galbrws2.hxx
+++ b/svx/inc/galbrws2.hxx
@@ -128,7 +128,7 @@ public:
     GalleryBrowser2(weld::Builder& rBuilder, Gallery* pGallery);
     ~GalleryBrowser2();
 
-    void                SelectTheme( const OUString& rThemeName );
+    void                SelectTheme( std::u16string_view rThemeName );
 
     GalleryBrowserMode  GetMode() const { return meMode; }
     void                SetMode( GalleryBrowserMode eMode );
diff --git a/svx/source/dialog/ClassificationCommon.cxx b/svx/source/dialog/ClassificationCommon.cxx
index d5561ec5b32c..8ff87270e585 100644
--- a/svx/source/dialog/ClassificationCommon.cxx
+++ b/svx/source/dialog/ClassificationCommon.cxx
@@ -58,7 +58,7 @@ OUString getProperty(uno::Reference<beans::XPropertyContainer> const& rxProperty
     return OUString();
 }
 
-bool containsProperty(uno::Sequence<beans::Property> const& rProperties, OUString const& rName)
+bool containsProperty(uno::Sequence<beans::Property> const& rProperties, std::u16string_view rName)
 {
     return std::any_of(rProperties.begin(), rProperties.end(),
                        [&](const beans::Property& rProperty) { return rProperty.Name == rName; });
diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx
index 2980d80ba6b2..d80f84890161 100644
--- a/svx/source/dialog/ctredlin.cxx
+++ b/svx/source/dialog/ctredlin.cxx
@@ -260,14 +260,14 @@ void SvxRedlinTable::SetCommentParams( const utl::SearchParam* pSearchPara )
     }
 }
 
-bool SvxRedlinTable::IsValidEntry(const OUString &rAuthorStr,
+bool SvxRedlinTable::IsValidEntry(std::u16string_view rAuthorStr,
                                   const DateTime &rDateTime,
                                   const OUString &rCommentStr)
 {
     return IsValidEntry(rAuthorStr, rDateTime) && IsValidComment(rCommentStr);
 }
 
-bool SvxRedlinTable::IsValidEntry(const OUString &rAuthorStr, const DateTime &rDateTime)
+bool SvxRedlinTable::IsValidEntry(std::u16string_view rAuthorStr, const DateTime &rDateTime)
 {
     if (bAuthor && aAuthor!=rAuthorStr)
         return false;
diff --git a/svx/source/gallery2/galbrws1.cxx b/svx/source/gallery2/galbrws1.cxx
index 6cf14753e524..8d71fe546b71 100644
--- a/svx/source/gallery2/galbrws1.cxx
+++ b/svx/source/gallery2/galbrws1.cxx
@@ -169,7 +169,7 @@ void GalleryBrowser1::ImplGetExecuteVector(std::vector<OString>& o_aExec)
     mpGallery->ReleaseTheme( pTheme, *this );
 }
 
-void GalleryBrowser1::ImplGalleryThemeProperties( const OUString & rThemeName, bool bCreateNew )
+void GalleryBrowser1::ImplGalleryThemeProperties( std::u16string_view rThemeName, bool bCreateNew )
 {
     DBG_ASSERT(!mpThemePropsDlgItemSet, "mpThemePropsDlgItemSet already set!");
     mpThemePropsDlgItemSet.reset(new SfxItemSet( SfxGetpApp()->GetPool() ));
diff --git a/svx/source/gallery2/galbrws1.hxx b/svx/source/gallery2/galbrws1.hxx
index 222237a72a74..e0b83f940b9d 100644
--- a/svx/source/gallery2/galbrws1.hxx
+++ b/svx/source/gallery2/galbrws1.hxx
@@ -60,7 +60,7 @@ private:
     static void             ImplFillExchangeData( const GalleryTheme* pThm, ExchangeData& rData );
     void                    ImplGetExecuteVector(std::vector<OString>& o_aExec);
     void                    ImplExecute(const OString &rIdent);
-    void                    ImplGalleryThemeProperties( const OUString & rThemeName, bool bCreateNew );
+    void                    ImplGalleryThemeProperties( std::u16string_view rThemeName, bool bCreateNew );
     void                    EndNewThemePropertiesDlgHdl(sal_Int32 nResult);
     void                    EndThemePropertiesDlgHdl(sal_Int32 nResult);
     void                    ImplEndGalleryThemeProperties(bool bCreateNew, sal_Int32 nResult);
diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx
index 71dd0ab32784..9338689c7c4a 100644
--- a/svx/source/gallery2/galbrws2.cxx
+++ b/svx/source/gallery2/galbrws2.cxx
@@ -600,7 +600,7 @@ bool GalleryBrowser2::KeyInput(const KeyEvent& rKEvt)
     return bRet;
 }
 
-void GalleryBrowser2::SelectTheme( const OUString& rThemeName )
+void GalleryBrowser2::SelectTheme( std::u16string_view rThemeName )
 {
     if( mpCurTheme )
         mpGallery->ReleaseTheme( mpCurTheme, *this );
diff --git a/svx/source/gallery2/galexpl.cxx b/svx/source/gallery2/galexpl.cxx
index b2d34749b7df..83dc3b1688dd 100644
--- a/svx/source/gallery2/galexpl.cxx
+++ b/svx/source/gallery2/galexpl.cxx
@@ -48,7 +48,7 @@ bool GalleryExplorer::FillThemeList( std::vector<OUString>& rThemeList )
     return !rThemeList.empty();
 }
 
-bool GalleryExplorer::FillObjList( const OUString& rThemeName, std::vector<OUString> &rObjList )
+bool GalleryExplorer::FillObjList( std::u16string_view rThemeName, std::vector<OUString> &rObjList )
 {
     Gallery* pGal = ::Gallery::GetGalleryInstance();
 
@@ -104,7 +104,7 @@ bool GalleryExplorer::FillObjListTitle( const sal_uInt32 nThemeId, std::vector<
     return !rList.empty();
 }
 
-bool GalleryExplorer::InsertURL( const OUString& rThemeName, const OUString& rURL )
+bool GalleryExplorer::InsertURL( std::u16string_view rThemeName, const OUString& rURL )
 {
     Gallery*    pGal = ::Gallery::GetGalleryInstance();
     bool        bRet = false;
@@ -132,7 +132,7 @@ bool GalleryExplorer::InsertURL( sal_uInt32 nThemeId, const OUString& rURL )
     return pGal && InsertURL( pGal->GetThemeName( nThemeId ), rURL );
 }
 
-bool GalleryExplorer::GetGraphicObj( const OUString& rThemeName, sal_uInt32 nPos,
+bool GalleryExplorer::GetGraphicObj( std::u16string_view rThemeName, sal_uInt32 nPos,
                                      Graphic* pGraphic )
 {
     Gallery*    pGal = ::Gallery::GetGalleryInstance();
@@ -162,7 +162,7 @@ bool GalleryExplorer::GetGraphicObj( sal_uInt32 nThemeId, sal_uInt32 nPos,
     return pGal && GetGraphicObj( pGal->GetThemeName( nThemeId ), nPos, pGraphic );
 }
 
-sal_uInt32 GalleryExplorer::GetSdrObjCount( const OUString& rThemeName )
+sal_uInt32 GalleryExplorer::GetSdrObjCount( std::u16string_view rThemeName )
 {
     Gallery*    pGal = ::Gallery::GetGalleryInstance();
     sal_uInt32     nRet = 0;
@@ -191,7 +191,7 @@ sal_uInt32 GalleryExplorer::GetSdrObjCount( sal_uInt32 nThemeId  )
     return( pGal ? GetSdrObjCount( pGal->GetThemeName( nThemeId ) ) : 0 );
 }
 
-bool GalleryExplorer::GetSdrObj( const OUString& rThemeName, sal_uInt32 nSdrModelPos,
+bool GalleryExplorer::GetSdrObj( std::u16string_view rThemeName, sal_uInt32 nSdrModelPos,
                                  SdrModel* pModel, BitmapEx* pThumb )
 {
     Gallery*    pGal = ::Gallery::GetGalleryInstance();
@@ -233,7 +233,7 @@ bool GalleryExplorer::GetSdrObj( sal_uInt32 nThemeId, sal_uInt32 nSdrModelPos,
     return pGal && GetSdrObj( pGal->GetThemeName( nThemeId ), nSdrModelPos, pModel, pThumb );
 }
 
-bool GalleryExplorer::BeginLocking( const OUString& rThemeName )
+bool GalleryExplorer::BeginLocking( std::u16string_view rThemeName )
 {
     Gallery*    pGal = ::Gallery::GetGalleryInstance();
     bool        bRet = false;
@@ -258,7 +258,7 @@ bool GalleryExplorer::BeginLocking( sal_uInt32 nThemeId )
     return pGal && BeginLocking( pGal->GetThemeName( nThemeId ) );
 }
 
-bool GalleryExplorer::EndLocking( const OUString& rThemeName )
+bool GalleryExplorer::EndLocking( std::u16string_view rThemeName )
 {
     Gallery*    pGal = ::Gallery::GetGalleryInstance();
     bool        bRet = false;
diff --git a/svx/source/gallery2/galini.cxx b/svx/source/gallery2/galini.cxx
index 161b1ec6e24c..87f6abfb28a1 100644
--- a/svx/source/gallery2/galini.cxx
+++ b/svx/source/gallery2/galini.cxx
@@ -23,7 +23,7 @@
 #include <vcl/settings.hxx>
 #include <memory>
 
-OUString GalleryBinaryEngineEntry::ReadStrFromIni(const OUString &aKeyName )
+OUString GalleryBinaryEngineEntry::ReadStrFromIni(std::u16string_view aKeyName )
 {
     std::unique_ptr<SvStream> pStrm(::utl::UcbStreamHelper::CreateStream(
         GetStrURL().GetMainURL( INetURLObject::DecodeMechanism::NONE ),
diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx
index c522fdf49e93..69b4ab1f59c6 100644
--- a/svx/source/gallery2/gallery1.cxx
+++ b/svx/source/gallery2/gallery1.cxx
@@ -129,7 +129,7 @@ GalleryThemeEntry::GalleryThemeEntry( bool bCreateUniqueURL,
 
     SetModified( _bNewFile );
 
-    aName = mpGalleryStorageEngineEntry->ReadStrFromIni( "name" );
+    aName = mpGalleryStorageEngineEntry->ReadStrFromIni( u"name" );
 
     // This is awful - we shouldn't use these resources if we
     // possibly can avoid them
@@ -476,9 +476,9 @@ void Gallery::ImplLoadSubDirs( const INetURLObject& rBaseURL, bool& rbDirIsReadO
     }
 }
 
-GalleryThemeEntry* Gallery::ImplGetThemeEntry( const OUString& rThemeName )
+GalleryThemeEntry* Gallery::ImplGetThemeEntry( std::u16string_view rThemeName )
 {
-    if( !rThemeName.isEmpty() )
+    if( !rThemeName.empty() )
     {
         for ( size_t i = 0, n = aThemeList.size(); i < n; ++i )
             if( rThemeName == aThemeList[ i ]->GetThemeName() )
@@ -567,7 +567,7 @@ OUString Gallery::GetThemeName( sal_uInt32 nThemeId ) const
     return( pFound ? pFound->GetThemeName() : OUString() );
 }
 
-bool Gallery::HasTheme( const OUString& rThemeName )
+bool Gallery::HasTheme( std::u16string_view rThemeName )
 {
     return( ImplGetThemeEntry( rThemeName ) != nullptr );
 }
@@ -691,7 +691,7 @@ void Gallery::ImplDeleteCachedTheme( GalleryTheme const * pTheme )
     }
 }
 
-GalleryTheme* Gallery::AcquireTheme( const OUString& rThemeName, SfxListener& rListener )
+GalleryTheme* Gallery::AcquireTheme( std::u16string_view rThemeName, SfxListener& rListener )
 {
     GalleryTheme*           pTheme = nullptr;
     GalleryThemeEntry*      pThemeEntry = ImplGetThemeEntry( rThemeName );
diff --git a/svx/source/inc/datanavi.hxx b/svx/source/inc/datanavi.hxx
index 30f140f2aad1..8feee550c5a8 100644
--- a/svx/source/inc/datanavi.hxx
+++ b/svx/source/inc/datanavi.hxx
@@ -110,7 +110,7 @@ namespace svxform
 
         /** convert submission replace string from UI to API.
             Use 'none' as default. */
-        OUString toAPI( const OUString& rStr ) const
+        OUString toAPI( std::u16string_view rStr ) const
         {
             if( rStr == m_sDoc_UI )
                 return m_sDoc_API;
@@ -154,7 +154,7 @@ namespace svxform
         }
 
         /** convert from UI to API; put is default */
-        OUString toAPI( const OUString& rStr ) const
+        OUString toAPI( std::u16string_view rStr ) const
         {
             if( rStr == m_sGet_UI )
                 return m_sGet_API;
diff --git a/svx/source/items/numfmtsh.cxx b/svx/source/items/numfmtsh.cxx
index 833dbccdfc3c..87fe7fa79b39 100644
--- a/svx/source/items/numfmtsh.cxx
+++ b/svx/source/items/numfmtsh.cxx
@@ -277,7 +277,7 @@ bool SvxNumberFormatShell::AddFormat(OUString& rFormat, sal_Int32& rErrPos,
     return bInserted;
 }
 
-void SvxNumberFormatShell::RemoveFormat(const OUString& rFormat, sal_uInt16& rCatLbSelPos,
+void SvxNumberFormatShell::RemoveFormat(std::u16string_view rFormat, sal_uInt16& rCatLbSelPos,
                                         short& rFmtSelPos, std::vector<OUString>& rFmtEntries)
 {
     sal_uInt32 nDelKey = pFormatter->GetEntryKey(rFormat, eCurLanguage);
@@ -338,7 +338,7 @@ void SvxNumberFormatShell::MakeFormat(OUString& rFormat, bool bThousand, bool bN
     }
 }
 
-sal_uInt16 SvxNumberFormatShell::GetFormatIntegerDigits(const OUString& rFormat) const
+sal_uInt16 SvxNumberFormatShell::GetFormatIntegerDigits(std::u16string_view rFormat) const
 {
     sal_uInt32 nFmtKey = pFormatter->GetEntryKey(rFormat, eCurLanguage);
 
@@ -1333,7 +1333,7 @@ OUString SvxNumberFormatShell::GetFormat4Entry(short nEntry)
  * Input:      Number of the entry
  * Output:     Category number
  */
-short SvxNumberFormatShell::GetListPos4Entry(sal_uInt32 nIdx, const OUString& rFmtString)
+short SvxNumberFormatShell::GetListPos4Entry(sal_uInt32 nIdx, std::u16string_view rFmtString)
 {
     short nSelP = SELPOS_NONE;
     if (nIdx != NUMBERFORMAT_ENTRY_NEW_CURRENCY)
@@ -1560,7 +1560,7 @@ sal_uInt16 SvxNumberFormatShell::FindCurrencyFormat(const NfCurrencyEntry* pTmpC
 }
 
 bool SvxNumberFormatShell::IsInTable(sal_uInt16 const nPos, bool const bTmpBanking,
-                                     OUString const& rFmtString)
+                                     std::u16string_view rFmtString)
 {
     bool bFlag = false;
 
diff --git a/svx/source/styles/ColorSets.cxx b/svx/source/styles/ColorSets.cxx
index 2e7771caefac..0c68d726a017 100644
--- a/svx/source/styles/ColorSets.cxx
+++ b/svx/source/styles/ColorSets.cxx
@@ -92,7 +92,7 @@ void ColorSets::init()
     }
 }
 
-const ColorSet& ColorSets::getColorSet(const OUString& rName)
+const ColorSet& ColorSets::getColorSet(std::u16string_view rName)
 {
     for (const ColorSet & rColorSet : maColorSets)
     {
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index 0daeb7cc9a5d..5685f0934872 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -1883,7 +1883,7 @@ void SdrTextObj::onEditOutlinerStatusEvent( EditStatus* pEditStatus )
 /* Begin chaining code */
 
 // XXX: Make it a method somewhere?
-static SdrObject *ImpGetObjByName(SdrObjList const *pObjList, OUString const& aObjName)
+static SdrObject *ImpGetObjByName(SdrObjList const *pObjList, std::u16string_view aObjName)
 {
     // scan the whole list
     size_t nObjCount = pObjList->GetObjCount();
@@ -1899,12 +1899,12 @@ static SdrObject *ImpGetObjByName(SdrObjList const *pObjList, OUString const& aO
 }
 
 // XXX: Make it a (private) method of SdrTextObj
-static void ImpUpdateChainLinks(SdrTextObj *pTextObj, OUString const& aNextLinkName)
+static void ImpUpdateChainLinks(SdrTextObj *pTextObj, std::u16string_view aNextLinkName)
 {
     // XXX: Current implementation constraints text boxes to be on the same page
 
     // No next link
-    if (aNextLinkName.isEmpty()) {
+    if (aNextLinkName.empty()) {
         pTextObj->SetNextLinkInChain(nullptr);
         return;
     }
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 954ebcf563e4..31507e4347a6 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -219,7 +219,7 @@ protected:
     void            ReleaseFocus();
     static Color    TestColorsVisible(const Color &FontCol, const Color &BackCol);
     static void     UserDrawEntry(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect, const OUString &rStyleName);
-    void            SetupEntry(vcl::RenderContext& rRenderContext, sal_Int32 nItem, const tools::Rectangle& rRect, const OUString& rStyleName, bool bIsNotSelected);
+    void            SetupEntry(vcl::RenderContext& rRenderContext, sal_Int32 nItem, const tools::Rectangle& rRect, std::u16string_view rStyleName, bool bIsNotSelected);
     static bool     AdjustFontForItemHeight(OutputDevice& rDevice, tools::Rectangle const & rTextRect, tools::Long nHeight);
     DECL_LINK(MenuSelectHdl, const OString&, void);
     DECL_STATIC_LINK(SvxStyleBox_Base, ShowMoreHdl, void*, void);
@@ -933,7 +933,7 @@ IMPL_STATIC_LINK_NOARG(SvxStyleBox_Base, ShowMoreHdl, void*, void)
     if (!pViewFrm)
         return;
     pViewFrm->ShowChildWindow(SID_SIDEBAR);
-    ::sfx2::sidebar::Sidebar::ShowPanel("StyleListPanel", pViewFrm->GetFrame().GetFrameInterface(), true);
+    ::sfx2::sidebar::Sidebar::ShowPanel(u"StyleListPanel", pViewFrm->GetFrame().GetFrameInterface(), true);
 }
 
 IMPL_LINK(SvxStyleBox_Base, SelectHdl, weld::ComboBox&, rCombo, void)
@@ -1127,7 +1127,7 @@ void SvxStyleBox_Base::UserDrawEntry(vcl::RenderContext& rRenderContext, const t
     rRenderContext.DrawText(aPos, rStyleName);
 }
 
-void SvxStyleBox_Base::SetupEntry(vcl::RenderContext& rRenderContext, sal_Int32 nItem, const tools::Rectangle& rRect, const OUString& rStyleName, bool bIsNotSelected)
+void SvxStyleBox_Base::SetupEntry(vcl::RenderContext& rRenderContext, sal_Int32 nItem, const tools::Rectangle& rRect, std::u16string_view rStyleName, bool bIsNotSelected)
 {
     const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings();
     if (!bIsNotSelected)
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx
index 54961330c503..33b8c27fa913 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx
@@ -166,7 +166,7 @@ DictionaryEntry* DictionaryList::getEntryOnPos(sal_Int32 nPos) const
     return reinterpret_cast<DictionaryEntry*>(sLBEntry.toInt64());
 }
 
-DictionaryEntry* DictionaryList::getTermEntry( const OUString& rTerm ) const
+DictionaryEntry* DictionaryList::getTermEntry( std::u16string_view rTerm ) const
 {
     int nRowCount = m_xControl->n_children();
     for( sal_Int32 nN = nRowCount; nN--; )
@@ -178,7 +178,7 @@ DictionaryEntry* DictionaryList::getTermEntry( const OUString& rTerm ) const
     return nullptr;
 }
 
-bool DictionaryList::hasTerm( const OUString& rTerm ) const
+bool DictionaryList::hasTerm( std::u16string_view rTerm ) const
 {
     return getTermEntry(rTerm) !=nullptr ;
 }
@@ -211,7 +211,7 @@ void DictionaryList::deleteEntryOnPos( sal_Int32 nPos  )
     }
 }
 
-int DictionaryList::deleteEntries( const OUString& rTerm )
+int DictionaryList::deleteEntries( std::u16string_view rTerm )
 {
     int nPos = -1;
     int nRowCount = m_xControl->n_children();
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx
index 4d3b120c23b8..ee179dd92e58 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx
@@ -55,12 +55,12 @@ public:
     void refillFromDictionary( sal_Int32 nTextConversionOptions /*i18n::TextConversionOption*/ );
     void save();
 
-    DictionaryEntry* getTermEntry( const OUString& rTerm ) const;
-    bool hasTerm( const OUString& rTerm ) const;
+    DictionaryEntry* getTermEntry( std::u16string_view rTerm ) const;
+    bool hasTerm( std::u16string_view rTerm ) const;
 
     void addEntry( const OUString& rTerm, const OUString& rMapping
             , sal_Int16 nConversionPropertyType /*linguistic2::ConversionPropertyType*/, int nPos = -1);
-    int deleteEntries( const OUString& rTerm ); //return lowest position of deleted entries or -1 if no entry was deleted
+    int deleteEntries( std::u16string_view rTerm ); //return lowest position of deleted entries or -1 if no entry was deleted
     void deleteEntryOnPos( sal_Int32 nPos  );
     DictionaryEntry* getEntryOnPos( sal_Int32 nPos ) const;
     DictionaryEntry* getFirstSelectedEntry() const;
diff --git a/svx/source/unodraw/unomtabl.cxx b/svx/source/unodraw/unomtabl.cxx
index b930fed67205..4e9de869ab40 100644
--- a/svx/source/unodraw/unomtabl.cxx
+++ b/svx/source/unodraw/unomtabl.cxx
@@ -265,7 +265,7 @@ void SAL_CALL SvxUnoMarkerTable::replaceByName( const OUString& aApiName, const
     ImplInsertByName( aName, aElement );
 }
 
-static bool getByNameFromPool( const OUString& rSearchName, SfxItemPool const * pPool, sal_uInt16 nWhich, uno::Any& rAny )
+static bool getByNameFromPool( std::u16string_view rSearchName, SfxItemPool const * pPool, sal_uInt16 nWhich, uno::Any& rAny )
 {
     if (pPool)
         for (const SfxPoolItem* p : pPool->GetItemSurrogates(nWhich))
diff --git a/svx/source/unogallery/unogaltheme.cxx b/svx/source/unogallery/unogaltheme.cxx
index 39013c20ea4c..857555ac2838 100644
--- a/svx/source/unogallery/unogaltheme.cxx
+++ b/svx/source/unogallery/unogaltheme.cxx
@@ -36,7 +36,7 @@ using namespace ::com::sun::star;
 namespace unogallery {
 
 
-GalleryTheme::GalleryTheme( const OUString& rThemeName )
+GalleryTheme::GalleryTheme( std::u16string_view rThemeName )
 {
     mpGallery = ::Gallery::GetGalleryInstance();
     mpTheme = ( mpGallery ? mpGallery->AcquireTheme( rThemeName, *this ) : nullptr );
diff --git a/svx/source/unogallery/unogaltheme.hxx b/svx/source/unogallery/unogaltheme.hxx
index 7eb3b2ccf13d..31cde7003bbe 100644
--- a/svx/source/unogallery/unogaltheme.hxx
+++ b/svx/source/unogallery/unogaltheme.hxx
@@ -44,7 +44,7 @@ class GalleryTheme : public ::cppu::WeakImplHelper<
 
 public:
 
-    explicit GalleryTheme( const OUString& rThemeName );
+    explicit GalleryTheme( std::u16string_view rThemeName );
     virtual ~GalleryTheme() override;
 
 protected:
diff --git a/svx/source/xoutdev/xtable.cxx b/svx/source/xoutdev/xtable.cxx
index 3bb6ca063765..6a0744fe0a3d 100644
--- a/svx/source/xoutdev/xtable.cxx
+++ b/svx/source/xoutdev/xtable.cxx
@@ -141,7 +141,7 @@ XPropertyEntry* XPropertyList::Get( tools::Long nIndex ) const
     return maList[nIndex].get();
 }
 
-tools::Long XPropertyList::GetIndex(const OUString& rName) const
+tools::Long XPropertyList::GetIndex(std::u16string_view rName) const
 {
     if( mbListDirty )
     {