sw/inc/doc.hxx | 2
sw/inc/swtable.hxx | 2
sw/inc/unotextcursor.hxx | 2
sw/source/ui/chrdlg/break.cxx | 28 -
sw/source/ui/chrdlg/chardlg.cxx | 22 -
sw/source/ui/chrdlg/drpcps.cxx | 30 +-
sw/source/ui/chrdlg/numpara.cxx | 40 +-
sw/source/ui/chrdlg/pardlg.cxx | 46 +--
sw/source/ui/chrdlg/swuiccoll.cxx | 14
sw/source/ui/chrdlg/tblnumfm.cxx | 4
sw/source/ui/config/mailconfigpage.cxx | 132 ++++----
sw/source/ui/config/optcomp.cxx | 12
sw/source/ui/config/optload.cxx | 136 ++++-----
sw/source/ui/config/optpage.cxx | 462 +++++++++++++++----------------
sw/source/ui/dialog/abstract.cxx | 7
sw/source/ui/dialog/ascfldlg.cxx | 24 -
sw/source/ui/dialog/docstdlg.cxx | 24 -
sw/source/ui/dialog/swdlgfact.cxx | 2
sw/source/ui/dialog/swmessdialog.cxx | 6
sw/source/ui/dialog/swuiexp.cxx | 4
sw/source/ui/dialog/uiregionsw.cxx | 190 ++++++------
sw/source/ui/dialog/wordcountdialog.cxx | 32 +-
sw/source/ui/dochdl/selglos.cxx | 6
sw/source/ui/envelp/envfmt.cxx | 22 -
sw/source/ui/envelp/envlop1.cxx | 28 -
sw/source/ui/envelp/envprt.cxx | 42 +-
sw/source/ui/envelp/label1.cxx | 118 +++----
sw/source/ui/envelp/labfmt.cxx | 46 +--
sw/source/ui/envelp/labprt.cxx | 22 -
sw/source/ui/envelp/mailmrge.cxx | 94 +++---
sw/source/ui/fmtui/tmpdlg.cxx | 128 ++++----
sw/source/ui/frmdlg/column.cxx | 68 ++--
sw/source/ui/frmdlg/cption.cxx | 44 +-
sw/source/ui/frmdlg/frmdlg.cxx | 38 +-
sw/source/ui/frmdlg/frmpage.cxx | 180 ++++++------
sw/source/ui/frmdlg/wrap.cxx | 46 +--
sw/source/ui/index/cntex.cxx | 4
sw/source/ui/index/cnttab.cxx | 262 ++++++++---------
sw/source/ui/index/multmrk.cxx | 8
sw/source/ui/index/swuiidxmrk.cxx | 132 ++++----
sw/source/ui/table/colwd.cxx | 6
sw/source/ui/table/convert.cxx | 42 +-
sw/source/ui/table/instable.cxx | 30 +-
sw/source/ui/table/mergetbl.cxx | 5
sw/source/ui/table/rowht.cxx | 6
sw/source/ui/table/splittbl.cxx | 9
sw/source/ui/table/tabledlg.cxx | 126 ++++----
sw/source/ui/table/tautofmt.cxx | 30 +-
sw/source/ui/uno/swdetect.cxx | 10
sw/source/ui/utlui/swrenamexnameddlg.cxx | 6
50 files changed, 1391 insertions(+), 1388 deletions(-)
New commits:
commit cade37fa17665b97abb51ff17da21c4be7934c69
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Fri Jun 14 08:30:28 2024 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Fri Jun 14 20:15:46 2024 +0200
loplugin:ostr in sw
Change-Id: Ibc8c3ce70d572e2e07ee6ae1e46996943cf90a5b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168840
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
Tested-by: Jenkins
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 77944005ec3d..5a366a86a6cc 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -1296,7 +1296,7 @@ public:
bool InsCopyOfTable( SwPosition& rInsPos, const SwSelBoxes& rBoxes,
const SwTable* pCpyTable, bool bCpyName = false,
- bool bCorrPos = false, const OUString& rStyleName = ""
);
+ bool bCorrPos = false, const OUString& rStyleName =
u""_ustr );
void UnProtectCells( const OUString& rTableName );
bool UnProtectCells( const SwSelBoxes& rBoxes );
diff --git a/sw/inc/swtable.hxx b/sw/inc/swtable.hxx
index 96388da38ec5..86876f86aff7 100644
--- a/sw/inc/swtable.hxx
+++ b/sw/inc/swtable.hxx
@@ -284,7 +284,7 @@ public:
const bool bPerformValidCheck = false ) const;
// Copy selected boxes to another document.
bool MakeCopy( SwDoc&, const SwPosition&, const SwSelBoxes&,
- bool bCpyName = false, const OUString& rStyleName = "" )
const;
+ bool bCpyName = false, const OUString& rStyleName =
u""_ustr ) const;
// Copy table in this
bool InsTable( const SwTable& rCpyTable, const SwNodeIndex&,
SwUndoTableCpyTable* pUndo );
diff --git a/sw/inc/unotextcursor.hxx b/sw/inc/unotextcursor.hxx
index 397d142dbb36..779c6a4982ae 100644
--- a/sw/inc/unotextcursor.hxx
+++ b/sw/inc/unotextcursor.hxx
@@ -80,7 +80,7 @@ private:
SwUnoCursor& GetCursorOrThrow() {
if(!m_pUnoCursor)
- throw css::uno::RuntimeException("SwXTextCursor: disposed or
invalid", nullptr);
+ throw css::uno::RuntimeException(u"SwXTextCursor: disposed or
invalid"_ustr, nullptr);
return *m_pUnoCursor;
}
diff --git a/sw/source/ui/chrdlg/break.cxx b/sw/source/ui/chrdlg/break.cxx
index 2a3ee6db0e8d..e980467eb0a5 100644
--- a/sw/source/ui/chrdlg/break.cxx
+++ b/sw/source/ui/chrdlg/break.cxx
@@ -126,17 +126,17 @@ IMPL_LINK_NOARG(SwBreakDlg, OkHdl, weld::Button&, void)
}
SwBreakDlg::SwBreakDlg(weld::Window *pParent, SwWrtShell &rS)
- : GenericDialogController(pParent, "modules/swriter/ui/insertbreak.ui",
"BreakDialog")
- , m_xLineBtn(m_xBuilder->weld_radio_button("linerb"))
- , m_xLineClearText(m_xBuilder->weld_label("clearft"))
- , m_xLineClearBox(m_xBuilder->weld_combo_box("clearlb"))
- , m_xColumnBtn(m_xBuilder->weld_radio_button("columnrb"))
- , m_xPageBtn(m_xBuilder->weld_radio_button("pagerb"))
- , m_xPageCollText(m_xBuilder->weld_label("styleft"))
- , m_xPageCollBox(m_xBuilder->weld_combo_box("stylelb"))
- , m_xPageNumBox(m_xBuilder->weld_check_button("pagenumcb"))
- , m_xPageNumEdit(m_xBuilder->weld_spin_button("pagenumsb"))
- , m_xOkBtn(m_xBuilder->weld_button("ok"))
+ : GenericDialogController(pParent,
u"modules/swriter/ui/insertbreak.ui"_ustr, u"BreakDialog"_ustr)
+ , m_xLineBtn(m_xBuilder->weld_radio_button(u"linerb"_ustr))
+ , m_xLineClearText(m_xBuilder->weld_label(u"clearft"_ustr))
+ , m_xLineClearBox(m_xBuilder->weld_combo_box(u"clearlb"_ustr))
+ , m_xColumnBtn(m_xBuilder->weld_radio_button(u"columnrb"_ustr))
+ , m_xPageBtn(m_xBuilder->weld_radio_button(u"pagerb"_ustr))
+ , m_xPageCollText(m_xBuilder->weld_label(u"styleft"_ustr))
+ , m_xPageCollBox(m_xBuilder->weld_combo_box(u"stylelb"_ustr))
+ , m_xPageNumBox(m_xBuilder->weld_check_button(u"pagenumcb"_ustr))
+ , m_xPageNumEdit(m_xBuilder->weld_spin_button(u"pagenumsb"_ustr))
+ , m_xOkBtn(m_xBuilder->weld_button(u"ok"_ustr))
, m_rSh(rS)
, m_nKind(0)
, m_bHtmlMode(0 != ::GetHtmlMode(rS.GetView().GetDocShell()))
@@ -156,7 +156,7 @@ SwBreakDlg::SwBreakDlg(weld::Window *pParent, SwWrtShell
&rS)
for (size_t i = 0; i < nCount; ++i)
{
const SwPageDesc &rPageDesc = m_rSh.GetPageDesc(i);
- ::InsertStringSorted("", rPageDesc.GetName(), *m_xPageCollBox, 1 );
+ ::InsertStringSorted(u""_ustr, rPageDesc.GetName(), *m_xPageCollBox, 1
);
}
OUString aFormatName;
@@ -164,12 +164,12 @@ SwBreakDlg::SwBreakDlg(weld::Window *pParent, SwWrtShell
&rS)
{
aFormatName = SwStyleNameMapper::GetUIName( i, aFormatName );
if (m_xPageCollBox->find_text(aFormatName) == -1)
- ::InsertStringSorted("", aFormatName, *m_xPageCollBox, 1 );
+ ::InsertStringSorted(u""_ustr, aFormatName, *m_xPageCollBox, 1 );
}
//add landscape page
aFormatName = SwStyleNameMapper::GetUIName( RES_POOLPAGE_LANDSCAPE,
aFormatName );
if (m_xPageCollBox->find_text(aFormatName) == -1)
- ::InsertStringSorted("", aFormatName, *m_xPageCollBox, 1);
+ ::InsertStringSorted(u""_ustr, aFormatName, *m_xPageCollBox, 1);
CheckEnable();
m_xPageNumEdit->set_text(OUString());
}
diff --git a/sw/source/ui/chrdlg/chardlg.cxx b/sw/source/ui/chrdlg/chardlg.cxx
index f57a78d735c9..864ebf48ae67 100644
--- a/sw/source/ui/chrdlg/chardlg.cxx
+++ b/sw/source/ui/chrdlg/chardlg.cxx
@@ -40,8 +40,8 @@ using namespace ::sfx2;
SwCharDlg::SwCharDlg(weld::Window* pParent, SwView& rVw, const SfxItemSet&
rCoreSet,
SwCharDlgMode nDialogMode, const OUString* pStr)
- : SfxTabDialogController(pParent,
"modules/swriter/ui/characterproperties.ui",
- "CharacterPropertiesDialog", &rCoreSet, pStr !=
nullptr)
+ : SfxTabDialogController(pParent,
u"modules/swriter/ui/characterproperties.ui"_ustr,
+ u"CharacterPropertiesDialog"_ustr, &rCoreSet,
pStr != nullptr)
, m_rView(rVw)
, m_nDialogMode(nDialogMode)
{
@@ -50,25 +50,25 @@ SwCharDlg::SwCharDlg(weld::Window* pParent, SwView& rVw,
const SfxItemSet& rCore
m_xDialog->set_title(m_xDialog->get_title() +
SwResId(STR_TEXTCOLL_HEADER) + *pStr + ")");
}
SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
- AddTabPage("font", pFact->GetTabPageCreatorFunc(RID_SVXPAGE_CHAR_NAME),
nullptr);
- AddTabPage("fonteffects",
pFact->GetTabPageCreatorFunc(RID_SVXPAGE_CHAR_EFFECTS), nullptr);
- AddTabPage("position", pFact->GetTabPageCreatorFunc(
RID_SVXPAGE_CHAR_POSITION ), nullptr );
- AddTabPage("asianlayout", pFact->GetTabPageCreatorFunc(
RID_SVXPAGE_CHAR_TWOLINES ), nullptr );
- AddTabPage("background", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BKG ),
nullptr );
- AddTabPage("borders", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ),
nullptr );
+ AddTabPage(u"font"_ustr,
pFact->GetTabPageCreatorFunc(RID_SVXPAGE_CHAR_NAME), nullptr);
+ AddTabPage(u"fonteffects"_ustr,
pFact->GetTabPageCreatorFunc(RID_SVXPAGE_CHAR_EFFECTS), nullptr);
+ AddTabPage(u"position"_ustr, pFact->GetTabPageCreatorFunc(
RID_SVXPAGE_CHAR_POSITION ), nullptr );
+ AddTabPage(u"asianlayout"_ustr, pFact->GetTabPageCreatorFunc(
RID_SVXPAGE_CHAR_TWOLINES ), nullptr );
+ AddTabPage(u"background"_ustr, pFact->GetTabPageCreatorFunc(
RID_SVXPAGE_BKG ), nullptr );
+ AddTabPage(u"borders"_ustr, pFact->GetTabPageCreatorFunc(
RID_SVXPAGE_BORDER ), nullptr );
if (m_nDialogMode == SwCharDlgMode::Draw || m_nDialogMode ==
SwCharDlgMode::Ann)
{
- RemoveTabPage("asianlayout");
+ RemoveTabPage(u"asianlayout"_ustr);
}
else
{
if (!SvtCJKOptions::IsDoubleLinesEnabled())
- RemoveTabPage("asianlayout");
+ RemoveTabPage(u"asianlayout"_ustr);
}
if (m_nDialogMode != SwCharDlgMode::Std)
- RemoveTabPage("borders");
+ RemoveTabPage(u"borders"_ustr);
}
SwCharDlg::~SwCharDlg()
diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx
index 0623d270e842..f669c5c51640 100644
--- a/sw/source/ui/chrdlg/drpcps.cxx
+++ b/sw/source/ui/chrdlg/drpcps.cxx
@@ -469,22 +469,22 @@ SwDropCapsDlg::SwDropCapsDlg(weld::Window *pParent, const
SfxItemSet &rSet)
}
SwDropCapsPage::SwDropCapsPage(weld::Container* pPage, weld::DialogController*
pController, const SfxItemSet &rSet)
- : SfxTabPage(pPage, pController, "modules/swriter/ui/dropcapspage.ui",
"DropCapPage", &rSet)
+ : SfxTabPage(pPage, pController,
u"modules/swriter/ui/dropcapspage.ui"_ustr, u"DropCapPage"_ustr, &rSet)
, m_bModified(false)
, m_bFormat(true)
- , m_xDropCapsBox(m_xBuilder->weld_check_button("checkCB_SWITCH"))
- , m_xWholeWordCB(m_xBuilder->weld_check_button("checkCB_WORD"))
- , m_xSwitchText(m_xBuilder->weld_label("labelFT_DROPCAPS"))
- , m_xDropCapsField(m_xBuilder->weld_spin_button("spinFLD_DROPCAPS"))
- , m_xLinesText(m_xBuilder->weld_label("labelTXT_LINES"))
- , m_xLinesField(m_xBuilder->weld_spin_button("spinFLD_LINES"))
- , m_xDistanceText(m_xBuilder->weld_label("labelTXT_DISTANCE"))
- , m_xDistanceField(m_xBuilder->weld_metric_spin_button("spinFLD_DISTANCE",
FieldUnit::CM))
- , m_xTextText(m_xBuilder->weld_label("labelTXT_TEXT"))
- , m_xTextEdit(m_xBuilder->weld_entry("entryEDT_TEXT"))
- , m_xTemplateText(m_xBuilder->weld_label("labelTXT_TEMPLATE"))
- , m_xTemplateBox(m_xBuilder->weld_combo_box("comboBOX_TEMPLATE"))
- , m_xPict(new weld::CustomWeld(*m_xBuilder, "drawingareaWN_EXAMPLE",
m_aPict))
+ , m_xDropCapsBox(m_xBuilder->weld_check_button(u"checkCB_SWITCH"_ustr))
+ , m_xWholeWordCB(m_xBuilder->weld_check_button(u"checkCB_WORD"_ustr))
+ , m_xSwitchText(m_xBuilder->weld_label(u"labelFT_DROPCAPS"_ustr))
+ , m_xDropCapsField(m_xBuilder->weld_spin_button(u"spinFLD_DROPCAPS"_ustr))
+ , m_xLinesText(m_xBuilder->weld_label(u"labelTXT_LINES"_ustr))
+ , m_xLinesField(m_xBuilder->weld_spin_button(u"spinFLD_LINES"_ustr))
+ , m_xDistanceText(m_xBuilder->weld_label(u"labelTXT_DISTANCE"_ustr))
+ ,
m_xDistanceField(m_xBuilder->weld_metric_spin_button(u"spinFLD_DISTANCE"_ustr,
FieldUnit::CM))
+ , m_xTextText(m_xBuilder->weld_label(u"labelTXT_TEXT"_ustr))
+ , m_xTextEdit(m_xBuilder->weld_entry(u"entryEDT_TEXT"_ustr))
+ , m_xTemplateText(m_xBuilder->weld_label(u"labelTXT_TEMPLATE"_ustr))
+ , m_xTemplateBox(m_xBuilder->weld_combo_box(u"comboBOX_TEMPLATE"_ustr))
+ , m_xPict(new weld::CustomWeld(*m_xBuilder, u"drawingareaWN_EXAMPLE"_ustr,
m_aPict))
{
m_aPict.SetDropCapsPage(this);
@@ -619,7 +619,7 @@ IMPL_LINK_NOARG(SwDropCapsPage, ClickHdl,
weld::Toggleable&, void)
m_xDropCapsField->grab_focus();
}
else
- m_aPict.SetText("");
+ m_aPict.SetText(u""_ustr);
m_bModified = true;
}
diff --git a/sw/source/ui/chrdlg/numpara.cxx b/sw/source/ui/chrdlg/numpara.cxx
index 65875eb79c39..07044fcfbfb4 100644
--- a/sw/source/ui/chrdlg/numpara.cxx
+++ b/sw/source/ui/chrdlg/numpara.cxx
@@ -41,26 +41,26 @@ const WhichRangesContainer SwParagraphNumTabPage::s_aPageRg(
FN_NUMBER_NEWSTART_AT>);
SwParagraphNumTabPage::SwParagraphNumTabPage(weld::Container* pPage,
weld::DialogController* pController, const SfxItemSet& rAttr)
- : SfxTabPage(pPage, pController, "modules/swriter/ui/numparapage.ui",
"NumParaPage", &rAttr)
+ : SfxTabPage(pPage, pController,
u"modules/swriter/ui/numparapage.ui"_ustr, u"NumParaPage"_ustr, &rAttr)
, msOutlineNumbering(SwResId(STR_OUTLINE_NUMBERING ))
, m_bModified(false)
, m_bCurNumrule(false)
- , m_xOutlineStartBX(m_xBuilder->weld_widget("boxOUTLINE"))
- , m_xOutlineLvLB(m_xBuilder->weld_combo_box("comboLB_OUTLINE_LEVEL"))
- , m_xNumberStyleBX(m_xBuilder->weld_widget("boxNUMBER_STYLE"))
- , m_xNumberStyleLB(m_xBuilder->weld_combo_box("comboLB_NUMBER_STYLE"))
- , m_xEditNumStyleBtn(m_xBuilder->weld_button("editnumstyle"))
- , m_xListLvBX(m_xBuilder->weld_widget("boxLIST_LEVEL"))
- , m_xListLvLB(m_xBuilder->weld_combo_box("comboLB_LIST_LEVEL"))
- , m_xNewStartCB(m_xBuilder->weld_check_button("checkCB_NEW_START"))
- , m_xNewStartBX(m_xBuilder->weld_widget("boxNEW_START"))
- ,
m_xNewStartNumberCB(m_xBuilder->weld_check_button("checkCB_NUMBER_NEW_START"))
- , m_xNewStartNF(m_xBuilder->weld_spin_button("spinNF_NEW_START"))
- , m_xCountParaFram(m_xBuilder->weld_widget("frameFL_COUNT_PARA"))
- , m_xCountParaCB(m_xBuilder->weld_check_button("checkCB_COUNT_PARA"))
- ,
m_xRestartParaCountCB(m_xBuilder->weld_check_button("checkCB_RESTART_PARACOUNT"))
- , m_xRestartBX(m_xBuilder->weld_widget("boxRESTART_NO"))
- , m_xRestartNF(m_xBuilder->weld_spin_button("spinNF_RESTART_PARA"))
+ , m_xOutlineStartBX(m_xBuilder->weld_widget(u"boxOUTLINE"_ustr))
+ , m_xOutlineLvLB(m_xBuilder->weld_combo_box(u"comboLB_OUTLINE_LEVEL"_ustr))
+ , m_xNumberStyleBX(m_xBuilder->weld_widget(u"boxNUMBER_STYLE"_ustr))
+ ,
m_xNumberStyleLB(m_xBuilder->weld_combo_box(u"comboLB_NUMBER_STYLE"_ustr))
+ , m_xEditNumStyleBtn(m_xBuilder->weld_button(u"editnumstyle"_ustr))
+ , m_xListLvBX(m_xBuilder->weld_widget(u"boxLIST_LEVEL"_ustr))
+ , m_xListLvLB(m_xBuilder->weld_combo_box(u"comboLB_LIST_LEVEL"_ustr))
+ , m_xNewStartCB(m_xBuilder->weld_check_button(u"checkCB_NEW_START"_ustr))
+ , m_xNewStartBX(m_xBuilder->weld_widget(u"boxNEW_START"_ustr))
+ ,
m_xNewStartNumberCB(m_xBuilder->weld_check_button(u"checkCB_NUMBER_NEW_START"_ustr))
+ , m_xNewStartNF(m_xBuilder->weld_spin_button(u"spinNF_NEW_START"_ustr))
+ , m_xCountParaFram(m_xBuilder->weld_widget(u"frameFL_COUNT_PARA"_ustr))
+ , m_xCountParaCB(m_xBuilder->weld_check_button(u"checkCB_COUNT_PARA"_ustr))
+ ,
m_xRestartParaCountCB(m_xBuilder->weld_check_button(u"checkCB_RESTART_PARACOUNT"_ustr))
+ , m_xRestartBX(m_xBuilder->weld_widget(u"boxRESTART_NO"_ustr))
+ , m_xRestartNF(m_xBuilder->weld_spin_button(u"spinNF_RESTART_PARA"_ustr))
{
m_xNewStartCB->set_state(TRISTATE_FALSE);
m_xNewStartNumberCB->set_state(TRISTATE_FALSE);
@@ -246,12 +246,12 @@ void SwParagraphNumTabPage::Reset(const SfxItemSet* rSet)
if( aStyle == "Outline")
{
- if (m_xNumberStyleLB->find_id("pseudo") == -1)
+ if (m_xNumberStyleLB->find_id(u"pseudo"_ustr) == -1)
{
// tdf#145804 show "Chapter Numbering"
- m_xNumberStyleLB->append("pseudo", msOutlineNumbering);
+ m_xNumberStyleLB->append(u"pseudo"_ustr, msOutlineNumbering);
}
- m_xNumberStyleLB->set_active_id("pseudo");
+ m_xNumberStyleLB->set_active_id(u"pseudo"_ustr);
m_xNumberStyleLB->save_value();
}
else
diff --git a/sw/source/ui/chrdlg/pardlg.cxx b/sw/source/ui/chrdlg/pardlg.cxx
index 379ee335cad8..14cf2ff599a4 100644
--- a/sw/source/ui/chrdlg/pardlg.cxx
+++ b/sw/source/ui/chrdlg/pardlg.cxx
@@ -47,8 +47,8 @@ SwParaDlg::SwParaDlg(weld::Window *pParent,
bool bDraw,
const OUString& sDefPage)
: SfxTabDialogController(pParent,
- "modules/swriter/ui/paradialog.ui",
- "ParagraphPropertiesDialog",
+ u"modules/swriter/ui/paradialog.ui"_ustr,
+ u"ParagraphPropertiesDialog"_ustr,
&rCoreSet, nullptr != pTitle)
, m_rView(rVw)
, m_bDrawParaDlg(bDraw)
@@ -65,77 +65,77 @@ SwParaDlg::SwParaDlg(weld::Window *pParent,
OSL_ENSURE(pFact->GetTabPageCreatorFunc(RID_SVXPAGE_STD_PARAGRAPH),
"GetTabPageCreatorFunc fail!");
OSL_ENSURE(pFact->GetTabPageRangesFunc(RID_SVXPAGE_STD_PARAGRAPH),
"GetTabPageRangesFunc fail!");
- AddTabPage("labelTP_PARA_STD",
pFact->GetTabPageCreatorFunc(RID_SVXPAGE_STD_PARAGRAPH),
+ AddTabPage(u"labelTP_PARA_STD"_ustr,
pFact->GetTabPageCreatorFunc(RID_SVXPAGE_STD_PARAGRAPH),
pFact->GetTabPageRangesFunc(RID_SVXPAGE_STD_PARAGRAPH) );
OSL_ENSURE(pFact->GetTabPageCreatorFunc(RID_SVXPAGE_ALIGN_PARAGRAPH),
"GetTabPageCreatorFunc fail!");
OSL_ENSURE(pFact->GetTabPageRangesFunc(RID_SVXPAGE_ALIGN_PARAGRAPH),
"GetTabPageRangesFunc fail!");
- AddTabPage("labelTP_PARA_ALIGN",
pFact->GetTabPageCreatorFunc(RID_SVXPAGE_ALIGN_PARAGRAPH),
+ AddTabPage(u"labelTP_PARA_ALIGN"_ustr,
pFact->GetTabPageCreatorFunc(RID_SVXPAGE_ALIGN_PARAGRAPH),
pFact->GetTabPageRangesFunc(RID_SVXPAGE_ALIGN_PARAGRAPH));
if (!m_bDrawParaDlg && (!bHtmlMode ||
officecfg::Office::Common::Filter::HTML::Export::PrintLayout::get()))
{
OSL_ENSURE(pFact->GetTabPageCreatorFunc(RID_SVXPAGE_EXT_PARAGRAPH),
"GetTabPageCreatorFunc fail!");
OSL_ENSURE(pFact->GetTabPageRangesFunc(RID_SVXPAGE_EXT_PARAGRAPH),
"GetTabPageRangesFunc fail!");
- AddTabPage("textflow",
pFact->GetTabPageCreatorFunc(RID_SVXPAGE_EXT_PARAGRAPH),
+ AddTabPage(u"textflow"_ustr,
pFact->GetTabPageCreatorFunc(RID_SVXPAGE_EXT_PARAGRAPH),
pFact->GetTabPageRangesFunc(RID_SVXPAGE_EXT_PARAGRAPH));
}
else
- RemoveTabPage("textflow");
+ RemoveTabPage(u"textflow"_ustr);
if(!bHtmlMode && SvtCJKOptions::IsAsianTypographyEnabled())
{
OSL_ENSURE(pFact->GetTabPageCreatorFunc(RID_SVXPAGE_PARA_ASIAN),
"GetTabPageCreatorFunc fail!");
OSL_ENSURE(pFact->GetTabPageRangesFunc(RID_SVXPAGE_PARA_ASIAN),
"GetTabPageRangesFunc fail!");
- AddTabPage( "labelTP_PARA_ASIAN",
pFact->GetTabPageCreatorFunc(RID_SVXPAGE_PARA_ASIAN),
+ AddTabPage( u"labelTP_PARA_ASIAN"_ustr,
pFact->GetTabPageCreatorFunc(RID_SVXPAGE_PARA_ASIAN),
pFact->GetTabPageRangesFunc(RID_SVXPAGE_PARA_ASIAN) );
}
else
- RemoveTabPage("labelTP_PARA_ASIAN");
+ RemoveTabPage(u"labelTP_PARA_ASIAN"_ustr);
if(bHtmlMode)
- RemoveTabPage("labelTP_TABULATOR");
+ RemoveTabPage(u"labelTP_TABULATOR"_ustr);
else
{
OSL_ENSURE(pFact->GetTabPageCreatorFunc(RID_SVXPAGE_TABULATOR),
"GetTabPageCreatorFunc fail!");
OSL_ENSURE(pFact->GetTabPageRangesFunc(RID_SVXPAGE_TABULATOR),
"GetTabPageRangesFunc fail!");
- AddTabPage( "labelTP_TABULATOR",
pFact->GetTabPageCreatorFunc(RID_SVXPAGE_TABULATOR),
pFact->GetTabPageRangesFunc(RID_SVXPAGE_TABULATOR) );
+ AddTabPage( u"labelTP_TABULATOR"_ustr,
pFact->GetTabPageCreatorFunc(RID_SVXPAGE_TABULATOR),
pFact->GetTabPageRangesFunc(RID_SVXPAGE_TABULATOR) );
}
// remove unwanted tabs for draw text box paragraph properties
if (m_bDrawParaDlg)
{
- RemoveTabPage("labelTP_NUMPARA");
- RemoveTabPage("labelTP_DROPCAPS");
- RemoveTabPage("labelTP_BORDER");
- RemoveTabPage("area");
- RemoveTabPage("transparence");
+ RemoveTabPage(u"labelTP_NUMPARA"_ustr);
+ RemoveTabPage(u"labelTP_DROPCAPS"_ustr);
+ RemoveTabPage(u"labelTP_BORDER"_ustr);
+ RemoveTabPage(u"area"_ustr);
+ RemoveTabPage(u"transparence"_ustr);
}
else
{
if(!(nDialogMode & DLG_ENVELOP))
- AddTabPage("labelTP_NUMPARA", SwParagraphNumTabPage::Create,
SwParagraphNumTabPage::GetRanges);
+ AddTabPage(u"labelTP_NUMPARA"_ustr, SwParagraphNumTabPage::Create,
SwParagraphNumTabPage::GetRanges);
else
- RemoveTabPage("labelTP_NUMPARA");
+ RemoveTabPage(u"labelTP_NUMPARA"_ustr);
- AddTabPage("labelTP_DROPCAPS", SwDropCapsPage::Create,
SwDropCapsPage::GetRanges);
+ AddTabPage(u"labelTP_DROPCAPS"_ustr, SwDropCapsPage::Create,
SwDropCapsPage::GetRanges);
if(!bHtmlMode || (nHtmlMode &
(HTMLMODE_SOME_STYLES|HTMLMODE_FULL_STYLES)))
{
// add Area and Transparence TabPages
- AddTabPage("area", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_AREA
), pFact->GetTabPageRangesFunc( RID_SVXPAGE_AREA ));
- AddTabPage("transparence", pFact->GetTabPageCreatorFunc(
RID_SVXPAGE_TRANSPARENCE ), pFact->GetTabPageRangesFunc(
RID_SVXPAGE_TRANSPARENCE ) );
+ AddTabPage(u"area"_ustr, pFact->GetTabPageCreatorFunc(
RID_SVXPAGE_AREA ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_AREA ));
+ AddTabPage(u"transparence"_ustr, pFact->GetTabPageCreatorFunc(
RID_SVXPAGE_TRANSPARENCE ), pFact->GetTabPageRangesFunc(
RID_SVXPAGE_TRANSPARENCE ) );
}
else
{
- RemoveTabPage("area");
- RemoveTabPage("transparence");
+ RemoveTabPage(u"area"_ustr);
+ RemoveTabPage(u"transparence"_ustr);
}
OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ),
"GetTabPageCreatorFunc fail!");
OSL_ENSURE(pFact->GetTabPageRangesFunc( RID_SVXPAGE_BORDER ),
"GetTabPageRangesFunc fail!");
- AddTabPage("labelTP_BORDER", pFact->GetTabPageCreatorFunc(
RID_SVXPAGE_BORDER ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BORDER ) );
+ AddTabPage(u"labelTP_BORDER"_ustr, pFact->GetTabPageCreatorFunc(
RID_SVXPAGE_BORDER ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BORDER ) );
}
if (!sDefPage.isEmpty())
diff --git a/sw/source/ui/chrdlg/swuiccoll.cxx
b/sw/source/ui/chrdlg/swuiccoll.cxx
index 8dddc8a41002..1838ac554570 100644
--- a/sw/source/ui/chrdlg/swuiccoll.cxx
+++ b/sw/source/ui/chrdlg/swuiccoll.cxx
@@ -36,14 +36,14 @@
const WhichRangesContainer SwCondCollPage::s_aPageRg(svl::Items<FN_COND_COLL,
FN_COND_COLL>);
SwCondCollPage::SwCondCollPage(weld::Container* pPage, weld::DialogController*
pController, const SfxItemSet &rSet)
- : SfxTabPage(pPage, pController, "modules/swriter/ui/conditionpage.ui",
"ConditionPage", &rSet)
+ : SfxTabPage(pPage, pController,
u"modules/swriter/ui/conditionpage.ui"_ustr, u"ConditionPage"_ustr, &rSet)
, m_pCmds(SwCondCollItem::GetCmds())
, m_pFormat(nullptr)
- , m_xTbLinks(m_xBuilder->weld_tree_view("links"))
- , m_xStyleLB(m_xBuilder->weld_tree_view("styles"))
- , m_xFilterLB(m_xBuilder->weld_combo_box("filter"))
- , m_xRemovePB(m_xBuilder->weld_button("remove"))
- , m_xAssignPB(m_xBuilder->weld_button("apply"))
+ , m_xTbLinks(m_xBuilder->weld_tree_view(u"links"_ustr))
+ , m_xStyleLB(m_xBuilder->weld_tree_view(u"styles"_ustr))
+ , m_xFilterLB(m_xBuilder->weld_combo_box(u"filter"_ustr))
+ , m_xRemovePB(m_xBuilder->weld_button(u"remove"_ustr))
+ , m_xAssignPB(m_xBuilder->weld_button(u"apply"_ustr))
{
m_xStyleLB->make_sorted();
const auto nHeightRequest = m_xStyleLB->get_height_rows(12);
@@ -183,7 +183,7 @@ void SwCondCollPage::AssignRemove(const weld::Widget* pBtn)
if (bAssEnabled)
m_xTbLinks->set_text(nPos, m_xStyleLB->get_selected_text(), 1);
else
- m_xTbLinks->set_text(nPos, "", 1);
+ m_xTbLinks->set_text(nPos, u""_ustr, 1);
}
IMPL_LINK(SwCondCollPage, SelectTreeListBoxHdl, weld::TreeView&, rBox, void)
diff --git a/sw/source/ui/chrdlg/tblnumfm.cxx b/sw/source/ui/chrdlg/tblnumfm.cxx
index dd3f575e2bdc..3c9fab379836 100644
--- a/sw/source/ui/chrdlg/tblnumfm.cxx
+++ b/sw/source/ui/chrdlg/tblnumfm.cxx
@@ -27,8 +27,8 @@
#include <sfx2/tabdlg.hxx>
SwNumFormatDlg::SwNumFormatDlg(weld::Widget* pParent, const SfxItemSet& rSet)
- : SfxSingleTabDialogController(pParent, &rSet,
"cui/ui/formatnumberdialog.ui", "FormatNumberDialog")
- , m_xContent( m_xBuilder->weld_container("content") )
+ : SfxSingleTabDialogController(pParent, &rSet,
u"cui/ui/formatnumberdialog.ui"_ustr, u"FormatNumberDialog"_ustr)
+ , m_xContent( m_xBuilder->weld_container(u"content"_ustr) )
{
// Create TabPage
SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
diff --git a/sw/source/ui/config/mailconfigpage.cxx
b/sw/source/ui/config/mailconfigpage.cxx
index 7bd8b994368c..01fc8f54be9a 100644
--- a/sw/source/ui/config/mailconfigpage.cxx
+++ b/sw/source/ui/config/mailconfigpage.cxx
@@ -108,25 +108,25 @@ public:
}
SwMailConfigPage::SwMailConfigPage(weld::Container* pPage,
weld::DialogController* pController, const SfxItemSet& rSet)
- : SfxTabPage(pPage, pController, "modules/swriter/ui/mailconfigpage.ui",
"MailConfigPage", &rSet)
+ : SfxTabPage(pPage, pController,
u"modules/swriter/ui/mailconfigpage.ui"_ustr, u"MailConfigPage"_ustr, &rSet)
, m_pConfigItem(new SwMailMergeConfigItem)
- , m_xDisplayNameED(m_xBuilder->weld_entry("displayname"))
- , m_xDisplayNameImg(m_xBuilder->weld_widget("lockdisplayname"))
- , m_xAddressED(m_xBuilder->weld_entry("address"))
- , m_xAddressImg(m_xBuilder->weld_widget("lockaddress"))
- , m_xReplyToCB(m_xBuilder->weld_check_button("replytocb"))
- , m_xReplyToCBImg(m_xBuilder->weld_widget("lockreplytocb"))
- , m_xReplyToFT(m_xBuilder->weld_label("replyto_label"))
- , m_xReplyToED(m_xBuilder->weld_entry("replyto"))
- , m_xReplyToImg(m_xBuilder->weld_widget("lockreplyto"))
- , m_xServerED(m_xBuilder->weld_entry("server"))
- , m_xServerImg(m_xBuilder->weld_widget("lockserver"))
- , m_xPortNF(m_xBuilder->weld_spin_button("port"))
- , m_xPortImg(m_xBuilder->weld_widget("lockport"))
- , m_xSecureCB(m_xBuilder->weld_check_button("secure"))
- , m_xSecureImg(m_xBuilder->weld_widget("locksecure"))
- ,
m_xServerAuthenticationPB(m_xBuilder->weld_button("serverauthentication"))
- , m_xTestPB(m_xBuilder->weld_button("test"))
+ , m_xDisplayNameED(m_xBuilder->weld_entry(u"displayname"_ustr))
+ , m_xDisplayNameImg(m_xBuilder->weld_widget(u"lockdisplayname"_ustr))
+ , m_xAddressED(m_xBuilder->weld_entry(u"address"_ustr))
+ , m_xAddressImg(m_xBuilder->weld_widget(u"lockaddress"_ustr))
+ , m_xReplyToCB(m_xBuilder->weld_check_button(u"replytocb"_ustr))
+ , m_xReplyToCBImg(m_xBuilder->weld_widget(u"lockreplytocb"_ustr))
+ , m_xReplyToFT(m_xBuilder->weld_label(u"replyto_label"_ustr))
+ , m_xReplyToED(m_xBuilder->weld_entry(u"replyto"_ustr))
+ , m_xReplyToImg(m_xBuilder->weld_widget(u"lockreplyto"_ustr))
+ , m_xServerED(m_xBuilder->weld_entry(u"server"_ustr))
+ , m_xServerImg(m_xBuilder->weld_widget(u"lockserver"_ustr))
+ , m_xPortNF(m_xBuilder->weld_spin_button(u"port"_ustr))
+ , m_xPortImg(m_xBuilder->weld_widget(u"lockport"_ustr))
+ , m_xSecureCB(m_xBuilder->weld_check_button(u"secure"_ustr))
+ , m_xSecureImg(m_xBuilder->weld_widget(u"locksecure"_ustr))
+ ,
m_xServerAuthenticationPB(m_xBuilder->weld_button(u"serverauthentication"_ustr))
+ , m_xTestPB(m_xBuilder->weld_button(u"test"_ustr))
{
m_xReplyToCB->connect_toggled(LINK(this, SwMailConfigPage, ReplyToHdl));
m_xServerAuthenticationPB->connect_clicked(LINK(this, SwMailConfigPage,
AuthenticationHdl));
@@ -147,8 +147,8 @@ std::unique_ptr<SfxTabPage>
SwMailConfigPage::Create(weld::Container* pPage, wel
OUString SwMailConfigPage::GetAllStrings()
{
OUString sAllStrings;
- OUString labels[] = { "label1", "displayname_label", "address_label",
"replyto_label",
- "label2", "server_label", "port_label" };
+ OUString labels[] = { u"label1"_ustr, u"displayname_label"_ustr,
u"address_label"_ustr, u"replyto_label"_ustr,
+ u"label2"_ustr, u"server_label"_ustr,
u"port_label"_ustr };
for (const auto& label : labels)
{
@@ -156,7 +156,7 @@ OUString SwMailConfigPage::GetAllStrings()
sAllStrings += pString->get_label() + " ";
}
- OUString checkButton[] = { "replytocb", "secure" };
+ OUString checkButton[] = { u"replytocb"_ustr, u"secure"_ustr };
for (const auto& check : checkButton)
{
@@ -164,7 +164,7 @@ OUString SwMailConfigPage::GetAllStrings()
sAllStrings += pString->get_label() + " ";
}
- OUString buttons[] = { "serverauthentication", "test" };
+ OUString buttons[] = { u"serverauthentication"_ustr, u"test"_ustr };
for (const auto& btn : buttons)
{
@@ -266,22 +266,22 @@ IMPL_LINK(SwMailConfigPage, SecureHdl, weld::Toggleable&,
rBox, void)
}
SwTestAccountSettingsDialog::SwTestAccountSettingsDialog(SwMailConfigPage*
pParent)
- : SfxDialogController(pParent->GetFrameWeld(),
"modules/swriter/ui/testmailsettings.ui", "TestMailSettings")
+ : SfxDialogController(pParent->GetFrameWeld(),
u"modules/swriter/ui/testmailsettings.ui"_ustr, u"TestMailSettings"_ustr)
, m_bStop(false)
, m_pParent(pParent)
- , m_xStopPB(m_xBuilder->weld_button("stop"))
- , m_xErrorsED(m_xBuilder->weld_text_view("errors"))
- , m_xResult1(m_xBuilder->weld_label("result1"))
- , m_xResult2(m_xBuilder->weld_label("result2"))
- , m_xImage1(m_xBuilder->weld_image("image1"))
- , m_xImage2(m_xBuilder->weld_image("image2"))
- , m_xImage3(m_xBuilder->weld_image("image3"))
- , m_xImage4(m_xBuilder->weld_image("image4"))
+ , m_xStopPB(m_xBuilder->weld_button(u"stop"_ustr))
+ , m_xErrorsED(m_xBuilder->weld_text_view(u"errors"_ustr))
+ , m_xResult1(m_xBuilder->weld_label(u"result1"_ustr))
+ , m_xResult2(m_xBuilder->weld_label(u"result2"_ustr))
+ , m_xImage1(m_xBuilder->weld_image(u"image1"_ustr))
+ , m_xImage2(m_xBuilder->weld_image(u"image2"_ustr))
+ , m_xImage3(m_xBuilder->weld_image(u"image3"_ustr))
+ , m_xImage4(m_xBuilder->weld_image(u"image4"_ustr))
{
m_xErrorsED->set_size_request(m_xErrorsED->get_approximate_digit_width() *
72,
m_xErrorsED->get_height_rows(8));
m_sErrorServer = m_xErrorsED->get_text();
- m_xErrorsED->set_text("");
+ m_xErrorsED->set_text(u""_ustr);
m_sCompleted = m_xResult1->get_label();
m_sFailed = m_xResult2->get_label();
@@ -351,7 +351,7 @@ void SwTestAccountSettingsDialog::Test()
new SwConnectionContext(
m_pParent->m_pConfigItem->GetInServerName(),
m_pParent->m_pConfigItem->GetInServerPort(),
- "Insecure");
+ u"Insecure"_ustr);
xInMailService->connect(xConnectionContext, xAuthenticator);
}
if(m_bStop)
@@ -381,7 +381,7 @@ void SwTestAccountSettingsDialog::Test()
new SwConnectionContext(
m_pParent->m_xServerED->get_text(),
m_pParent->m_xPortNF->get_value(),
- m_pParent->m_xSecureCB->get_active() ? OUString("Ssl") :
OUString("Insecure"));
+ m_pParent->m_xSecureCB->get_active() ? u"Ssl"_ustr :
u"Insecure"_ustr);
xMailService->connect(xConnectionContext, xAuthenticator);
bIsLoggedIn = xMailService->isConnected();
if( xInMailService.is() )
@@ -421,37 +421,37 @@ SwMailConfigDlg::SwMailConfigDlg(weld::Window* pParent,
const SfxItemSet& rSet)
SwAuthenticationSettingsDialog::SwAuthenticationSettingsDialog(
weld::Window* pParent, SwMailMergeConfigItem& rItem)
- : SfxDialogController(pParent,
"modules/swriter/ui/authenticationsettingsdialog.ui",
"AuthenticationSettingsDialog")
+ : SfxDialogController(pParent,
u"modules/swriter/ui/authenticationsettingsdialog.ui"_ustr,
u"AuthenticationSettingsDialog"_ustr)
, m_rConfigItem(rItem)
- , m_xAuthenticationCB(m_xBuilder->weld_check_button("authentication"))
- , m_xAuthenticationImg(m_xBuilder->weld_widget("lockauthentication"))
- ,
m_xSeparateAuthenticationRB(m_xBuilder->weld_radio_button("separateauthentication"))
- , m_xSeparateAuthenticationImg(m_xBuilder->weld_widget("lockseparaauth"))
- , m_xSMTPAfterPOPRB(m_xBuilder->weld_radio_button("smtpafterpop"))
- , m_xSMTPAfterPOPImg(m_xBuilder->weld_widget("locksmtpafterpop"))
- , m_xOutgoingServerFT(m_xBuilder->weld_label("label1"))
- , m_xUserNameFT(m_xBuilder->weld_label("username_label"))
- , m_xUserNameED(m_xBuilder->weld_entry("username"))
- , m_xUserNameImg(m_xBuilder->weld_widget("lockusername"))
- , m_xOutPasswordFT(m_xBuilder->weld_label("outpassword_label"))
- , m_xOutPasswordED(m_xBuilder->weld_entry("outpassword"))
- , m_xIncomingServerFT(m_xBuilder->weld_label("label2"))
- , m_xServerFT(m_xBuilder->weld_label("server_label"))
- , m_xServerED(m_xBuilder->weld_entry("server"))
- , m_xServerImg(m_xBuilder->weld_widget("lockserver"))
- , m_xPortFT(m_xBuilder->weld_label("port_label"))
- , m_xPortNF(m_xBuilder->weld_spin_button("port"))
- , m_xPortImg(m_xBuilder->weld_widget("lockport"))
- , m_xProtocolFT(m_xBuilder->weld_label("label3"))
- , m_xPOP3RB(m_xBuilder->weld_radio_button("pop3"))
- , m_xPOP3Img(m_xBuilder->weld_widget("lockpop3"))
- , m_xIMAPRB(m_xBuilder->weld_radio_button("imap"))
- , m_xInUsernameFT(m_xBuilder->weld_label("inusername_label"))
- , m_xInUsernameED(m_xBuilder->weld_entry("inusername"))
- , m_xInUsernameImg(m_xBuilder->weld_widget("lockinusername"))
- , m_xInPasswordFT(m_xBuilder->weld_label("inpassword_label"))
- , m_xInPasswordED(m_xBuilder->weld_entry("inpassword"))
- , m_xOKPB(m_xBuilder->weld_button("ok"))
+ ,
m_xAuthenticationCB(m_xBuilder->weld_check_button(u"authentication"_ustr))
+ , m_xAuthenticationImg(m_xBuilder->weld_widget(u"lockauthentication"_ustr))
+ ,
m_xSeparateAuthenticationRB(m_xBuilder->weld_radio_button(u"separateauthentication"_ustr))
+ ,
m_xSeparateAuthenticationImg(m_xBuilder->weld_widget(u"lockseparaauth"_ustr))
+ , m_xSMTPAfterPOPRB(m_xBuilder->weld_radio_button(u"smtpafterpop"_ustr))
+ , m_xSMTPAfterPOPImg(m_xBuilder->weld_widget(u"locksmtpafterpop"_ustr))
+ , m_xOutgoingServerFT(m_xBuilder->weld_label(u"label1"_ustr))
+ , m_xUserNameFT(m_xBuilder->weld_label(u"username_label"_ustr))
+ , m_xUserNameED(m_xBuilder->weld_entry(u"username"_ustr))
+ , m_xUserNameImg(m_xBuilder->weld_widget(u"lockusername"_ustr))
+ , m_xOutPasswordFT(m_xBuilder->weld_label(u"outpassword_label"_ustr))
+ , m_xOutPasswordED(m_xBuilder->weld_entry(u"outpassword"_ustr))
+ , m_xIncomingServerFT(m_xBuilder->weld_label(u"label2"_ustr))
+ , m_xServerFT(m_xBuilder->weld_label(u"server_label"_ustr))
+ , m_xServerED(m_xBuilder->weld_entry(u"server"_ustr))
+ , m_xServerImg(m_xBuilder->weld_widget(u"lockserver"_ustr))
+ , m_xPortFT(m_xBuilder->weld_label(u"port_label"_ustr))
+ , m_xPortNF(m_xBuilder->weld_spin_button(u"port"_ustr))
+ , m_xPortImg(m_xBuilder->weld_widget(u"lockport"_ustr))
+ , m_xProtocolFT(m_xBuilder->weld_label(u"label3"_ustr))
+ , m_xPOP3RB(m_xBuilder->weld_radio_button(u"pop3"_ustr))
+ , m_xPOP3Img(m_xBuilder->weld_widget(u"lockpop3"_ustr))
+ , m_xIMAPRB(m_xBuilder->weld_radio_button(u"imap"_ustr))
+ , m_xInUsernameFT(m_xBuilder->weld_label(u"inusername_label"_ustr))
+ , m_xInUsernameED(m_xBuilder->weld_entry(u"inusername"_ustr))
+ , m_xInUsernameImg(m_xBuilder->weld_widget(u"lockinusername"_ustr))
+ , m_xInPasswordFT(m_xBuilder->weld_label(u"inpassword_label"_ustr))
+ , m_xInPasswordED(m_xBuilder->weld_entry(u"inpassword"_ustr))
+ , m_xOKPB(m_xBuilder->weld_button(u"ok"_ustr))
{
m_xAuthenticationCB->connect_toggled( LINK( this,
SwAuthenticationSettingsDialog, CheckBoxHdl_Impl));
Link<weld::Toggleable&,void> aRBLink = LINK( this,
SwAuthenticationSettingsDialog, RadioButtonHdl_Impl );
@@ -522,12 +522,12 @@ IMPL_LINK_NOARG(SwAuthenticationSettingsDialog,
RadioButtonHdl_Impl, weld::Toggl
if (bSeparate && m_xUserNameED->get_text().isEmpty())
m_xUserNameED->set_text(m_rConfigItem.GetMailAddress());
else if (!bSeparate && m_xUserNameED->get_text() ==
m_rConfigItem.GetMailAddress())
- m_xUserNameED->set_text("");
+ m_xUserNameED->set_text(u""_ustr);
if (bNotSeparate && m_xInUsernameED->get_text().isEmpty())
m_xInUsernameED->set_text(m_rConfigItem.GetMailAddress());
else if (!bNotSeparate && m_xInUsernameED->get_text() ==
m_rConfigItem.GetMailAddress())
- m_xInUsernameED->set_text("");
+ m_xInUsernameED->set_text(u""_ustr);
m_xOutgoingServerFT->set_sensitive(bSeparate);
m_xUserNameFT->set_sensitive(bSeparate);
diff --git a/sw/source/ui/config/optcomp.cxx b/sw/source/ui/config/optcomp.cxx
index d95b5638a442..10488cf7d36d 100644
--- a/sw/source/ui/config/optcomp.cxx
+++ b/sw/source/ui/config/optcomp.cxx
@@ -97,11 +97,11 @@ std::pair<DocumentSettingId, bool>
DocumentSettingForOption(const OUString& opti
}
SwCompatibilityOptPage::SwCompatibilityOptPage(weld::Container* pPage,
weld::DialogController* pController, const SfxItemSet& rSet)
- : SfxTabPage(pPage, pController, "modules/swriter/ui/optcompatpage.ui",
"OptCompatPage", &rSet)
+ : SfxTabPage(pPage, pController,
u"modules/swriter/ui/optcompatpage.ui"_ustr, u"OptCompatPage"_ustr, &rSet)
, m_pWrtShell(nullptr)
- , m_xMain(m_xBuilder->weld_frame("compatframe"))
- , m_xOptionsLB(m_xBuilder->weld_tree_view("options"))
- , m_xDefaultPB(m_xBuilder->weld_button("default"))
+ , m_xMain(m_xBuilder->weld_frame(u"compatframe"_ustr))
+ , m_xOptionsLB(m_xBuilder->weld_tree_view(u"options"_ustr))
+ , m_xDefaultPB(m_xBuilder->weld_button(u"default"_ustr))
{
m_xOptionsLB->enable_toggle_buttons(weld::ColumnToggleType::Check);
@@ -146,8 +146,8 @@ void SwCompatibilityOptPage::InitControls( const
SfxItemSet& rSet )
IMPL_LINK_NOARG(SwCompatibilityOptPage, UseAsDefaultHdl, weld::Button&, void)
{
- std::unique_ptr<weld::Builder>
xBuilder(Application::CreateBuilder(GetFrameWeld(),
"modules/swriter/ui/querydefaultcompatdialog.ui"));
- std::unique_ptr<weld::MessageDialog>
xQueryBox(xBuilder->weld_message_dialog("QueryDefaultCompatDialog"));
+ std::unique_ptr<weld::Builder>
xBuilder(Application::CreateBuilder(GetFrameWeld(),
u"modules/swriter/ui/querydefaultcompatdialog.ui"_ustr));
+ std::unique_ptr<weld::MessageDialog>
xQueryBox(xBuilder->weld_message_dialog(u"QueryDefaultCompatDialog"_ustr));
if (xQueryBox->run() != RET_YES)
return;
diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx
index 3adf4dce4e34..6262ad9cfbd8 100644
--- a/sw/source/ui/config/optload.cxx
+++ b/sw/source/ui/config/optload.cxx
@@ -506,34 +506,34 @@ FieldUnit SwFieldUnitTable::GetValue(sal_uInt32 nPos)
}
SwLoadOptPage::SwLoadOptPage(weld::Container* pPage, weld::DialogController*
pController, const SfxItemSet& rSet)
- : SfxTabPage(pPage, pController, "modules/swriter/ui/optgeneralpage.ui",
"OptGeneralPage", &rSet)
+ : SfxTabPage(pPage, pController,
u"modules/swriter/ui/optgeneralpage.ui"_ustr, u"OptGeneralPage"_ustr, &rSet)
, m_pWrtShell(nullptr)
, m_nLastTab(0)
, m_nOldLinkMode(MANUAL)
- , m_xAlwaysRB(m_xBuilder->weld_radio_button("always"))
- , m_xRequestRB(m_xBuilder->weld_radio_button("onrequest"))
- , m_xNeverRB(m_xBuilder->weld_radio_button("never"))
- , m_xGridupdatelink(m_xBuilder->weld_widget("gridupdatelink"))
- , m_xUpdateLinkImg(m_xBuilder->weld_widget("lockupdatelink"))
- , m_xAutoUpdateFields(m_xBuilder->weld_check_button("updatefields"))
- , m_xAutoUpdateFieldsImg(m_xBuilder->weld_widget("lockupdatefields"))
- , m_xAutoUpdateCharts(m_xBuilder->weld_check_button("updatecharts"))
- , m_xAutoUpdateChartsImg(m_xBuilder->weld_widget("lockupdatecharts"))
- , m_xMetricLB(m_xBuilder->weld_combo_box("metric"))
- , m_xMetricImg(m_xBuilder->weld_widget("lockmetric"))
- , m_xTabFT(m_xBuilder->weld_label("tablabel"))
- , m_xTabMF(m_xBuilder->weld_metric_spin_button("tab", FieldUnit::CM))
- , m_xTabImg(m_xBuilder->weld_widget("locktab"))
- , m_xUseSquaredPageMode(m_xBuilder->weld_check_button("squaremode"))
- , m_xUseSquaredPageModeImg(m_xBuilder->weld_widget("locksquaremode"))
- , m_xUseCharUnit(m_xBuilder->weld_check_button("usecharunit"))
- , m_xUseCharUnitImg(m_xBuilder->weld_widget("lockusecharunit"))
- , m_xWordCountED(m_xBuilder->weld_entry("wordcount"))
- , m_xWordCountImg(m_xBuilder->weld_widget("lockwordcount"))
- ,
m_xShowStandardizedPageCount(m_xBuilder->weld_check_button("standardizedpageshow"))
- ,
m_xShowStandardizedPageCountImg(m_xBuilder->weld_widget("lockstandardizedpageshow"))
- ,
m_xStandardizedPageSizeNF(m_xBuilder->weld_spin_button("standardpagesize"))
- ,
m_xStandardizedPageSizeImg(m_xBuilder->weld_widget("lockstandardpagesize"))
+ , m_xAlwaysRB(m_xBuilder->weld_radio_button(u"always"_ustr))
+ , m_xRequestRB(m_xBuilder->weld_radio_button(u"onrequest"_ustr))
+ , m_xNeverRB(m_xBuilder->weld_radio_button(u"never"_ustr))
+ , m_xGridupdatelink(m_xBuilder->weld_widget(u"gridupdatelink"_ustr))
+ , m_xUpdateLinkImg(m_xBuilder->weld_widget(u"lockupdatelink"_ustr))
+ , m_xAutoUpdateFields(m_xBuilder->weld_check_button(u"updatefields"_ustr))
+ , m_xAutoUpdateFieldsImg(m_xBuilder->weld_widget(u"lockupdatefields"_ustr))
+ , m_xAutoUpdateCharts(m_xBuilder->weld_check_button(u"updatecharts"_ustr))
+ , m_xAutoUpdateChartsImg(m_xBuilder->weld_widget(u"lockupdatecharts"_ustr))
+ , m_xMetricLB(m_xBuilder->weld_combo_box(u"metric"_ustr))
+ , m_xMetricImg(m_xBuilder->weld_widget(u"lockmetric"_ustr))
+ , m_xTabFT(m_xBuilder->weld_label(u"tablabel"_ustr))
+ , m_xTabMF(m_xBuilder->weld_metric_spin_button(u"tab"_ustr, FieldUnit::CM))
+ , m_xTabImg(m_xBuilder->weld_widget(u"locktab"_ustr))
+ , m_xUseSquaredPageMode(m_xBuilder->weld_check_button(u"squaremode"_ustr))
+ , m_xUseSquaredPageModeImg(m_xBuilder->weld_widget(u"locksquaremode"_ustr))
+ , m_xUseCharUnit(m_xBuilder->weld_check_button(u"usecharunit"_ustr))
+ , m_xUseCharUnitImg(m_xBuilder->weld_widget(u"lockusecharunit"_ustr))
+ , m_xWordCountED(m_xBuilder->weld_entry(u"wordcount"_ustr))
+ , m_xWordCountImg(m_xBuilder->weld_widget(u"lockwordcount"_ustr))
+ ,
m_xShowStandardizedPageCount(m_xBuilder->weld_check_button(u"standardizedpageshow"_ustr))
+ ,
m_xShowStandardizedPageCountImg(m_xBuilder->weld_widget(u"lockstandardizedpageshow"_ustr))
+ ,
m_xStandardizedPageSizeNF(m_xBuilder->weld_spin_button(u"standardpagesize"_ustr))
+ ,
m_xStandardizedPageSizeImg(m_xBuilder->weld_widget(u"lockstandardpagesize"_ustr))
{
for (sal_uInt32 i = 0; i < SwFieldUnitTable::Count(); ++i)
{
@@ -591,8 +591,8 @@ IMPL_LINK_NOARG(SwLoadOptPage,
StandardizedPageCountCheckHdl, weld::Toggleable&,
OUString SwLoadOptPage::GetAllStrings()
{
OUString sAllStrings;
- OUString labels[] = { "label2", "label1", "label3", "label5",
- "tablabel", "label4", "label7", "labelstandardpages"
};
+ OUString labels[] = { u"label2"_ustr, u"label1"_ustr, u"label3"_ustr,
u"label5"_ustr,
+ u"tablabel"_ustr, u"label4"_ustr, u"label7"_ustr,
u"labelstandardpages"_ustr };
for (const auto& label : labels)
{
@@ -601,7 +601,7 @@ OUString SwLoadOptPage::GetAllStrings()
}
OUString checkButton[]
- = { "updatefields", "updatecharts", "usecharunit", "squaremode",
"standardizedpageshow" };
+ = { u"updatefields"_ustr, u"updatecharts"_ustr, u"usecharunit"_ustr,
u"squaremode"_ustr, u"standardizedpageshow"_ustr };
for (const auto& check : checkButton)
{
@@ -609,7 +609,7 @@ OUString SwLoadOptPage::GetAllStrings()
sAllStrings += pString->get_label() + " ";
}
- OUString radioButton[] = { "always", "onrequest", "never" };
+ OUString radioButton[] = { u"always"_ustr, u"onrequest"_ustr,
u"never"_ustr };
for (const auto& radio : radioButton)
{
@@ -869,8 +869,8 @@ IMPL_LINK_NOARG(SwLoadOptPage, MetricHdl, weld::ComboBox&,
void)
}
SwCaptionOptDlg::SwCaptionOptDlg(weld::Window* pParent, const SfxItemSet& rSet)
- : SfxSingleTabDialogController(pParent, &rSet,
"modules/swriter/ui/captiondialog.ui",
- "CaptionDialog")
+ : SfxSingleTabDialogController(pParent, &rSet,
u"modules/swriter/ui/captiondialog.ui"_ustr,
+ u"CaptionDialog"_ustr)
{
// create TabPage
SetTabPage(SwCaptionOptPage::Create(get_content_area(), this, &rSet));
@@ -930,7 +930,7 @@ IMPL_LINK(SwCaptionOptPage, TextFilterHdl, OUString&,
rTest, bool)
}
SwCaptionOptPage::SwCaptionOptPage(weld::Container* pPage,
weld::DialogController* pController, const SfxItemSet& rSet)
- : SfxTabPage(pPage, pController, "modules/swriter/ui/optcaptionpage.ui",
"OptCaptionPage", &rSet)
+ : SfxTabPage(pPage, pController,
u"modules/swriter/ui/optcaptionpage.ui"_ustr, u"OptCaptionPage"_ustr, &rSet)
, m_sSWTable(SwResId(STR_CAPTION_TABLE))
, m_sSWFrame(SwResId(STR_CAPTION_FRAME))
, m_sSWGraphic(SwResId(STR_CAPTION_GRAPHIC))
@@ -944,34 +944,34 @@ SwCaptionOptPage::SwCaptionOptPage(weld::Container*
pPage, weld::DialogControlle
, m_pMgr(new SwFieldMgr)
, m_bHTMLMode(false)
, m_aTextFilter(m_sNone)
- , m_xCheckLB(m_xBuilder->weld_tree_view("objects"))
- , m_xLbCaptionOrder(m_xBuilder->weld_combo_box("captionorder"))
- , m_xLbCaptionOrderImg(m_xBuilder->weld_widget("lockcaptionorder"))
- , m_xSettingsGroup(m_xBuilder->weld_widget("settings"))
- , m_xCategoryBox(m_xBuilder->weld_combo_box("category"))
- , m_xCategoryBoxImg(m_xBuilder->weld_widget("lockcategory"))
- , m_xFormatText(m_xBuilder->weld_label("numberingft"))
- , m_xFormatBox(m_xBuilder->weld_combo_box("numbering"))
- , m_xFormatBoxImg(m_xBuilder->weld_widget("locknumbering"))
- , m_xNumberingSeparatorFT(m_xBuilder->weld_label("numseparatorft"))
- , m_xNumberingSeparatorED(m_xBuilder->weld_entry("numseparator"))
- , m_xNumberingSeparatorImg(m_xBuilder->weld_widget("locknumseparator"))
- , m_xTextText(m_xBuilder->weld_label("separatorft"))
- , m_xTextEdit(m_xBuilder->weld_entry("separator"))
- , m_xTextEditImg(m_xBuilder->weld_widget("lockseparator"))
- , m_xPosBox(m_xBuilder->weld_combo_box("position"))
- , m_xPosBoxImg(m_xBuilder->weld_widget("lockposition"))
- , m_xNumCapt(m_xBuilder->weld_widget("numcaption"))
- , m_xLbLevel(m_xBuilder->weld_combo_box("level"))
- , m_xLbLevelImg(m_xBuilder->weld_widget("locklevel"))
- , m_xEdDelim(m_xBuilder->weld_entry("chapseparator"))
- , m_xEdDelimImg(m_xBuilder->weld_widget("lockchapseparator"))
- , m_xCategory(m_xBuilder->weld_widget("categoryformat"))
- , m_xCharStyleLB(m_xBuilder->weld_combo_box("charstyle"))
- , m_xCharStyleImg(m_xBuilder->weld_widget("lockcharstyle"))
- , m_xApplyBorderCB(m_xBuilder->weld_check_button("applyborder"))
- , m_xApplyBorderImg(m_xBuilder->weld_widget("lockapplyborder"))
- , m_xPreview(new weld::CustomWeld(*m_xBuilder, "preview", m_aPreview))
+ , m_xCheckLB(m_xBuilder->weld_tree_view(u"objects"_ustr))
+ , m_xLbCaptionOrder(m_xBuilder->weld_combo_box(u"captionorder"_ustr))
+ , m_xLbCaptionOrderImg(m_xBuilder->weld_widget(u"lockcaptionorder"_ustr))
+ , m_xSettingsGroup(m_xBuilder->weld_widget(u"settings"_ustr))
+ , m_xCategoryBox(m_xBuilder->weld_combo_box(u"category"_ustr))
+ , m_xCategoryBoxImg(m_xBuilder->weld_widget(u"lockcategory"_ustr))
+ , m_xFormatText(m_xBuilder->weld_label(u"numberingft"_ustr))
+ , m_xFormatBox(m_xBuilder->weld_combo_box(u"numbering"_ustr))
+ , m_xFormatBoxImg(m_xBuilder->weld_widget(u"locknumbering"_ustr))
+ , m_xNumberingSeparatorFT(m_xBuilder->weld_label(u"numseparatorft"_ustr))
+ , m_xNumberingSeparatorED(m_xBuilder->weld_entry(u"numseparator"_ustr))
+ ,
m_xNumberingSeparatorImg(m_xBuilder->weld_widget(u"locknumseparator"_ustr))
+ , m_xTextText(m_xBuilder->weld_label(u"separatorft"_ustr))
+ , m_xTextEdit(m_xBuilder->weld_entry(u"separator"_ustr))
+ , m_xTextEditImg(m_xBuilder->weld_widget(u"lockseparator"_ustr))
+ , m_xPosBox(m_xBuilder->weld_combo_box(u"position"_ustr))
+ , m_xPosBoxImg(m_xBuilder->weld_widget(u"lockposition"_ustr))
+ , m_xNumCapt(m_xBuilder->weld_widget(u"numcaption"_ustr))
+ , m_xLbLevel(m_xBuilder->weld_combo_box(u"level"_ustr))
+ , m_xLbLevelImg(m_xBuilder->weld_widget(u"locklevel"_ustr))
+ , m_xEdDelim(m_xBuilder->weld_entry(u"chapseparator"_ustr))
+ , m_xEdDelimImg(m_xBuilder->weld_widget(u"lockchapseparator"_ustr))
+ , m_xCategory(m_xBuilder->weld_widget(u"categoryformat"_ustr))
+ , m_xCharStyleLB(m_xBuilder->weld_combo_box(u"charstyle"_ustr))
+ , m_xCharStyleImg(m_xBuilder->weld_widget(u"lockcharstyle"_ustr))
+ , m_xApplyBorderCB(m_xBuilder->weld_check_button(u"applyborder"_ustr))
+ , m_xApplyBorderImg(m_xBuilder->weld_widget(u"lockapplyborder"_ustr))
+ , m_xPreview(new weld::CustomWeld(*m_xBuilder, u"preview"_ustr,
m_aPreview))
{
m_xCategoryBox->connect_entry_insert_text(LINK(this, SwCaptionOptPage,
TextFilterHdl));
@@ -1016,7 +1016,7 @@ SwCaptionOptPage::SwCaptionOptPage(weld::Container*
pPage, weld::DialogControlle
m_xLbLevel->append_text(OUString::number(i + 1));
sal_Unicode nLvl = MAXLEVEL;
- OUString sDelim(": ");
+ OUString sDelim(u": "_ustr);
if (pSh)
{
@@ -1062,9 +1062,9 @@ std::unique_ptr<SfxTabPage>
SwCaptionOptPage::Create(weld::Container* pPage, wel
OUString SwCaptionOptPage::GetAllStrings()
{
OUString sAllStrings;
- OUString labels[] = { "label1", "label13", "label2",
"label7", "numberingft",
- "numseparatorft", "separatorft", "label18",
"label11", "label4",
- "label6", "label10", "label3" };
+ OUString labels[] = { u"label1"_ustr, u"label13"_ustr,
u"label2"_ustr, u"label7"_ustr, u"numberingft"_ustr,
+ u"numseparatorft"_ustr, u"separatorft"_ustr,
u"label18"_ustr, u"label11"_ustr, u"label4"_ustr,
+ u"label6"_ustr, u"label10"_ustr,
u"label3"_ustr };
for (const auto& label : labels)
{
@@ -1072,7 +1072,7 @@ OUString SwCaptionOptPage::GetAllStrings()
sAllStrings += pString->get_label() + " ";
}
- if (const auto& pString = m_xBuilder->weld_check_button("applyborder"))
+ if (const auto& pString =
m_xBuilder->weld_check_button(u"applyborder"_ustr))
sAllStrings += pString->get_label() + " ";
return sAllStrings.replaceAll("_", "");
@@ -1208,7 +1208,7 @@ void SwCaptionOptPage::DelUserData()
for (int i = 0, nCount = m_xCheckLB->n_children(); i < nCount; ++i)
{
delete weld::fromId<InsCaptionOpt*>(m_xCheckLB->get_id(i));
- m_xCheckLB->set_id(i, "0");
+ m_xCheckLB->set_id(i, u"0"_ustr);
}
}
@@ -1376,7 +1376,7 @@ void SwCaptionOptPage::SaveEntry(int nEntry)
pOpt->UseCaption() = m_xCheckLB->get_toggle(nEntry) == TRISTATE_TRUE;
const OUString aName(m_xCategoryBox->get_active_text());
if (aName == m_sNone)
- pOpt->SetCategory("");
+ pOpt->SetCategory(u""_ustr);
else
pOpt->SetCategory(comphelper::string::strip(aName, ' '));
pOpt->SetNumType(m_xFormatBox->get_active_id().toUInt32());
@@ -1388,7 +1388,7 @@ void SwCaptionOptPage::SaveEntry(int nEntry)
pOpt->SetSeparator(m_xEdDelim->get_text());
pOpt->SetNumSeparator(m_xNumberingSeparatorED->get_text());
if (m_xCharStyleLB->get_active() == -1)
- pOpt->SetCharacterStyle("");
+ pOpt->SetCharacterStyle(u""_ustr);
else
pOpt->SetCharacterStyle(m_xCharStyleLB->get_active_text());
pOpt->CopyAttributes() = m_xApplyBorderCB->get_active();
diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx
index 089942b5eeb0..a1572f1e8b45 100644
--- a/sw/source/ui/config/optpage.cxx
+++ b/sw/source/ui/config/optpage.cxx
@@ -86,42 +86,42 @@ void drawRect(vcl::RenderContext& rRenderContext, const
tools::Rectangle &rRect,
// Tools->Options->Writer->View
// Tools->Options->Writer/Web->View
SwContentOptPage::SwContentOptPage(weld::Container* pPage,
weld::DialogController* pController, const SfxItemSet& rCoreSet)
- : SfxTabPage(pPage, pController, "modules/swriter/ui/viewoptionspage.ui",
"ViewOptionsPage", &rCoreSet)
- , m_xCrossCB(m_xBuilder->weld_check_button("helplines"))
- , m_xCrossImg(m_xBuilder->weld_widget("lockhelplines"))
- , m_xHMetric(m_xBuilder->weld_combo_box("hrulercombobox"))
- , m_xHMetricImg(m_xBuilder->weld_widget("lockhruler"))
- , m_xVRulerCBox(m_xBuilder->weld_check_button("vruler"))
- , m_xVRulerImg(m_xBuilder->weld_widget("lockvruler"))
- , m_xVRulerRightCBox(m_xBuilder->weld_check_button("vrulerright"))
- , m_xVRulerRightImg(m_xBuilder->weld_widget("lockvrulerright"))
- , m_xVMetric(m_xBuilder->weld_combo_box("vrulercombobox"))
- , m_xSmoothCBox(m_xBuilder->weld_check_button("smoothscroll"))
- , m_xSmoothImg(m_xBuilder->weld_widget("locksmoothscroll"))
- , m_xGrfCB(m_xBuilder->weld_check_button("graphics"))
- , m_xGrfImg(m_xBuilder->weld_widget("lockgraphics"))
- , m_xTableCB(m_xBuilder->weld_check_button("tables"))
- , m_xTableImg(m_xBuilder->weld_widget("locktables"))
- , m_xDrwCB(m_xBuilder->weld_check_button("drawings"))
- , m_xDrwImg(m_xBuilder->weld_widget("lockdrawings"))
- , m_xPostItCB(m_xBuilder->weld_check_button("comments"))
- , m_xSettingsFrame(m_xBuilder->weld_frame("settingsframe"))
- , m_xSettingsLabel(m_xBuilder->weld_label("settingslabel"))
- , m_xMetricLabel(m_xBuilder->weld_label("measureunitlabel"))
- , m_xMetricLB(m_xBuilder->weld_combo_box("measureunit"))
- , m_xMetricImg(m_xBuilder->weld_widget("lockmeasureunit"))
- , m_xShowInlineTooltips(m_xBuilder->weld_check_button("changestooltip"))
- , m_xShowInlineTooltipsImg(m_xBuilder->weld_widget("lockchangestooltip"))
- ,
m_xShowOutlineContentVisibilityButton(m_xBuilder->weld_check_button("outlinecontentvisibilitybutton"))
- ,
m_xShowOutlineContentVImg(m_xBuilder->weld_widget("lockoutlinecontentvisibility"))
- ,
m_xTreatSubOutlineLevelsAsContent(m_xBuilder->weld_check_button("suboutlinelevelsascontent"))
- ,
m_xTreatSubOutlineLevelsImg(m_xBuilder->weld_widget("locksuboutlinelevels"))
- , m_xShowChangesInMargin(m_xBuilder->weld_check_button("changesinmargin"))
- , m_xShowChangesInMarginImg(m_xBuilder->weld_widget("lockchangesinmargin"))
- , m_xFieldHiddenCB(m_xBuilder->weld_check_button("hiddentextfield"))
- , m_xFieldHiddenImg(m_xBuilder->weld_widget("lockhiddentextfield"))
- , m_xFieldHiddenParaCB(m_xBuilder->weld_check_button("hiddenparafield"))
- , m_xFieldHiddenParaImg(m_xBuilder->weld_widget("lockhiddenparafield"))
+ : SfxTabPage(pPage, pController,
u"modules/swriter/ui/viewoptionspage.ui"_ustr, u"ViewOptionsPage"_ustr,
&rCoreSet)
+ , m_xCrossCB(m_xBuilder->weld_check_button(u"helplines"_ustr))
+ , m_xCrossImg(m_xBuilder->weld_widget(u"lockhelplines"_ustr))
+ , m_xHMetric(m_xBuilder->weld_combo_box(u"hrulercombobox"_ustr))
+ , m_xHMetricImg(m_xBuilder->weld_widget(u"lockhruler"_ustr))
+ , m_xVRulerCBox(m_xBuilder->weld_check_button(u"vruler"_ustr))
+ , m_xVRulerImg(m_xBuilder->weld_widget(u"lockvruler"_ustr))
+ , m_xVRulerRightCBox(m_xBuilder->weld_check_button(u"vrulerright"_ustr))
+ , m_xVRulerRightImg(m_xBuilder->weld_widget(u"lockvrulerright"_ustr))
+ , m_xVMetric(m_xBuilder->weld_combo_box(u"vrulercombobox"_ustr))
+ , m_xSmoothCBox(m_xBuilder->weld_check_button(u"smoothscroll"_ustr))
+ , m_xSmoothImg(m_xBuilder->weld_widget(u"locksmoothscroll"_ustr))
+ , m_xGrfCB(m_xBuilder->weld_check_button(u"graphics"_ustr))
+ , m_xGrfImg(m_xBuilder->weld_widget(u"lockgraphics"_ustr))
+ , m_xTableCB(m_xBuilder->weld_check_button(u"tables"_ustr))
+ , m_xTableImg(m_xBuilder->weld_widget(u"locktables"_ustr))
+ , m_xDrwCB(m_xBuilder->weld_check_button(u"drawings"_ustr))
+ , m_xDrwImg(m_xBuilder->weld_widget(u"lockdrawings"_ustr))
+ , m_xPostItCB(m_xBuilder->weld_check_button(u"comments"_ustr))
+ , m_xSettingsFrame(m_xBuilder->weld_frame(u"settingsframe"_ustr))
+ , m_xSettingsLabel(m_xBuilder->weld_label(u"settingslabel"_ustr))
+ , m_xMetricLabel(m_xBuilder->weld_label(u"measureunitlabel"_ustr))
+ , m_xMetricLB(m_xBuilder->weld_combo_box(u"measureunit"_ustr))
+ , m_xMetricImg(m_xBuilder->weld_widget(u"lockmeasureunit"_ustr))
+ ,
m_xShowInlineTooltips(m_xBuilder->weld_check_button(u"changestooltip"_ustr))
+ ,
m_xShowInlineTooltipsImg(m_xBuilder->weld_widget(u"lockchangestooltip"_ustr))
+ ,
m_xShowOutlineContentVisibilityButton(m_xBuilder->weld_check_button(u"outlinecontentvisibilitybutton"_ustr))
+ ,
m_xShowOutlineContentVImg(m_xBuilder->weld_widget(u"lockoutlinecontentvisibility"_ustr))
+ ,
m_xTreatSubOutlineLevelsAsContent(m_xBuilder->weld_check_button(u"suboutlinelevelsascontent"_ustr))
+ ,
m_xTreatSubOutlineLevelsImg(m_xBuilder->weld_widget(u"locksuboutlinelevels"_ustr))
+ ,
m_xShowChangesInMargin(m_xBuilder->weld_check_button(u"changesinmargin"_ustr))
+ ,
m_xShowChangesInMarginImg(m_xBuilder->weld_widget(u"lockchangesinmargin"_ustr))
+ , m_xFieldHiddenCB(m_xBuilder->weld_check_button(u"hiddentextfield"_ustr))
+ , m_xFieldHiddenImg(m_xBuilder->weld_widget(u"lockhiddentextfield"_ustr))
+ ,
m_xFieldHiddenParaCB(m_xBuilder->weld_check_button(u"hiddenparafield"_ustr))
+ ,
m_xFieldHiddenParaImg(m_xBuilder->weld_widget(u"lockhiddenparafield"_ustr))
{
m_xShowOutlineContentVisibilityButton->connect_toggled(LINK(this,
SwContentOptPage, ShowOutlineContentVisibilityButtonHdl));
@@ -312,8 +312,8 @@ OUString SwContentOptPage::GetAllStrings()
{
OUString sAllStrings;
OUString labels[]
- = { "guideslabel", "displaylabel", "displayfl1",
"changeslabel", "label3",
- "hruler", "settingslabel", "measureunitlabel", "outlinelabel"
};
+ = { u"guideslabel"_ustr, u"displaylabel"_ustr, u"displayfl1"_ustr,
u"changeslabel"_ustr, u"label3"_ustr,
+ u"hruler"_ustr, u"settingslabel"_ustr,
u"measureunitlabel"_ustr, u"outlinelabel"_ustr };
for (const auto& label : labels)
{
@@ -321,21 +321,21 @@ OUString SwContentOptPage::GetAllStrings()
sAllStrings += pString->get_label() + " ";
}
- OUString checkButton[] = { "helplines",
- "graphics",
- "tables",
- "drawings",
- "comments",
- "resolvedcomments",
- "hiddentextfield",
- "hiddenparafield",
- "changesinmargin",
- "changestooltip",
- "vruler",
- "vrulerright",
- "smoothscroll",
- "outlinecontentvisibilitybutton",
- "suboutlinelevelsascontent" };
+ OUString checkButton[] = { u"helplines"_ustr,
+ u"graphics"_ustr,
+ u"tables"_ustr,
+ u"drawings"_ustr,
+ u"comments"_ustr,
+ u"resolvedcomments"_ustr,
+ u"hiddentextfield"_ustr,
+ u"hiddenparafield"_ustr,
+ u"changesinmargin"_ustr,
+ u"changestooltip"_ustr,
+ u"vruler"_ustr,
+ u"vrulerright"_ustr,
+ u"smoothscroll"_ustr,
+ u"outlinecontentvisibilitybutton"_ustr,
+ u"suboutlinelevelsascontent"_ustr };
for (const auto& check : checkButton)
{
@@ -411,45 +411,45 @@ IMPL_LINK(SwContentOptPage,
ShowOutlineContentVisibilityButtonHdl, weld::Togglea
// TabPage Printer additional settings
SwAddPrinterTabPage::SwAddPrinterTabPage(weld::Container* pPage,
weld::DialogController* pController,
const SfxItemSet& rCoreSet)
- : SfxTabPage(pPage, pController, "modules/swriter/ui/printoptionspage.ui",
"PrintOptionsPage", &rCoreSet)
+ : SfxTabPage(pPage, pController,
u"modules/swriter/ui/printoptionspage.ui"_ustr, u"PrintOptionsPage"_ustr,
&rCoreSet)
, m_sNone(SwResId(SW_STR_NONE))
, m_bAttrModified(false)
, m_bPreview(false)
, m_bHTMLMode(false)
- , m_xGrfCB(m_xBuilder->weld_check_button("graphics"))
- , m_xGrfImg(m_xBuilder->weld_widget("lockgraphics"))
- , m_xCtrlFieldCB(m_xBuilder->weld_check_button("formcontrols"))
- , m_xCtrlFieldImg(m_xBuilder->weld_widget("lockformcontrols"))
- , m_xBackgroundCB(m_xBuilder->weld_check_button("background"))
- , m_xBackgroundImg(m_xBuilder->weld_widget("lockbackground"))
- , m_xBlackFontCB(m_xBuilder->weld_check_button("inblack"))
- , m_xBlackFontImg(m_xBuilder->weld_widget("lockinblack"))
- , m_xPrintHiddenTextCB(m_xBuilder->weld_check_button("hiddentext"))
- , m_xPrintHiddenTextImg(m_xBuilder->weld_widget("lockhiddentext"))
- ,
m_xPrintTextPlaceholderCB(m_xBuilder->weld_check_button("textplaceholder"))
- ,
m_xPrintTextPlaceholderImg(m_xBuilder->weld_widget("locktextplaceholder"))
- , m_xPagesFrame(m_xBuilder->weld_widget("pagesframe"))
- , m_xLeftPageCB(m_xBuilder->weld_check_button("leftpages"))
- , m_xLeftPageImg(m_xBuilder->weld_widget("lockleftpages"))
- , m_xRightPageCB(m_xBuilder->weld_check_button("rightpages"))
- , m_xRightPageImg(m_xBuilder->weld_widget("lockrightpages"))
- , m_xProspectCB(m_xBuilder->weld_check_button("brochure"))
- , m_xProspectImg(m_xBuilder->weld_widget("lockbrochure"))
- , m_xProspectCB_RTL(m_xBuilder->weld_check_button("rtl"))
- , m_xProspectImg_RTL(m_xBuilder->weld_widget("lockrtl"))
- , m_xCommentsFrame(m_xBuilder->weld_widget("commentsframe"))
- , m_xNoRB(m_xBuilder->weld_radio_button("none"))
- , m_xOnlyRB(m_xBuilder->weld_radio_button("only"))
- , m_xEndRB(m_xBuilder->weld_radio_button("end"))
- , m_xEndPageRB(m_xBuilder->weld_radio_button("endpage"))
- , m_xInMarginsRB(m_xBuilder->weld_radio_button("inmargins"))
- , m_xMarginsImg(m_xBuilder->weld_widget("lockcomments"))
- , m_xPrintEmptyPagesCB(m_xBuilder->weld_check_button("blankpages"))
- , m_xPrintEmptyPagesImg(m_xBuilder->weld_widget("lockblankpages"))
- , m_xPaperFromSetupCB(m_xBuilder->weld_check_button("papertray"))
- , m_xPaperFromSetupImg(m_xBuilder->weld_widget("lockpapertray"))
- , m_xFaxLB(m_xBuilder->weld_combo_box("fax"))
- , m_xFaxImg(m_xBuilder->weld_widget("lockfax"))
+ , m_xGrfCB(m_xBuilder->weld_check_button(u"graphics"_ustr))
+ , m_xGrfImg(m_xBuilder->weld_widget(u"lockgraphics"_ustr))
+ , m_xCtrlFieldCB(m_xBuilder->weld_check_button(u"formcontrols"_ustr))
+ , m_xCtrlFieldImg(m_xBuilder->weld_widget(u"lockformcontrols"_ustr))
+ , m_xBackgroundCB(m_xBuilder->weld_check_button(u"background"_ustr))
+ , m_xBackgroundImg(m_xBuilder->weld_widget(u"lockbackground"_ustr))
+ , m_xBlackFontCB(m_xBuilder->weld_check_button(u"inblack"_ustr))
+ , m_xBlackFontImg(m_xBuilder->weld_widget(u"lockinblack"_ustr))
+ , m_xPrintHiddenTextCB(m_xBuilder->weld_check_button(u"hiddentext"_ustr))
+ , m_xPrintHiddenTextImg(m_xBuilder->weld_widget(u"lockhiddentext"_ustr))
+ ,
m_xPrintTextPlaceholderCB(m_xBuilder->weld_check_button(u"textplaceholder"_ustr))
+ ,
m_xPrintTextPlaceholderImg(m_xBuilder->weld_widget(u"locktextplaceholder"_ustr))
+ , m_xPagesFrame(m_xBuilder->weld_widget(u"pagesframe"_ustr))
+ , m_xLeftPageCB(m_xBuilder->weld_check_button(u"leftpages"_ustr))
+ , m_xLeftPageImg(m_xBuilder->weld_widget(u"lockleftpages"_ustr))
+ , m_xRightPageCB(m_xBuilder->weld_check_button(u"rightpages"_ustr))
+ , m_xRightPageImg(m_xBuilder->weld_widget(u"lockrightpages"_ustr))
+ , m_xProspectCB(m_xBuilder->weld_check_button(u"brochure"_ustr))
+ , m_xProspectImg(m_xBuilder->weld_widget(u"lockbrochure"_ustr))
+ , m_xProspectCB_RTL(m_xBuilder->weld_check_button(u"rtl"_ustr))
+ , m_xProspectImg_RTL(m_xBuilder->weld_widget(u"lockrtl"_ustr))
+ , m_xCommentsFrame(m_xBuilder->weld_widget(u"commentsframe"_ustr))
+ , m_xNoRB(m_xBuilder->weld_radio_button(u"none"_ustr))
+ , m_xOnlyRB(m_xBuilder->weld_radio_button(u"only"_ustr))
+ , m_xEndRB(m_xBuilder->weld_radio_button(u"end"_ustr))
+ , m_xEndPageRB(m_xBuilder->weld_radio_button(u"endpage"_ustr))
+ , m_xInMarginsRB(m_xBuilder->weld_radio_button(u"inmargins"_ustr))
+ , m_xMarginsImg(m_xBuilder->weld_widget(u"lockcomments"_ustr))
+ , m_xPrintEmptyPagesCB(m_xBuilder->weld_check_button(u"blankpages"_ustr))
+ , m_xPrintEmptyPagesImg(m_xBuilder->weld_widget(u"lockblankpages"_ustr))
+ , m_xPaperFromSetupCB(m_xBuilder->weld_check_button(u"papertray"_ustr))
+ , m_xPaperFromSetupImg(m_xBuilder->weld_widget(u"lockpapertray"_ustr))
+ , m_xFaxLB(m_xBuilder->weld_combo_box(u"fax"_ustr))
+ , m_xFaxImg(m_xBuilder->weld_widget(u"lockfax"_ustr))
{
Link<weld::Toggleable&,void> aLk = LINK( this, SwAddPrinterTabPage,
AutoClickHdl);
m_xGrfCB->connect_toggled( aLk );
@@ -506,7 +506,7 @@ std::unique_ptr<SfxTabPage> SwAddPrinterTabPage::Create(
weld::Container* pPage,
OUString SwAddPrinterTabPage::GetAllStrings()
{
OUString sAllStrings;
- OUString labels[] = { "label2", "label10", "label1", "label5", "4" };
+ OUString labels[] = { u"label2"_ustr, u"label10"_ustr, u"label1"_ustr,
u"label5"_ustr, u"4"_ustr };
for (const auto& label : labels)
{
@@ -515,8 +515,8 @@ OUString SwAddPrinterTabPage::GetAllStrings()
}
OUString checkButton[]
- = { "graphics", "formcontrols", "background", "inblack",
"hiddentext", "textplaceholder",
- "leftpages", "rightpages", "brochure", "rtl",
"blankpages", "papertray" };
+ = { u"graphics"_ustr, u"formcontrols"_ustr, u"background"_ustr,
u"inblack"_ustr, u"hiddentext"_ustr, u"textplaceholder"_ustr,
+ u"leftpages"_ustr, u"rightpages"_ustr, u"brochure"_ustr,
u"rtl"_ustr, u"blankpages"_ustr, u"papertray"_ustr };
for (const auto& check : checkButton)
{
@@ -524,7 +524,7 @@ OUString SwAddPrinterTabPage::GetAllStrings()
sAllStrings += pString->get_label() + " ";
}
- OUString radioButton[] = { "none", "only", "end", "endpage", "inmargins" };
+ OUString radioButton[] = { u"none"_ustr, u"only"_ustr, u"end"_ustr,
u"endpage"_ustr, u"inmargins"_ustr };
for (const auto& radio : radioButton)
{
@@ -738,7 +738,7 @@ void SwAddPrinterTabPage::PageCreated( const SfxAllItemSet&
aSet)
// Tabpage Standardfonts
SwStdFontTabPage::SwStdFontTabPage(weld::Container* pPage,
weld::DialogController* pController, const SfxItemSet& rSet)
- : SfxTabPage(pPage, pController, "modules/swriter/ui/optfonttabpage.ui",
"OptFontTabPage", &rSet)
+ : SfxTabPage(pPage, pController,
u"modules/swriter/ui/optfonttabpage.ui"_ustr, u"OptFontTabPage"_ustr, &rSet)
, m_pPrt(nullptr)
, m_pFontConfig(nullptr)
, m_pWrtShell(nullptr)
@@ -754,28 +754,28 @@ SwStdFontTabPage::SwStdFontTabPage(weld::Container*
pPage, weld::DialogControlle
, m_sScriptWestern(SwResId(ST_SCRIPT_WESTERN))
, m_sScriptAsian(SwResId(ST_SCRIPT_ASIAN))
, m_sScriptComplex(SwResId(ST_SCRIPT_CTL))
- , m_xLabelFT(m_xBuilder->weld_label("label1"))
- , m_xStandardBox(m_xBuilder->weld_combo_box("standardbox"))
- , m_xStandardBoxImg(m_xBuilder->weld_widget("lockstandardbox"))
- , m_xStandardHeightLB(new
FontSizeBox(m_xBuilder->weld_combo_box("standardheight")))
- , m_xStandardHeightImg(m_xBuilder->weld_widget("lockstandardheight"))
- , m_xTitleBox(m_xBuilder->weld_combo_box("titlebox"))
- , m_xTitleBoxImg(m_xBuilder->weld_widget("locktitlebox"))
- , m_xTitleHeightLB(new
FontSizeBox(m_xBuilder->weld_combo_box("titleheight")))
- , m_xTitleHeightImg(m_xBuilder->weld_widget("locktitleheight"))
- , m_xListBox(m_xBuilder->weld_combo_box("listbox"))
- , m_xListBoxImg(m_xBuilder->weld_widget("locklistbox"))
- , m_xListHeightLB(new
FontSizeBox(m_xBuilder->weld_combo_box("listheight")))
- , m_xListHeightImg(m_xBuilder->weld_widget("locklistheight"))
- , m_xLabelBox(m_xBuilder->weld_combo_box("labelbox"))
- , m_xLabelBoxImg(m_xBuilder->weld_widget("locklabelbox"))
- , m_xLabelHeightLB(new
FontSizeBox(m_xBuilder->weld_combo_box("labelheight")))
- , m_xLabelHeightImg(m_xBuilder->weld_widget("locklabelheight"))
- , m_xIdxBox(m_xBuilder->weld_combo_box("idxbox"))
- , m_xIdxBoxImg(m_xBuilder->weld_widget("lockidxbox"))
- , m_xIndexHeightLB(new
FontSizeBox(m_xBuilder->weld_combo_box("indexheight")))
- , m_xIndexHeightImg(m_xBuilder->weld_widget("lockindexheight"))
- , m_xStandardPB(m_xBuilder->weld_button("standard"))
+ , m_xLabelFT(m_xBuilder->weld_label(u"label1"_ustr))
+ , m_xStandardBox(m_xBuilder->weld_combo_box(u"standardbox"_ustr))
+ , m_xStandardBoxImg(m_xBuilder->weld_widget(u"lockstandardbox"_ustr))
+ , m_xStandardHeightLB(new
FontSizeBox(m_xBuilder->weld_combo_box(u"standardheight"_ustr)))
+ , m_xStandardHeightImg(m_xBuilder->weld_widget(u"lockstandardheight"_ustr))
+ , m_xTitleBox(m_xBuilder->weld_combo_box(u"titlebox"_ustr))
+ , m_xTitleBoxImg(m_xBuilder->weld_widget(u"locktitlebox"_ustr))
+ , m_xTitleHeightLB(new
FontSizeBox(m_xBuilder->weld_combo_box(u"titleheight"_ustr)))
+ , m_xTitleHeightImg(m_xBuilder->weld_widget(u"locktitleheight"_ustr))
+ , m_xListBox(m_xBuilder->weld_combo_box(u"listbox"_ustr))
+ , m_xListBoxImg(m_xBuilder->weld_widget(u"locklistbox"_ustr))
+ , m_xListHeightLB(new
FontSizeBox(m_xBuilder->weld_combo_box(u"listheight"_ustr)))
+ , m_xListHeightImg(m_xBuilder->weld_widget(u"locklistheight"_ustr))
+ , m_xLabelBox(m_xBuilder->weld_combo_box(u"labelbox"_ustr))
+ , m_xLabelBoxImg(m_xBuilder->weld_widget(u"locklabelbox"_ustr))
+ , m_xLabelHeightLB(new
FontSizeBox(m_xBuilder->weld_combo_box(u"labelheight"_ustr)))
+ , m_xLabelHeightImg(m_xBuilder->weld_widget(u"locklabelheight"_ustr))
+ , m_xIdxBox(m_xBuilder->weld_combo_box(u"idxbox"_ustr))
+ , m_xIdxBoxImg(m_xBuilder->weld_widget(u"lockidxbox"_ustr))
+ , m_xIndexHeightLB(new
FontSizeBox(m_xBuilder->weld_combo_box(u"indexheight"_ustr)))
+ , m_xIndexHeightImg(m_xBuilder->weld_widget(u"lockindexheight"_ustr))
+ , m_xStandardPB(m_xBuilder->weld_button(u"standard"_ustr))
{
m_xStandardBox->make_sorted();
m_xTitleBox->make_sorted();
@@ -840,8 +840,8 @@ static void lcl_SetColl(SwWrtShell* pWrtShell, sal_uInt16
nType,
OUString SwStdFontTabPage::GetAllStrings()
{
OUString sAllStrings;
- OUString labels[] = { "label1", "font_label", "size_label",
"default_label",
- "heading_label", "list_label", "caption_label",
"index_label" };
+ OUString labels[] = { u"label1"_ustr, u"font_label"_ustr,
u"size_label"_ustr, u"default_label"_ustr,
+ u"heading_label"_ustr, u"list_label"_ustr,
u"caption_label"_ustr, u"index_label"_ustr };
for (const auto& label : labels)
{
@@ -1296,35 +1296,35 @@ void SwStdFontTabPage::PageCreated( const
SfxAllItemSet& aSet)
}
SwTableOptionsTabPage::SwTableOptionsTabPage(weld::Container* pPage,
weld::DialogController* pController, const SfxItemSet& rSet)
- : SfxTabPage(pPage, pController, "modules/swriter/ui/opttablepage.ui",
"OptTablePage", &rSet)
+ : SfxTabPage(pPage, pController,
u"modules/swriter/ui/opttablepage.ui"_ustr, u"OptTablePage"_ustr, &rSet)
, m_pWrtShell(nullptr)
, m_bHTMLMode(false)
- , m_xHeaderCB(m_xBuilder->weld_check_button("header"))
- , m_xHeaderImg(m_xBuilder->weld_widget("lockheader"))
- , m_xRepeatHeaderCB(m_xBuilder->weld_check_button("repeatheader"))
- , m_xRepeatHeaderImg(m_xBuilder->weld_widget("lockrepeatheader"))
- , m_xDontSplitCB(m_xBuilder->weld_check_button("dontsplit"))
- , m_xDontSplitImg(m_xBuilder->weld_widget("lockdontsplit"))
- , m_xBorderCB(m_xBuilder->weld_check_button("border"))
- , m_xBorderImg(m_xBuilder->weld_widget("lockborder"))
- , m_xNumFormattingCB(m_xBuilder->weld_check_button("numformatting"))
- , m_xNumFormattingImg(m_xBuilder->weld_widget("locknumformatting"))
- ,
m_xNumFormatFormattingCB(m_xBuilder->weld_check_button("numfmtformatting"))
- ,
m_xNumFormatFormattingImg(m_xBuilder->weld_widget("locknumfmtformatting"))
- , m_xNumAlignmentCB(m_xBuilder->weld_check_button("numalignment"))
- , m_xNumAlignmentImg(m_xBuilder->weld_widget("locknumalignment"))
- , m_xRowMoveMF(m_xBuilder->weld_metric_spin_button("rowmove",
FieldUnit::CM))
- , m_xRowMoveImg(m_xBuilder->weld_widget("lockrowmove"))
- , m_xColMoveMF(m_xBuilder->weld_metric_spin_button("colmove",
FieldUnit::CM))
- , m_xColMoveImg(m_xBuilder->weld_widget("lockcolmove"))
- , m_xRowInsertMF(m_xBuilder->weld_metric_spin_button("rowinsert",
FieldUnit::CM))
- , m_xRowInsertImg(m_xBuilder->weld_widget("lockrowinsert"))
- , m_xColInsertMF(m_xBuilder->weld_metric_spin_button("colinsert",
FieldUnit::CM))
- , m_xColInsertImg(m_xBuilder->weld_widget("lockcolinsert"))
- , m_xFixRB(m_xBuilder->weld_radio_button("fix"))
- , m_xFixPropRB(m_xBuilder->weld_radio_button("fixprop"))
- , m_xVarRB(m_xBuilder->weld_radio_button("var"))
- , m_xBehaviorOfImg(m_xBuilder->weld_widget("lockbehaviorof"))
+ , m_xHeaderCB(m_xBuilder->weld_check_button(u"header"_ustr))
+ , m_xHeaderImg(m_xBuilder->weld_widget(u"lockheader"_ustr))
+ , m_xRepeatHeaderCB(m_xBuilder->weld_check_button(u"repeatheader"_ustr))
+ , m_xRepeatHeaderImg(m_xBuilder->weld_widget(u"lockrepeatheader"_ustr))
+ , m_xDontSplitCB(m_xBuilder->weld_check_button(u"dontsplit"_ustr))
+ , m_xDontSplitImg(m_xBuilder->weld_widget(u"lockdontsplit"_ustr))
+ , m_xBorderCB(m_xBuilder->weld_check_button(u"border"_ustr))
+ , m_xBorderImg(m_xBuilder->weld_widget(u"lockborder"_ustr))
+ , m_xNumFormattingCB(m_xBuilder->weld_check_button(u"numformatting"_ustr))
+ , m_xNumFormattingImg(m_xBuilder->weld_widget(u"locknumformatting"_ustr))
+ ,
m_xNumFormatFormattingCB(m_xBuilder->weld_check_button(u"numfmtformatting"_ustr))
+ ,
m_xNumFormatFormattingImg(m_xBuilder->weld_widget(u"locknumfmtformatting"_ustr))
+ , m_xNumAlignmentCB(m_xBuilder->weld_check_button(u"numalignment"_ustr))
+ , m_xNumAlignmentImg(m_xBuilder->weld_widget(u"locknumalignment"_ustr))
+ , m_xRowMoveMF(m_xBuilder->weld_metric_spin_button(u"rowmove"_ustr,
FieldUnit::CM))
+ , m_xRowMoveImg(m_xBuilder->weld_widget(u"lockrowmove"_ustr))
+ , m_xColMoveMF(m_xBuilder->weld_metric_spin_button(u"colmove"_ustr,
FieldUnit::CM))
+ , m_xColMoveImg(m_xBuilder->weld_widget(u"lockcolmove"_ustr))
+ , m_xRowInsertMF(m_xBuilder->weld_metric_spin_button(u"rowinsert"_ustr,
FieldUnit::CM))
+ , m_xRowInsertImg(m_xBuilder->weld_widget(u"lockrowinsert"_ustr))
+ , m_xColInsertMF(m_xBuilder->weld_metric_spin_button(u"colinsert"_ustr,
FieldUnit::CM))
+ , m_xColInsertImg(m_xBuilder->weld_widget(u"lockcolinsert"_ustr))
+ , m_xFixRB(m_xBuilder->weld_radio_button(u"fix"_ustr))
+ , m_xFixPropRB(m_xBuilder->weld_radio_button(u"fixprop"_ustr))
+ , m_xVarRB(m_xBuilder->weld_radio_button(u"var"_ustr))
+ , m_xBehaviorOfImg(m_xBuilder->weld_widget(u"lockbehaviorof"_ustr))
{
Link<weld::Toggleable&,void> aLnk(LINK(this, SwTableOptionsTabPage,
CheckBoxHdl));
m_xNumFormattingCB->connect_toggled(aLnk);
@@ -1346,8 +1346,8 @@ OUString SwTableOptionsTabPage::GetAllStrings()
{
OUString sAllStrings;
OUString labels[]
- = { "label1", "label3", "label4", "label5", "label6", "label10",
"label2",
- "label14", "label15", "label16", "label11", "label12", "label13" };
+ = { u"label1"_ustr, u"label3"_ustr, u"label4"_ustr, u"label5"_ustr,
u"label6"_ustr, u"label10"_ustr, u"label2"_ustr,
+ u"label14"_ustr, u"label15"_ustr, u"label16"_ustr,
u"label11"_ustr, u"label12"_ustr, u"label13"_ustr };
for (const auto& label : labels)
{
@@ -1355,8 +1355,8 @@ OUString SwTableOptionsTabPage::GetAllStrings()
sAllStrings += pString->get_label() + " ";
}
- OUString checkButton[] = { "header", "repeatheader",
"dontsplit", "border",
- "numformatting", "numfmtformatting",
"numalignment" };
+ OUString checkButton[] = { u"header"_ustr, u"repeatheader"_ustr,
u"dontsplit"_ustr, u"border"_ustr,
+ u"numformatting"_ustr,
u"numfmtformatting"_ustr, u"numalignment"_ustr };
for (const auto& check : checkButton)
{
@@ -1364,7 +1364,7 @@ OUString SwTableOptionsTabPage::GetAllStrings()
sAllStrings += pString->get_label() + " ";
}
- OUString radioButton[] = { "fix", "fixprop", "var" };
+ OUString radioButton[] = { u"fix"_ustr, u"fixprop"_ustr, u"var"_ustr };
for (const auto& radio : radioButton)
{
@@ -1608,43 +1608,43 @@ void SwTableOptionsTabPage::PageCreated( const
SfxAllItemSet& aSet)
}
SwShdwCursorOptionsTabPage::SwShdwCursorOptionsTabPage(weld::Container* pPage,
weld::DialogController* pController, const SfxItemSet& rSet)
- : SfxTabPage(pPage, pController,
"modules/swriter/ui/optformataidspage.ui", "OptFormatAidsPage", &rSet)
+ : SfxTabPage(pPage, pController,
u"modules/swriter/ui/optformataidspage.ui"_ustr, u"OptFormatAidsPage"_ustr,
&rSet)
, m_pWrtShell(nullptr)
, m_bHTMLMode(false)
- , m_xParaCB(m_xBuilder->weld_check_button("paragraph"))
- , m_xParaImg(m_xBuilder->weld_widget("lockparagraph"))
- , m_xSHyphCB(m_xBuilder->weld_check_button("hyphens"))
- , m_xSHyphImg(m_xBuilder->weld_widget("lockhyphens"))
- , m_xSpacesCB(m_xBuilder->weld_check_button("spaces"))
- , m_xSpacesImg(m_xBuilder->weld_widget("lockspaces"))
- , m_xHSpacesCB(m_xBuilder->weld_check_button("nonbreak"))
- , m_xHSpacesImg(m_xBuilder->weld_widget("locknonbreak"))
- , m_xTabCB(m_xBuilder->weld_check_button("tabs"))
- , m_xTabImg(m_xBuilder->weld_widget("locktabs"))
- , m_xTabLabel(m_xBuilder->weld_label("tabs_label"))
- , m_xBreakCB(m_xBuilder->weld_check_button("break"))
- , m_xBreakImg(m_xBuilder->weld_widget("lockbreak"))
- , m_xCharHiddenCB(m_xBuilder->weld_check_button("hiddentext"))
- , m_xCharHiddenImg(m_xBuilder->weld_widget("lockhiddentext"))
- , m_xBookmarkCB(m_xBuilder->weld_check_button("bookmarks"))
- , m_xBookmarkImg(m_xBuilder->weld_widget("lockbookmarks"))
- , m_xBookmarkLabel(m_xBuilder->weld_label("bookmarks_label"))
- , m_xDirectCursorFrame(m_xBuilder->weld_frame("directcrsrframe"))
- , m_xOnOffCB(m_xBuilder->weld_check_button("cursoronoff"))
- , m_xOnOffImg(m_xBuilder->weld_widget("lockcursoronoff"))
- ,
m_xDirectCursorFillMode(m_xBuilder->weld_combo_box("cxDirectCursorFillMode"))
- , m_xDirectCursorFillModeImg(m_xBuilder->weld_widget("lockfillmode"))
- , m_xCursorProtFrame(m_xBuilder->weld_frame("crsrprotframe"))
- , m_xImageFrame(m_xBuilder->weld_frame("frmImage"))
- , m_xCursorInProtCB(m_xBuilder->weld_check_button("cursorinprot"))
- , m_xCursorInProtImg(m_xBuilder->weld_widget("lockcursorinprot"))
- , m_xDefaultAnchorType(m_xBuilder->weld_combo_box("cxDefaultAnchor"))
- , m_xDefaultAnchorTypeImg(m_xBuilder->weld_widget("lockAnchor"))
- , m_xMathBaselineAlignmentCB(m_xBuilder->weld_check_button("mathbaseline"))
- , m_xMathBaselineAlignmentImg(m_xBuilder->weld_widget("lockmathbaseline"))
- ,
m_xFmtAidsAutoComplFrame(m_xBuilder->weld_frame("fmtaidsautocompleteframe"))
- ,
m_xEncloseWithCharactersCB(m_xBuilder->weld_check_button("enclosewithcharacters"))
- ,
m_xEncloseWithCharactersImg(m_xBuilder->weld_widget("lockenclosewithcharacters"))
+ , m_xParaCB(m_xBuilder->weld_check_button(u"paragraph"_ustr))
+ , m_xParaImg(m_xBuilder->weld_widget(u"lockparagraph"_ustr))
+ , m_xSHyphCB(m_xBuilder->weld_check_button(u"hyphens"_ustr))
+ , m_xSHyphImg(m_xBuilder->weld_widget(u"lockhyphens"_ustr))
+ , m_xSpacesCB(m_xBuilder->weld_check_button(u"spaces"_ustr))
+ , m_xSpacesImg(m_xBuilder->weld_widget(u"lockspaces"_ustr))
+ , m_xHSpacesCB(m_xBuilder->weld_check_button(u"nonbreak"_ustr))
+ , m_xHSpacesImg(m_xBuilder->weld_widget(u"locknonbreak"_ustr))
+ , m_xTabCB(m_xBuilder->weld_check_button(u"tabs"_ustr))
+ , m_xTabImg(m_xBuilder->weld_widget(u"locktabs"_ustr))
+ , m_xTabLabel(m_xBuilder->weld_label(u"tabs_label"_ustr))
+ , m_xBreakCB(m_xBuilder->weld_check_button(u"break"_ustr))
+ , m_xBreakImg(m_xBuilder->weld_widget(u"lockbreak"_ustr))
+ , m_xCharHiddenCB(m_xBuilder->weld_check_button(u"hiddentext"_ustr))
+ , m_xCharHiddenImg(m_xBuilder->weld_widget(u"lockhiddentext"_ustr))
+ , m_xBookmarkCB(m_xBuilder->weld_check_button(u"bookmarks"_ustr))
+ , m_xBookmarkImg(m_xBuilder->weld_widget(u"lockbookmarks"_ustr))
+ , m_xBookmarkLabel(m_xBuilder->weld_label(u"bookmarks_label"_ustr))
+ , m_xDirectCursorFrame(m_xBuilder->weld_frame(u"directcrsrframe"_ustr))
+ , m_xOnOffCB(m_xBuilder->weld_check_button(u"cursoronoff"_ustr))
+ , m_xOnOffImg(m_xBuilder->weld_widget(u"lockcursoronoff"_ustr))
+ ,
m_xDirectCursorFillMode(m_xBuilder->weld_combo_box(u"cxDirectCursorFillMode"_ustr))
+ , m_xDirectCursorFillModeImg(m_xBuilder->weld_widget(u"lockfillmode"_ustr))
+ , m_xCursorProtFrame(m_xBuilder->weld_frame(u"crsrprotframe"_ustr))
+ , m_xImageFrame(m_xBuilder->weld_frame(u"frmImage"_ustr))
+ , m_xCursorInProtCB(m_xBuilder->weld_check_button(u"cursorinprot"_ustr))
+ , m_xCursorInProtImg(m_xBuilder->weld_widget(u"lockcursorinprot"_ustr))
+ , m_xDefaultAnchorType(m_xBuilder->weld_combo_box(u"cxDefaultAnchor"_ustr))
+ , m_xDefaultAnchorTypeImg(m_xBuilder->weld_widget(u"lockAnchor"_ustr))
+ ,
m_xMathBaselineAlignmentCB(m_xBuilder->weld_check_button(u"mathbaseline"_ustr))
+ ,
m_xMathBaselineAlignmentImg(m_xBuilder->weld_widget(u"lockmathbaseline"_ustr))
+ ,
m_xFmtAidsAutoComplFrame(m_xBuilder->weld_frame(u"fmtaidsautocompleteframe"_ustr))
+ ,
m_xEncloseWithCharactersCB(m_xBuilder->weld_check_button(u"enclosewithcharacters"_ustr))
+ ,
m_xEncloseWithCharactersImg(m_xBuilder->weld_widget(u"lockenclosewithcharacters"_ustr))
{
SwFillMode eMode = SwFillMode::Tab;
bool bIsOn = false;
@@ -1706,8 +1706,8 @@ void SwShdwCursorOptionsTabPage::PageCreated( const
SfxAllItemSet& aSet )
OUString SwShdwCursorOptionsTabPage::GetAllStrings()
{
OUString sAllStrings;
- OUString labels[] = { "layoutopt", "displayfl", "cursoropt",
"cursorlabel",
- "fillmode", "lbImage", "lbDefaultAnchor",
"autocomplete" };
+ OUString labels[] = { u"layoutopt"_ustr, u"displayfl"_ustr,
u"cursoropt"_ustr, u"cursorlabel"_ustr,
+ u"fillmode"_ustr, u"lbImage"_ustr,
u"lbDefaultAnchor"_ustr, u"autocomplete"_ustr };
for (const auto& label : labels)
{
@@ -1716,9 +1716,9 @@ OUString SwShdwCursorOptionsTabPage::GetAllStrings()
}
OUString checkButton[]
- = { "mathbaseline", "paragraph", "hyphens", "spaces",
- "nonbreak", "tabs", "break", "hiddentext",
- "bookmarks", "cursorinprot", "cursoronoff",
"enclosewithcharacters" };
+ = { u"mathbaseline"_ustr, u"paragraph"_ustr, u"hyphens"_ustr,
u"spaces"_ustr,
+ u"nonbreak"_ustr, u"tabs"_ustr, u"break"_ustr,
u"hiddentext"_ustr,
+ u"bookmarks"_ustr, u"cursorinprot"_ustr, u"cursoronoff"_ustr,
u"enclosewithcharacters"_ustr };
for (const auto& check : checkButton)
{
@@ -2087,35 +2087,35 @@ namespace
SwRedlineOptionsTabPage::SwRedlineOptionsTabPage(weld::Container* pPage,
weld::DialogController* pController,
const SfxItemSet& rSet)
- : SfxTabPage(pPage, pController, "modules/swriter/ui/optredlinepage.ui",
"OptRedLinePage", &rSet)
- , m_xInsertLB(m_xBuilder->weld_combo_box("insert"))
- , m_xInsertImg(m_xBuilder->weld_widget("lockinsert"))
- , m_xInsertColorLB(new
ColorListBox(m_xBuilder->weld_menu_button("insertcolor"),
+ : SfxTabPage(pPage, pController,
u"modules/swriter/ui/optredlinepage.ui"_ustr, u"OptRedLinePage"_ustr, &rSet)
+ , m_xInsertLB(m_xBuilder->weld_combo_box(u"insert"_ustr))
+ , m_xInsertImg(m_xBuilder->weld_widget(u"lockinsert"_ustr))
+ , m_xInsertColorLB(new
ColorListBox(m_xBuilder->weld_menu_button(u"insertcolor"_ustr),
[this]{ return GetDialogController()->getDialog(); }))
- , m_xInsertColorImg(m_xBuilder->weld_widget("lockinsertcolor"))
+ , m_xInsertColorImg(m_xBuilder->weld_widget(u"lockinsertcolor"_ustr))
, m_xInsertedPreviewWN(new SvxFontPrevWindow)
- , m_xInsertedPreview(new weld::CustomWeld(*m_xBuilder, "insertedpreview",
*m_xInsertedPreviewWN))
- , m_xDeletedLB(m_xBuilder->weld_combo_box("deleted"))
- , m_xDeletedImg(m_xBuilder->weld_widget("lockdeleted"))
- , m_xDeletedColorLB(new
ColorListBox(m_xBuilder->weld_menu_button("deletedcolor"),
+ , m_xInsertedPreview(new weld::CustomWeld(*m_xBuilder,
u"insertedpreview"_ustr, *m_xInsertedPreviewWN))
+ , m_xDeletedLB(m_xBuilder->weld_combo_box(u"deleted"_ustr))
+ , m_xDeletedImg(m_xBuilder->weld_widget(u"lockdeleted"_ustr))
+ , m_xDeletedColorLB(new
ColorListBox(m_xBuilder->weld_menu_button(u"deletedcolor"_ustr),
[this]{ return GetDialogController()->getDialog(); }))
- , m_xDeletedColorImg(m_xBuilder->weld_widget("lockdeletedcolor"))
+ , m_xDeletedColorImg(m_xBuilder->weld_widget(u"lockdeletedcolor"_ustr))
, m_xDeletedPreviewWN(new SvxFontPrevWindow)
- , m_xDeletedPreview(new weld::CustomWeld(*m_xBuilder, "deletedpreview",
*m_xDeletedPreviewWN))
- , m_xChangedLB(m_xBuilder->weld_combo_box("changed"))
- , m_xChangedImg(m_xBuilder->weld_widget("lockchanged"))
- , m_xChangedColorLB(new
ColorListBox(m_xBuilder->weld_menu_button("changedcolor"),
+ , m_xDeletedPreview(new weld::CustomWeld(*m_xBuilder,
u"deletedpreview"_ustr, *m_xDeletedPreviewWN))
+ , m_xChangedLB(m_xBuilder->weld_combo_box(u"changed"_ustr))
+ , m_xChangedImg(m_xBuilder->weld_widget(u"lockchanged"_ustr))
+ , m_xChangedColorLB(new
ColorListBox(m_xBuilder->weld_menu_button(u"changedcolor"_ustr),
[this]{ return GetDialogController()->getDialog(); }))
- , m_xChangedColorImg(m_xBuilder->weld_widget("lockchangedcolor"))
+ , m_xChangedColorImg(m_xBuilder->weld_widget(u"lockchangedcolor"_ustr))
, m_xChangedPreviewWN(new SvxFontPrevWindow)
- , m_xChangedPreview(new weld::CustomWeld(*m_xBuilder, "changedpreview",
*m_xChangedPreviewWN))
- , m_xMarkPosLB(m_xBuilder->weld_combo_box("markpos"))
- , m_xMarkPosImg(m_xBuilder->weld_widget("lockmarkpos"))
- , m_xMarkColorLB(new
ColorListBox(m_xBuilder->weld_menu_button("markcolor"),
+ , m_xChangedPreview(new weld::CustomWeld(*m_xBuilder,
u"changedpreview"_ustr, *m_xChangedPreviewWN))
+ , m_xMarkPosLB(m_xBuilder->weld_combo_box(u"markpos"_ustr))
+ , m_xMarkPosImg(m_xBuilder->weld_widget(u"lockmarkpos"_ustr))
+ , m_xMarkColorLB(new
ColorListBox(m_xBuilder->weld_menu_button(u"markcolor"_ustr),
[this]{ return GetDialogController()->getDialog(); }))
- , m_xMarkColorImg(m_xBuilder->weld_widget("lockmarkcolor"))
+ , m_xMarkColorImg(m_xBuilder->weld_widget(u"lockmarkcolor"_ustr))
, m_xMarkPreviewWN(new SwMarkPreview)
- , m_xMarkPreview(new weld::CustomWeld(*m_xBuilder, "markpreview",
*m_xMarkPreviewWN))
+ , m_xMarkPreview(new weld::CustomWeld(*m_xBuilder, u"markpreview"_ustr,
*m_xMarkPreviewWN))
{
Size
aPreviewSize(getPreviewOptionsSize(m_xMarkPreviewWN->GetDrawingArea()->get_ref_device()));
@@ -2180,10 +2180,10 @@ std::unique_ptr<SfxTabPage>
SwRedlineOptionsTabPage::Create( weld::Container* pP
OUString SwRedlineOptionsTabPage::GetAllStrings()
{
OUString sAllStrings;
- OUString labels[] = { "label2", "insert_label", "insertcolor_label",
- "label3", "deleted_label", "deletedcolor_label",
- "label4", "changed_label", "changedcolor_label",
- "label5", "markpos_label", "markcolor_label" };
+ OUString labels[] = { u"label2"_ustr, u"insert_label"_ustr,
u"insertcolor_label"_ustr,
+ u"label3"_ustr, u"deleted_label"_ustr,
u"deletedcolor_label"_ustr,
+ u"label4"_ustr, u"changed_label"_ustr,
u"changedcolor_label"_ustr,
+ u"label5"_ustr, u"markpos_label"_ustr,
u"markcolor_label"_ustr };
for (const auto& label : labels)
{
@@ -2598,7 +2598,7 @@ std::unique_ptr<SfxTabPage>
SwCompareOptionsTabPage::Create( weld::Container* pP
OUString SwCompareOptionsTabPage::GetAllStrings()
{
OUString sAllStrings;
- OUString labels[] = { "label1", "setting" };
+ OUString labels[] = { u"label1"_ustr, u"setting"_ustr };
for (const auto& label : labels)
{
@@ -2710,18 +2710,18 @@ IMPL_LINK(SwCompareOptionsTabPage, ComparisonHdl,
weld::Toggleable&, rButton, vo
#ifdef DBG_UTIL
SwTestTabPage::SwTestTabPage(weld::Container* pPage, weld::DialogController*
pController, const SfxItemSet& rCoreSet)
- : SfxTabPage(pPage, pController, "modules/swriter/ui/opttestpage.ui",
"OptTestPage", &rCoreSet)
+ : SfxTabPage(pPage, pController,
u"modules/swriter/ui/opttestpage.ui"_ustr, u"OptTestPage"_ustr, &rCoreSet)
, m_bAttrModified( false )
- , m_xTest1CBox(m_xBuilder->weld_check_button("unused"))
- , m_xTest2CBox(m_xBuilder->weld_check_button("dynamic"))
- , m_xTest3CBox(m_xBuilder->weld_check_button("nocalm"))
- , m_xTest4CBox(m_xBuilder->weld_check_button("wysiwygdbg"))
- , m_xTest5CBox(m_xBuilder->weld_check_button("noidle"))
- , m_xTest6CBox(m_xBuilder->weld_check_button("noscreenadj"))
- , m_xTest7CBox(m_xBuilder->weld_check_button("winformat"))
- , m_xTest8CBox(m_xBuilder->weld_check_button("noscroll"))
- , m_xTest9CBox(m_xBuilder->weld_check_button("DrawingLayerNotLoading"))
- , m_xTest10CBox(m_xBuilder->weld_check_button("AutoFormatByInput"))
+ , m_xTest1CBox(m_xBuilder->weld_check_button(u"unused"_ustr))
+ , m_xTest2CBox(m_xBuilder->weld_check_button(u"dynamic"_ustr))
+ , m_xTest3CBox(m_xBuilder->weld_check_button(u"nocalm"_ustr))
+ , m_xTest4CBox(m_xBuilder->weld_check_button(u"wysiwygdbg"_ustr))
+ , m_xTest5CBox(m_xBuilder->weld_check_button(u"noidle"_ustr))
+ , m_xTest6CBox(m_xBuilder->weld_check_button(u"noscreenadj"_ustr))
+ , m_xTest7CBox(m_xBuilder->weld_check_button(u"winformat"_ustr))
+ , m_xTest8CBox(m_xBuilder->weld_check_button(u"noscroll"_ustr))
+ ,
m_xTest9CBox(m_xBuilder->weld_check_button(u"DrawingLayerNotLoading"_ustr))
+ , m_xTest10CBox(m_xBuilder->weld_check_button(u"AutoFormatByInput"_ustr))
{
Init();
}
@@ -2739,10 +2739,10 @@ std::unique_ptr<SfxTabPage> SwTestTabPage::Create(
weld::Container* pPage, weld:
OUString SwTestTabPage::GetAllStrings()
{
OUString sAllStrings;
- OUString checkButton[] = { "unused", "dynamic", "nocalm",
- "wysiwygdbg", "noidle", "noscreenadj",
- "winformat", "noscroll",
"DrawingLayerNotLoading",
- "AutoFormatByInput" };
+ OUString checkButton[] = { u"unused"_ustr, u"dynamic"_ustr,
u"nocalm"_ustr,
+ u"wysiwygdbg"_ustr, u"noidle"_ustr,
u"noscreenadj"_ustr,
+ u"winformat"_ustr, u"noscroll"_ustr,
u"DrawingLayerNotLoading"_ustr,
+ u"AutoFormatByInput"_ustr };
for (const auto& check : checkButton)
{
@@ -2750,7 +2750,7 @@ OUString SwTestTabPage::GetAllStrings()
sAllStrings += pString->get_label() + " ";
}
- if (const auto& pString = m_xBuilder->weld_label("label1"))
+ if (const auto& pString = m_xBuilder->weld_label(u"label1"_ustr))
sAllStrings += pString->get_label() + " ";
return sAllStrings.replaceAll("_", "");
diff --git a/sw/source/ui/dialog/abstract.cxx b/sw/source/ui/dialog/abstract.cxx
index 01e013895563..4d70158495c8 100644
--- a/sw/source/ui/dialog/abstract.cxx
+++ b/sw/source/ui/dialog/abstract.cxx
@@ -20,9 +20,10 @@
#include <abstract.hxx>
SwInsertAbstractDlg::SwInsertAbstractDlg(weld::Window* pParent)
- : SfxDialogController(pParent, "modules/swriter/ui/abstractdialog.ui",
"AbstractDialog")
- , m_xLevelNF(m_xBuilder->weld_spin_button("outlines"))
- , m_xParaNF(m_xBuilder->weld_spin_button("paras"))
+ : SfxDialogController(pParent,
u"modules/swriter/ui/abstractdialog.ui"_ustr,
+ u"AbstractDialog"_ustr)
+ , m_xLevelNF(m_xBuilder->weld_spin_button(u"outlines"_ustr))
+ , m_xParaNF(m_xBuilder->weld_spin_button(u"paras"_ustr))
{
}
diff --git a/sw/source/ui/dialog/ascfldlg.cxx b/sw/source/ui/dialog/ascfldlg.cxx
index 43a3249823ae..4efba9159e6f 100644
--- a/sw/source/ui/dialog/ascfldlg.cxx
+++ b/sw/source/ui/dialog/ascfldlg.cxx
@@ -56,17 +56,17 @@ const sal_Int32 nDialogExtraDataLen = 11; //
12345678901
SwAsciiFilterDlg::SwAsciiFilterDlg( weld::Window* pParent, SwDocShell& rDocSh,
SvStream* pStream )
- : SfxDialogController(pParent, "modules/swriter/ui/asciifilterdialog.ui",
"AsciiFilterDialog")
+ : SfxDialogController(pParent,
u"modules/swriter/ui/asciifilterdialog.ui"_ustr, u"AsciiFilterDialog"_ustr)
, m_bSaveLineStatus(true)
- , m_xCharSetLB(new
SvxTextEncodingBox(m_xBuilder->weld_combo_box("charset")))
- , m_xFontFT(m_xBuilder->weld_label("fontft"))
- , m_xFontLB(m_xBuilder->weld_combo_box("font"))
- , m_xLanguageFT(m_xBuilder->weld_label("languageft"))
- , m_xLanguageLB(new SvxLanguageBox(m_xBuilder->weld_combo_box("language")))
- , m_xCRLF_RB(m_xBuilder->weld_radio_button("crlf"))
- , m_xCR_RB(m_xBuilder->weld_radio_button("cr"))
- , m_xLF_RB(m_xBuilder->weld_radio_button("lf"))
- , m_xIncludeBOM_CB(m_xBuilder->weld_check_button("includebom"))
+ , m_xCharSetLB(new
SvxTextEncodingBox(m_xBuilder->weld_combo_box(u"charset"_ustr)))
+ , m_xFontFT(m_xBuilder->weld_label(u"fontft"_ustr))
+ , m_xFontLB(m_xBuilder->weld_combo_box(u"font"_ustr))
+ , m_xLanguageFT(m_xBuilder->weld_label(u"languageft"_ustr))
+ , m_xLanguageLB(new
SvxLanguageBox(m_xBuilder->weld_combo_box(u"language"_ustr)))
+ , m_xCRLF_RB(m_xBuilder->weld_radio_button(u"crlf"_ustr))
+ , m_xCR_RB(m_xBuilder->weld_radio_button(u"cr"_ustr))
+ , m_xLF_RB(m_xBuilder->weld_radio_button(u"lf"_ustr))
+ , m_xIncludeBOM_CB(m_xBuilder->weld_check_button(u"includebom"_ustr))
{
m_xFontLB->make_sorted();
@@ -75,7 +75,7 @@ SwAsciiFilterDlg::SwAsciiFilterDlg( weld::Window* pParent,
SwDocShell& rDocSh,
SvtViewOptions aDlgOpt(EViewType::Dialog, m_xDialog->get_help_id());
if (aDlgOpt.Exists())
{
- css::uno::Any aUserItem = aDlgOpt.GetUserItem("UserItem");
+ css::uno::Any aUserItem = aDlgOpt.GetUserItem(u"UserItem"_ustr);
aUserItem >>= m_sExtraData;
}
@@ -266,7 +266,7 @@ SwAsciiFilterDlg::SwAsciiFilterDlg( weld::Window* pParent,
SwDocShell& rDocSh,
SwAsciiFilterDlg::~SwAsciiFilterDlg()
{
SvtViewOptions aDlgOpt(EViewType::Dialog, m_xDialog->get_help_id());
- aDlgOpt.SetUserItem("UserItem", uno::Any(m_sExtraData));
+ aDlgOpt.SetUserItem(u"UserItem"_ustr, uno::Any(m_sExtraData));
}
void SwAsciiFilterDlg::FillOptions( SwAsciiOptions& rOptions )
diff --git a/sw/source/ui/dialog/docstdlg.cxx b/sw/source/ui/dialog/docstdlg.cxx
index 1b300206fc8e..87003e77aff9 100644
--- a/sw/source/ui/dialog/docstdlg.cxx
+++ b/sw/source/ui/dialog/docstdlg.cxx
@@ -37,18 +37,18 @@ std::unique_ptr<SfxTabPage>
SwDocStatPage::Create(weld::Container* pPage, weld::
}
SwDocStatPage::SwDocStatPage(weld::Container* pPage, weld::DialogController*
pController, const SfxItemSet &rSet)
- : SfxTabPage(pPage, pController,
"modules/swriter/ui/statisticsinfopage.ui", "StatisticsInfoPage", &rSet)
- , m_xPageNo(m_xBuilder->weld_label("nopages"))
- , m_xTableNo(m_xBuilder->weld_label("notables"))
- , m_xGrfNo(m_xBuilder->weld_label("nogrfs"))
- , m_xOLENo(m_xBuilder->weld_label("nooles"))
- , m_xParaNo(m_xBuilder->weld_label("noparas"))
- , m_xWordNo(m_xBuilder->weld_label("nowords"))
- , m_xCharNo(m_xBuilder->weld_label("nochars"))
- , m_xCharExclSpacesNo(m_xBuilder->weld_label("nocharsexspaces"))
- , m_xLineLbl(m_xBuilder->weld_label("lineft"))
- , m_xLineNo(m_xBuilder->weld_label("nolines"))
- , m_xUpdatePB(m_xBuilder->weld_button("update"))
+ : SfxTabPage(pPage, pController,
u"modules/swriter/ui/statisticsinfopage.ui"_ustr, u"StatisticsInfoPage"_ustr,
&rSet)
+ , m_xPageNo(m_xBuilder->weld_label(u"nopages"_ustr))
+ , m_xTableNo(m_xBuilder->weld_label(u"notables"_ustr))
+ , m_xGrfNo(m_xBuilder->weld_label(u"nogrfs"_ustr))
+ , m_xOLENo(m_xBuilder->weld_label(u"nooles"_ustr))
+ , m_xParaNo(m_xBuilder->weld_label(u"noparas"_ustr))
+ , m_xWordNo(m_xBuilder->weld_label(u"nowords"_ustr))
+ , m_xCharNo(m_xBuilder->weld_label(u"nochars"_ustr))
+ , m_xCharExclSpacesNo(m_xBuilder->weld_label(u"nocharsexspaces"_ustr))
+ , m_xLineLbl(m_xBuilder->weld_label(u"lineft"_ustr))
+ , m_xLineNo(m_xBuilder->weld_label(u"nolines"_ustr))
+ , m_xUpdatePB(m_xBuilder->weld_button(u"update"_ustr))
{
Update();
m_xUpdatePB->connect_clicked(LINK(this, SwDocStatPage, UpdateHdl));
diff --git a/sw/source/ui/dialog/swdlgfact.cxx
b/sw/source/ui/dialog/swdlgfact.cxx
index 42a46be6858f..4e3d87ba0ff0 100644
--- a/sw/source/ui/dialog/swdlgfact.cxx
+++ b/sw/source/ui/dialog/swdlgfact.cxx
@@ -536,7 +536,7 @@ OUString AbstractSwBreakDlg_Impl::GetTemplateName()
if (pDlg)
return pDlg->GetTemplateName();
- return "";
+ return u""_ustr;
}
sal_uInt16 AbstractSwBreakDlg_Impl:: GetKind()
diff --git a/sw/source/ui/dialog/swmessdialog.cxx
b/sw/source/ui/dialog/swmessdialog.cxx
index abdf16bf4da1..087a884f92a3 100644
--- a/sw/source/ui/dialog/swmessdialog.cxx
+++ b/sw/source/ui/dialog/swmessdialog.cxx
@@ -11,9 +11,9 @@
SwMessageAndEditDialog::SwMessageAndEditDialog(weld::Window* pParent, const
OUString& rID,
const OUString& rUIXMLDescription)
- : MessageDialogController(pParent, rUIXMLDescription, rID, "grid")
- , m_xEdit(m_xBuilder->weld_entry("edit"))
- , m_xOKPB(m_xBuilder->weld_button("ok"))
+ : MessageDialogController(pParent, rUIXMLDescription, rID, u"grid"_ustr)
+ , m_xEdit(m_xBuilder->weld_entry(u"edit"_ustr))
+ , m_xOKPB(m_xBuilder->weld_button(u"ok"_ustr))
{
}
diff --git a/sw/source/ui/dialog/swuiexp.cxx b/sw/source/ui/dialog/swuiexp.cxx
index 7f2912414b6d..8cbeeb083c2d 100644
--- a/sw/source/ui/dialog/swuiexp.cxx
+++ b/sw/source/ui/dialog/swuiexp.cxx
@@ -41,7 +41,7 @@ public:
// css::lang::XServiceInfo:
virtual OUString SAL_CALL getImplementationName() override
{
- return "com.sun.star.text.comp.DialogFactoryService";
+ return u"com.sun.star.text.comp.DialogFactoryService"_ustr;
}
virtual sal_Bool SAL_CALL supportsService(const OUString& serviceName)
override
{
@@ -49,7 +49,7 @@ public:
}
virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
override
{
- return { "com.sun.star.text.DialogFactoryService" };
+ return { u"com.sun.star.text.DialogFactoryService"_ustr };
}
// XUnoTunnel
diff --git a/sw/source/ui/dialog/uiregionsw.cxx
b/sw/source/ui/dialog/uiregionsw.cxx
index f1499b6a28ca..9b786215e419 100644
--- a/sw/source/ui/dialog/uiregionsw.cxx
+++ b/sw/source/ui/dialog/uiregionsw.cxx
@@ -330,34 +330,34 @@ OUString SectRepr::GetSubRegion() const
// dialog edit regions
SwEditRegionDlg::SwEditRegionDlg(weld::Window* pParent, SwWrtShell& rWrtSh)
- : SfxDialogController(pParent, "modules/swriter/ui/editsectiondialog.ui",
-e
... etc. - the rest is truncated
