summaryrefslogtreecommitdiff
path: root/sw/source/uibase/docvw
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2024-06-10 10:36:45 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2024-06-10 12:15:17 +0200
commit18ef391582e1f8db5838dfc1aaff36f78ce51447 (patch)
tree34f19156e59bf0bf08a9b05102849332cf465684 /sw/source/uibase/docvw
parentd25de4a04671c2f380fc86a58259b073c49dfe19 (diff)
loplugin:ostr in sw/../uibase
Change-Id: I4f4284b55d481caa006743688e6d83cc3c713b5c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168601 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw/source/uibase/docvw')
-rw-r--r--sw/source/uibase/docvw/AnnotationMenuButton.cxx36
-rw-r--r--sw/source/uibase/docvw/AnnotationWin.cxx10
-rw-r--r--sw/source/uibase/docvw/AnnotationWin2.cxx24
-rw-r--r--sw/source/uibase/docvw/HeaderFooterWin.cxx16
-rw-r--r--sw/source/uibase/docvw/OutlineContentVisibilityWin.cxx7
-rw-r--r--sw/source/uibase/docvw/PageBreakWin.cxx10
-rw-r--r--sw/source/uibase/docvw/UnfloatTableButton.cxx8
-rw-r--r--sw/source/uibase/docvw/contentcontrolaliasbutton.cxx7
-rw-r--r--sw/source/uibase/docvw/edtwin.cxx4
-rw-r--r--sw/source/uibase/docvw/edtwin2.cxx4
-rw-r--r--sw/source/uibase/docvw/romenu.cxx2
-rw-r--r--sw/source/uibase/docvw/srcedtw.cxx2
12 files changed, 66 insertions, 64 deletions
diff --git a/sw/source/uibase/docvw/AnnotationMenuButton.cxx b/sw/source/uibase/docvw/AnnotationMenuButton.cxx
index 5e42d15c879e..345e57d4b084 100644
--- a/sw/source/uibase/docvw/AnnotationMenuButton.cxx
+++ b/sw/source/uibase/docvw/AnnotationMenuButton.cxx
@@ -69,29 +69,29 @@ IMPL_LINK_NOARG(SwAnnotationWin, ToggleHdl, weld::Toggleable&, void)
bool bReadOnly = IsReadOnly();
if (bReadOnly)
{
- mxMenuButton->set_item_visible("reply", false);
- mxMenuButton->set_item_visible("sep1", false); // Separator after reply button.
- mxMenuButton->set_item_visible("resolve", false);
- mxMenuButton->set_item_visible("unresolve", false);
- mxMenuButton->set_item_visible("resolvethread", false);
- mxMenuButton->set_item_visible("unresolvethread", false);
- mxMenuButton->set_item_visible("delete", false );
+ mxMenuButton->set_item_visible(u"reply"_ustr, false);
+ mxMenuButton->set_item_visible(u"sep1"_ustr, false); // Separator after reply button.
+ mxMenuButton->set_item_visible(u"resolve"_ustr, false);
+ mxMenuButton->set_item_visible(u"unresolve"_ustr, false);
+ mxMenuButton->set_item_visible(u"resolvethread"_ustr, false);
+ mxMenuButton->set_item_visible(u"unresolvethread"_ustr, false);
+ mxMenuButton->set_item_visible(u"delete"_ustr, false );
}
else
{
- mxMenuButton->set_item_visible("reply", !IsReadOnlyOrProtected());
- mxMenuButton->set_item_visible("sep1", !IsReadOnlyOrProtected());
- mxMenuButton->set_item_visible("resolve", !IsResolved());
- mxMenuButton->set_item_visible("unresolve", IsResolved());
- mxMenuButton->set_item_visible("resolvethread", !IsThreadResolved());
- mxMenuButton->set_item_visible("unresolvethread", IsThreadResolved());
- mxMenuButton->set_item_visible("delete", !IsReadOnlyOrProtected());
+ mxMenuButton->set_item_visible(u"reply"_ustr, !IsReadOnlyOrProtected());
+ mxMenuButton->set_item_visible(u"sep1"_ustr, !IsReadOnlyOrProtected());
+ mxMenuButton->set_item_visible(u"resolve"_ustr, !IsResolved());
+ mxMenuButton->set_item_visible(u"unresolve"_ustr, IsResolved());
+ mxMenuButton->set_item_visible(u"resolvethread"_ustr, !IsThreadResolved());
+ mxMenuButton->set_item_visible(u"unresolvethread"_ustr, IsThreadResolved());
+ mxMenuButton->set_item_visible(u"delete"_ustr, !IsReadOnlyOrProtected());
}
- mxMenuButton->set_item_visible("deletethread", !bReadOnly);
- mxMenuButton->set_item_visible("deleteby", !bReadOnly);
- mxMenuButton->set_item_visible("deleteall", !bReadOnly);
- mxMenuButton->set_item_visible("formatall", !bReadOnly);
+ mxMenuButton->set_item_visible(u"deletethread"_ustr, !bReadOnly);
+ mxMenuButton->set_item_visible(u"deleteby"_ustr, !bReadOnly);
+ mxMenuButton->set_item_visible(u"deleteall"_ustr, !bReadOnly);
+ mxMenuButton->set_item_visible(u"formatall"_ustr, !bReadOnly);
}
IMPL_LINK(SwAnnotationWin, KeyInputHdl, const KeyEvent&, rKeyEvt, bool)
diff --git a/sw/source/uibase/docvw/AnnotationWin.cxx b/sw/source/uibase/docvw/AnnotationWin.cxx
index db54099486af..d30a160f31f8 100644
--- a/sw/source/uibase/docvw/AnnotationWin.cxx
+++ b/sw/source/uibase/docvw/AnnotationWin.cxx
@@ -92,7 +92,7 @@ SwAnnotationWin::SwAnnotationWin( SwEditWin& rEditWin,
SwPostItMgr& aMgr,
SwSidebarItem& rSidebarItem,
SwFormatField* aField )
- : InterimItemWindow(&rEditWin, "modules/swriter/ui/annotation.ui", "Annotation")
+ : InterimItemWindow(&rEditWin, u"modules/swriter/ui/annotation.ui"_ustr, u"Annotation"_ustr)
, mrMgr(aMgr)
, mrView(rEditWin.GetView())
, mnDeleteEventId(nullptr)
@@ -237,7 +237,7 @@ void SwAnnotationWin::SetResolved(bool resolved)
mbResolvedStateUpdated = true;
UpdateData();
Invalidate();
- collectUIInformation("SETRESOLVED",get_id());
+ collectUIInformation(u"SETRESOLVED"_ustr,get_id());
}
void SwAnnotationWin::ToggleResolved()
@@ -343,7 +343,7 @@ void SwAnnotationWin::UpdateData()
void SwAnnotationWin::Delete()
{
- collectUIInformation("DELETE",get_id());
+ collectUIInformation(u"DELETE"_ustr,get_id());
SwWrtShell* pWrtShell = mrView.GetWrtShellPtr();
if (!(pWrtShell && pWrtShell->GotoField(*mpFormatField)))
return;
@@ -423,8 +423,8 @@ void SwAnnotationWin::InitAnswer(OutlinerParaObject const & rText)
if (rText.GetTextObject().HasText(0))
GetOutlinerView()->GetEditView().InsertText(rText.GetTextObject());
else
- GetOutlinerView()->InsertText("...");
- GetOutlinerView()->InsertText("\"\n");
+ GetOutlinerView()->InsertText(u"..."_ustr);
+ GetOutlinerView()->InsertText(u"\"\n"_ustr);
GetOutlinerView()->SetSelection(ESelection(0,0,EE_PARA_ALL,EE_TEXTPOS_ALL));
SfxItemSet aAnswerSet( mrView.GetDocShell()->GetPool() );
diff --git a/sw/source/uibase/docvw/AnnotationWin2.cxx b/sw/source/uibase/docvw/AnnotationWin2.cxx
index 378d35b174d4..debca6ca43a6 100644
--- a/sw/source/uibase/docvw/AnnotationWin2.cxx
+++ b/sw/source/uibase/docvw/AnnotationWin2.cxx
@@ -244,7 +244,7 @@ void SwAnnotationWin::DrawForPage(OutputDevice* pDev, const Point& rPt)
int x, y, width, height;
mxMenuButton->get_extents_relative_to(*m_xContainer, x, y, width, height);
Point aPos(rPt + PixelToLogic(Point(x, y)));
- pDev->DrawText(aPos, "...");
+ pDev->DrawText(aPos, u"..."_ustr);
}
pDev->Pop();
@@ -302,7 +302,7 @@ void SwAnnotationWin::ShowAnchorOnly(const Point &aPoint)
void SwAnnotationWin::InitControls()
{
// window controls for author and date
- mxMetadataAuthor = m_xBuilder->weld_label("author");
+ mxMetadataAuthor = m_xBuilder->weld_label(u"author"_ustr);
mxMetadataAuthor->set_accessible_name( SwResId( STR_ACCESS_ANNOTATION_AUTHOR_NAME ) );
mxMetadataAuthor->set_direction(AllSettings::GetLayoutRTL());
@@ -313,7 +313,7 @@ void SwAnnotationWin::InitControls()
// with variable meta size height
mxMetadataAuthor->set_font(maLabelFont);
- mxMetadataDate = m_xBuilder->weld_label("date");
+ mxMetadataDate = m_xBuilder->weld_label(u"date"_ustr);
mxMetadataDate->set_accessible_name( SwResId( STR_ACCESS_ANNOTATION_DATE_NAME ) );
mxMetadataDate->set_direction(AllSettings::GetLayoutRTL());
mxMetadataDate->connect_mouse_move(LINK(this, SwAnnotationWin, MouseMoveHdl));
@@ -322,7 +322,7 @@ void SwAnnotationWin::InitControls()
// with variable meta size height
mxMetadataDate->set_font(maLabelFont);
- mxMetadataResolved = m_xBuilder->weld_label("resolved");
+ mxMetadataResolved = m_xBuilder->weld_label(u"resolved"_ustr);
mxMetadataResolved->set_accessible_name( SwResId( STR_ACCESS_ANNOTATION_RESOLVED_NAME ) );
mxMetadataResolved->set_direction(AllSettings::GetLayoutRTL());
mxMetadataResolved->connect_mouse_move(LINK(this, SwAnnotationWin, MouseMoveHdl));
@@ -342,14 +342,14 @@ void SwAnnotationWin::InitControls()
mpOutliner->InsertView(mpOutlinerView.get());
//create Scrollbars
- mxVScrollbar = m_xBuilder->weld_scrolled_window("scrolledwindow", true);
+ mxVScrollbar = m_xBuilder->weld_scrolled_window(u"scrolledwindow"_ustr, true);
- mxMenuButton = m_xBuilder->weld_menu_button("menubutton");
+ mxMenuButton = m_xBuilder->weld_menu_button(u"menubutton"_ustr);
mxMenuButton->set_size_request(METABUTTON_WIDTH, METABUTTON_HEIGHT);
// actual window which holds the user text
mxSidebarTextControl.reset(new SidebarTextControl(*this, mrView, mrMgr));
- mxSidebarTextControlWin.reset(new weld::CustomWeld(*m_xBuilder, "editview", *mxSidebarTextControl));
+ mxSidebarTextControlWin.reset(new weld::CustomWeld(*m_xBuilder, u"editview"_ustr, *mxSidebarTextControl));
mxSidebarTextControl->SetPointer(PointerStyle::Text);
Rescale();
@@ -390,11 +390,11 @@ void SwAnnotationWin::InitControls()
CheckMetaText();
// expand %1 "Author"
- OUString aText = mxMenuButton->get_item_label("deleteby");
+ OUString aText = mxMenuButton->get_item_label(u"deleteby"_ustr);
SwRewriter aRewriter;
aRewriter.AddRule(UndoArg1, GetAuthor());
aText = aRewriter.Apply(aText);
- mxMenuButton->set_item_label("deleteby", aText);
+ mxMenuButton->set_item_label(u"deleteby"_ustr, aText);
mxMenuButton->set_accessible_name(SwResId(STR_ACCESS_ANNOTATION_BUTTON_NAME));
mxMenuButton->set_accessible_description(SwResId(STR_ACCESS_ANNOTATION_BUTTON_DESC));
@@ -945,7 +945,7 @@ void SwAnnotationWin::ShowNote()
if (mpTextRangeOverlay && !mpTextRangeOverlay->isVisible())
mpTextRangeOverlay->setVisible(true);
- collectUIInformation("SHOW",get_id());
+ collectUIInformation(u"SHOW"_ustr,get_id());
}
void SwAnnotationWin::HideNote()
@@ -963,7 +963,7 @@ void SwAnnotationWin::HideNote()
mpShadow->setVisible(false);
if (mpTextRangeOverlay && mpTextRangeOverlay->isVisible())
mpTextRangeOverlay->setVisible(false);
- collectUIInformation("HIDE",get_id());
+ collectUIInformation(u"HIDE"_ustr,get_id());
}
void SwAnnotationWin::ActivatePostIt()
@@ -1388,7 +1388,7 @@ void SwAnnotationWin::SwitchToFieldPos()
if (aCount)
mrView.GetDocShell()->GetWrtShell()->SwCursorShell::Right(aCount, SwCursorSkipMode::Chars);
GrabFocusToDocument();
- collectUIInformation("LEAVE",get_id());
+ collectUIInformation(u"LEAVE"_ustr,get_id());
}
void SwAnnotationWin::SetChangeTracking( const SwPostItHelper::SwLayoutStatus aLayoutStatus,
diff --git a/sw/source/uibase/docvw/HeaderFooterWin.cxx b/sw/source/uibase/docvw/HeaderFooterWin.cxx
index 8035c73cebc3..c20c39dcb6e4 100644
--- a/sw/source/uibase/docvw/HeaderFooterWin.cxx
+++ b/sw/source/uibase/docvw/HeaderFooterWin.cxx
@@ -227,9 +227,9 @@ void SwHeaderFooterDashedLine::SetOffset(Point aOffset, tools::Long nXLineStart,
}
SwHeaderFooterWin::SwHeaderFooterWin(SwEditWin* pEditWin, const SwFrame *pFrame, bool bHeader ) :
- InterimItemWindow(pEditWin, "modules/swriter/ui/hfmenubutton.ui", "HFMenuButton"),
- m_xMenuButton(m_xBuilder->weld_menu_button("menubutton")),
- m_xPushButton(m_xBuilder->weld_button("button")),
+ InterimItemWindow(pEditWin, u"modules/swriter/ui/hfmenubutton.ui"_ustr, u"HFMenuButton"_ustr),
+ m_xMenuButton(m_xBuilder->weld_menu_button(u"menubutton"_ustr)),
+ m_xPushButton(m_xBuilder->weld_button(u"button"_ustr)),
m_pEditWin(pEditWin),
m_pFrame(pFrame),
m_bIsHeader( bHeader ),
@@ -247,13 +247,13 @@ SwHeaderFooterWin::SwHeaderFooterWin(SwEditWin* pEditWin, const SwFrame *pFrame,
// Rewrite the menu entries' text
if (m_bIsHeader)
{
- m_xMenuButton->set_item_label("edit", SwResId(STR_FORMAT_HEADER));
- m_xMenuButton->set_item_label("delete", SwResId(STR_DELETE_HEADER));
+ m_xMenuButton->set_item_label(u"edit"_ustr, SwResId(STR_FORMAT_HEADER));
+ m_xMenuButton->set_item_label(u"delete"_ustr, SwResId(STR_DELETE_HEADER));
}
else
{
- m_xMenuButton->set_item_label("edit", SwResId(STR_FORMAT_FOOTER));
- m_xMenuButton->set_item_label("delete", SwResId(STR_DELETE_FOOTER));
+ m_xMenuButton->set_item_label(u"edit"_ustr, SwResId(STR_FORMAT_FOOTER));
+ m_xMenuButton->set_item_label(u"delete"_ustr, SwResId(STR_DELETE_FOOTER));
}
m_aFadeTimer.SetTimeout(50);
@@ -483,7 +483,7 @@ void SwHeaderFooterWin::ExecuteCommand(std::u16string_view rIdent)
const OUString& rStyleName = pPageFrame->GetPageDesc()->GetName();
if (rIdent == u"edit")
{
- OUString sPageId = m_bIsHeader ? OUString("header") : OUString("footer");
+ OUString sPageId = m_bIsHeader ? u"header"_ustr : u"footer"_ustr;
rView.GetDocShell()->FormatPage(rView.GetFrameWeld(), rStyleName, sPageId, rSh);
}
else if (rIdent == u"borderback")
diff --git a/sw/source/uibase/docvw/OutlineContentVisibilityWin.cxx b/sw/source/uibase/docvw/OutlineContentVisibilityWin.cxx
index b7a21add98be..eebc0e905f14 100644
--- a/sw/source/uibase/docvw/OutlineContentVisibilityWin.cxx
+++ b/sw/source/uibase/docvw/OutlineContentVisibilityWin.cxx
@@ -26,9 +26,10 @@
SwOutlineContentVisibilityWin::SwOutlineContentVisibilityWin(SwEditWin* pEditWin,
const SwFrame* pFrame)
- : InterimItemWindow(pEditWin, "modules/swriter/ui/outlinebutton.ui", "OutlineButton")
- , m_xShowBtn(m_xBuilder->weld_button("show"))
- , m_xHideBtn(m_xBuilder->weld_button("hide"))
+ : InterimItemWindow(pEditWin, u"modules/swriter/ui/outlinebutton.ui"_ustr,
+ u"OutlineButton"_ustr)
+ , m_xShowBtn(m_xBuilder->weld_button(u"show"_ustr))
+ , m_xHideBtn(m_xBuilder->weld_button(u"hide"_ustr))
, m_pEditWin(pEditWin)
, m_pFrame(pFrame)
, m_nDelayAppearing(0)
diff --git a/sw/source/uibase/docvw/PageBreakWin.cxx b/sw/source/uibase/docvw/PageBreakWin.cxx
index c71dc62ecc3a..41aca8454d7a 100644
--- a/sw/source/uibase/docvw/PageBreakWin.cxx
+++ b/sw/source/uibase/docvw/PageBreakWin.cxx
@@ -64,7 +64,7 @@ SwBreakDashedLine::SwBreakDashedLine(SwEditWin* pEditWin, const SwFrame *pFrame)
, m_pEditWin(pEditWin)
, m_pFrame(pFrame)
{
- set_id("PageBreak"); // for uitest
+ set_id(u"PageBreak"_ustr); // for uitest
}
SwPageBreakWin& SwBreakDashedLine::GetOrCreateWin()
@@ -123,8 +123,8 @@ bool SwBreakDashedLine::Contains(const Point &rDocPt) const
}
SwPageBreakWin::SwPageBreakWin(SwBreakDashedLine* pLine, SwEditWin* pEditWin, const SwFrame *pFrame) :
- InterimItemWindow(pEditWin, "modules/swriter/ui/pbmenubutton.ui", "PBMenuButton"),
- m_xMenuButton(m_xBuilder->weld_menu_button("menubutton")),
+ InterimItemWindow(pEditWin, u"modules/swriter/ui/pbmenubutton.ui"_ustr, u"PBMenuButton"_ustr),
+ m_xMenuButton(m_xBuilder->weld_menu_button(u"menubutton"_ustr)),
m_pLine(pLine),
m_pEditWin(pEditWin),
m_pFrame(pFrame),
@@ -312,7 +312,7 @@ void SwBreakDashedLine::execute(std::u16string_view rIdent)
rSh.SetSelection( SwPaM(rNd) );
- SfxStringItem aItem(m_pEditWin->GetView().GetPool().GetWhichIDFromSlotID(FN_FORMAT_TABLE_DLG), "textflow");
+ SfxStringItem aItem(m_pEditWin->GetView().GetPool().GetWhichIDFromSlotID(FN_FORMAT_TABLE_DLG), u"textflow"_ustr);
m_pEditWin->GetView().GetViewFrame().GetDispatcher()->ExecuteList(
FN_FORMAT_TABLE_DLG,
SfxCallMode::SYNCHRON | SfxCallMode::RECORD,
@@ -324,7 +324,7 @@ void SwBreakDashedLine::execute(std::u16string_view rIdent)
{
SwPaM aPaM( rNd );
SwPaMItem aPaMItem( m_pEditWin->GetView().GetPool( ).GetWhichIDFromSlotID( FN_PARAM_PAM ), &aPaM );
- SfxStringItem aItem( SID_PARA_DLG, "textflow" );
+ SfxStringItem aItem( SID_PARA_DLG, u"textflow"_ustr );
m_pEditWin->GetView().GetViewFrame().GetDispatcher()->ExecuteList(
SID_PARA_DLG,
SfxCallMode::SYNCHRON | SfxCallMode::RECORD,
diff --git a/sw/source/uibase/docvw/UnfloatTableButton.cxx b/sw/source/uibase/docvw/UnfloatTableButton.cxx
index c9169102f14e..d5331aeec3ee 100644
--- a/sw/source/uibase/docvw/UnfloatTableButton.cxx
+++ b/sw/source/uibase/docvw/UnfloatTableButton.cxx
@@ -46,9 +46,9 @@
#define BUTTON_WIDTH 12
UnfloatTableButton::UnfloatTableButton(SwEditWin* pEditWin, const SwFrame* pFrame)
- : SwFrameMenuButtonBase(pEditWin, pFrame, "modules/swriter/ui/unfloatbutton.ui",
- "UnfloatButton")
- , m_xPushButton(m_xBuilder->weld_button("button"))
+ : SwFrameMenuButtonBase(pEditWin, pFrame, u"modules/swriter/ui/unfloatbutton.ui"_ustr,
+ u"UnfloatButton"_ustr)
+ , m_xPushButton(m_xBuilder->weld_button(u"button"_ustr))
, m_sLabel(SwResId(STR_UNFLOAT_TABLE))
{
m_xPushButton->set_accessible_name(m_sLabel);
@@ -137,7 +137,7 @@ IMPL_LINK_NOARG(UnfloatTableButton, ClickHdl, weld::Button&, void)
if (const SfxGrabBagItem* pGrabBagItem = pTableFormat->GetAttrSet().GetItem(RES_FRMATR_GRABBAG))
{
SfxGrabBagItem aGrabBagItem(*pGrabBagItem); // Editable copy
- if (aGrabBagItem.GetGrabBag().erase("TablePosition"))
+ if (aGrabBagItem.GetGrabBag().erase(u"TablePosition"_ustr))
{
css::uno::Any aVal;
aGrabBagItem.QueryValue(aVal);
diff --git a/sw/source/uibase/docvw/contentcontrolaliasbutton.cxx b/sw/source/uibase/docvw/contentcontrolaliasbutton.cxx
index a22deda2d4ee..67d83ed35a29 100644
--- a/sw/source/uibase/docvw/contentcontrolaliasbutton.cxx
+++ b/sw/source/uibase/docvw/contentcontrolaliasbutton.cxx
@@ -32,9 +32,10 @@
SwContentControlAliasButton::SwContentControlAliasButton(SwEditWin* pEditWin,
SwContentControl* pContentControl)
- : SwFrameMenuButtonBase(pEditWin, nullptr, "modules/swriter/ui/contentcontrolaliasbutton.ui",
- "ContentControlAliasButton")
- , m_xPushButton(m_xBuilder->weld_button("button"))
+ : SwFrameMenuButtonBase(pEditWin, nullptr,
+ u"modules/swriter/ui/contentcontrolaliasbutton.ui"_ustr,
+ u"ContentControlAliasButton"_ustr)
+ , m_xPushButton(m_xBuilder->weld_button(u"button"_ustr))
, m_sLabel(pContentControl->GetAlias())
{
m_xPushButton->set_accessible_name(m_sLabel);
diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx
index 3752d4a418f4..8c41e02a98bc 100644
--- a/sw/source/uibase/docvw/edtwin.cxx
+++ b/sw/source/uibase/docvw/edtwin.cxx
@@ -5481,7 +5481,7 @@ SwEditWin::SwEditWin(vcl::Window *pParent, SwView &rMyView):
m_nKS_NUMINDENTINC_Count(0),
m_pFrameControlsManager(new SwFrameControlsManager(this))
{
- set_id("writer_edit");
+ set_id(u"writer_edit"_ustr);
SetHelpId(HID_EDIT_WIN);
EnableChildTransparentMode();
SetDialogControlFlags( DialogControlFlags::Return | DialogControlFlags::WantFocus );
@@ -5720,7 +5720,7 @@ void SwEditWin::Command( const CommandEvent& rCEvt )
aEvent.ExecutePosition.Y = aPixPos.Y();
rtl::Reference<VCLXPopupMenu> xMenu;
rtl::Reference<VCLXPopupMenu> xMenuInterface = aROPopup.CreateMenuInterface();
- if (GetView().TryContextMenuInterception(xMenuInterface, "private:resource/ReadonlyContextMenu", xMenu, aEvent))
+ if (GetView().TryContextMenuInterception(xMenuInterface, u"private:resource/ReadonlyContextMenu"_ustr, xMenu, aEvent))
{
if (xMenu.is())
{
diff --git a/sw/source/uibase/docvw/edtwin2.cxx b/sw/source/uibase/docvw/edtwin2.cxx
index 4107d2a05c0b..24f801f88cb5 100644
--- a/sw/source/uibase/docvw/edtwin2.cxx
+++ b/sw/source/uibase/docvw/edtwin2.cxx
@@ -142,7 +142,7 @@ bool PSCSDFPropsQuickHelp(const HelpEvent &rEvt, SwWrtShell& rSh)
{
// check if in CS formatting highlighted area
OUString sCharStyle;
- xRange->getPropertyValue("CharStyleName") >>= sCharStyle;
+ xRange->getPropertyValue(u"CharStyleName"_ustr) >>= sCharStyle;
if (!sCharStyle.isEmpty())
sText = SwStyleNameMapper::GetUIName(sCharStyle, SwGetPoolIdFromName::ChrFmt);
}
@@ -217,7 +217,7 @@ bool PSCSDFPropsQuickHelp(const HelpEvent &rEvt, SwWrtShell& rSh)
if (aFrameAreaRect.Contains(aPt))
{
OUString sParaStyle;
- xRange->getPropertyValue("ParaStyleName") >>= sParaStyle;
+ xRange->getPropertyValue(u"ParaStyleName"_ustr) >>= sParaStyle;
sText = SwStyleNameMapper::GetUIName(sParaStyle, SwGetPoolIdFromName::TxtColl);
// check for paragraph direct formatting
if (SwDoc::HasParagraphDirectFormatting(aPos))
diff --git a/sw/source/uibase/docvw/romenu.cxx b/sw/source/uibase/docvw/romenu.cxx
index 7baea26be154..fb8d20d0e525 100644
--- a/sw/source/uibase/docvw/romenu.cxx
+++ b/sw/source/uibase/docvw/romenu.cxx
@@ -73,7 +73,7 @@ void SwReadOnlyPopup::Check( sal_uInt16 nMID, sal_uInt16 nSID, SfxDispatcher con
#define MN_READONLY_BACKGROUNDTOGALLERY 2000
SwReadOnlyPopup::SwReadOnlyPopup(const Point &rDPos, SwView &rV)
- : m_aBuilder(nullptr, AllSettings::GetUIRootDir(), "modules/swriter/ui/readonlymenu.ui", "")
+ : m_aBuilder(nullptr, AllSettings::GetUIRootDir(), u"modules/swriter/ui/readonlymenu.ui"_ustr, u""_ustr)
, m_xMenu(m_aBuilder.get_menu(u"menu"))
, m_nReadonlyOpenurl(m_xMenu->GetItemId(u"openurl"))
, m_nReadonlyOpendoc(m_xMenu->GetItemId(u"opendoc"))
diff --git a/sw/source/uibase/docvw/srcedtw.cxx b/sw/source/uibase/docvw/srcedtw.cxx
index b4196d97f1bf..8fd5e2f3b797 100644
--- a/sw/source/uibase/docvw/srcedtw.cxx
+++ b/sw/source/uibase/docvw/srcedtw.cxx
@@ -252,7 +252,7 @@ SwSrcEditWindow::SwSrcEditWindow( vcl::Window* pParent, SwSrcView* pParentView )
std::unique_lock g(mutex_);
m_xNotifier = n;
}
- n->addPropertiesChangeListener({ "FontHeight", "FontName" }, m_xListener);
+ n->addPropertiesChangeListener({ u"FontHeight"_ustr, u"FontName"_ustr }, m_xListener);
}
SwSrcEditWindow::~SwSrcEditWindow()