summaryrefslogtreecommitdiff
path: root/sw/source/uibase
diff options
context:
space:
mode:
authorNoel <noelgrandin@gmail.com>2020-11-18 10:10:40 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2020-11-24 09:45:04 +0100
commitbb06f51308428500c9c8d11ae05f0aa03ecc179c (patch)
treeb18620e8572ed6d4c43c8605660d59f5f7a7e531 /sw/source/uibase
parent42e8e16cf93dcf944e5c1106f76aaa32057c0397 (diff)
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>
Diffstat (limited to 'sw/source/uibase')
-rw-r--r--sw/source/uibase/app/docsh2.cxx4
-rw-r--r--sw/source/uibase/app/docstyle.cxx2
-rw-r--r--sw/source/uibase/dbui/dbtree.cxx6
-rw-r--r--sw/source/uibase/docvw/PostItMgr.cxx2
-rw-r--r--sw/source/uibase/fldui/fldmgr.cxx2
-rw-r--r--sw/source/uibase/inc/dbtree.hxx4
-rw-r--r--sw/source/uibase/inc/fldmgr.hxx2
-rw-r--r--sw/source/uibase/inc/gloslst.hxx4
-rw-r--r--sw/source/uibase/inc/glossary.hxx2
-rw-r--r--sw/source/uibase/inc/label.hxx2
-rw-r--r--sw/source/uibase/inc/langhelper.hxx4
-rw-r--r--sw/source/uibase/inc/outline.hxx2
-rw-r--r--sw/source/uibase/inc/regionsw.hxx2
-rw-r--r--sw/source/uibase/inc/wrtsh.hxx6
-rw-r--r--sw/source/uibase/shells/frmsh.cxx2
-rw-r--r--sw/source/uibase/shells/langhelper.cxx4
-rw-r--r--sw/source/uibase/sidebar/StylePresetsPanel.cxx8
-rw-r--r--sw/source/uibase/sidebar/ThemePanel.cxx6
-rw-r--r--sw/source/uibase/uiview/view2.cxx2
-rw-r--r--sw/source/uibase/utlui/content.cxx4
-rw-r--r--sw/source/uibase/utlui/gloslst.cxx4
-rw-r--r--sw/source/uibase/wrtsh/move.cxx2
-rw-r--r--sw/source/uibase/wrtsh/wrtsh1.cxx8
23 files changed, 42 insertions, 42 deletions
diff --git a/sw/source/uibase/app/docsh2.cxx b/sw/source/uibase/app/docsh2.cxx
index a2342c9f3d0e..bb135b823c92 100644
--- a/sw/source/uibase/app/docsh2.cxx
+++ b/sw/source/uibase/app/docsh2.cxx
@@ -648,7 +648,7 @@ void SwDocShell::Execute(SfxRequest& rReq)
// 3 - file saved in non-HTML -> QueryBox to save as HTML
std::shared_ptr<const SfxFilter> pHtmlFlt =
SwIoSystem::GetFilterOfFormat(
- "HTML",
+ u"HTML",
SwWebDocShell::Factory().GetFilterContainer() );
bool bLocalHasName = HasName();
if(bLocalHasName)
@@ -976,7 +976,7 @@ void SwDocShell::Execute(SfxRequest& rReq)
{
// for HTML there is only one filter!!
pFlt = SwIoSystem::GetFilterOfFormat(
- "HTML",
+ u"HTML",
SwWebDocShell::Factory().GetFilterContainer() );
pStrId = STR_LOAD_HTML_DOC;
}
diff --git a/sw/source/uibase/app/docstyle.cxx b/sw/source/uibase/app/docstyle.cxx
index a15f9000883b..c720c3775c8c 100644
--- a/sw/source/uibase/app/docstyle.cxx
+++ b/sw/source/uibase/app/docstyle.cxx
@@ -330,7 +330,7 @@ static SwTableAutoFormat* lcl_FindTableStyle(SwDoc& rDoc, const OUString& rName,
return pFormat;
}
-static const SwBoxAutoFormat* lcl_FindCellStyle(SwDoc& rDoc, const OUString& rName, SwDocStyleSheet *pStyle)
+static const SwBoxAutoFormat* lcl_FindCellStyle(SwDoc& rDoc, std::u16string_view rName, SwDocStyleSheet *pStyle)
{
const SwBoxAutoFormat* pFormat = rDoc.GetCellStyles().GetBoxFormat(rName);
diff --git a/sw/source/uibase/dbui/dbtree.cxx b/sw/source/uibase/dbui/dbtree.cxx
index 4dee21a4ed0c..e47c7dc92c9c 100644
--- a/sw/source/uibase/dbui/dbtree.cxx
+++ b/sw/source/uibase/dbui/dbtree.cxx
@@ -164,7 +164,7 @@ void SwDBTreeList::InitTreeList()
m_xTreeView->set_image(*m_xScratchIter, aImg);
}
}
- Select(OUString(), OUString(), OUString());
+ Select(u"", u"", u"");
bInitialized = true;
}
@@ -320,7 +320,7 @@ OUString SwDBTreeList::GetDBName(OUString& rTableName, OUString& rColumnName, sa
}
// Format: database.table
-void SwDBTreeList::Select(const OUString& rDBName, const OUString& rTableName, const OUString& rColumnName)
+void SwDBTreeList::Select(std::u16string_view rDBName, std::u16string_view rTableName, std::u16string_view rColumnName)
{
std::unique_ptr<weld::TreeIter> xParent(m_xTreeView->make_iterator());
if (!m_xTreeView->get_iter_first(*xParent))
@@ -345,7 +345,7 @@ void SwDBTreeList::Select(const OUString& rDBName, const OUString& rTableName, c
m_xTreeView->copy_iterator(*xChild, *xParent);
bool bNoChild = false;
- if (bShowColumns && !rColumnName.isEmpty())
+ if (bShowColumns && !rColumnName.empty())
{
if (!m_xTreeView->iter_has_child(*xParent))
{
diff --git a/sw/source/uibase/docvw/PostItMgr.cxx b/sw/source/uibase/docvw/PostItMgr.cxx
index d5153892a0dc..84144c447bbb 100644
--- a/sw/source/uibase/docvw/PostItMgr.cxx
+++ b/sw/source/uibase/docvw/PostItMgr.cxx
@@ -1726,7 +1726,7 @@ void SwPostItMgr::FormatAll(const SfxItemSet &rNewAttr)
LayoutPostIts();
}
-void SwPostItMgr::Hide( const OUString& rAuthor )
+void SwPostItMgr::Hide( std::u16string_view rAuthor )
{
for (auto const& postItField : mvPostItFields)
{
diff --git a/sw/source/uibase/fldui/fldmgr.cxx b/sw/source/uibase/fldui/fldmgr.cxx
index 42ac135fedcd..dcf02a29de31 100644
--- a/sw/source/uibase/fldui/fldmgr.cxx
+++ b/sw/source/uibase/fldui/fldmgr.cxx
@@ -373,7 +373,7 @@ SwFieldMgr::~SwFieldMgr()
}
// organise RefMark by names
-bool SwFieldMgr::CanInsertRefMark( const OUString& rStr )
+bool SwFieldMgr::CanInsertRefMark( std::u16string_view rStr )
{
bool bRet = false;
SwWrtShell *pSh = m_pWrtShell ? m_pWrtShell : lcl_GetShell();
diff --git a/sw/source/uibase/inc/dbtree.hxx b/sw/source/uibase/inc/dbtree.hxx
index 863ac1a40083..651654bb9843 100644
--- a/sw/source/uibase/inc/dbtree.hxx
+++ b/sw/source/uibase/inc/dbtree.hxx
@@ -45,8 +45,8 @@ public:
OUString GetDBName(OUString& rTableName, OUString& rColumnName, sal_Bool* pbIsTable = nullptr);
- void Select( const OUString& rDBName, const OUString& rTableName,
- const OUString& rColumnName );
+ void Select( std::u16string_view rDBName, std::u16string_view rTableName,
+ std::u16string_view rColumnName );
void ShowColumns(bool bShowCol);
diff --git a/sw/source/uibase/inc/fldmgr.hxx b/sw/source/uibase/inc/fldmgr.hxx
index 9a701e2a4280..ebc5c4966c09 100644
--- a/sw/source/uibase/inc/fldmgr.hxx
+++ b/sw/source/uibase/inc/fldmgr.hxx
@@ -154,7 +154,7 @@ public:
bool bIsTable, const OUString& rFieldName);
// organise RefMark with names
- bool CanInsertRefMark( const OUString& rStr );
+ bool CanInsertRefMark( std::u16string_view rStr );
// access to field types via ResId
size_t GetFieldTypeCount() const;
diff --git a/sw/source/uibase/inc/gloslst.hxx b/sw/source/uibase/inc/gloslst.hxx
index 3da5d88617a5..11192ecd6234 100644
--- a/sw/source/uibase/inc/gloslst.hxx
+++ b/sw/source/uibase/inc/gloslst.hxx
@@ -50,7 +50,7 @@ class SwGlossaryList : public AutoTimer
OUString sPath;
bool bFilled;
- AutoTextGroup* FindGroup(const OUString& rGroupName);
+ AutoTextGroup* FindGroup(std::u16string_view rGroupName);
static void FillGroup(AutoTextGroup* pGroup, SwGlossaries* pGloss);
public:
@@ -59,7 +59,7 @@ public:
void HasLongName(const std::vector<OUString>& rBeginCandidates,
std::vector<std::pair<OUString, sal_uInt16>>& rLongNames);
- bool GetShortName(const OUString& rLongName,
+ bool GetShortName(std::u16string_view rLongName,
OUString& rShortName, OUString& rGroupName );
size_t GetGroupCount();
diff --git a/sw/source/uibase/inc/glossary.hxx b/sw/source/uibase/inc/glossary.hxx
index 7f0dab68901f..4ac5b6c8e4ec 100644
--- a/sw/source/uibase/inc/glossary.hxx
+++ b/sw/source/uibase/inc/glossary.hxx
@@ -95,7 +95,7 @@ class SwGlossaryDlg : public SfxDialogController
void Apply();
void Init();
- std::unique_ptr<weld::TreeIter> DoesBlockExist(const OUString& sBlock, const OUString& rShort);
+ std::unique_ptr<weld::TreeIter> DoesBlockExist(std::u16string_view sBlock, std::u16string_view rShort);
void ShowAutoText(const OUString& rGroup, const OUString& rShortName);
void ResumeShowAutoText();
diff --git a/sw/source/uibase/inc/label.hxx b/sw/source/uibase/inc/label.hxx
index 86d08a2573a1..a7a1c66412c6 100644
--- a/sw/source/uibase/inc/label.hxx
+++ b/sw/source/uibase/inc/label.hxx
@@ -51,7 +51,7 @@ public:
SwDBManager* pDBManager, bool bLabel);
virtual ~SwLabDlg() override;
- SwLabRec* GetRecord(const OUString &rRecName, bool bCont);
+ SwLabRec* GetRecord(std::u16string_view rRecName, bool bCont);
void GetLabItem(SwLabItem &rItem);
SwLabRecs &Recs() { return *m_pRecs; }
diff --git a/sw/source/uibase/inc/langhelper.hxx b/sw/source/uibase/inc/langhelper.hxx
index 8c93d29d3c36..8efc5931e574 100644
--- a/sw/source/uibase/inc/langhelper.hxx
+++ b/sw/source/uibase/inc/langhelper.hxx
@@ -38,8 +38,8 @@ namespace SwLangHelper
extern void GetLanguageStatus( OutlinerView* pOLV, SfxItemSet& rSet );
extern bool SetLanguageStatus( OutlinerView* pOLV, SfxRequest &rReq, SwView const &rView, SwWrtShell &rSh );
- extern void SetLanguage( SwWrtShell &rWrtSh, const OUString &rLangText, bool bIsForSelection, SfxItemSet &rCoreSet );
- extern void SetLanguage( SwWrtShell &rWrtSh, OutlinerView const * pOLV, const ESelection& rSelection, const OUString &rLangText, bool bIsForSelection, SfxItemSet &rCoreSet );
+ extern void SetLanguage( SwWrtShell &rWrtSh, std::u16string_view rLangText, bool bIsForSelection, SfxItemSet &rCoreSet );
+ extern void SetLanguage( SwWrtShell &rWrtSh, OutlinerView const * pOLV, const ESelection& rSelection, std::u16string_view rLangText, bool bIsForSelection, SfxItemSet &rCoreSet );
extern void SetLanguage_None( SwWrtShell &rWrtSh, bool bIsForSelection, SfxItemSet &rCoreSet );
extern void SetLanguage_None( SwWrtShell &rWrtSh, OutlinerView const * pOLV, const ESelection& rSelection, bool bIsForSelection, SfxItemSet &rCoreSet );
extern void ResetLanguages( SwWrtShell &rWrtSh, OutlinerView const * pOLV = nullptr );
diff --git a/sw/source/uibase/inc/outline.hxx b/sw/source/uibase/inc/outline.hxx
index f9c3c1f15dde..f7702359c3ee 100644
--- a/sw/source/uibase/inc/outline.hxx
+++ b/sw/source/uibase/inc/outline.hxx
@@ -56,7 +56,7 @@ public:
virtual ~SwOutlineTabDialog() override;
SwNumRule* GetNumRule() { return xNumRule.get(); }
- sal_uInt16 GetLevel(const OUString &rFormatName) const;
+ sal_uInt16 GetLevel(std::u16string_view rFormatName) const;
OUString* GetCollNames() {return aCollNames;}
static sal_uInt16 GetActNumLevel() {return nNumLevel;}
diff --git a/sw/source/uibase/inc/regionsw.hxx b/sw/source/uibase/inc/regionsw.hxx
index adb2681efef2..a16fc1b93f5e 100644
--- a/sw/source/uibase/inc/regionsw.hxx
+++ b/sw/source/uibase/inc/regionsw.hxx
@@ -110,7 +110,7 @@ public:
SwEditRegionDlg(weld::Window* pParent, SwWrtShell& rWrtSh);
virtual ~SwEditRegionDlg() override;
- void SelectSection(const OUString& rSectionName);
+ void SelectSection(std::u16string_view rSectionName);
};
diff --git a/sw/source/uibase/inc/wrtsh.hxx b/sw/source/uibase/inc/wrtsh.hxx
index a8cc9a49d6cb..4499c0c15763 100644
--- a/sw/source/uibase/inc/wrtsh.hxx
+++ b/sw/source/uibase/inc/wrtsh.hxx
@@ -358,7 +358,7 @@ typedef bool (SwWrtShell::*FNSimpleMove)();
GetStyle eCreate = GETSTYLE_NOCREATE);
SwCharFormat* GetCharStyle(const OUString &rFormatName,
GetStyle eCreate = GETSTYLE_NOCREATE);
- SwFrameFormat* GetTableStyle(const OUString &rFormatName);
+ SwFrameFormat* GetTableStyle(std::u16string_view rFormatName);
void SetPageStyle(const OUString &rCollName);
@@ -475,7 +475,7 @@ typedef bool (SwWrtShell::*FNSimpleMove)();
bool GotoINetAttr( const SwTextINetFormat& rAttr );
void GotoOutline( SwOutlineNodes::size_type nIdx );
bool GotoOutline( const OUString& rName );
- bool GotoRegion( const OUString& rName );
+ bool GotoRegion( std::u16string_view rName );
bool GotoRefMark( const OUString& rRefMark, sal_uInt16 nSubType = 0,
sal_uInt16 nSeqNo = 0 );
bool GotoNextTOXBase( const OUString* pName = nullptr);
@@ -483,7 +483,7 @@ typedef bool (SwWrtShell::*FNSimpleMove)();
void GotoFormatField( const SwFormatField& rField );
const SwRangeRedline* GotoRedline( SwRedlineTable::size_type nArrPos, bool bSelect);
- void ChangeHeaderOrFooter(const OUString& rStyleName, bool bHeader, bool bOn, bool bShowWarning);
+ void ChangeHeaderOrFooter(std::u16string_view rStyleName, bool bHeader, bool bOn, bool bShowWarning);
virtual void SetShowHeaderFooterSeparator( FrameControlType eControl, bool bShow ) override;
/// Inserts a new annotation/comment at the current cursor position / selection.
diff --git a/sw/source/uibase/shells/frmsh.cxx b/sw/source/uibase/shells/frmsh.cxx
index c203ace11024..e6a758b37e5c 100644
--- a/sw/source/uibase/shells/frmsh.cxx
+++ b/sw/source/uibase/shells/frmsh.cxx
@@ -80,7 +80,7 @@ using namespace ::com::sun::star::uno;
// Prototypes
static void lcl_FrameGetMaxLineWidth(const SvxBorderLine* pBorderLine, SvxBorderLine& rBorderLine);
-static const SwFrameFormat* lcl_GetFrameFormatByName(SwWrtShell const & rSh, const OUString& rName)
+static const SwFrameFormat* lcl_GetFrameFormatByName(SwWrtShell const & rSh, std::u16string_view rName)
{
const size_t nCount = rSh.GetFlyCount(FLYCNTTYPE_FRM);
for( size_t i = 0; i < nCount; ++i )
diff --git a/sw/source/uibase/shells/langhelper.cxx b/sw/source/uibase/shells/langhelper.cxx
index 53e039f057e1..1be26660c34c 100644
--- a/sw/source/uibase/shells/langhelper.cxx
+++ b/sw/source/uibase/shells/langhelper.cxx
@@ -217,12 +217,12 @@ namespace SwLangHelper
return bRestoreSelection;
}
- void SetLanguage( SwWrtShell &rWrtSh, const OUString &rLangText, bool bIsForSelection, SfxItemSet &rCoreSet )
+ void SetLanguage( SwWrtShell &rWrtSh, std::u16string_view rLangText, bool bIsForSelection, SfxItemSet &rCoreSet )
{
SetLanguage( rWrtSh, nullptr , ESelection(), rLangText, bIsForSelection, rCoreSet );
}
- void SetLanguage( SwWrtShell &rWrtSh, OutlinerView const * pOLV, const ESelection& rSelection, const OUString &rLangText, bool bIsForSelection, SfxItemSet &rCoreSet )
+ void SetLanguage( SwWrtShell &rWrtSh, OutlinerView const * pOLV, const ESelection& rSelection, std::u16string_view rLangText, bool bIsForSelection, SfxItemSet &rCoreSet )
{
const LanguageType nLang = SvtLanguageTable::GetLanguageType( rLangText );
if (nLang == LANGUAGE_DONTKNOW)
diff --git a/sw/source/uibase/sidebar/StylePresetsPanel.cxx b/sw/source/uibase/sidebar/StylePresetsPanel.cxx
index f24bf135c706..ecb2e61bd3f6 100644
--- a/sw/source/uibase/sidebar/StylePresetsPanel.cxx
+++ b/sw/source/uibase/sidebar/StylePresetsPanel.cxx
@@ -33,7 +33,7 @@ namespace sw::sidebar {
namespace {
void renderPreview(sfx2::StyleManager* pStyleManager, OutputDevice& aOutputDevice,
- OUString const & sName, sal_Int32 nHeight, tools::Rectangle const & aRect)
+ std::u16string_view sName, sal_Int32 nHeight, tools::Rectangle const & aRect)
{
SfxStyleSheetBase* pStyleSheet = pStyleManager->Search(sName, SfxStyleFamily::Para);
@@ -98,18 +98,18 @@ BitmapEx GenerateStylePreview(SfxObjectShell& rSource, OUString const & aName)
{
tools::Rectangle aRenderRect(Point(nMargin, y), aSize);
- renderPreview(pStyleManager, *pVirtualDev, "Title", nTitleHeight, aRenderRect);
+ renderPreview(pStyleManager, *pVirtualDev, u"Title", nTitleHeight, aRenderRect);
y += nTitleHeight;
}
{
tools::Rectangle aRenderRect(Point(nMargin, y), aSize);
- renderPreview(pStyleManager, *pVirtualDev, "Heading 1", nHeadingHeight, aRenderRect);
+ renderPreview(pStyleManager, *pVirtualDev, u"Heading 1", nHeadingHeight, aRenderRect);
y += nHeadingHeight;
}
{
tools::Rectangle aRenderRect(Point(nMargin, y), aSize);
- renderPreview(pStyleManager, *pVirtualDev, "Text Body", nTextBodyHeight, aRenderRect);
+ renderPreview(pStyleManager, *pVirtualDev, u"Text Body", nTextBodyHeight, aRenderRect);
}
return pVirtualDev->GetBitmapEx(Point(), aSize);
diff --git a/sw/source/uibase/sidebar/ThemePanel.cxx b/sw/source/uibase/sidebar/ThemePanel.cxx
index f4c4951f6546..2ba276cf212e 100644
--- a/sw/source/uibase/sidebar/ThemePanel.cxx
+++ b/sw/source/uibase/sidebar/ThemePanel.cxx
@@ -104,7 +104,7 @@ public:
maStyles.push_back(aRedefinition);
}
- StyleRedefinition* get(const OUString& aString)
+ StyleRedefinition* get(std::u16string_view aString)
{
for (StyleRedefinition & rStyle : maStyles)
{
@@ -315,7 +315,7 @@ std::vector<FontSet> initFontSets()
return aFontSets;
}
-FontSet getFontSet(const OUString& rFontVariant, std::vector<FontSet>& aFontSets)
+FontSet getFontSet(std::u16string_view rFontVariant, std::vector<FontSet>& aFontSets)
{
for (const FontSet & rFontSet : aFontSets)
{
@@ -325,7 +325,7 @@ FontSet getFontSet(const OUString& rFontVariant, std::vector<FontSet>& aFontSets
return aFontSets[0];
}
-void applyTheme(SfxStyleSheetBasePool* pPool, const OUString& sFontSetName, const OUString& sColorSetName,
+void applyTheme(SfxStyleSheetBasePool* pPool, std::u16string_view sFontSetName, std::u16string_view sColorSetName,
StyleSet& rStyleSet, svx::ColorSets& rColorSets)
{
SwDocStyleSheet* pStyle;
diff --git a/sw/source/uibase/uiview/view2.cxx b/sw/source/uibase/uiview/view2.cxx
index 4b83a3d00e95..bf6804075822 100644
--- a/sw/source/uibase/uiview/view2.cxx
+++ b/sw/source/uibase/uiview/view2.cxx
@@ -1178,7 +1178,7 @@ void SwView::Execute(SfxRequest &rReq)
GetViewFrame()->ShowChildWindow(SID_SIDEBAR);
::sfx2::sidebar::Sidebar::ShowPanel(
- "GalleryPanel",
+ u"GalleryPanel",
GetViewFrame()->GetFrame().GetFrameInterface());
break;
case SID_AVMEDIA_PLAYER :
diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx
index 2ac47cd7efb7..dfaa0b123096 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -3092,9 +3092,9 @@ void SwContentTree::HideTree()
}
static void lcl_SelectByContentTypeAndName(SwContentTree* pThis, weld::TreeView& rContentTree,
- const OUString& rContentTypeName, const OUString& rName)
+ std::u16string_view rContentTypeName, std::u16string_view rName)
{
- if (!rName.isEmpty())
+ if (!rName.empty())
{
// find content type entry
std::unique_ptr<weld::TreeIter> xIter(rContentTree.make_iterator());
diff --git a/sw/source/uibase/utlui/gloslst.cxx b/sw/source/uibase/utlui/gloslst.cxx
index b58335850ad9..8d2dcc2af2d3 100644
--- a/sw/source/uibase/utlui/gloslst.cxx
+++ b/sw/source/uibase/utlui/gloslst.cxx
@@ -100,7 +100,7 @@ SwGlossaryList::~SwGlossaryList()
// will be filled. Otherwise also rGroupName will be set and
// on demand asked for the right group.
-bool SwGlossaryList::GetShortName(const OUString& rLongName,
+bool SwGlossaryList::GetShortName(std::u16string_view rLongName,
OUString& rShortName, OUString& rGroupName )
{
if(!bFilled)
@@ -336,7 +336,7 @@ void SwGlossaryList::Invoke()
Update();
}
-AutoTextGroup* SwGlossaryList::FindGroup(const OUString& rGroupName)
+AutoTextGroup* SwGlossaryList::FindGroup(std::u16string_view rGroupName)
{
for(const auto & pRet : aGroupArr)
{
diff --git a/sw/source/uibase/wrtsh/move.cxx b/sw/source/uibase/wrtsh/move.cxx
index 491a2fcbdb2a..bd076831167d 100644
--- a/sw/source/uibase/wrtsh/move.cxx
+++ b/sw/source/uibase/wrtsh/move.cxx
@@ -624,7 +624,7 @@ bool SwWrtShell::GotoOutline( const OUString& rName )
return bRet;
}
-bool SwWrtShell::GotoRegion( const OUString& rName )
+bool SwWrtShell::GotoRegion( std::u16string_view rName )
{
SwPosition aPos = *GetCursor()->GetPoint();
bool bRet = SwCursorShell::GotoRegion (rName);
diff --git a/sw/source/uibase/wrtsh/wrtsh1.cxx b/sw/source/uibase/wrtsh/wrtsh1.cxx
index 8251a9978142..3fb11b740ca4 100644
--- a/sw/source/uibase/wrtsh/wrtsh1.cxx
+++ b/sw/source/uibase/wrtsh/wrtsh1.cxx
@@ -1526,7 +1526,7 @@ SwCharFormat *SwWrtShell::GetCharStyle(const OUString &rFormatName, GetStyle eCr
// frame format with this name exists or
// this is a default format or the format is automatic.
-SwFrameFormat *SwWrtShell::GetTableStyle(const OUString &rFormatName)
+SwFrameFormat *SwWrtShell::GetTableStyle(std::u16string_view rFormatName)
{
for( size_t i = GetTableFrameFormatCount(); i; )
{
@@ -1804,7 +1804,7 @@ void SwWrtShell::SetReadonlyOption(bool bSet)
// given all styles are changed
void SwWrtShell::ChangeHeaderOrFooter(
- const OUString& rStyleName, bool bHeader, bool bOn, bool bShowWarning)
+ std::u16string_view rStyleName, bool bHeader, bool bOn, bool bShowWarning)
{
SdrView *const pSdrView = GetDrawView();
if (pSdrView && pSdrView->IsTextEdit())
@@ -1821,7 +1821,7 @@ void SwWrtShell::ChangeHeaderOrFooter(
{
SwPageDesc aDesc( GetPageDesc( nFrom ));
OUString sTmp(aDesc.GetName());
- if( rStyleName.isEmpty() || rStyleName == sTmp )
+ if( rStyleName.empty() || rStyleName == sTmp )
{
bool bChgd = false;
@@ -1872,7 +1872,7 @@ void SwWrtShell::ChangeHeaderOrFooter(
if ( !IsHeaderFooterEdit() )
ToggleHeaderFooterEdit();
bCursorSet = SetCursorInHdFt(
- rStyleName.isEmpty() ? SIZE_MAX : nFrom,
+ rStyleName.empty() ? SIZE_MAX : nFrom,
bHeader );
}
}