sc/source/ui/miscdlgs/acredlin.cxx | 12 +-
sc/source/ui/miscdlgs/conflictsdlg.cxx | 12 +-
sc/source/ui/miscdlgs/crdlg.cxx | 9 +-
sc/source/ui/miscdlgs/crnrdlg.cxx | 30 +++---
sc/source/ui/miscdlgs/datafdlg.cxx | 26 ++---
sc/source/ui/miscdlgs/dataproviderdlg.cxx | 128 ++++++++++++++---------------
sc/source/ui/miscdlgs/datastreamdlg.cxx | 33 +++----
sc/source/ui/miscdlgs/delcldlg.cxx | 11 +-
sc/source/ui/miscdlgs/delcodlg.cxx | 18 ++--
sc/source/ui/miscdlgs/filldlg.cxx | 42 ++++-----
sc/source/ui/miscdlgs/gototabdlg.cxx | 11 +-
sc/source/ui/miscdlgs/groupdlg.cxx | 12 +-
sc/source/ui/miscdlgs/highred.cxx | 16 +--
sc/source/ui/miscdlgs/inscldlg.cxx | 15 +--
sc/source/ui/miscdlgs/inscodlg.cxx | 52 +++++------
sc/source/ui/miscdlgs/instbdlg.cxx | 26 ++---
sc/source/ui/miscdlgs/lbseldlg.cxx | 4
sc/source/ui/miscdlgs/linkarea.cxx | 18 ++--
sc/source/ui/miscdlgs/mergecellsdialog.cxx | 9 +-
sc/source/ui/miscdlgs/mtrindlg.cxx | 4
sc/source/ui/miscdlgs/mvtabdlg.cxx | 25 ++---
sc/source/ui/miscdlgs/namecrea.cxx | 11 +-
sc/source/ui/miscdlgs/optsolver.cxx | 110 ++++++++++++------------
sc/source/ui/miscdlgs/protectiondlg.cxx | 30 +++---
sc/source/ui/miscdlgs/retypepassdlg.cxx | 41 ++++-----
sc/source/ui/miscdlgs/scuiautofmt.cxx | 28 +++---
sc/source/ui/miscdlgs/sharedocdlg.cxx | 10 +-
sc/source/ui/miscdlgs/shtabdlg.cxx | 7 -
sc/source/ui/miscdlgs/simpref.cxx | 12 +-
sc/source/ui/miscdlgs/solveroptions.cxx | 20 ++--
sc/source/ui/miscdlgs/solvrdlg.cxx | 20 ++--
sc/source/ui/miscdlgs/strindlg.cxx | 8 -
sc/source/ui/miscdlgs/tabbgcolordlg.cxx | 10 +-
sc/source/ui/miscdlgs/tabopdlg.cxx | 26 ++---
sc/source/ui/miscdlgs/textdlgs.cxx | 24 ++---
sc/source/ui/miscdlgs/warnbox.cxx | 6 -
36 files changed, 443 insertions(+), 433 deletions(-)
New commits:
commit efe386b01668c9a67224857773849916d44d56cd
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Fri May 31 09:58:06 2024 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Fri May 31 16:29:42 2024 +0200
loplugin:ostr in sc/../miscdlgs
Change-Id: I9cc24ed6692d9495e6ace3ccacbbe488ef82eea6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168282
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
Tested-by: Jenkins
diff --git a/sc/source/ui/miscdlgs/acredlin.cxx
b/sc/source/ui/miscdlgs/acredlin.cxx
index 957661186906..782b08b87d47 100644
--- a/sc/source/ui/miscdlgs/acredlin.cxx
+++ b/sc/source/ui/miscdlgs/acredlin.cxx
@@ -70,7 +70,7 @@ ScRedlinData::~ScRedlinData()
ScAcceptChgDlg::ScAcceptChgDlg(SfxBindings* pB, SfxChildWindow* pCW,
weld::Window* pParent,
ScViewData* ptrViewData)
: SfxModelessDialogController(pB, pCW, pParent,
- "svx/ui/acceptrejectchangesdialog.ui", "AcceptRejectChangesDialog")
+ u"svx/ui/acceptrejectchangesdialog.ui"_ustr,
u"AcceptRejectChangesDialog"_ustr)
, aSelectionIdle( "ScAcceptChgDlg aSelectionIdle" )
, aReOpenIdle("ScAcceptChgDlg ReOpenIdle")
, pViewData( ptrViewData )
@@ -91,14 +91,14 @@ ScAcceptChgDlg::ScAcceptChgDlg(SfxBindings* pB,
SfxChildWindow* pCW, weld::Windo
, aStrChildContent(ScResId(STR_CHG_CHILD_CONTENT))
, aStrChildOrgContent(ScResId(STR_CHG_CHILD_ORGCONTENT))
, aStrEmpty(ScResId(STR_CHG_EMPTY))
- , aUnknown("Unknown")
+ , aUnknown(u"Unknown"_ustr)
, bIgnoreMsg(false)
, bNoSelection(false)
, bHasFilterEntry(false)
, bUseColor(false)
, m_xContentArea(m_xDialog->weld_content_area())
- , m_xPopup(m_xBuilder->weld_menu("calcmenu"))
- , m_xSortMenu(m_xBuilder->weld_menu("calcsortmenu"))
+ , m_xPopup(m_xBuilder->weld_menu(u"calcmenu"_ustr))
+ , m_xSortMenu(m_xBuilder->weld_menu(u"calcsortmenu"_ustr))
{
m_xAcceptChgCtr.reset(new SvxAcceptChgCtr(m_xContentArea.get()));
nAcceptCount=0;
@@ -1602,7 +1602,7 @@ IMPL_LINK(ScAcceptChgDlg, CommandHdl, const
CommandEvent&, rCEvt, bool)
for (sal_Int32 i = 0; i < 5; ++i)
m_xSortMenu->set_active("calcsort" + OUString::number(i), i ==
nSortedCol);
- m_xPopup->set_sensitive("calcedit", false);
+ m_xPopup->set_sensitive(u"calcedit"_ustr, false);
if (pDoc->IsDocEditable() && bEntry)
{
@@ -1611,7 +1611,7 @@ IMPL_LINK(ScAcceptChgDlg, CommandHdl, const
CommandEvent&, rCEvt, bool)
{
ScChangeAction* pScChangeAction =
static_cast<ScChangeAction*>(pEntryData->pData);
if (pScChangeAction && !rTreeView.get_iter_depth(*xEntry))
- m_xPopup->set_sensitive("calcedit", true);
+ m_xPopup->set_sensitive(u"calcedit"_ustr, true);
}
}
diff --git a/sc/source/ui/miscdlgs/conflictsdlg.cxx
b/sc/source/ui/miscdlgs/conflictsdlg.cxx
index 3a48325aa52c..a70cff4641b0 100644
--- a/sc/source/ui/miscdlgs/conflictsdlg.cxx
+++ b/sc/source/ui/miscdlgs/conflictsdlg.cxx
@@ -320,7 +320,7 @@ void ScConflictsResolver::HandleAction( ScChangeAction*
pAction, bool bIsSharedA
ScConflictsDlg::ScConflictsDlg(weld::Window* pParent, ScViewData* pViewData,
ScDocument* pSharedDoc, ScConflictsList& rConflictsList)
- : GenericDialogController(pParent, "modules/scalc/ui/conflictsdialog.ui",
"ConflictsDialog")
+ : GenericDialogController(pParent,
u"modules/scalc/ui/conflictsdialog.ui"_ustr, u"ConflictsDialog"_ustr)
, maStrUnknownUser ( ScResId( STR_UNKNOWN_USER_CONFLICT ) )
, mpViewData ( pViewData )
, mpOwnDoc ( nullptr )
@@ -330,11 +330,11 @@ ScConflictsDlg::ScConflictsDlg(weld::Window* pParent,
ScViewData* pViewData, ScD
, mrConflictsList ( rConflictsList )
, maSelectionIdle ( "ScConflictsDlg maSelectionIdle" )
, mbInSelectHdl ( false )
- , m_xBtnKeepMine(m_xBuilder->weld_button("keepmine"))
- , m_xBtnKeepOther(m_xBuilder->weld_button("keepother"))
- , m_xBtnKeepAllMine(m_xBuilder->weld_button("keepallmine"))
- , m_xBtnKeepAllOthers(m_xBuilder->weld_button("keepallothers"))
- , m_xLbConflicts(new
SvxRedlinTable(m_xBuilder->weld_tree_view("container"), nullptr))
+ , m_xBtnKeepMine(m_xBuilder->weld_button(u"keepmine"_ustr))
+ , m_xBtnKeepOther(m_xBuilder->weld_button(u"keepother"_ustr))
+ , m_xBtnKeepAllMine(m_xBuilder->weld_button(u"keepallmine"_ustr))
+ , m_xBtnKeepAllOthers(m_xBuilder->weld_button(u"keepallothers"_ustr))
+ , m_xLbConflicts(new
SvxRedlinTable(m_xBuilder->weld_tree_view(u"container"_ustr), nullptr))
{
OSL_ENSURE( mpViewData, "ScConflictsDlg CTOR: mpViewData is null!" );
mpOwnDoc = ( mpViewData ? &mpViewData->GetDocument() : nullptr );
diff --git a/sc/source/ui/miscdlgs/crdlg.cxx b/sc/source/ui/miscdlgs/crdlg.cxx
index 51f4fe9bb409..4166c3fd2afb 100644
--- a/sc/source/ui/miscdlgs/crdlg.cxx
+++ b/sc/source/ui/miscdlgs/crdlg.cxx
@@ -24,10 +24,11 @@
ScColOrRowDlg::ScColOrRowDlg(weld::Window* pParent, const OUString& rStrTitle,
const OUString& rStrLabel)
- : GenericDialogController(pParent, "modules/scalc/ui/colorrowdialog.ui",
"ColOrRowDialog")
- , m_xFrame(m_xBuilder->weld_frame("frame"))
- , m_xBtnCols(m_xBuilder->weld_radio_button("columns"))
- , m_xBtnOk(m_xBuilder->weld_button("ok"))
+ : GenericDialogController(pParent,
u"modules/scalc/ui/colorrowdialog.ui"_ustr,
+ u"ColOrRowDialog"_ustr)
+ , m_xFrame(m_xBuilder->weld_frame(u"frame"_ustr))
+ , m_xBtnCols(m_xBuilder->weld_radio_button(u"columns"_ustr))
+ , m_xBtnOk(m_xBuilder->weld_button(u"ok"_ustr))
{
m_xDialog->set_title(rStrTitle);
m_xFrame->set_label(rStrLabel);
diff --git a/sc/source/ui/miscdlgs/crnrdlg.cxx
b/sc/source/ui/miscdlgs/crnrdlg.cxx
index 38a0cfe668d6..c59c8d50122c 100644
--- a/sc/source/ui/miscdlgs/crnrdlg.cxx
+++ b/sc/source/ui/miscdlgs/crnrdlg.cxx
@@ -60,25 +60,25 @@ ScColRowNameRangesDlg::ScColRowNameRangesDlg( SfxBindings*
pB,
weld::Window* pParent,
ScViewData& rViewData )
- : ScAnyRefDlgController(pB, pCW, pParent,
"modules/scalc/ui/namerangesdialog.ui", "NameRangesDialog")
+ : ScAnyRefDlgController(pB, pCW, pParent,
u"modules/scalc/ui/namerangesdialog.ui"_ustr, u"NameRangesDialog"_ustr)
, m_rViewData(rViewData)
, rDoc(rViewData.GetDocument())
, bDlgLostFocus(false)
, m_pEdActive(nullptr)
- , m_xLbRange(m_xBuilder->weld_tree_view("range"))
- , m_xEdAssign(new formula::RefEdit(m_xBuilder->weld_entry("edassign")))
- , m_xRbAssign(new formula::RefButton(m_xBuilder->weld_button("rbassign")))
- , m_xBtnColHead(m_xBuilder->weld_radio_button("colhead"))
- , m_xBtnRowHead(m_xBuilder->weld_radio_button("rowhead"))
- , m_xEdAssign2(new formula::RefEdit(m_xBuilder->weld_entry("edassign2")))
- , m_xRbAssign2(new
formula::RefButton(m_xBuilder->weld_button("rbassign2")))
- , m_xBtnOk(m_xBuilder->weld_button("ok"))
- , m_xBtnCancel(m_xBuilder->weld_button("cancel"))
- , m_xBtnAdd(m_xBuilder->weld_button("add"))
- , m_xBtnRemove(m_xBuilder->weld_button("delete"))
- , m_xRangeFrame(m_xBuilder->weld_frame("rangeframe"))
+ , m_xLbRange(m_xBuilder->weld_tree_view(u"range"_ustr))
+ , m_xEdAssign(new
formula::RefEdit(m_xBuilder->weld_entry(u"edassign"_ustr)))
+ , m_xRbAssign(new
formula::RefButton(m_xBuilder->weld_button(u"rbassign"_ustr)))
+ , m_xBtnColHead(m_xBuilder->weld_radio_button(u"colhead"_ustr))
+ , m_xBtnRowHead(m_xBuilder->weld_radio_button(u"rowhead"_ustr))
+ , m_xEdAssign2(new
formula::RefEdit(m_xBuilder->weld_entry(u"edassign2"_ustr)))
+ , m_xRbAssign2(new
formula::RefButton(m_xBuilder->weld_button(u"rbassign2"_ustr)))
+ , m_xBtnOk(m_xBuilder->weld_button(u"ok"_ustr))
+ , m_xBtnCancel(m_xBuilder->weld_button(u"cancel"_ustr))
+ , m_xBtnAdd(m_xBuilder->weld_button(u"add"_ustr))
+ , m_xBtnRemove(m_xBuilder->weld_button(u"delete"_ustr))
+ , m_xRangeFrame(m_xBuilder->weld_frame(u"rangeframe"_ustr))
, m_xRangeFT(m_xRangeFrame->weld_label_widget())
- , m_xDataFT(m_xBuilder->weld_label("datarange"))
+ , m_xDataFT(m_xBuilder->weld_label(u"datarange"_ustr))
{
m_xRbAssign->SetReferences(this, m_xEdAssign.get());
m_xEdAssign->SetReferences(this, m_xRangeFT.get());
@@ -353,7 +353,7 @@ void ScColRowNameRangesDlg::UpdateNames()
OUString rString;
const ScAddress::Details aDetails(rDoc.GetAddressConvention());
- OUString strDelim(" --- ");
+ OUString strDelim(u" --- "_ustr);
OUString aString = strDelim + ScResId( STR_COLUMN ) + strDelim;
m_xLbRange->append(OUString::number(nEntryDataDelim), aString);
if ( xColNameRanges->size() > 0 )
diff --git a/sc/source/ui/miscdlgs/datafdlg.cxx
b/sc/source/ui/miscdlgs/datafdlg.cxx
index 0ed421cba831..3c6670109446 100644
--- a/sc/source/ui/miscdlgs/datafdlg.cxx
+++ b/sc/source/ui/miscdlgs/datafdlg.cxx
@@ -18,7 +18,7 @@
#include <osl/diagnose.h>
ScDataFormDlg::ScDataFormDlg(weld::Window* pParent, ScTabViewShell*
pTabViewShellOri)
- : GenericDialogController(pParent, "modules/scalc/ui/dataform.ui",
"DataFormDialog")
+ : GenericDialogController(pParent, u"modules/scalc/ui/dataform.ui"_ustr,
u"DataFormDialog"_ustr)
, pTabViewShell(pTabViewShellOri)
, aColLength(0)
, nCurrentRow(0)
@@ -27,15 +27,15 @@ ScDataFormDlg::ScDataFormDlg(weld::Window* pParent,
ScTabViewShell* pTabViewShel
, nStartRow(0)
, nEndRow(0)
, nTab(0)
- , m_xBtnNew(m_xBuilder->weld_button("new"))
- , m_xBtnDelete(m_xBuilder->weld_button("delete"))
- , m_xBtnRestore(m_xBuilder->weld_button("restore"))
- , m_xBtnPrev(m_xBuilder->weld_button("prev"))
- , m_xBtnNext(m_xBuilder->weld_button("next"))
- , m_xBtnClose(m_xBuilder->weld_button("close"))
- , m_xSlider(m_xBuilder->weld_scrolled_window("scrollbar", true))
- , m_xGrid(m_xBuilder->weld_container("grid"))
- , m_xFixedText(m_xBuilder->weld_label("label"))
+ , m_xBtnNew(m_xBuilder->weld_button(u"new"_ustr))
+ , m_xBtnDelete(m_xBuilder->weld_button(u"delete"_ustr))
+ , m_xBtnRestore(m_xBuilder->weld_button(u"restore"_ustr))
+ , m_xBtnPrev(m_xBuilder->weld_button(u"prev"_ustr))
+ , m_xBtnNext(m_xBuilder->weld_button(u"next"_ustr))
+ , m_xBtnClose(m_xBuilder->weld_button(u"close"_ustr))
+ , m_xSlider(m_xBuilder->weld_scrolled_window(u"scrollbar"_ustr, true))
+ , m_xGrid(m_xBuilder->weld_container(u"grid"_ustr))
+ , m_xFixedText(m_xBuilder->weld_label(u"label"_ustr))
{
sNewRecord = m_xFixedText->get_label();
@@ -341,9 +341,9 @@ void ScDataFormDlg::SetButtonState()
}
ScDataFormFragment::ScDataFormFragment(weld::Container* pGrid, int nLine)
- : m_xBuilder(Application::CreateBuilder(pGrid,
"modules/scalc/ui/dataformfragment.ui"))
- , m_xLabel(m_xBuilder->weld_label("label"))
- , m_xEdit(m_xBuilder->weld_entry("entry"))
+ : m_xBuilder(Application::CreateBuilder(pGrid,
u"modules/scalc/ui/dataformfragment.ui"_ustr))
+ , m_xLabel(m_xBuilder->weld_label(u"label"_ustr))
+ , m_xEdit(m_xBuilder->weld_entry(u"entry"_ustr))
{
m_xLabel->set_grid_left_attach(0);
m_xLabel->set_grid_top_attach(nLine);
diff --git a/sc/source/ui/miscdlgs/dataproviderdlg.cxx
b/sc/source/ui/miscdlgs/dataproviderdlg.cxx
index 82f5163e289b..114da63c897c 100644
--- a/sc/source/ui/miscdlgs/dataproviderdlg.cxx
+++ b/sc/source/ui/miscdlgs/dataproviderdlg.cxx
@@ -63,7 +63,7 @@ SCCOL ScDataTransformationBaseControl::getLastCol(const
ScDocument& rDoc)
ScDataTransformationBaseControl::ScDataTransformationBaseControl(weld::Container*
pParent, const OUString& rUIFile, sal_uInt32 nIndex)
: mxBuilder(Application::CreateBuilder(pParent, rUIFile))
- , mxGrid(mxBuilder->weld_container("grid"))
+ , mxGrid(mxBuilder->weld_container(u"grid"_ustr))
, mpContainer(pParent)
, mnIndex(nIndex)
{
@@ -114,9 +114,9 @@ public:
ScDeleteColumnTransformationControl::ScDeleteColumnTransformationControl(
const ScDocument* pDoc, weld::Container* pParent, sal_uInt32 nIndex,
std::function<void(sal_uInt32&)> aDeleteTransformation)
- : ScDataTransformationBaseControl(pParent,
"modules/scalc/ui/deletecolumnentry.ui", nIndex)
- , mxColumnNums(mxBuilder->weld_entry("ed_columns"))
- , mxDelete(mxBuilder->weld_button("ed_delete"))
+ : ScDataTransformationBaseControl(pParent,
u"modules/scalc/ui/deletecolumnentry.ui"_ustr, nIndex)
+ , mxColumnNums(mxBuilder->weld_entry(u"ed_columns"_ustr))
+ , mxDelete(mxBuilder->weld_button(u"ed_delete"_ustr))
, maDeleteTransformation(std::move(aDeleteTransformation))
, mpDoc(pDoc)
{
@@ -163,10 +163,10 @@ public:
ScSplitColumnTransformationControl::ScSplitColumnTransformationControl(
const ScDocument* pDoc, weld::Container* pParent, sal_uInt32 nIndex,
std::function<void(sal_uInt32&)> aDeleteTransformation)
- : ScDataTransformationBaseControl(pParent,
"modules/scalc/ui/splitcolumnentry.ui", nIndex)
- , mxSeparator(mxBuilder->weld_entry("ed_separator"))
- , mxNumColumns(mxBuilder->weld_entry("num_cols"))
- , mxDelete(mxBuilder->weld_button("ed_delete"))
+ : ScDataTransformationBaseControl(pParent,
u"modules/scalc/ui/splitcolumnentry.ui"_ustr, nIndex)
+ , mxSeparator(mxBuilder->weld_entry(u"ed_separator"_ustr))
+ , mxNumColumns(mxBuilder->weld_entry(u"num_cols"_ustr))
+ , mxDelete(mxBuilder->weld_button(u"ed_delete"_ustr))
, maDeleteTransformation(std::move(aDeleteTransformation))
, mpDoc(pDoc)
{
@@ -204,10 +204,10 @@ public:
ScMergeColumnTransformationControl::ScMergeColumnTransformationControl(
const ScDocument* pDoc, weld::Container* pParent, SCCOL nStartCol, SCCOL
nEndCol, sal_uInt32 nIndex,
std::function<void(sal_uInt32&)> aDeleteTransformation)
- : ScDataTransformationBaseControl(pParent,
"modules/scalc/ui/mergecolumnentry.ui", nIndex)
- , mxSeparator(mxBuilder->weld_entry("ed_separator"))
- , mxEdColumns(mxBuilder->weld_entry("ed_columns"))
- , mxDelete(mxBuilder->weld_button("ed_delete"))
+ : ScDataTransformationBaseControl(pParent,
u"modules/scalc/ui/mergecolumnentry.ui"_ustr, nIndex)
+ , mxSeparator(mxBuilder->weld_entry(u"ed_separator"_ustr))
+ , mxEdColumns(mxBuilder->weld_entry(u"ed_columns"_ustr))
+ , mxDelete(mxBuilder->weld_button(u"ed_delete"_ustr))
, maDeleteTransformation(std::move(aDeleteTransformation))
, mpDoc(pDoc)
{
@@ -263,10 +263,10 @@ public:
ScSortTransformationControl::ScSortTransformationControl(
const ScDocument* pDoc, weld::Container* pParent, sal_uInt32 nIndex,
std::function<void(sal_uInt32&)> aDeleteTransformation)
- : ScDataTransformationBaseControl(pParent,
"modules/scalc/ui/sorttransformationentry.ui", nIndex)
- , mxType(mxBuilder->weld_combo_box("ed_ascending"))
- , mxEdColumns(mxBuilder->weld_entry("ed_columns"))
- , mxDelete(mxBuilder->weld_button("ed_delete"))
+ : ScDataTransformationBaseControl(pParent,
u"modules/scalc/ui/sorttransformationentry.ui"_ustr, nIndex)
+ , mxType(mxBuilder->weld_combo_box(u"ed_ascending"_ustr))
+ , mxEdColumns(mxBuilder->weld_entry(u"ed_columns"_ustr))
+ , mxDelete(mxBuilder->weld_button(u"ed_delete"_ustr))
, maDeleteTransformation(std::move(aDeleteTransformation))
, mpDoc(pDoc)
{
@@ -311,10 +311,10 @@ public:
ScColumnTextTransformation::ScColumnTextTransformation(
const ScDocument* pDoc, weld::Container* pParent, sal_uInt32 nIndex,
std::function<void(sal_uInt32&)> aDeleteTransformation)
- : ScDataTransformationBaseControl(pParent,
"modules/scalc/ui/texttransformationentry.ui", nIndex)
- , mxColumnNums(mxBuilder->weld_entry("ed_columns"))
- , mxType(mxBuilder->weld_combo_box("ed_lst"))
- , mxDelete(mxBuilder->weld_button("ed_delete"))
+ : ScDataTransformationBaseControl(pParent,
u"modules/scalc/ui/texttransformationentry.ui"_ustr, nIndex)
+ , mxColumnNums(mxBuilder->weld_entry(u"ed_columns"_ustr))
+ , mxType(mxBuilder->weld_combo_box(u"ed_lst"_ustr))
+ , mxDelete(mxBuilder->weld_button(u"ed_delete"_ustr))
, maDeleteTransformation(std::move(aDeleteTransformation))
, mpDoc(pDoc)
{
@@ -375,10 +375,10 @@ public:
ScAggregateFunction::ScAggregateFunction(const ScDocument* pDoc,
weld::Container* pParent, sal_uInt32 nIndex,
std::function<void(sal_uInt32&)>
aDeleteTransformation)
- : ScDataTransformationBaseControl(pParent,
"modules/scalc/ui/aggregatefunctionentry.ui", nIndex)
- , mxColumnNums(mxBuilder->weld_entry("ed_columns"))
- , mxType(mxBuilder->weld_combo_box("ed_lst"))
- , mxDelete(mxBuilder->weld_button("ed_delete"))
+ : ScDataTransformationBaseControl(pParent,
u"modules/scalc/ui/aggregatefunctionentry.ui"_ustr, nIndex)
+ , mxColumnNums(mxBuilder->weld_entry(u"ed_columns"_ustr))
+ , mxType(mxBuilder->weld_combo_box(u"ed_lst"_ustr))
+ , mxDelete(mxBuilder->weld_button(u"ed_delete"_ustr))
, maDeleteTransformation(std::move(aDeleteTransformation))
, mpDoc(pDoc)
{
@@ -438,10 +438,10 @@ public:
ScNumberTransformation::ScNumberTransformation(
const ScDocument *pDoc, weld::Container* pParent, sal_uInt32 nIndex,
std::function<void(sal_uInt32&)> aDeleteTransformation)
- : ScDataTransformationBaseControl(pParent,
"modules/scalc/ui/numbertransformationentry.ui", nIndex)
- , mxColumnNums(mxBuilder->weld_entry("ed_columns"))
- , mxType(mxBuilder->weld_combo_box("ed_lst"))
- , mxDelete(mxBuilder->weld_button("ed_delete"))
+ : ScDataTransformationBaseControl(pParent,
u"modules/scalc/ui/numbertransformationentry.ui"_ustr, nIndex)
+ , mxColumnNums(mxBuilder->weld_entry(u"ed_columns"_ustr))
+ , mxType(mxBuilder->weld_combo_box(u"ed_lst"_ustr))
+ , mxDelete(mxBuilder->weld_button(u"ed_delete"_ustr))
, maDeleteTransformation(std::move(aDeleteTransformation))
, mpDoc(pDoc)
{
@@ -519,10 +519,10 @@ public:
};
ScReplaceNullTransformation::ScReplaceNullTransformation(const ScDocument
*pDoc, weld::Container* pParent, sal_uInt32 nIndex,
std::function<void(sal_uInt32&)> aDeleteTransformation)
- :
ScDataTransformationBaseControl(pParent,"modules/scalc/ui/replacenulltransformationentry.ui",
nIndex)
- , mxColumnNums(mxBuilder->weld_entry("ed_columns"))
- , mxReplaceString(mxBuilder->weld_entry("ed_str"))
- , mxDelete(mxBuilder->weld_button("ed_delete"))
+ :
ScDataTransformationBaseControl(pParent,u"modules/scalc/ui/replacenulltransformationentry.ui"_ustr,
nIndex)
+ , mxColumnNums(mxBuilder->weld_entry(u"ed_columns"_ustr))
+ , mxReplaceString(mxBuilder->weld_entry(u"ed_str"_ustr))
+ , mxDelete(mxBuilder->weld_button(u"ed_delete"_ustr))
, maDeleteTransformation(std::move(aDeleteTransformation))
, mpDoc(pDoc)
{
@@ -570,10 +570,10 @@ public:
};
ScDateTimeTransformation::ScDateTimeTransformation(const ScDocument* pDoc,
weld::Container* pParent, sal_uInt32 nIndex, std::function<void(sal_uInt32&)>
aDeleteTransformation)
- :
ScDataTransformationBaseControl(pParent,"modules/scalc/ui/datetimetransformationentry.ui",
nIndex)
- , mxColumnNums(mxBuilder->weld_entry("ed_columns"))
- , mxType(mxBuilder->weld_combo_box("ed_lst"))
- , mxDelete(mxBuilder->weld_button("ed_delete"))
+ :
ScDataTransformationBaseControl(pParent,u"modules/scalc/ui/datetimetransformationentry.ui"_ustr,
nIndex)
+ , mxColumnNums(mxBuilder->weld_entry(u"ed_columns"_ustr))
+ , mxType(mxBuilder->weld_combo_box(u"ed_lst"_ustr))
+ , mxDelete(mxBuilder->weld_button(u"ed_delete"_ustr))
, maDeleteTransformation(std::move(aDeleteTransformation))
, mpDoc(pDoc)
{
@@ -663,11 +663,11 @@ public:
ScFindReplaceTransformation::ScFindReplaceTransformation(
const ScDocument *pDoc, weld::Container* pParent, sal_uInt32 nIndex,
std::function<void(sal_uInt32&)> aDeleteTransformation)
- : ScDataTransformationBaseControl(pParent,
"modules/scalc/ui/findreplaceentry.ui", nIndex)
- , mxFindString(mxBuilder->weld_entry("ed_find"))
- , mxReplaceString(mxBuilder->weld_entry("ed_replace"))
- , mxEdColumns(mxBuilder->weld_entry("ed_columns"))
- , mxDelete(mxBuilder->weld_button("ed_delete"))
+ : ScDataTransformationBaseControl(pParent,
u"modules/scalc/ui/findreplaceentry.ui"_ustr, nIndex)
+ , mxFindString(mxBuilder->weld_entry(u"ed_find"_ustr))
+ , mxReplaceString(mxBuilder->weld_entry(u"ed_replace"_ustr))
+ , mxEdColumns(mxBuilder->weld_entry(u"ed_columns"_ustr))
+ , mxDelete(mxBuilder->weld_button(u"ed_delete"_ustr))
, maDeleteTransformation(std::move(aDeleteTransformation))
, mpDoc(pDoc)
{
@@ -703,10 +703,10 @@ public:
ScDeleteRowTransformation::ScDeleteRowTransformation(
const ScDocument *pDoc, weld::Container* pParent, sal_uInt32 nIndex,
std::function<void(sal_uInt32&)> aDeleteTransformation)
- : ScDataTransformationBaseControl(pParent,
"modules/scalc/ui/deleterowentry.ui", nIndex)
- , mxFindString(mxBuilder->weld_entry("ed_find"))
- , mxEdColumns(mxBuilder->weld_entry("ed_columns"))
- , mxDelete(mxBuilder->weld_button("ed_delete"))
+ : ScDataTransformationBaseControl(pParent,
u"modules/scalc/ui/deleterowentry.ui"_ustr, nIndex)
+ , mxFindString(mxBuilder->weld_entry(u"ed_find"_ustr))
+ , mxEdColumns(mxBuilder->weld_entry(u"ed_columns"_ustr))
+ , mxDelete(mxBuilder->weld_button(u"ed_delete"_ustr))
, maDeleteTransformation(std::move(aDeleteTransformation))
, mpDoc(pDoc)
{
@@ -742,10 +742,10 @@ public:
ScSwapRowsTransformation::ScSwapRowsTransformation(
const ScDocument *pDoc, weld::Container* pParent, sal_uInt32 nIndex,
std::function<void(sal_uInt32&)> aDeleteTransformation)
- : ScDataTransformationBaseControl(pParent,
"modules/scalc/ui/swaprowsentry.ui", nIndex)
- , mxRow(mxBuilder->weld_entry("ed_row1"))
- , nxRow(mxBuilder->weld_entry("ed_row2"))
- , mxDelete(mxBuilder->weld_button("ed_delete"))
+ : ScDataTransformationBaseControl(pParent,
u"modules/scalc/ui/swaprowsentry.ui"_ustr, nIndex)
+ , mxRow(mxBuilder->weld_entry(u"ed_row1"_ustr))
+ , nxRow(mxBuilder->weld_entry(u"ed_row2"_ustr))
+ , mxDelete(mxBuilder->weld_button(u"ed_delete"_ustr))
, maDeleteTransformation(std::move(aDeleteTransformation))
, mpDoc(pDoc)
{
@@ -771,23 +771,23 @@ std::shared_ptr<sc::DataTransformation>
ScSwapRowsTransformation::getTransformat
ScDataProviderDlg::ScDataProviderDlg(weld::Window* pParent,
std::shared_ptr<ScDocument> pDoc,
const ScDocument* pDocument)
- : GenericDialogController(pParent, "modules/scalc/ui/dataproviderdlg.ui",
"dataproviderdlg")
+ : GenericDialogController(pParent,
u"modules/scalc/ui/dataproviderdlg.ui"_ustr, u"dataproviderdlg"_ustr)
, mxDoc(std::move(pDoc))
- , mxBox(m_xBuilder->weld_container("data_table"))
+ , mxBox(m_xBuilder->weld_container(u"data_table"_ustr))
, m_xTableParent(mxBox->CreateChildFrame())
, mxTable(VclPtr<ScDataTableView>::Create(m_xTableParent, mxDoc))
- , mxDBRanges(m_xBuilder->weld_combo_box("select_db_range"))
- , mxOKBtn(m_xBuilder->weld_button("ok"))
- , mxCancelBtn(m_xBuilder->weld_button("cancel"))
- , mxAddTransformationBtn(m_xBuilder->weld_button("add_transformation"))
- , mxScroll(m_xBuilder->weld_scrolled_window("scroll"))
- , mxTransformationList(m_xBuilder->weld_container("transformation_ctrl"))
- , mxTransformationBox(m_xBuilder->weld_combo_box("transformation_box"))
- , mxProviderList(m_xBuilder->weld_combo_box("provider_lst"))
- , mxEditURL(m_xBuilder->weld_entry("ed_url"))
- , mxEditID(m_xBuilder->weld_entry("ed_id"))
- , mxApplyBtn(m_xBuilder->weld_button("apply"))
- , mxBrowseBtn(m_xBuilder->weld_button("browse"))
+ , mxDBRanges(m_xBuilder->weld_combo_box(u"select_db_range"_ustr))
+ , mxOKBtn(m_xBuilder->weld_button(u"ok"_ustr))
+ , mxCancelBtn(m_xBuilder->weld_button(u"cancel"_ustr))
+ ,
mxAddTransformationBtn(m_xBuilder->weld_button(u"add_transformation"_ustr))
+ , mxScroll(m_xBuilder->weld_scrolled_window(u"scroll"_ustr))
+ ,
mxTransformationList(m_xBuilder->weld_container(u"transformation_ctrl"_ustr))
+ ,
mxTransformationBox(m_xBuilder->weld_combo_box(u"transformation_box"_ustr))
+ , mxProviderList(m_xBuilder->weld_combo_box(u"provider_lst"_ustr))
+ , mxEditURL(m_xBuilder->weld_entry(u"ed_url"_ustr))
+ , mxEditID(m_xBuilder->weld_entry(u"ed_id"_ustr))
+ , mxApplyBtn(m_xBuilder->weld_button(u"apply"_ustr))
+ , mxBrowseBtn(m_xBuilder->weld_button(u"browse"_ustr))
, maIdle("ScDataProviderDlg maIdle")
, mnIndex(0)
{
@@ -807,7 +807,7 @@ ScDataProviderDlg::ScDataProviderDlg(weld::Window* pParent,
std::shared_ptr<ScDo
mxTransformationBox->append_text(OUString::createFromAscii(i.aTransformationName));
}
- pDBData = new ScDBData("data", 0, 0, 0, mxDoc->MaxCol(), mxDoc->MaxRow());
+ pDBData = new ScDBData(u"data"_ustr, 0, 0, 0, mxDoc->MaxCol(),
mxDoc->MaxRow());
bool bSuccess =
mxDoc->GetDBCollection()->getNamedDBs().insert(std::unique_ptr<ScDBData>(pDBData));
SAL_WARN_IF(!bSuccess, "sc", "temporary warning");
diff --git a/sc/source/ui/miscdlgs/datastreamdlg.cxx
b/sc/source/ui/miscdlgs/datastreamdlg.cxx
index 1876665dabbc..f56ebc0fb694 100644
--- a/sc/source/ui/miscdlgs/datastreamdlg.cxx
+++ b/sc/source/ui/miscdlgs/datastreamdlg.cxx
@@ -18,23 +18,24 @@
namespace sc
{
DataStreamDlg::DataStreamDlg(ScDocShell* pDocShell, weld::Window* pParent)
- : GenericDialogController(pParent, "modules/scalc/ui/datastreams.ui",
"DataStreamDialog")
+ : GenericDialogController(pParent, u"modules/scalc/ui/datastreams.ui"_ustr,
+ u"DataStreamDialog"_ustr)
, m_pDocShell(pDocShell)
- , m_xCbUrl(new SvtURLBox(m_xBuilder->weld_combo_box("url")))
- , m_xBtnBrowse(m_xBuilder->weld_button("browse"))
- , m_xRBValuesInLine(m_xBuilder->weld_radio_button("valuesinline"))
- , m_xRBAddressValue(m_xBuilder->weld_radio_button("addressvalue"))
- , m_xCBRefreshOnEmpty(m_xBuilder->weld_check_button("refresh_ui"))
- , m_xRBDataDown(m_xBuilder->weld_radio_button("datadown"))
- , m_xRBRangeDown(m_xBuilder->weld_radio_button("rangedown"))
- , m_xRBNoMove(m_xBuilder->weld_radio_button("nomove"))
- , m_xRBMaxLimit(m_xBuilder->weld_radio_button("maxlimit"))
- , m_xRBUnlimited(m_xBuilder->weld_radio_button("unlimited"))
- , m_xEdRange(m_xBuilder->weld_entry("range"))
- , m_xEdLimit(m_xBuilder->weld_entry("limit"))
- , m_xBtnOk(m_xBuilder->weld_button("ok"))
- , m_xVclFrameLimit(m_xBuilder->weld_frame("framelimit"))
- , m_xVclFrameMove(m_xBuilder->weld_frame("framemove"))
+ , m_xCbUrl(new SvtURLBox(m_xBuilder->weld_combo_box(u"url"_ustr)))
+ , m_xBtnBrowse(m_xBuilder->weld_button(u"browse"_ustr))
+ , m_xRBValuesInLine(m_xBuilder->weld_radio_button(u"valuesinline"_ustr))
+ , m_xRBAddressValue(m_xBuilder->weld_radio_button(u"addressvalue"_ustr))
+ , m_xCBRefreshOnEmpty(m_xBuilder->weld_check_button(u"refresh_ui"_ustr))
+ , m_xRBDataDown(m_xBuilder->weld_radio_button(u"datadown"_ustr))
+ , m_xRBRangeDown(m_xBuilder->weld_radio_button(u"rangedown"_ustr))
+ , m_xRBNoMove(m_xBuilder->weld_radio_button(u"nomove"_ustr))
+ , m_xRBMaxLimit(m_xBuilder->weld_radio_button(u"maxlimit"_ustr))
+ , m_xRBUnlimited(m_xBuilder->weld_radio_button(u"unlimited"_ustr))
+ , m_xEdRange(m_xBuilder->weld_entry(u"range"_ustr))
+ , m_xEdLimit(m_xBuilder->weld_entry(u"limit"_ustr))
+ , m_xBtnOk(m_xBuilder->weld_button(u"ok"_ustr))
+ , m_xVclFrameLimit(m_xBuilder->weld_frame(u"framelimit"_ustr))
+ , m_xVclFrameMove(m_xBuilder->weld_frame(u"framemove"_ustr))
{
m_xCbUrl->connect_changed(LINK(this, DataStreamDlg, UpdateComboBoxHdl));
m_xRBAddressValue->connect_toggled(LINK(this, DataStreamDlg,
UpdateClickHdl));
diff --git a/sc/source/ui/miscdlgs/delcldlg.cxx
b/sc/source/ui/miscdlgs/delcldlg.cxx
index 71ce6b99edd2..925993c7fb01 100644
--- a/sc/source/ui/miscdlgs/delcldlg.cxx
+++ b/sc/source/ui/miscdlgs/delcldlg.cxx
@@ -24,11 +24,12 @@
static sal_uInt8 nDelItemChecked = 0;
ScDeleteCellDlg::ScDeleteCellDlg(weld::Window* pParent, bool bDisallowCellMove)
- : GenericDialogController(pParent, "modules/scalc/ui/deletecells.ui",
"DeleteCellsDialog")
- , m_xBtnCellsUp(m_xBuilder->weld_radio_button("up"))
- , m_xBtnCellsLeft(m_xBuilder->weld_radio_button("left"))
- , m_xBtnDelRows(m_xBuilder->weld_radio_button("rows"))
- , m_xBtnDelCols(m_xBuilder->weld_radio_button("cols"))
+ : GenericDialogController(pParent, u"modules/scalc/ui/deletecells.ui"_ustr,
+ u"DeleteCellsDialog"_ustr)
+ , m_xBtnCellsUp(m_xBuilder->weld_radio_button(u"up"_ustr))
+ , m_xBtnCellsLeft(m_xBuilder->weld_radio_button(u"left"_ustr))
+ , m_xBtnDelRows(m_xBuilder->weld_radio_button(u"rows"_ustr))
+ , m_xBtnDelCols(m_xBuilder->weld_radio_button(u"cols"_ustr))
{
if (bDisallowCellMove)
{
diff --git a/sc/source/ui/miscdlgs/delcodlg.cxx
b/sc/source/ui/miscdlgs/delcodlg.cxx
index 56334ba9ca9c..a136ec927e6f 100644
--- a/sc/source/ui/miscdlgs/delcodlg.cxx
+++ b/sc/source/ui/miscdlgs/delcodlg.cxx
@@ -27,16 +27,16 @@ InsertDeleteFlags ScDeleteContentsDlg::nPreviousChecks =
InsertDeleteFlags::DA
InsertDeleteFlags::VALUE;
ScDeleteContentsDlg::ScDeleteContentsDlg(weld::Window* pParent)
- : GenericDialogController(pParent, "modules/scalc/ui/deletecontents.ui",
"DeleteContentsDialog")
+ : GenericDialogController(pParent,
u"modules/scalc/ui/deletecontents.ui"_ustr, u"DeleteContentsDialog"_ustr)
, m_bObjectsDisabled(false)
- , m_xBtnDelAll(m_xBuilder->weld_check_button("deleteall"))
- , m_xBtnDelStrings(m_xBuilder->weld_check_button("text"))
- , m_xBtnDelNumbers(m_xBuilder->weld_check_button("numbers"))
- , m_xBtnDelDateTime(m_xBuilder->weld_check_button("datetime"))
- , m_xBtnDelFormulas(m_xBuilder->weld_check_button("formulas"))
- , m_xBtnDelNotes(m_xBuilder->weld_check_button("comments"))
- , m_xBtnDelAttrs(m_xBuilder->weld_check_button("formats"))
- , m_xBtnDelObjects(m_xBuilder->weld_check_button("objects"))
+ , m_xBtnDelAll(m_xBuilder->weld_check_button(u"deleteall"_ustr))
+ , m_xBtnDelStrings(m_xBuilder->weld_check_button(u"text"_ustr))
+ , m_xBtnDelNumbers(m_xBuilder->weld_check_button(u"numbers"_ustr))
+ , m_xBtnDelDateTime(m_xBuilder->weld_check_button(u"datetime"_ustr))
+ , m_xBtnDelFormulas(m_xBuilder->weld_check_button(u"formulas"_ustr))
+ , m_xBtnDelNotes(m_xBuilder->weld_check_button(u"comments"_ustr))
+ , m_xBtnDelAttrs(m_xBuilder->weld_check_button(u"formats"_ustr))
+ , m_xBtnDelObjects(m_xBuilder->weld_check_button(u"objects"_ustr))
{
m_xBtnDelAll->set_active( ScDeleteContentsDlg::bPreviousAllCheck );
m_xBtnDelStrings->set_active( bool(InsertDeleteFlags::STRING &
ScDeleteContentsDlg::nPreviousChecks) );
diff --git a/sc/source/ui/miscdlgs/filldlg.cxx
b/sc/source/ui/miscdlgs/filldlg.cxx
index 2210df0f8e9a..9bcc5bfbf6ed 100644
--- a/sc/source/ui/miscdlgs/filldlg.cxx
+++ b/sc/source/ui/miscdlgs/filldlg.cxx
@@ -42,7 +42,7 @@ ScFillSeriesDlg::ScFillSeriesDlg( weld::Window* pParent,
const SCSIZE nSelectHeight,
const SCSIZE nSelectWidth,
sal_uInt16 nPossDir )
- : GenericDialogController(pParent, "modules/scalc/ui/filldlg.ui",
"FillSeriesDialog")
+ : GenericDialogController(pParent, u"modules/scalc/ui/filldlg.ui"_ustr,
u"FillSeriesDialog"_ustr)
, aStartStrVal(std::move(aStartStr))
, aErrMsgInvalidVal(ScResId(SCSTR_VALERR))
, rDoc(rDocument)
@@ -53,26 +53,26 @@ ScFillSeriesDlg::ScFillSeriesDlg( weld::Window*
pParent,
, fEndVal(fMax)
, m_nSelectHeight(nSelectHeight)
, m_nSelectWidth(nSelectWidth)
- , m_xFtStartVal(m_xBuilder->weld_label("startL"))
- , m_xEdStartVal(m_xBuilder->weld_entry("startValue"))
- , m_xFtEndVal(m_xBuilder->weld_label("endL"))
- , m_xEdEndVal(m_xBuilder->weld_entry("endValue"))
- , m_xFtIncrement(m_xBuilder->weld_label("incrementL"))
- , m_xEdIncrement(m_xBuilder->weld_entry("increment"))
- , m_xBtnDown(m_xBuilder->weld_radio_button("down"))
- , m_xBtnRight(m_xBuilder->weld_radio_button("right"))
- , m_xBtnUp(m_xBuilder->weld_radio_button("up"))
- , m_xBtnLeft(m_xBuilder->weld_radio_button("left"))
- , m_xBtnArithmetic(m_xBuilder->weld_radio_button("linear"))
- , m_xBtnGeometric(m_xBuilder->weld_radio_button("growth"))
- , m_xBtnDate(m_xBuilder->weld_radio_button("date"))
- , m_xBtnAutoFill(m_xBuilder->weld_radio_button("autofill"))
- , m_xFtTimeUnit(m_xBuilder->weld_label("tuL"))
- , m_xBtnDay(m_xBuilder->weld_radio_button("day"))
- , m_xBtnDayOfWeek(m_xBuilder->weld_radio_button("week"))
- , m_xBtnMonth(m_xBuilder->weld_radio_button("month"))
- , m_xBtnYear(m_xBuilder->weld_radio_button("year"))
- , m_xBtnOk(m_xBuilder->weld_button("ok"))
+ , m_xFtStartVal(m_xBuilder->weld_label(u"startL"_ustr))
+ , m_xEdStartVal(m_xBuilder->weld_entry(u"startValue"_ustr))
+ , m_xFtEndVal(m_xBuilder->weld_label(u"endL"_ustr))
+ , m_xEdEndVal(m_xBuilder->weld_entry(u"endValue"_ustr))
+ , m_xFtIncrement(m_xBuilder->weld_label(u"incrementL"_ustr))
+ , m_xEdIncrement(m_xBuilder->weld_entry(u"increment"_ustr))
+ , m_xBtnDown(m_xBuilder->weld_radio_button(u"down"_ustr))
+ , m_xBtnRight(m_xBuilder->weld_radio_button(u"right"_ustr))
+ , m_xBtnUp(m_xBuilder->weld_radio_button(u"up"_ustr))
+ , m_xBtnLeft(m_xBuilder->weld_radio_button(u"left"_ustr))
+ , m_xBtnArithmetic(m_xBuilder->weld_radio_button(u"linear"_ustr))
+ , m_xBtnGeometric(m_xBuilder->weld_radio_button(u"growth"_ustr))
+ , m_xBtnDate(m_xBuilder->weld_radio_button(u"date"_ustr))
+ , m_xBtnAutoFill(m_xBuilder->weld_radio_button(u"autofill"_ustr))
+ , m_xFtTimeUnit(m_xBuilder->weld_label(u"tuL"_ustr))
+ , m_xBtnDay(m_xBuilder->weld_radio_button(u"day"_ustr))
+ , m_xBtnDayOfWeek(m_xBuilder->weld_radio_button(u"week"_ustr))
+ , m_xBtnMonth(m_xBuilder->weld_radio_button(u"month"_ustr))
+ , m_xBtnYear(m_xBuilder->weld_radio_button(u"year"_ustr))
+ , m_xBtnOk(m_xBuilder->weld_button(u"ok"_ustr))
{
Init(nPossDir);
}
diff --git a/sc/source/ui/miscdlgs/gototabdlg.cxx
b/sc/source/ui/miscdlgs/gototabdlg.cxx
index c817e506d6a6..078f24f25180 100644
--- a/sc/source/ui/miscdlgs/gototabdlg.cxx
+++ b/sc/source/ui/miscdlgs/gototabdlg.cxx
@@ -13,11 +13,12 @@
#include <gototabdlg.hxx>
ScGoToTabDlg::ScGoToTabDlg(weld::Window* pParent)
- : GenericDialogController(pParent, "modules/scalc/ui/gotosheetdialog.ui",
"GoToSheetDialog")
- , m_xFrameMask(m_xBuilder->weld_frame("frame-mask"))
- , m_xEnNameMask(m_xBuilder->weld_entry("entry-mask"))
- , m_xFrameSheets(m_xBuilder->weld_frame("frame-sheets"))
- , m_xLb(m_xBuilder->weld_tree_view("treeview"))
+ : GenericDialogController(pParent,
u"modules/scalc/ui/gotosheetdialog.ui"_ustr,
+ u"GoToSheetDialog"_ustr)
+ , m_xFrameMask(m_xBuilder->weld_frame(u"frame-mask"_ustr))
+ , m_xEnNameMask(m_xBuilder->weld_entry(u"entry-mask"_ustr))
+ , m_xFrameSheets(m_xBuilder->weld_frame(u"frame-sheets"_ustr))
+ , m_xLb(m_xBuilder->weld_tree_view(u"treeview"_ustr))
{
m_xLb->set_selection_mode(SelectionMode::Single);
m_xLb->set_size_request(-1, m_xLb->get_height_rows(10));
diff --git a/sc/source/ui/miscdlgs/groupdlg.cxx
b/sc/source/ui/miscdlgs/groupdlg.cxx
index f200dbccba2c..6f6d7a6970fd 100644
--- a/sc/source/ui/miscdlgs/groupdlg.cxx
+++ b/sc/source/ui/miscdlgs/groupdlg.cxx
@@ -24,14 +24,14 @@
ScGroupDlg::ScGroupDlg(weld::Window* pParent, bool bUngroup, bool bRows)
: GenericDialogController(pParent,
bUngroup ?
- OUString("modules/scalc/ui/ungroupdialog.ui") :
- OUString("modules/scalc/ui/groupdialog.ui")
+ u"modules/scalc/ui/ungroupdialog.ui"_ustr :
+ u"modules/scalc/ui/groupdialog.ui"_ustr
,
bUngroup ?
- OUString("UngroupDialog") :
- OUString("GroupDialog"))
- , m_xBtnRows(m_xBuilder->weld_radio_button("rows"))
- , m_xBtnCols(m_xBuilder->weld_radio_button("cols"))
+ u"UngroupDialog"_ustr :
+ u"GroupDialog"_ustr)
+ , m_xBtnRows(m_xBuilder->weld_radio_button(u"rows"_ustr))
+ , m_xBtnCols(m_xBuilder->weld_radio_button(u"cols"_ustr))
{
if (bRows)
m_xBtnRows->set_active(true);
diff --git a/sc/source/ui/miscdlgs/highred.cxx
b/sc/source/ui/miscdlgs/highred.cxx
index fa655f80e405..e207c2b5cf79 100644
--- a/sc/source/ui/miscdlgs/highred.cxx
+++ b/sc/source/ui/miscdlgs/highred.cxx
@@ -27,16 +27,16 @@
ScHighlightChgDlg::ScHighlightChgDlg(SfxBindings* pB, SfxChildWindow* pCW,
weld::Window* pParent,
ScViewData& rViewData)
- : ScAnyRefDlgController(pB, pCW, pParent,
"modules/scalc/ui/showchangesdialog.ui", "ShowChangesDialog")
+ : ScAnyRefDlgController(pB, pCW, pParent,
u"modules/scalc/ui/showchangesdialog.ui"_ustr, u"ShowChangesDialog"_ustr)
, m_rViewData(rViewData)
, rDoc(rViewData.GetDocument())
- , m_xHighlightBox(m_xBuilder->weld_check_button("showchanges"))
- , m_xCbAccept(m_xBuilder->weld_check_button("showaccepted"))
- , m_xCbReject(m_xBuilder->weld_check_button("showrejected"))
- , m_xOkButton(m_xBuilder->weld_button("ok"))
- , m_xEdAssign(new formula::RefEdit(m_xBuilder->weld_entry("range")))
- , m_xRbAssign(new formula::RefButton(m_xBuilder->weld_button("rangeref")))
- , m_xBox(m_xBuilder->weld_container("box"))
+ , m_xHighlightBox(m_xBuilder->weld_check_button(u"showchanges"_ustr))
+ , m_xCbAccept(m_xBuilder->weld_check_button(u"showaccepted"_ustr))
+ , m_xCbReject(m_xBuilder->weld_check_button(u"showrejected"_ustr))
+ , m_xOkButton(m_xBuilder->weld_button(u"ok"_ustr))
+ , m_xEdAssign(new formula::RefEdit(m_xBuilder->weld_entry(u"range"_ustr)))
+ , m_xRbAssign(new
formula::RefButton(m_xBuilder->weld_button(u"rangeref"_ustr)))
+ , m_xBox(m_xBuilder->weld_container(u"box"_ustr))
, m_xFilterCtr(new SvxTPFilter(m_xBox.get()))
{
m_xEdAssign->SetReferences(this, nullptr);
diff --git a/sc/source/ui/miscdlgs/inscldlg.cxx
b/sc/source/ui/miscdlgs/inscldlg.cxx
index cc9d60472e5c..21ede36e8f3b 100644
--- a/sc/source/ui/miscdlgs/inscldlg.cxx
+++ b/sc/source/ui/miscdlgs/inscldlg.cxx
@@ -27,13 +27,14 @@
static sal_uInt8 nInsItemChecked = 0;
ScInsertCellDlg::ScInsertCellDlg(weld::Window* pParent, bool bDisallowCellMove)
- : GenericDialogController(pParent, "modules/scalc/ui/insertcells.ui",
"InsertCellsDialog")
- , m_xBtnCellsDown(m_xBuilder->weld_radio_button("down"))
- , m_xBtnCellsRight(m_xBuilder->weld_radio_button("right"))
- , m_xBtnInsRow(m_xBuilder->weld_radio_button("rows"))
- , m_xBtnInsCol(m_xBuilder->weld_radio_button("cols"))
- , m_xNumberOfRows(m_xBuilder->weld_spin_button("number_of_rows"))
- , m_xNumberOfCols(m_xBuilder->weld_spin_button("number_of_columns"))
+ : GenericDialogController(pParent, u"modules/scalc/ui/insertcells.ui"_ustr,
+ u"InsertCellsDialog"_ustr)
+ , m_xBtnCellsDown(m_xBuilder->weld_radio_button(u"down"_ustr))
+ , m_xBtnCellsRight(m_xBuilder->weld_radio_button(u"right"_ustr))
+ , m_xBtnInsRow(m_xBuilder->weld_radio_button(u"rows"_ustr))
+ , m_xBtnInsCol(m_xBuilder->weld_radio_button(u"cols"_ustr))
+ , m_xNumberOfRows(m_xBuilder->weld_spin_button(u"number_of_rows"_ustr))
+ , m_xNumberOfCols(m_xBuilder->weld_spin_button(u"number_of_columns"_ustr))
{
const ScViewData* pViewData = ScDocShell::GetViewData();
if (pViewData &&
pViewData->GetDocument().IsLayoutRTL(pViewData->GetTabNo()))
diff --git a/sc/source/ui/miscdlgs/inscodlg.cxx
b/sc/source/ui/miscdlgs/inscodlg.cxx
index 1bff0777792b..8eb5c5d85681 100644
--- a/sc/source/ui/miscdlgs/inscodlg.cxx
+++ b/sc/source/ui/miscdlgs/inscodlg.cxx
@@ -75,37 +75,37 @@ void ScInsertContentsDlg::storeFlagsInRegistry()
ScInsertContentsDlg::ScInsertContentsDlg(weld::Window* pParent,
const OUString* pStrTitle )
- : GenericDialogController(pParent, "modules/scalc/ui/pastespecial.ui",
"PasteSpecial")
+ : GenericDialogController(pParent,
u"modules/scalc/ui/pastespecial.ui"_ustr, u"PasteSpecial"_ustr)
, bOtherDoc(false)
, bFillMode(false)
, bChangeTrack(false)
, bMoveDownDisabled(false)
, bMoveRightDisabled(false)
- , mxBtnInsAll(m_xBuilder->weld_check_button("paste_all"))
- , mxBtnInsStrings(m_xBuilder->weld_check_button("text"))
- , mxBtnInsNumbers(m_xBuilder->weld_check_button("numbers"))
- , mxBtnInsDateTime(m_xBuilder->weld_check_button("datetime"))
- , mxBtnInsFormulas(m_xBuilder->weld_check_button("formulas"))
- , mxBtnInsNotes(m_xBuilder->weld_check_button("comments"))
- , mxBtnInsAttrs(m_xBuilder->weld_check_button("formats"))
- , mxBtnInsObjects(m_xBuilder->weld_check_button("objects"))
- , mxBtnSkipEmptyCells(m_xBuilder->weld_check_button("skip_empty"))
- , mxBtnTranspose(m_xBuilder->weld_check_button("transpose"))
- , mxBtnLink(m_xBuilder->weld_check_button("link"))
- , mxRbNoOp(m_xBuilder->weld_radio_button("none"))
- , mxRbAdd(m_xBuilder->weld_radio_button("add"))
- , mxRbSub(m_xBuilder->weld_radio_button("subtract"))
- , mxRbMul(m_xBuilder->weld_radio_button("multiply"))
- , mxRbDiv(m_xBuilder->weld_radio_button("divide"))
- , mxRbMoveNone(m_xBuilder->weld_radio_button("no_shift"))
- , mxRbMoveDown(m_xBuilder->weld_radio_button("move_down"))
- , mxRbMoveRight(m_xBuilder->weld_radio_button("move_right"))
- ,
mxBtnShortCutPasteValuesOnly(m_xBuilder->weld_button("paste_values_only"))
- ,
mxBtnShortCutPasteValuesFormats(m_xBuilder->weld_button("paste_values_formats"))
- , mxBtnShortCutPasteTranspose(m_xBuilder->weld_button("paste_transpose"))
- , mxBtnShortCutPasteFormats(m_xBuilder->weld_button("paste_formats"))
- , mxOKBtn(m_xBuilder->weld_button("ok"))
- , mxImmediately(m_xBuilder->weld_check_button("cbImmediately"))
+ , mxBtnInsAll(m_xBuilder->weld_check_button(u"paste_all"_ustr))
+ , mxBtnInsStrings(m_xBuilder->weld_check_button(u"text"_ustr))
+ , mxBtnInsNumbers(m_xBuilder->weld_check_button(u"numbers"_ustr))
+ , mxBtnInsDateTime(m_xBuilder->weld_check_button(u"datetime"_ustr))
+ , mxBtnInsFormulas(m_xBuilder->weld_check_button(u"formulas"_ustr))
+ , mxBtnInsNotes(m_xBuilder->weld_check_button(u"comments"_ustr))
+ , mxBtnInsAttrs(m_xBuilder->weld_check_button(u"formats"_ustr))
+ , mxBtnInsObjects(m_xBuilder->weld_check_button(u"objects"_ustr))
+ , mxBtnSkipEmptyCells(m_xBuilder->weld_check_button(u"skip_empty"_ustr))
+ , mxBtnTranspose(m_xBuilder->weld_check_button(u"transpose"_ustr))
+ , mxBtnLink(m_xBuilder->weld_check_button(u"link"_ustr))
+ , mxRbNoOp(m_xBuilder->weld_radio_button(u"none"_ustr))
+ , mxRbAdd(m_xBuilder->weld_radio_button(u"add"_ustr))
+ , mxRbSub(m_xBuilder->weld_radio_button(u"subtract"_ustr))
+ , mxRbMul(m_xBuilder->weld_radio_button(u"multiply"_ustr))
+ , mxRbDiv(m_xBuilder->weld_radio_button(u"divide"_ustr))
+ , mxRbMoveNone(m_xBuilder->weld_radio_button(u"no_shift"_ustr))
+ , mxRbMoveDown(m_xBuilder->weld_radio_button(u"move_down"_ustr))
+ , mxRbMoveRight(m_xBuilder->weld_radio_button(u"move_right"_ustr))
+ ,
mxBtnShortCutPasteValuesOnly(m_xBuilder->weld_button(u"paste_values_only"_ustr))
+ ,
mxBtnShortCutPasteValuesFormats(m_xBuilder->weld_button(u"paste_values_formats"_ustr))
+ ,
mxBtnShortCutPasteTranspose(m_xBuilder->weld_button(u"paste_transpose"_ustr))
+ , mxBtnShortCutPasteFormats(m_xBuilder->weld_button(u"paste_formats"_ustr))
+ , mxOKBtn(m_xBuilder->weld_button(u"ok"_ustr))
+ , mxImmediately(m_xBuilder->weld_check_button(u"cbImmediately"_ustr))
{
if (pStrTitle)
m_xDialog->set_title(*pStrTitle);
diff --git a/sc/source/ui/miscdlgs/instbdlg.cxx
b/sc/source/ui/miscdlgs/instbdlg.cxx
index ae81f4e3c17b..8e34c44a4e7f 100644
--- a/sc/source/ui/miscdlgs/instbdlg.cxx
+++ b/sc/source/ui/miscdlgs/instbdlg.cxx
@@ -34,25 +34,25 @@
#include <instbdlg.hxx>
ScInsertTableDlg::ScInsertTableDlg(weld::Window* pParent, ScViewData& rData,
SCTAB nTabCount, bool bFromFile)
- : GenericDialogController(pParent, "modules/scalc/ui/insertsheet.ui",
"InsertSheetDialog")
+ : GenericDialogController(pParent,
u"modules/scalc/ui/insertsheet.ui"_ustr, u"InsertSheetDialog"_ustr)
, aBrowseTimer("ScInsertTableDlg aBrowseTimer")
, rViewData(rData)
, rDoc(rData.GetDocument())
, bMustClose(false)
, nSelTabIndex(0)
, nTableCount(nTabCount)
- , m_xBtnBefore(m_xBuilder->weld_radio_button("before"))
- , m_xBtnNew(m_xBuilder->weld_radio_button("new"))
- , m_xBtnFromFile(m_xBuilder->weld_radio_button("fromfile"))
- , m_xFtCount(m_xBuilder->weld_label("countft"))
- , m_xNfCount(m_xBuilder->weld_spin_button("countnf"))
- , m_xFtName(m_xBuilder->weld_label("nameft"))
- , m_xEdName(m_xBuilder->weld_entry("nameed"))
- , m_xLbTables(m_xBuilder->weld_tree_view("tables"))
- , m_xFtPath(m_xBuilder->weld_label("path"))
- , m_xBtnBrowse(m_xBuilder->weld_button("browse"))
- , m_xBtnLink(m_xBuilder->weld_check_button("link"))
- , m_xBtnOk(m_xBuilder->weld_button("ok"))
+ , m_xBtnBefore(m_xBuilder->weld_radio_button(u"before"_ustr))
+ , m_xBtnNew(m_xBuilder->weld_radio_button(u"new"_ustr))
+ , m_xBtnFromFile(m_xBuilder->weld_radio_button(u"fromfile"_ustr))
+ , m_xFtCount(m_xBuilder->weld_label(u"countft"_ustr))
+ , m_xNfCount(m_xBuilder->weld_spin_button(u"countnf"_ustr))
+ , m_xFtName(m_xBuilder->weld_label(u"nameft"_ustr))
+ , m_xEdName(m_xBuilder->weld_entry(u"nameed"_ustr))
+ , m_xLbTables(m_xBuilder->weld_tree_view(u"tables"_ustr))
+ , m_xFtPath(m_xBuilder->weld_label(u"path"_ustr))
+ , m_xBtnBrowse(m_xBuilder->weld_button(u"browse"_ustr))
+ , m_xBtnLink(m_xBuilder->weld_check_button(u"link"_ustr))
+ , m_xBtnOk(m_xBuilder->weld_button(u"ok"_ustr))
{
m_sSheetDotDotDot = m_xEdName->get_text();
m_xLbTables->set_size_request(-1, m_xLbTables->get_height_rows(8));
diff --git a/sc/source/ui/miscdlgs/lbseldlg.cxx
b/sc/source/ui/miscdlgs/lbseldlg.cxx
index 4c0b592c7073..f3c28ad0e25c 100644
--- a/sc/source/ui/miscdlgs/lbseldlg.cxx
+++ b/sc/source/ui/miscdlgs/lbseldlg.cxx
@@ -22,8 +22,8 @@
#include <lbseldlg.hxx>
ScSelEntryDlg::ScSelEntryDlg(weld::Window* pParent, const
std::vector<OUString> &rEntryList)
- : GenericDialogController(pParent, "modules/scalc/ui/selectrange.ui",
"SelectRangeDialog")
- , m_xLb(m_xBuilder->weld_tree_view("treeview"))
+ : GenericDialogController(pParent,
u"modules/scalc/ui/selectrange.ui"_ustr, u"SelectRangeDialog"_ustr)
+ , m_xLb(m_xBuilder->weld_tree_view(u"treeview"_ustr))
{
m_xLb->set_size_request(m_xLb->get_approximate_digit_width() * 32,
m_xLb->get_height_rows(8));
diff --git a/sc/source/ui/miscdlgs/linkarea.cxx
b/sc/source/ui/miscdlgs/linkarea.cxx
index e2737c0a5ff6..e265e97007ad 100644
--- a/sc/source/ui/miscdlgs/linkarea.cxx
+++ b/sc/source/ui/miscdlgs/linkarea.cxx
@@ -37,14 +37,14 @@
#include <strings.hrc>
ScLinkedAreaDlg::ScLinkedAreaDlg(weld::Widget* pParent)
- : GenericDialogController(pParent, "modules/scalc/ui/externaldata.ui",
"ExternalDataDialog")
- , m_xCbUrl(new SvtURLBox(m_xBuilder->weld_combo_box("url")))
- , m_xBtnBrowse(m_xBuilder->weld_button("browse"))
- , m_xLbRanges(m_xBuilder->weld_tree_view("ranges"))
- , m_xBtnReload(m_xBuilder->weld_check_button("reload"))
- , m_xNfDelay(m_xBuilder->weld_spin_button("delay"))
- , m_xFtSeconds(m_xBuilder->weld_label("secondsft"))
- , m_xBtnOk(m_xBuilder->weld_button("ok"))
+ : GenericDialogController(pParent,
u"modules/scalc/ui/externaldata.ui"_ustr, u"ExternalDataDialog"_ustr)
+ , m_xCbUrl(new SvtURLBox(m_xBuilder->weld_combo_box(u"url"_ustr)))
+ , m_xBtnBrowse(m_xBuilder->weld_button(u"browse"_ustr))
+ , m_xLbRanges(m_xBuilder->weld_tree_view(u"ranges"_ustr))
+ , m_xBtnReload(m_xBuilder->weld_check_button(u"reload"_ustr))
+ , m_xNfDelay(m_xBuilder->weld_spin_button(u"delay"_ustr))
+ , m_xFtSeconds(m_xBuilder->weld_label(u"secondsft"_ustr))
+ , m_xBtnOk(m_xBuilder->weld_button(u"ok"_ustr))
{
m_xLbRanges->set_selection_mode(SelectionMode::Multiple);
@@ -243,7 +243,7 @@ void ScLinkedAreaDlg::UpdateSourceRanges()
if (pFilter && pFilter->GetFilterName() == SC_TEXT_CSV_FILTER_NAME)
{
// Insert dummy All range to have something selectable.
- m_xLbRanges->append_text("CSV_all");
+ m_xLbRanges->append_text(u"CSV_all"_ustr);
}
// tdf#142600 - list tables in order of their appearance in the
document's source
diff --git a/sc/source/ui/miscdlgs/mergecellsdialog.cxx
b/sc/source/ui/miscdlgs/mergecellsdialog.cxx
index 2bfcc5da3b9b..cedcf6777b46 100644
--- a/sc/source/ui/miscdlgs/mergecellsdialog.cxx
+++ b/sc/source/ui/miscdlgs/mergecellsdialog.cxx
@@ -11,10 +11,11 @@
#include <mergecellsdialog.hxx>
ScMergeCellsDialog::ScMergeCellsDialog(weld::Window* pParent)
- : GenericDialogController(pParent, "modules/scalc/ui/mergecellsdialog.ui",
"MergeCellsDialog")
- , m_xRBMoveContent(m_xBuilder->weld_radio_button("move-cells-radio"))
- , m_xRBKeepContent(m_xBuilder->weld_radio_button("keep-content-radio"))
- , m_xRBEmptyContent(m_xBuilder->weld_radio_button("empty-cells-radio"))
+ : GenericDialogController(pParent,
u"modules/scalc/ui/mergecellsdialog.ui"_ustr,
+ u"MergeCellsDialog"_ustr)
+ , m_xRBMoveContent(m_xBuilder->weld_radio_button(u"move-cells-radio"_ustr))
+ ,
m_xRBKeepContent(m_xBuilder->weld_radio_button(u"keep-content-radio"_ustr))
+ ,
m_xRBEmptyContent(m_xBuilder->weld_radio_button(u"empty-cells-radio"_ustr))
{
m_xRBKeepContent->set_active(true);
}
diff --git a/sc/source/ui/miscdlgs/mtrindlg.cxx
b/sc/source/ui/miscdlgs/mtrindlg.cxx
index a203a3710d09..b207eb8523a4 100644
--- a/sc/source/ui/miscdlgs/mtrindlg.cxx
+++ b/sc/source/ui/miscdlgs/mtrindlg.cxx
@@ -31,8 +31,8 @@ ScMetricInputDlg::ScMetricInputDlg( weld::Window*
pParent,
tools::Long nMinimum)
: GenericDialogController(pParent, "modules/scalc/ui/" +
sDialogName.toAsciiLowerCase() + ".ui", sDialogName)
- , m_xEdValue(m_xBuilder->weld_metric_spin_button("value", FieldUnit::CM))
- , m_xBtnDefVal(m_xBuilder->weld_check_button("default"))
+ , m_xEdValue(m_xBuilder->weld_metric_spin_button(u"value"_ustr,
FieldUnit::CM))
+ , m_xBtnDefVal(m_xBuilder->weld_check_button(u"default"_ustr))
{
m_xBtnDefVal->connect_toggled(LINK(this, ScMetricInputDlg, SetDefValHdl));
m_xEdValue->connect_value_changed(LINK( this, ScMetricInputDlg,
ModifyHdl));
diff --git a/sc/source/ui/miscdlgs/mvtabdlg.cxx
b/sc/source/ui/miscdlgs/mvtabdlg.cxx
index fe2b9d211104..822313b046f6 100644
--- a/sc/source/ui/miscdlgs/mvtabdlg.cxx
+++ b/sc/source/ui/miscdlgs/mvtabdlg.cxx
@@ -29,7 +29,8 @@
#include <tabvwsh.hxx>
ScMoveTableDlg::ScMoveTableDlg(weld::Window* pParent, OUString aDefault)
- : GenericDialogController(pParent, "modules/scalc/ui/movecopysheet.ui",
"MoveCopySheetDialog")
+ : GenericDialogController(pParent,
u"modules/scalc/ui/movecopysheet.ui"_ustr,
+ u"MoveCopySheetDialog"_ustr)
, maDefaultName(std::move(aDefault))
, mnCurrentDocPos(0)
, nDocument(0)
@@ -37,17 +38,17 @@ ScMoveTableDlg::ScMoveTableDlg(weld::Window* pParent,
OUString aDefault)
, bCopyTable(false)
, bRenameTable(false)
, mbEverEdited(false)
- , m_xBtnMove(m_xBuilder->weld_radio_button("move"))
- , m_xBtnCopy(m_xBuilder->weld_radio_button("copy"))
- , m_xFtDoc(m_xBuilder->weld_label("toDocumentLabel"))
- , m_xLbDoc(m_xBuilder->weld_combo_box("toDocument"))
- , m_xLbTable(m_xBuilder->weld_tree_view("insertBefore"))
- , m_xEdTabName(m_xBuilder->weld_entry("newName"))
- , m_xFtWarn(m_xBuilder->weld_label("newNameWarn"))
- , m_xBtnOk(m_xBuilder->weld_button("ok"))
- , m_xUnusedLabel(m_xBuilder->weld_label("warnunused"))
- , m_xEmptyLabel(m_xBuilder->weld_label("warnempty"))
- , m_xInvalidLabel(m_xBuilder->weld_label("warninvalid"))
+ , m_xBtnMove(m_xBuilder->weld_radio_button(u"move"_ustr))
+ , m_xBtnCopy(m_xBuilder->weld_radio_button(u"copy"_ustr))
+ , m_xFtDoc(m_xBuilder->weld_label(u"toDocumentLabel"_ustr))
+ , m_xLbDoc(m_xBuilder->weld_combo_box(u"toDocument"_ustr))
+ , m_xLbTable(m_xBuilder->weld_tree_view(u"insertBefore"_ustr))
+ , m_xEdTabName(m_xBuilder->weld_entry(u"newName"_ustr))
+ , m_xFtWarn(m_xBuilder->weld_label(u"newNameWarn"_ustr))
+ , m_xBtnOk(m_xBuilder->weld_button(u"ok"_ustr))
+ , m_xUnusedLabel(m_xBuilder->weld_label(u"warnunused"_ustr))
+ , m_xEmptyLabel(m_xBuilder->weld_label(u"warnempty"_ustr))
+ , m_xInvalidLabel(m_xBuilder->weld_label(u"warninvalid"_ustr))
{
assert(m_xLbDoc->get_count() == 2);
msCurrentDoc = m_xLbDoc->get_text(0);
diff --git a/sc/source/ui/miscdlgs/namecrea.cxx
b/sc/source/ui/miscdlgs/namecrea.cxx
index 334b89d8ba77..269da6efb1cf 100644
--- a/sc/source/ui/miscdlgs/namecrea.cxx
+++ b/sc/source/ui/miscdlgs/namecrea.cxx
@@ -22,11 +22,12 @@
#include <namecrea.hxx>
ScNameCreateDlg::ScNameCreateDlg(weld::Window* pParent, CreateNameFlags nFlags)
- : GenericDialogController(pParent,
"modules/scalc/ui/createnamesdialog.ui", "CreateNamesDialog")
- , m_xTopBox(m_xBuilder->weld_check_button("top"))
- , m_xLeftBox(m_xBuilder->weld_check_button("left"))
- , m_xBottomBox(m_xBuilder->weld_check_button("bottom"))
- , m_xRightBox(m_xBuilder->weld_check_button("right"))
+ : GenericDialogController(pParent,
u"modules/scalc/ui/createnamesdialog.ui"_ustr,
+ u"CreateNamesDialog"_ustr)
+ , m_xTopBox(m_xBuilder->weld_check_button(u"top"_ustr))
+ , m_xLeftBox(m_xBuilder->weld_check_button(u"left"_ustr))
+ , m_xBottomBox(m_xBuilder->weld_check_button(u"bottom"_ustr))
+ , m_xRightBox(m_xBuilder->weld_check_button(u"right"_ustr))
{
m_xTopBox->set_active(bool(nFlags & CreateNameFlags::Top));
m_xLeftBox->set_active(bool(nFlags & CreateNameFlags::Left));
diff --git a/sc/source/ui/miscdlgs/optsolver.cxx
b/sc/source/ui/miscdlgs/optsolver.cxx
index ba3a2ac070e8..3a9d319bf015 100644
--- a/sc/source/ui/miscdlgs/optsolver.cxx
+++ b/sc/source/ui/miscdlgs/optsolver.cxx
@@ -47,9 +47,9 @@
using namespace com::sun::star;
ScSolverProgressDialog::ScSolverProgressDialog(weld::Window* pParent)
- : GenericDialogController(pParent,
"modules/scalc/ui/solverprogressdialog.ui",
- "SolverProgressDialog")
- , m_xFtTime(m_xBuilder->weld_label("progress"))
+ : GenericDialogController(pParent,
u"modules/scalc/ui/solverprogressdialog.ui"_ustr,
+ u"SolverProgressDialog"_ustr)
+ , m_xFtTime(m_xBuilder->weld_label(u"progress"_ustr))
{
}
@@ -70,8 +70,8 @@ void ScSolverProgressDialog::SetTimeLimit( sal_Int32 nSeconds
)
}
ScSolverNoSolutionDialog::ScSolverNoSolutionDialog(weld::Window* pParent,
const OUString& rErrorText)
- : GenericDialogController(pParent, "modules/scalc/ui/nosolutiondialog.ui",
"NoSolutionDialog")
- , m_xFtErrorText(m_xBuilder->weld_label("error"))
+ : GenericDialogController(pParent,
u"modules/scalc/ui/nosolutiondialog.ui"_ustr, u"NoSolutionDialog"_ustr)
+ , m_xFtErrorText(m_xBuilder->weld_label(u"error"_ustr))
{
m_xFtErrorText->set_label(rErrorText);
}
@@ -81,10 +81,10 @@ ScSolverNoSolutionDialog::~ScSolverNoSolutionDialog()
}
ScSolverSuccessDialog::ScSolverSuccessDialog(weld::Window* pParent,
std::u16string_view rSolution)
- : GenericDialogController(pParent,
"modules/scalc/ui/solversuccessdialog.ui", "SolverSuccessDialog")
- , m_xFtResult(m_xBuilder->weld_label("result"))
- , m_xBtnOk(m_xBuilder->weld_button("ok"))
- , m_xBtnCancel(m_xBuilder->weld_button("cancel"))
+ : GenericDialogController(pParent,
u"modules/scalc/ui/solversuccessdialog.ui"_ustr, u"SolverSuccessDialog"_ustr)
+ , m_xFtResult(m_xBuilder->weld_label(u"result"_ustr))
+ , m_xBtnOk(m_xBuilder->weld_button(u"ok"_ustr))
+ , m_xBtnCancel(m_xBuilder->weld_button(u"cancel"_ustr))
{
m_xBtnOk->connect_clicked(LINK(this, ScSolverSuccessDialog, ClickHdl));
m_xBtnCancel->connect_clicked(LINK(this, ScSolverSuccessDialog, ClickHdl));
@@ -135,7 +135,7 @@ IMPL_LINK(ScCursorRefEdit, KeyInputHdl, const KeyEvent&,
rKEvt, bool)
ScOptSolverDlg::ScOptSolverDlg(SfxBindings* pB, SfxChildWindow* pCW,
weld::Window* pParent,
ScDocShell* pDocSh, const ScAddress& aCursorPos)
- : ScAnyRefDlgController(pB, pCW, pParent, "modules/scalc/ui/solverdlg.ui",
"SolverDialog")
+ : ScAnyRefDlgController(pB, pCW, pParent,
u"modules/scalc/ui/solverdlg.ui"_ustr, u"SolverDialog"_ustr)
, maInputError(ScResId(STR_INVALIDINPUT))
, maConditionError(ScResId(STR_INVALIDCONDITION))
@@ -145,50 +145,50 @@ ScOptSolverDlg::ScOptSolverDlg(SfxBindings* pB,
SfxChildWindow* pCW, weld::Windo
, mbDlgLostFocus(false)
, nScrollPos(0)
, mpEdActive(nullptr)
- , m_xFtObjectiveCell(m_xBuilder->weld_label("targetlabel"))
- , m_xEdObjectiveCell(new
formula::RefEdit(m_xBuilder->weld_entry("targetedit")))
- , m_xRBObjectiveCell(new
formula::RefButton(m_xBuilder->weld_button("targetbutton")))
- , m_xRbMax(m_xBuilder->weld_radio_button("max"))
- , m_xRbMin(m_xBuilder->weld_radio_button("min"))
- , m_xRbValue(m_xBuilder->weld_radio_button("value"))
- , m_xEdTargetValue(new
formula::RefEdit(m_xBuilder->weld_entry("valueedit")))
- , m_xRBTargetValue(new
formula::RefButton(m_xBuilder->weld_button("valuebutton")))
- , m_xFtVariableCells(m_xBuilder->weld_label("changelabel"))
- , m_xEdVariableCells(new
formula::RefEdit(m_xBuilder->weld_entry("changeedit")))
- , m_xRBVariableCells(new
formula::RefButton(m_xBuilder->weld_button("changebutton")))
- , m_xFtCellRef(m_xBuilder->weld_label("cellreflabel"))
- , m_xEdLeft1(new ScCursorRefEdit(m_xBuilder->weld_entry("ref1edit")))
- , m_xRBLeft1(new formula::RefButton(m_xBuilder->weld_button("ref1button")))
- , m_xLbOp1(m_xBuilder->weld_combo_box("op1list"))
- , m_xFtConstraint(m_xBuilder->weld_label("constraintlabel"))
- , m_xEdRight1(new ScCursorRefEdit(m_xBuilder->weld_entry("val1edit")))
- , m_xRBRight1(new
formula::RefButton(m_xBuilder->weld_button("val1button")))
- , m_xBtnDel1(m_xBuilder->weld_button("del1"))
- , m_xEdLeft2(new ScCursorRefEdit(m_xBuilder->weld_entry("ref2edit")))
- , m_xRBLeft2(new formula::RefButton(m_xBuilder->weld_button("ref2button")))
- , m_xLbOp2(m_xBuilder->weld_combo_box("op2list"))
- , m_xEdRight2(new ScCursorRefEdit(m_xBuilder->weld_entry("val2edit")))
- , m_xRBRight2(new
formula::RefButton(m_xBuilder->weld_button("val2button")))
- , m_xBtnDel2(m_xBuilder->weld_button("del2"))
- , m_xEdLeft3(new ScCursorRefEdit(m_xBuilder->weld_entry("ref3edit")))
- , m_xRBLeft3(new formula::RefButton(m_xBuilder->weld_button("ref3button")))
- , m_xLbOp3(m_xBuilder->weld_combo_box("op3list"))
- , m_xEdRight3(new ScCursorRefEdit(m_xBuilder->weld_entry("val3edit")))
- , m_xRBRight3(new
formula::RefButton(m_xBuilder->weld_button("val3button")))
- , m_xBtnDel3(m_xBuilder->weld_button("del3"))
- , m_xEdLeft4(new ScCursorRefEdit(m_xBuilder->weld_entry("ref4edit")))
- , m_xRBLeft4(new formula::RefButton(m_xBuilder->weld_button("ref4button")))
- , m_xLbOp4(m_xBuilder->weld_combo_box("op4list"))
- , m_xEdRight4(new ScCursorRefEdit(m_xBuilder->weld_entry("val4edit")))
- , m_xRBRight4(new
formula::RefButton(m_xBuilder->weld_button("val4button")))
- , m_xBtnDel4(m_xBuilder->weld_button("del4"))
- , m_xScrollBar(m_xBuilder->weld_scrolled_window("scrollbar", true))
- , m_xBtnOpt(m_xBuilder->weld_button("options"))
- , m_xBtnClose(m_xBuilder->weld_button("close"))
- , m_xBtnSolve(m_xBuilder->weld_button("ok"))
- , m_xBtnResetAll(m_xBuilder->weld_button("resetall"))
- , m_xResultFT(m_xBuilder->weld_label("result"))
- , m_xContents(m_xBuilder->weld_widget("grid"))
+ , m_xFtObjectiveCell(m_xBuilder->weld_label(u"targetlabel"_ustr))
+ , m_xEdObjectiveCell(new
formula::RefEdit(m_xBuilder->weld_entry(u"targetedit"_ustr)))
+ , m_xRBObjectiveCell(new
formula::RefButton(m_xBuilder->weld_button(u"targetbutton"_ustr)))
+ , m_xRbMax(m_xBuilder->weld_radio_button(u"max"_ustr))
+ , m_xRbMin(m_xBuilder->weld_radio_button(u"min"_ustr))
+ , m_xRbValue(m_xBuilder->weld_radio_button(u"value"_ustr))
+ , m_xEdTargetValue(new
formula::RefEdit(m_xBuilder->weld_entry(u"valueedit"_ustr)))
+ , m_xRBTargetValue(new
formula::RefButton(m_xBuilder->weld_button(u"valuebutton"_ustr)))
+ , m_xFtVariableCells(m_xBuilder->weld_label(u"changelabel"_ustr))
+ , m_xEdVariableCells(new
formula::RefEdit(m_xBuilder->weld_entry(u"changeedit"_ustr)))
+ , m_xRBVariableCells(new
formula::RefButton(m_xBuilder->weld_button(u"changebutton"_ustr)))
+ , m_xFtCellRef(m_xBuilder->weld_label(u"cellreflabel"_ustr))
+ , m_xEdLeft1(new ScCursorRefEdit(m_xBuilder->weld_entry(u"ref1edit"_ustr)))
+ , m_xRBLeft1(new
formula::RefButton(m_xBuilder->weld_button(u"ref1button"_ustr)))
+ , m_xLbOp1(m_xBuilder->weld_combo_box(u"op1list"_ustr))
+ , m_xFtConstraint(m_xBuilder->weld_label(u"constraintlabel"_ustr))
+ , m_xEdRight1(new
ScCursorRefEdit(m_xBuilder->weld_entry(u"val1edit"_ustr)))
+ , m_xRBRight1(new
formula::RefButton(m_xBuilder->weld_button(u"val1button"_ustr)))
+ , m_xBtnDel1(m_xBuilder->weld_button(u"del1"_ustr))
+ , m_xEdLeft2(new ScCursorRefEdit(m_xBuilder->weld_entry(u"ref2edit"_ustr)))
+ , m_xRBLeft2(new
formula::RefButton(m_xBuilder->weld_button(u"ref2button"_ustr)))
+ , m_xLbOp2(m_xBuilder->weld_combo_box(u"op2list"_ustr))
+ , m_xEdRight2(new
ScCursorRefEdit(m_xBuilder->weld_entry(u"val2edit"_ustr)))
+ , m_xRBRight2(new
formula::RefButton(m_xBuilder->weld_button(u"val2button"_ustr)))
+ , m_xBtnDel2(m_xBuilder->weld_button(u"del2"_ustr))
+ , m_xEdLeft3(new ScCursorRefEdit(m_xBuilder->weld_entry(u"ref3edit"_ustr)))
+ , m_xRBLeft3(new
formula::RefButton(m_xBuilder->weld_button(u"ref3button"_ustr)))
+ , m_xLbOp3(m_xBuilder->weld_combo_box(u"op3list"_ustr))
+ , m_xEdRight3(new
ScCursorRefEdit(m_xBuilder->weld_entry(u"val3edit"_ustr)))
+ , m_xRBRight3(new
formula::RefButton(m_xBuilder->weld_button(u"val3button"_ustr)))
+ , m_xBtnDel3(m_xBuilder->weld_button(u"del3"_ustr))
+ , m_xEdLeft4(new ScCursorRefEdit(m_xBuilder->weld_entry(u"ref4edit"_ustr)))
+ , m_xRBLeft4(new
formula::RefButton(m_xBuilder->weld_button(u"ref4button"_ustr)))
+ , m_xLbOp4(m_xBuilder->weld_combo_box(u"op4list"_ustr))
+ , m_xEdRight4(new
ScCursorRefEdit(m_xBuilder->weld_entry(u"val4edit"_ustr)))
+ , m_xRBRight4(new
formula::RefButton(m_xBuilder->weld_button(u"val4button"_ustr)))
+ , m_xBtnDel4(m_xBuilder->weld_button(u"del4"_ustr))
+ , m_xScrollBar(m_xBuilder->weld_scrolled_window(u"scrollbar"_ustr, true))
+ , m_xBtnOpt(m_xBuilder->weld_button(u"options"_ustr))
+ , m_xBtnClose(m_xBuilder->weld_button(u"close"_ustr))
+ , m_xBtnSolve(m_xBuilder->weld_button(u"ok"_ustr))
+ , m_xBtnResetAll(m_xBuilder->weld_button(u"resetall"_ustr))
+ , m_xResultFT(m_xBuilder->weld_label(u"result"_ustr))
+ , m_xContents(m_xBuilder->weld_widget(u"grid"_ustr))
, m_pSolverSettings(mrDoc.FetchTable(mnCurTab)->GetSolverSettings())
{
m_xEdObjectiveCell->SetReferences(this, m_xFtObjectiveCell.get());
@@ -252,7 +252,7 @@ ScOptSolverDlg::~ScOptSolverDlg()
void ScOptSolverDlg::Init(const ScAddress& rCursorPos)
{
uno::Reference<frame::XFrame> xFrame = GetBindings().GetActiveFrame();
- auto xDelNm =
vcl::CommandInfoProvider::GetXGraphicForCommand(".uno:DeleteRows", xFrame);
+ auto xDelNm =
vcl::CommandInfoProvider::GetXGraphicForCommand(u".uno:DeleteRows"_ustr,
xFrame);
for (weld::Button* pButton : mpDelButton)
pButton->set_image(xDelNm);
diff --git a/sc/source/ui/miscdlgs/protectiondlg.cxx
b/sc/source/ui/miscdlgs/protectiondlg.cxx
index 1353f5f154cc..f96cc72c0346 100644
--- a/sc/source/ui/miscdlgs/protectiondlg.cxx
+++ b/sc/source/ui/miscdlgs/protectiondlg.cxx
@@ -38,21 +38,21 @@ const std::vector<ScTableProtection::Option> aOptions = {
}
ScTableProtectionDlg::ScTableProtectionDlg(weld::Window* pParent)
- : weld::GenericDialogController(pParent,
"modules/scalc/ui/protectsheetdlg.ui", "ProtectSheetDialog")
- , m_xBtnProtect(m_xBuilder->weld_check_button("protect"))
- , m_xPasswords(m_xBuilder->weld_container("passwords"))
- , m_xOptions(m_xBuilder->weld_container("options"))
- , m_xPassword1Edit(m_xBuilder->weld_entry("password1"))
- , m_xPassword2Edit(m_xBuilder->weld_entry("password2"))
- , m_xPasswordStrengthBar(m_xBuilder->weld_level_bar("passwordbar"))
- , m_xOptionsListBox(m_xBuilder->weld_tree_view("checklist"))
- , m_xBtnOk(m_xBuilder->weld_button("ok"))
- , m_xProtected(m_xBuilder->weld_label("protected"))
- , m_xUnprotected(m_xBuilder->weld_label("unprotected"))
- , m_xInsertColumns(m_xBuilder->weld_label("insert-columns"))
- , m_xInsertRows(m_xBuilder->weld_label("insert-rows"))
- , m_xDeleteColumns(m_xBuilder->weld_label("delete-columns"))
- , m_xDeleteRows(m_xBuilder->weld_label("delete-rows"))
+ : weld::GenericDialogController(pParent,
u"modules/scalc/ui/protectsheetdlg.ui"_ustr, u"ProtectSheetDialog"_ustr)
+ , m_xBtnProtect(m_xBuilder->weld_check_button(u"protect"_ustr))
+ , m_xPasswords(m_xBuilder->weld_container(u"passwords"_ustr))
+ , m_xOptions(m_xBuilder->weld_container(u"options"_ustr))
+ , m_xPassword1Edit(m_xBuilder->weld_entry(u"password1"_ustr))
+ , m_xPassword2Edit(m_xBuilder->weld_entry(u"password2"_ustr))
+ , m_xPasswordStrengthBar(m_xBuilder->weld_level_bar(u"passwordbar"_ustr))
+ , m_xOptionsListBox(m_xBuilder->weld_tree_view(u"checklist"_ustr))
+ , m_xBtnOk(m_xBuilder->weld_button(u"ok"_ustr))
+ , m_xProtected(m_xBuilder->weld_label(u"protected"_ustr))
+ , m_xUnprotected(m_xBuilder->weld_label(u"unprotected"_ustr))
+ , m_xInsertColumns(m_xBuilder->weld_label(u"insert-columns"_ustr))
+ , m_xInsertRows(m_xBuilder->weld_label(u"insert-rows"_ustr))
+ , m_xDeleteColumns(m_xBuilder->weld_label(u"delete-columns"_ustr))
+ , m_xDeleteRows(m_xBuilder->weld_label(u"delete-rows"_ustr))
{
m_aSelectLockedCells = m_xProtected->get_label();
m_aSelectUnlockedCells = m_xUnprotected->get_label();
diff --git a/sc/source/ui/miscdlgs/retypepassdlg.cxx
b/sc/source/ui/miscdlgs/retypepassdlg.cxx
index c7b9084a82d9..4dc5808a8bae 100644
--- a/sc/source/ui/miscdlgs/retypepassdlg.cxx
+++ b/sc/source/ui/miscdlgs/retypepassdlg.cxx
@@ -25,17 +25,18 @@
#include <tabprotection.hxx>
ScRetypePassDlg::ScRetypePassDlg(weld::Window* pParent)
- : GenericDialogController(pParent, "modules/scalc/ui/retypepassdialog.ui",
"RetypePass")
+ : GenericDialogController(pParent,
u"modules/scalc/ui/retypepassdialog.ui"_ustr,
+ u"RetypePass"_ustr)
, maTextNotProtected(ScResId(STR_NOT_PROTECTED))
, maTextNotPassProtected(ScResId(STR_NOT_PASS_PROTECTED))
, maTextHashBad(ScResId(STR_HASH_BAD))
, maTextHashGood(ScResId(STR_HASH_GOOD))
, meDesiredHash(PASSHASH_SHA1)
- , mxBtnOk(m_xBuilder->weld_button("ok"))
- , mxTextDocStatus(m_xBuilder->weld_label("docStatusLabel"))
- , mxBtnRetypeDoc(m_xBuilder->weld_button("retypeDocButton"))
- , mxScrolledWindow(m_xBuilder->weld_scrolled_window("scrolledwindow"))
- , mxSheetsBox(m_xBuilder->weld_container("sheetsBox"))
+ , mxBtnOk(m_xBuilder->weld_button(u"ok"_ustr))
+ , mxTextDocStatus(m_xBuilder->weld_label(u"docStatusLabel"_ustr))
+ , mxBtnRetypeDoc(m_xBuilder->weld_button(u"retypeDocButton"_ustr))
+ ,
mxScrolledWindow(m_xBuilder->weld_scrolled_window(u"scrolledwindow"_ustr))
+ , mxSheetsBox(m_xBuilder->weld_container(u"sheetsBox"_ustr))
{
mxScrolledWindow->set_size_request(mxScrolledWindow->get_approximate_digit_width()
* 46,
mxScrolledWindow->get_text_height() *
10);
@@ -54,11 +55,11 @@ short ScRetypePassDlg::run()
}
PassFragment::PassFragment(weld::Widget* pParent)
- : m_xBuilder(Application::CreateBuilder(pParent,
"modules/scalc/ui/passfragment.ui"))
- , m_xSheetsBox(m_xBuilder->weld_container("PassEntry"))
- , m_xName(m_xBuilder->weld_label("name"))
- , m_xStatus(m_xBuilder->weld_label("status"))
- , m_xButton(m_xBuilder->weld_button("button"))
+ : m_xBuilder(Application::CreateBuilder(pParent,
u"modules/scalc/ui/passfragment.ui"_ustr))
+ , m_xSheetsBox(m_xBuilder->weld_container(u"PassEntry"_ustr))
+ , m_xName(m_xBuilder->weld_label(u"name"_ustr))
+ , m_xStatus(m_xBuilder->weld_label(u"status"_ustr))
+ , m_xButton(m_xBuilder->weld_button(u"button"_ustr))
{
m_xButton->set_label(ScResId(STR_RETYPE));
}
@@ -265,16 +266,16 @@ IMPL_LINK(ScRetypePassDlg, RetypeBtnHdl, weld::Button&,
rBtn, void)
}
ScRetypePassInputDlg::ScRetypePassInputDlg(weld::Window* pParent,
ScPassHashProtectable* pProtected)
- : GenericDialogController(pParent,
"modules/scalc/ui/retypepassworddialog.ui",
- "RetypePasswordDialog")
+ : GenericDialogController(pParent,
u"modules/scalc/ui/retypepassworddialog.ui"_ustr,
+ u"RetypePasswordDialog"_ustr)
, m_pProtected(pProtected)
- , m_xBtnOk(m_xBuilder->weld_button("ok"))
- , m_xBtnRetypePassword(m_xBuilder->weld_radio_button("retypepassword"))
- , m_xPasswordGrid(m_xBuilder->weld_widget("passwordgrid"))
- , m_xPassword1Edit(m_xBuilder->weld_entry("newpassEntry"))
- , m_xPassword2Edit(m_xBuilder->weld_entry("confirmpassEntry"))
- , m_xBtnMatchOldPass(m_xBuilder->weld_check_button("mustmatch"))
- , m_xBtnRemovePassword(m_xBuilder->weld_radio_button("removepassword"))
+ , m_xBtnOk(m_xBuilder->weld_button(u"ok"_ustr))
+ ,
m_xBtnRetypePassword(m_xBuilder->weld_radio_button(u"retypepassword"_ustr))
+ , m_xPasswordGrid(m_xBuilder->weld_widget(u"passwordgrid"_ustr))
+ , m_xPassword1Edit(m_xBuilder->weld_entry(u"newpassEntry"_ustr))
+ , m_xPassword2Edit(m_xBuilder->weld_entry(u"confirmpassEntry"_ustr))
+ , m_xBtnMatchOldPass(m_xBuilder->weld_check_button(u"mustmatch"_ustr))
+ ,
m_xBtnRemovePassword(m_xBuilder->weld_radio_button(u"removepassword"_ustr))
{
Init();
}
diff --git a/sc/source/ui/miscdlgs/scuiautofmt.cxx
b/sc/source/ui/miscdlgs/scuiautofmt.cxx
index ecf446081c13..c64373b1dcf2 100644
--- a/sc/source/ui/miscdlgs/scuiautofmt.cxx
+++ b/sc/source/ui/miscdlgs/scuiautofmt.cxx
@@ -39,7 +39,7 @@ ScAutoFormatDlg::ScAutoFormatDlg(weld::Window* pParent,
ScAutoFormat* pAutoFormat,
const ScAutoFormatData* pSelFormatData,
const ScViewData& rViewData)
- : GenericDialogController(pParent, "modules/scalc/ui/autoformattable.ui",
"AutoFormatTableDialog")
+ : GenericDialogController(pParent,
u"modules/scalc/ui/autoformattable.ui"_ustr, u"AutoFormatTableDialog"_ustr)
, aStrTitle(ScResId(STR_ADD_AUTOFORMAT_TITLE))
, aStrLabel(ScResId(STR_ADD_AUTOFORMAT_LABEL))
, aStrClose(ScResId(STR_BTN_AUTOFORMAT_CLOSE))
@@ -50,19 +50,19 @@ ScAutoFormatDlg::ScAutoFormatDlg(weld::Window* pParent,
, nIndex(0)
, bCoreDataChanged(false)
, bFmtInserted(false)
- , m_xLbFormat(m_xBuilder->weld_tree_view("formatlb"))
- , m_xBtnOk(m_xBuilder->weld_button("ok"))
- , m_xBtnCancel(m_xBuilder->weld_button("cancel"))
- , m_xBtnAdd(m_xBuilder->weld_button("add"))
- , m_xBtnRemove(m_xBuilder->weld_button("remove"))
- , m_xBtnRename(m_xBuilder->weld_button("rename"))
- , m_xBtnNumFormat(m_xBuilder->weld_check_button("numformatcb"))
- , m_xBtnBorder(m_xBuilder->weld_check_button("bordercb"))
- , m_xBtnFont(m_xBuilder->weld_check_button("fontcb"))
- , m_xBtnPattern(m_xBuilder->weld_check_button("patterncb"))
- , m_xBtnAlignment(m_xBuilder->weld_check_button("alignmentcb"))
- , m_xBtnAdjust(m_xBuilder->weld_check_button("autofitcb"))
- , m_xWndPreview(new weld::CustomWeld(*m_xBuilder, "preview",
m_aWndPreview))
+ , m_xLbFormat(m_xBuilder->weld_tree_view(u"formatlb"_ustr))
+ , m_xBtnOk(m_xBuilder->weld_button(u"ok"_ustr))
+ , m_xBtnCancel(m_xBuilder->weld_button(u"cancel"_ustr))
+ , m_xBtnAdd(m_xBuilder->weld_button(u"add"_ustr))
+ , m_xBtnRemove(m_xBuilder->weld_button(u"remove"_ustr))
+ , m_xBtnRename(m_xBuilder->weld_button(u"rename"_ustr))
+ , m_xBtnNumFormat(m_xBuilder->weld_check_button(u"numformatcb"_ustr))
+ , m_xBtnBorder(m_xBuilder->weld_check_button(u"bordercb"_ustr))
+ , m_xBtnFont(m_xBuilder->weld_check_button(u"fontcb"_ustr))
+ , m_xBtnPattern(m_xBuilder->weld_check_button(u"patterncb"_ustr))
+ , m_xBtnAlignment(m_xBuilder->weld_check_button(u"alignmentcb"_ustr))
+ , m_xBtnAdjust(m_xBuilder->weld_check_button(u"autofitcb"_ustr))
+ , m_xWndPreview(new weld::CustomWeld(*m_xBuilder, u"preview"_ustr,
m_aWndPreview))
{
m_aWndPreview.DetectRTL(rViewData);
diff --git a/sc/source/ui/miscdlgs/sharedocdlg.cxx
b/sc/source/ui/miscdlgs/sharedocdlg.cxx
index 30e55c9293b5..34044fa4f87d 100644
--- a/sc/source/ui/miscdlgs/sharedocdlg.cxx
+++ b/sc/source/ui/miscdlgs/sharedocdlg.cxx
@@ -50,15 +50,15 @@ IMPL_LINK(ScShareDocumentDlg, SizeAllocated, const Size&,
rSize, void)
ScShareDocumentDlg::ScShareDocumentDlg(weld::Window* pParent, const
ScViewData* pViewData)
- : GenericDialogController(pParent, "modules/scalc/ui/sharedocumentdlg.ui",
- "ShareDocumentDialog")
+ : GenericDialogController(pParent,
u"modules/scalc/ui/sharedocumentdlg.ui"_ustr,
+ u"ShareDocumentDialog"_ustr)
, m_aStrNoUserData(ScResId(STR_NO_USER_DATA_AVAILABLE))
, m_aStrUnknownUser(ScResId(STR_UNKNOWN_USER_CONFLICT))
, m_aStrExclusiveAccess(ScResId(STR_EXCLUSIVE_ACCESS))
, mpDocShell(nullptr)
- , m_xCbShare(m_xBuilder->weld_check_button("share"))
- , m_xFtWarning(m_xBuilder->weld_label("warning"))
- , m_xLbUsers(m_xBuilder->weld_tree_view("users"))
+ , m_xCbShare(m_xBuilder->weld_check_button(u"share"_ustr))
+ , m_xFtWarning(m_xBuilder->weld_label(u"warning"_ustr))
+ , m_xLbUsers(m_xBuilder->weld_tree_view(u"users"_ustr))
{
OSL_ENSURE( pViewData, "ScShareDocumentDlg CTOR: mpViewData is null!" );
diff --git a/sc/source/ui/miscdlgs/shtabdlg.cxx
b/sc/source/ui/miscdlgs/shtabdlg.cxx
index 23dc981e6a08..07b606b4dbd5 100644
--- a/sc/source/ui/miscdlgs/shtabdlg.cxx
+++ b/sc/source/ui/miscdlgs/shtabdlg.cxx
@@ -22,9 +22,10 @@
#include <shtabdlg.hxx>
ScShowTabDlg::ScShowTabDlg(weld::Window* pParent)
- : GenericDialogController(pParent, "modules/scalc/ui/showsheetdialog.ui",
"ShowSheetDialog")
- , m_xFrame(m_xBuilder->weld_frame("frame"))
- , m_xLb(m_xBuilder->weld_tree_view("treeview"))
+ : GenericDialogController(pParent,
u"modules/scalc/ui/showsheetdialog.ui"_ustr,
+ u"ShowSheetDialog"_ustr)
+ , m_xFrame(m_xBuilder->weld_frame(u"frame"_ustr))
+ , m_xLb(m_xBuilder->weld_tree_view(u"treeview"_ustr))
{
m_xLb->set_selection_mode(SelectionMode::Multiple);
m_xLb->set_size_request(-1, m_xLb->get_height_rows(10));
diff --git a/sc/source/ui/miscdlgs/simpref.cxx
b/sc/source/ui/miscdlgs/simpref.cxx
index cb98e263f3af..b4f0ac3b8b5e 100644
--- a/sc/source/ui/miscdlgs/simpref.cxx
+++ b/sc/source/ui/miscdlgs/simpref.cxx
@@ -22,16 +22,16 @@
#include <simpref.hxx>
ScSimpleRefDlg::ScSimpleRefDlg(SfxBindings* pB, SfxChildWindow* pCW,
weld::Window* pParent)
- : ScAnyRefDlgController(pB, pCW, pParent,
"modules/scalc/ui/simplerefdialog.ui", "SimpleRefDialog")
+ : ScAnyRefDlgController(pB, pCW, pParent,
u"modules/scalc/ui/simplerefdialog.ui"_ustr, u"SimpleRefDialog"_ustr)
, bAutoReOpen(true)
, bCloseOnButtonUp(false)
, bSingleCell(false)
, bMultiSelection(false)
- , m_xFtAssign(m_xBuilder->weld_label("area"))
- , m_xEdAssign(new formula::RefEdit(m_xBuilder->weld_entry("assign")))
- , m_xRbAssign(new formula::RefButton(m_xBuilder->weld_button("assignref")))
- , m_xBtnOk(m_xBuilder->weld_button("ok"))
- , m_xBtnCancel(m_xBuilder->weld_button("cancel"))
+ , m_xFtAssign(m_xBuilder->weld_label(u"area"_ustr))
+ , m_xEdAssign(new formula::RefEdit(m_xBuilder->weld_entry(u"assign"_ustr)))
+ , m_xRbAssign(new
formula::RefButton(m_xBuilder->weld_button(u"assignref"_ustr)))
+ , m_xBtnOk(m_xBuilder->weld_button(u"ok"_ustr))
+ , m_xBtnCancel(m_xBuilder->weld_button(u"cancel"_ustr))
{
m_xEdAssign->SetReferences(this, m_xFtAssign.get());
m_xRbAssign->SetReferences(this, m_xEdAssign.get());
diff --git a/sc/source/ui/miscdlgs/solveroptions.cxx
b/sc/source/ui/miscdlgs/solveroptions.cxx
index 81f5c8b7b4ce..15e91f65f6e0 100644
--- a/sc/source/ui/miscdlgs/solveroptions.cxx
+++ b/sc/source/ui/miscdlgs/solveroptions.cxx
@@ -60,13 +60,13 @@ ScSolverOptionsDialog::ScSolverOptionsDialog(weld::Window*
pParent,
const uno::Sequence<OUString>& rDescriptions,
OUString aEngine,
const uno::Sequence<beans::PropertyValue>& rProperties
)
- : GenericDialogController(pParent,
"modules/scalc/ui/solveroptionsdialog.ui", "SolverOptionsDialog")
+ : GenericDialogController(pParent,
u"modules/scalc/ui/solveroptionsdialog.ui"_ustr, u"SolverOptionsDialog"_ustr)
, maImplNames(rImplNames)
, maEngine(std::move(aEngine))
, maProperties(rProperties)
- , m_xLbEngine(m_xBuilder->weld_combo_box("engine"))
- , m_xLbSettings(m_xBuilder->weld_tree_view("settings"))
- , m_xBtnEdit(m_xBuilder->weld_button("edit"))
+ , m_xLbEngine(m_xBuilder->weld_combo_box(u"engine"_ustr))
+ , m_xLbSettings(m_xBuilder->weld_tree_view(u"settings"_ustr))
+ , m_xBtnEdit(m_xBuilder->weld_button(u"edit"_ustr))
{
m_xLbSettings->set_size_request(m_xLbSettings->get_approximate_digit_width() *
32,
m_xLbSettings->get_height_rows(12));
@@ -341,9 +341,9 @@ IMPL_LINK_NOARG(ScSolverOptionsDialog, SettingsSelHdl,
weld::TreeView&, void)
}
ScSolverIntegerDialog::ScSolverIntegerDialog(weld::Window * pParent)
- : GenericDialogController(pParent, "modules/scalc/ui/integerdialog.ui",
"IntegerDialog")
- , m_xFrame(m_xBuilder->weld_frame("frame"))
- , m_xNfValue(m_xBuilder->weld_spin_button("value"))
+ : GenericDialogController(pParent,
u"modules/scalc/ui/integerdialog.ui"_ustr, u"IntegerDialog"_ustr)
+ , m_xFrame(m_xBuilder->weld_frame(u"frame"_ustr))
+ , m_xNfValue(m_xBuilder->weld_spin_button(u"value"_ustr))
{
}
@@ -372,9 +372,9 @@ sal_Int32 ScSolverIntegerDialog::GetValue() const
}
ScSolverValueDialog::ScSolverValueDialog(weld::Window* pParent)
- : GenericDialogController(pParent, "modules/scalc/ui/doubledialog.ui",
"DoubleDialog")
- , m_xFrame(m_xBuilder->weld_frame("frame"))
- , m_xEdValue(m_xBuilder->weld_entry("value"))
+ : GenericDialogController(pParent,
u"modules/scalc/ui/doubledialog.ui"_ustr, u"DoubleDialog"_ustr)
+ , m_xFrame(m_xBuilder->weld_frame(u"frame"_ustr))
+ , m_xEdValue(m_xBuilder->weld_entry(u"value"_ustr))
, m_fMaxValue(std::numeric_limits<double>::quiet_NaN())
{
}
diff --git a/sc/source/ui/miscdlgs/solvrdlg.cxx
b/sc/source/ui/miscdlgs/solvrdlg.cxx
index f7cd8e27b695..824f4bfad752 100644
--- a/sc/source/ui/miscdlgs/solvrdlg.cxx
+++ b/sc/source/ui/miscdlgs/solvrdlg.cxx
@@ -35,7 +35,7 @@ ScSolverDlg::ScSolverDlg( SfxBindings* pB, SfxChildWindow*
pCW, weld::Window* pP
ScDocument* pDocument,
const ScAddress& aCursorPos )
- : ScAnyRefDlgController(pB, pCW, pParent,
"modules/scalc/ui/goalseekdlg.ui", "GoalSeekDialog")
+ : ScAnyRefDlgController(pB, pCW, pParent,
u"modules/scalc/ui/goalseekdlg.ui"_ustr, u"GoalSeekDialog"_ustr)
, theFormulaCell(aCursorPos)
, theVariableCell(aCursorPos)
, pDoc(pDocument)
@@ -46,15 +46,15 @@ ScSolverDlg::ScSolverDlg( SfxBindings* pB, SfxChildWindow*
pCW, weld::Window* pP
, errMsgNoFormula(ScResId(STR_NOFORMULA))
, errMsgInvalidVal(ScResId(STR_INVALIDVAL))
, m_pEdActive(nullptr)
- , m_xFtFormulaCell(m_xBuilder->weld_label("formulatext"))
- , m_xEdFormulaCell(new
formula::RefEdit(m_xBuilder->weld_entry("formulaedit")))
- , m_xRBFormulaCell(new
formula::RefButton(m_xBuilder->weld_button("formulabutton")))
- , m_xEdTargetVal(m_xBuilder->weld_entry("target"))
- , m_xFtVariableCell(m_xBuilder->weld_label("vartext"))
- , m_xEdVariableCell(new
formula::RefEdit(m_xBuilder->weld_entry("varedit")))
- , m_xRBVariableCell(new
formula::RefButton(m_xBuilder->weld_button("varbutton")))
- , m_xBtnOk(m_xBuilder->weld_button("ok"))
- , m_xBtnCancel(m_xBuilder->weld_button("cancel"))
+ , m_xFtFormulaCell(m_xBuilder->weld_label(u"formulatext"_ustr))
+ , m_xEdFormulaCell(new
formula::RefEdit(m_xBuilder->weld_entry(u"formulaedit"_ustr)))
+ , m_xRBFormulaCell(new
formula::RefButton(m_xBuilder->weld_button(u"formulabutton"_ustr)))
+ , m_xEdTargetVal(m_xBuilder->weld_entry(u"target"_ustr))
+ , m_xFtVariableCell(m_xBuilder->weld_label(u"vartext"_ustr))
+ , m_xEdVariableCell(new
formula::RefEdit(m_xBuilder->weld_entry(u"varedit"_ustr)))
+ , m_xRBVariableCell(new
formula::RefButton(m_xBuilder->weld_button(u"varbutton"_ustr)))
+ , m_xBtnOk(m_xBuilder->weld_button(u"ok"_ustr))
+ , m_xBtnCancel(m_xBuilder->weld_button(u"cancel"_ustr))
{
m_xEdFormulaCell->SetReferences(this, m_xFtFormulaCell.get());
m_xRBFormulaCell->SetReferences(this, m_xEdFormulaCell.get());
diff --git a/sc/source/ui/miscdlgs/strindlg.cxx
b/sc/source/ui/miscdlgs/strindlg.cxx
index 18112a69347e..3751959f785d 100644
--- a/sc/source/ui/miscdlgs/strindlg.cxx
+++ b/sc/source/ui/miscdlgs/strindlg.cxx
@@ -26,10 +26,10 @@ ScStringInputDlg::ScStringInputDlg(weld::Window* pParent,
const OUString& rEditTitle,
const OUString& rDefault,
const OUString& rHelpId, const OUString&
rEditHelpId)
- : GenericDialogController(pParent, "modules/scalc/ui/inputstringdialog.ui",
- "InputStringDialog")
- , m_xLabel(m_xBuilder->weld_label("description_label"))
- , m_xEdInput(m_xBuilder->weld_entry("name_entry"))
+ : GenericDialogController(pParent,
u"modules/scalc/ui/inputstringdialog.ui"_ustr,
+ u"InputStringDialog"_ustr)
+ , m_xLabel(m_xBuilder->weld_label(u"description_label"_ustr))
+ , m_xEdInput(m_xBuilder->weld_entry(u"name_entry"_ustr))
{
m_xLabel->set_label(rEditTitle);
m_xDialog->set_title(rTitle);
diff --git a/sc/source/ui/miscdlgs/tabbgcolordlg.cxx
b/sc/source/ui/miscdlgs/tabbgcolordlg.cxx
index 7a346a4e3bb7..d87a7bdacd2f 100644
--- a/sc/source/ui/miscdlgs/tabbgcolordlg.cxx
+++ b/sc/source/ui/miscdlgs/tabbgcolordlg.cxx
@@ -28,12 +28,12 @@
ScTabBgColorDlg::ScTabBgColorDlg(weld::Window* pParent, const OUString& rTitle,
const OUString& rTabBgColorNoColorText, const Color& rDefaultColor)
- : GenericDialogController(pParent, "modules/scalc/ui/tabcolordialog.ui",
"TabColorDialog")
+ : GenericDialogController(pParent,
u"modules/scalc/ui/tabcolordialog.ui"_ustr, u"TabColorDialog"_ustr)
, m_aTabBgColor(rDefaultColor)
- , m_xSelectPalette(m_xBuilder->weld_combo_box("paletteselector"))
- , m_xTabBgColorSet(new
ScTabBgColorValueSet(m_xBuilder->weld_scrolled_window("colorsetwin", true)))
- , m_xTabBgColorSetWin(new weld::CustomWeld(*m_xBuilder, "colorset",
*m_xTabBgColorSet))
- , m_xBtnOk(m_xBuilder->weld_button("ok"))
+ , m_xSelectPalette(m_xBuilder->weld_combo_box(u"paletteselector"_ustr))
+ , m_xTabBgColorSet(new
ScTabBgColorValueSet(m_xBuilder->weld_scrolled_window(u"colorsetwin"_ustr,
true)))
+ , m_xTabBgColorSetWin(new weld::CustomWeld(*m_xBuilder, u"colorset"_ustr,
*m_xTabBgColorSet))
+ , m_xBtnOk(m_xBuilder->weld_button(u"ok"_ustr))
{
m_xTabBgColorSet->SetDialog(this);
m_xTabBgColorSet->SetColCount(SvxColorValueSet::getColumnCount());
diff --git a/sc/source/ui/miscdlgs/tabopdlg.cxx
b/sc/source/ui/miscdlgs/tabopdlg.cxx
index 7e9be6ea820a..56a1eb78c3ee 100644
--- a/sc/source/ui/miscdlgs/tabopdlg.cxx
+++ b/sc/source/ui/miscdlgs/tabopdlg.cxx
@@ -34,8 +34,8 @@
ScTabOpDlg::ScTabOpDlg(SfxBindings* pB, SfxChildWindow* pCW, weld::Window*
pParent,
ScDocument* pDocument,
const ScRefAddress& rCursorPos )
- : ScAnyRefDlgController(pB, pCW, pParent,
"modules/scalc/ui/multipleoperationsdialog.ui",
- "MultipleOperationsDialog")
+ : ScAnyRefDlgController(pB, pCW, pParent,
u"modules/scalc/ui/multipleoperationsdialog.ui"_ustr,
+ u"MultipleOperationsDialog"_ustr)
, theFormulaCell(rCursorPos)
, pDoc(pDocument)
, nCurTab(theFormulaCell.Tab())
@@ -47,17 +47,17 @@ ScTabOpDlg::ScTabOpDlg(SfxBindings* pB, SfxChildWindow*
pCW, weld::Window* pPare
, errMsgNoColFormula(ScResId(STR_NOCOLFORMULA))
, errMsgNoRowFormula(ScResId(STR_NOROWFORMULA))
, m_pEdActive(nullptr)
- , m_xFtFormulaRange(m_xBuilder->weld_label("formulasft"))
- , m_xEdFormulaRange(new
formula::RefEdit(m_xBuilder->weld_entry("formulas")))
- , m_xRBFormulaRange(new
formula::RefButton(m_xBuilder->weld_button("formulasref")))
- , m_xFtRowCell(m_xBuilder->weld_label("rowft"))
- , m_xEdRowCell(new formula::RefEdit(m_xBuilder->weld_entry("row")))
- , m_xRBRowCell(new formula::RefButton(m_xBuilder->weld_button("rowref")))
- , m_xFtColCell(m_xBuilder->weld_label("colft"))
- , m_xEdColCell(new formula::RefEdit(m_xBuilder->weld_entry("col")))
- , m_xRBColCell(new formula::RefButton(m_xBuilder->weld_button("colref")))
- , m_xBtnOk(m_xBuilder->weld_button("ok"))
- , m_xBtnCancel(m_xBuilder->weld_button("cancel"))
+ , m_xFtFormulaRange(m_xBuilder->weld_label(u"formulasft"_ustr))
+ , m_xEdFormulaRange(new
formula::RefEdit(m_xBuilder->weld_entry(u"formulas"_ustr)))
+ , m_xRBFormulaRange(new
formula::RefButton(m_xBuilder->weld_button(u"formulasref"_ustr)))
+ , m_xFtRowCell(m_xBuilder->weld_label(u"rowft"_ustr))
+ , m_xEdRowCell(new formula::RefEdit(m_xBuilder->weld_entry(u"row"_ustr)))
+ , m_xRBRowCell(new
formula::RefButton(m_xBuilder->weld_button(u"rowref"_ustr)))
+ , m_xFtColCell(m_xBuilder->weld_label(u"colft"_ustr))
+ , m_xEdColCell(new formula::RefEdit(m_xBuilder->weld_entry(u"col"_ustr)))
+ , m_xRBColCell(new
formula::RefButton(m_xBuilder->weld_button(u"colref"_ustr)))
+ , m_xBtnOk(m_xBuilder->weld_button(u"ok"_ustr))
+ , m_xBtnCancel(m_xBuilder->weld_button(u"cancel"_ustr))
{
m_xEdFormulaRange->SetReferences(this, m_xFtFormulaRange.get());
m_xRBFormulaRange->SetReferences(this, m_xEdFormulaRange.get());
diff --git a/sc/source/ui/miscdlgs/textdlgs.cxx
b/sc/source/ui/miscdlgs/textdlgs.cxx
index 2cf70d8f5705..4ac869ad06a7 100644
--- a/sc/source/ui/miscdlgs/textdlgs.cxx
+++ b/sc/source/ui/miscdlgs/textdlgs.cxx
@@ -31,18 +31,18 @@
#include <svx/flagsdef.hxx>
ScCharDlg::ScCharDlg(weld::Window* pParent, const SfxItemSet* pAttr, const
SfxObjectShell* pDocShell, bool bDrawText)
- : SfxTabDialogController(pParent, "modules/scalc/ui/chardialog.ui",
"CharDialog", pAttr)
+ : SfxTabDialogController(pParent, u"modules/scalc/ui/chardialog.ui"_ustr,
u"CharDialog"_ustr, pAttr)
, m_rDocShell(*pDocShell)
, m_bDrawText(bDrawText)
{
- AddTabPage("font", RID_SVXPAGE_CHAR_NAME);
- AddTabPage("fonteffects", RID_SVXPAGE_CHAR_EFFECTS);
- AddTabPage("position", RID_SVXPAGE_CHAR_POSITION);
+ AddTabPage(u"font"_ustr, RID_SVXPAGE_CHAR_NAME);
+ AddTabPage(u"fonteffects"_ustr, RID_SVXPAGE_CHAR_EFFECTS);
+ AddTabPage(u"position"_ustr, RID_SVXPAGE_CHAR_POSITION);
if (bDrawText)
- AddTabPage("background", RID_SVXPAGE_BKG);
+ AddTabPage(u"background"_ustr, RID_SVXPAGE_BKG);
else
- RemoveTabPage("background");
+ RemoveTabPage(u"background"_ustr);
}
void ScCharDlg::PageCreated(const OUString& rId, SfxTabPage &rPage)
@@ -71,15 +71,15 @@ void ScCharDlg::PageCreated(const OUString& rId, SfxTabPage
&rPage)
}
ScParagraphDlg::ScParagraphDlg(weld::Window* pParent, const SfxItemSet* pAttr)
- : SfxTabDialogController(pParent, "modules/scalc/ui/paradialog.ui",
"ParagraphDialog", pAttr)
+ : SfxTabDialogController(pParent, u"modules/scalc/ui/paradialog.ui"_ustr,
u"ParagraphDialog"_ustr, pAttr)
{
- AddTabPage("labelTP_PARA_STD", RID_SVXPAGE_STD_PARAGRAPH);
- AddTabPage("labelTP_PARA_ALIGN", RID_SVXPAGE_ALIGN_PARAGRAPH);
+ AddTabPage(u"labelTP_PARA_STD"_ustr, RID_SVXPAGE_STD_PARAGRAPH);
+ AddTabPage(u"labelTP_PARA_ALIGN"_ustr, RID_SVXPAGE_ALIGN_PARAGRAPH);
if (SvtCJKOptions::IsAsianTypographyEnabled() )
- AddTabPage("labelTP_PARA_ASIAN", RID_SVXPAGE_PARA_ASIAN);
+ AddTabPage(u"labelTP_PARA_ASIAN"_ustr, RID_SVXPAGE_PARA_ASIAN);
else
- RemoveTabPage("labelTP_PARA_ASIAN");
- AddTabPage("labelTP_TABULATOR", RID_SVXPAGE_TABULATOR);
+ RemoveTabPage(u"labelTP_PARA_ASIAN"_ustr);
+ AddTabPage(u"labelTP_TABULATOR"_ustr, RID_SVXPAGE_TABULATOR);
}
void ScParagraphDlg::PageCreated(const OUString& rId, SfxTabPage &rPage)
diff --git a/sc/source/ui/miscdlgs/warnbox.cxx
b/sc/source/ui/miscdlgs/warnbox.cxx
index 8bb0a37d1220..60119df4f028 100644
--- a/sc/source/ui/miscdlgs/warnbox.cxx
+++ b/sc/source/ui/miscdlgs/warnbox.cxx
@@ -23,11 +23,11 @@
#include <inputopt.hxx>
ScReplaceWarnBox::ScReplaceWarnBox(weld::Window* pParent)
- : MessageDialogController(pParent,
"modules/scalc/ui/checkwarningdialog.ui",
- "CheckWarningDialog", "ask")
+ : MessageDialogController(pParent,
u"modules/scalc/ui/checkwarningdialog.ui"_ustr,
+ u"CheckWarningDialog"_ustr, u"ask"_ustr)
// By default, the check box is ON, and the user needs to un-check it to
// disable all future warnings.
- , m_xWarningOnBox(m_xBuilder->weld_check_button("ask"))
+ , m_xWarningOnBox(m_xBuilder->weld_check_button(u"ask"_ustr))
{
m_xDialog->set_default_response(RET_YES);
}
