include/svl/hint.hxx | 2
sc/source/ui/dbgui/PivotLayoutDialog.cxx | 56 +++++++++----------
sc/source/ui/dbgui/consdlg.cxx | 36 ++++++------
sc/source/ui/dbgui/csvtablebox.cxx | 8 +-
sc/source/ui/dbgui/dapidata.cxx | 8 +-
sc/source/ui/dbgui/dapitype.cxx | 28 ++++-----
sc/source/ui/dbgui/dbnamdlg.cxx | 38 ++++++-------
sc/source/ui/dbgui/dpgroupdlg.cxx | 40 ++++++-------
sc/source/ui/dbgui/filtdlg.cxx | 86 ++++++++++++++---------------
sc/source/ui/dbgui/pfiltdlg.cxx | 32 +++++------
sc/source/ui/dbgui/pvfundlg.cxx | 90 +++++++++++++++----------------
sc/source/ui/dbgui/scendlg.cxx | 24 ++++----
sc/source/ui/dbgui/scuiasciiopt.cxx | 82 ++++++++++++++--------------
sc/source/ui/dbgui/scuiimoptdlg.cxx | 28 ++++-----
sc/source/ui/dbgui/sfiltdlg.cxx | 38 ++++++-------
sc/source/ui/dbgui/sortdlg.cxx | 18 +++---
sc/source/ui/dbgui/sortkeydlg.cxx | 12 ++--
sc/source/ui/dbgui/subtdlg.cxx | 12 ++--
sc/source/ui/dbgui/textimportoptions.cxx | 16 ++---
sc/source/ui/dbgui/tpsort.cxx | 42 +++++++-------
sc/source/ui/dbgui/tpsubt.cxx | 34 +++++------
sc/source/ui/dbgui/validate.cxx | 40 ++++++-------
sw/inc/unoredline.hxx | 3 -
sw/source/core/unocore/unoredline.cxx | 5 +
24 files changed, 392 insertions(+), 386 deletions(-)
New commits:
commit aea4dd58521b5621463c653a47275808a315edd6
Author: Noel Grandin <noelgran...@gmail.com>
AuthorDate: Mon May 27 21:45:15 2024 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Tue May 28 18:01:46 2024 +0200
avoid dynamic_cast in SwXRedline
Change-Id: Id39e34c0f1b68639d3adf0092d753cb5dfb4cb0d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168125
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/include/svl/hint.hxx b/include/svl/hint.hxx
index 98c37e4b7baa..31564677dd32 100644
--- a/include/svl/hint.hxx
+++ b/include/svl/hint.hxx
@@ -158,6 +158,7 @@ enum class SfxHintId {
SwVirtPageNumHint,
SwAutoFormatUsedHint,
SwFormatField,
+ SwFindRedline,
ThisIsAnSdrHint,
ThisIsAnSfxEventHint
@@ -248,6 +249,7 @@ inline std::basic_ostream<charT, traits> & operator <<(
case SfxHintId::SwCollectTextMarks: return stream << "SwCollectTextMarks";
case SfxHintId::SwCollectTextTOXMarksForLayout: return stream <<
"SwCollectTextTOXMarksForLayout";
case SfxHintId::SwFormatField: return stream << "SwFormatField";
+ case SfxHintId::SwFindRedline: return stream << "SwFindRedline";
case SfxHintId::ThisIsAnSdrHint: return stream << "SdrHint";
default: return stream << "unk(" << std::to_string(int(id)) << ")";
}
diff --git a/sw/inc/unoredline.hxx b/sw/inc/unoredline.hxx
index b0c2dc41cfab..90f9d212a168 100644
--- a/sw/inc/unoredline.hxx
+++ b/sw/inc/unoredline.hxx
@@ -114,7 +114,8 @@ namespace sw
{
const SwRangeRedline& m_rRedline;
SwXRedline** m_ppXRedline;
- FindRedlineHint(const SwRangeRedline& rRedline, SwXRedline**
ppXRedline) : m_rRedline(rRedline), m_ppXRedline(ppXRedline) {}
+ FindRedlineHint(const SwRangeRedline& rRedline, SwXRedline**
ppXRedline)
+ : SfxHint(SfxHintId::SwFindRedline), m_rRedline(rRedline),
m_ppXRedline(ppXRedline) {}
};
}
diff --git a/sw/source/core/unocore/unoredline.cxx
b/sw/source/core/unocore/unoredline.cxx
index b97cc20028b2..414bebbc1056 100644
--- a/sw/source/core/unocore/unoredline.cxx
+++ b/sw/source/core/unocore/unoredline.cxx
@@ -490,7 +490,10 @@ void SwXRedline::Notify( const SfxHint& rHint )
{
m_pDoc = nullptr;
m_pRedline = nullptr;
- } else if(auto pHint = dynamic_cast<const sw::FindRedlineHint*>(&rHint)) {
+ }
+ else if(rHint.GetId() == SfxHintId::SwFindRedline)
+ {
+ auto pHint = static_cast<const sw::FindRedlineHint*>(&rHint);
if(!*pHint->m_ppXRedline && &pHint->m_rRedline == GetRedline())
*pHint->m_ppXRedline = this;
}
commit 57c7269fb48237573a0d2a0429dd6e82fe62fd71
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Tue May 28 11:40:18 2024 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Tue May 28 18:01:34 2024 +0200
loplugin:ostr in sc/../dbgui
Change-Id: Ife9bda0112a9f76b767c6c8f5afba464da8d8464
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168144
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/sc/source/ui/dbgui/PivotLayoutDialog.cxx
b/sc/source/ui/dbgui/PivotLayoutDialog.cxx
index cd84cf8b248c..db93d6c5cee2 100644
--- a/sc/source/ui/dbgui/PivotLayoutDialog.cxx
+++ b/sc/source/ui/dbgui/PivotLayoutDialog.cxx
@@ -72,7 +72,7 @@ ScRange lclGetRangeForNamedRange(OUString const & aName,
const ScDocument& rDocu
ScPivotLayoutDialog::ScPivotLayoutDialog(
SfxBindings* pSfxBindings, SfxChildWindow*
pChildWindow, weld::Window* pParent,
ScViewData* pViewData, const ScDPObject*
pPivotTableObject, bool bNewPivotTable)
- : ScAnyRefDlgController(pSfxBindings, pChildWindow, pParent,
"modules/scalc/ui/pivottablelayoutdialog.ui", "PivotTableLayout")
+ : ScAnyRefDlgController(pSfxBindings, pChildWindow, pParent,
u"modules/scalc/ui/pivottablelayoutdialog.ui"_ustr, u"PivotTableLayout"_ustr)
, maPivotTableObject(*pPivotTableObject)
, mpPreviouslyFocusedListBox(nullptr)
, mpViewData(pViewData)
@@ -81,34 +81,34 @@ ScPivotLayoutDialog::ScPivotLayoutDialog(
, maAddressDetails(mrDocument.GetAddressConvention(), 0, 0)
, mbDialogLostFocus(false)
, mpActiveEdit(nullptr)
- , mxListBoxField(new
ScPivotLayoutTreeListLabel(m_xBuilder->weld_tree_view("listbox-fields")))
- , mxListBoxPage(new
ScPivotLayoutTreeList(m_xBuilder->weld_tree_view("listbox-page")))
- , mxListBoxColumn(new
ScPivotLayoutTreeList(m_xBuilder->weld_tree_view("listbox-column")))
- , mxListBoxRow(new
ScPivotLayoutTreeList(m_xBuilder->weld_tree_view("listbox-row")))
- , mxListBoxData(new
ScPivotLayoutTreeListData(m_xBuilder->weld_tree_view("listbox-data")))
- ,
mxCheckIgnoreEmptyRows(m_xBuilder->weld_check_button("check-ignore-empty-rows"))
- , mxCheckTotalColumns(m_xBuilder->weld_check_button("check-total-columns"))
- , mxCheckAddFilter(m_xBuilder->weld_check_button("check-add-filter"))
- ,
mxCheckIdentifyCategories(m_xBuilder->weld_check_button("check-identify-categories"))
- , mxCheckTotalRows(m_xBuilder->weld_check_button("check-total-rows"))
- ,
mxCheckDrillToDetail(m_xBuilder->weld_check_button("check-drill-to-details"))
- ,
mxCheckExpandCollapse(m_xBuilder->weld_check_button("check-show-expand-collapse"))
- ,
mxSourceRadioNamedRange(m_xBuilder->weld_radio_button("source-radio-named-range"))
- ,
mxSourceRadioSelection(m_xBuilder->weld_radio_button("source-radio-selection"))
- , mxSourceListBox(m_xBuilder->weld_combo_box("source-list"))
- , mxSourceEdit(new formula::RefEdit(m_xBuilder->weld_entry("source-edit")))
- , mxSourceButton(new
formula::RefButton(m_xBuilder->weld_button("source-button")))
- ,
mxDestinationRadioNewSheet(m_xBuilder->weld_radio_button("destination-radio-new-sheet"))
- ,
mxDestinationRadioNamedRange(m_xBuilder->weld_radio_button("destination-radio-named-range"))
- ,
mxDestinationRadioSelection(m_xBuilder->weld_radio_button("destination-radio-selection"))
- , mxDestinationListBox(m_xBuilder->weld_combo_box("destination-list"))
- , mxDestinationEdit(new
formula::RefEdit(m_xBuilder->weld_entry("destination-edit")))
- , mxDestinationButton(new
formula::RefButton(m_xBuilder->weld_button("destination-button")))
- , mxBtnOK(m_xBuilder->weld_button("ok"))
- , mxBtnCancel(m_xBuilder->weld_button("cancel"))
- , mxSourceFrame(m_xBuilder->weld_frame("frame2"))
+ , mxListBoxField(new
ScPivotLayoutTreeListLabel(m_xBuilder->weld_tree_view(u"listbox-fields"_ustr)))
+ , mxListBoxPage(new
ScPivotLayoutTreeList(m_xBuilder->weld_tree_view(u"listbox-page"_ustr)))
+ , mxListBoxColumn(new
ScPivotLayoutTreeList(m_xBuilder->weld_tree_view(u"listbox-column"_ustr)))
+ , mxListBoxRow(new
ScPivotLayoutTreeList(m_xBuilder->weld_tree_view(u"listbox-row"_ustr)))
+ , mxListBoxData(new
ScPivotLayoutTreeListData(m_xBuilder->weld_tree_view(u"listbox-data"_ustr)))
+ ,
mxCheckIgnoreEmptyRows(m_xBuilder->weld_check_button(u"check-ignore-empty-rows"_ustr))
+ ,
mxCheckTotalColumns(m_xBuilder->weld_check_button(u"check-total-columns"_ustr))
+ , mxCheckAddFilter(m_xBuilder->weld_check_button(u"check-add-filter"_ustr))
+ ,
mxCheckIdentifyCategories(m_xBuilder->weld_check_button(u"check-identify-categories"_ustr))
+ , mxCheckTotalRows(m_xBuilder->weld_check_button(u"check-total-rows"_ustr))
+ ,
mxCheckDrillToDetail(m_xBuilder->weld_check_button(u"check-drill-to-details"_ustr))
+ ,
mxCheckExpandCollapse(m_xBuilder->weld_check_button(u"check-show-expand-collapse"_ustr))
+ ,
mxSourceRadioNamedRange(m_xBuilder->weld_radio_button(u"source-radio-named-range"_ustr))
+ ,
mxSourceRadioSelection(m_xBuilder->weld_radio_button(u"source-radio-selection"_ustr))
+ , mxSourceListBox(m_xBuilder->weld_combo_box(u"source-list"_ustr))
+ , mxSourceEdit(new
formula::RefEdit(m_xBuilder->weld_entry(u"source-edit"_ustr)))
+ , mxSourceButton(new
formula::RefButton(m_xBuilder->weld_button(u"source-button"_ustr)))
+ ,
mxDestinationRadioNewSheet(m_xBuilder->weld_radio_button(u"destination-radio-new-sheet"_ustr))
+ ,
mxDestinationRadioNamedRange(m_xBuilder->weld_radio_button(u"destination-radio-named-range"_ustr))
+ ,
mxDestinationRadioSelection(m_xBuilder->weld_radio_button(u"destination-radio-selection"_ustr))
+ ,
mxDestinationListBox(m_xBuilder->weld_combo_box(u"destination-list"_ustr))
+ , mxDestinationEdit(new
formula::RefEdit(m_xBuilder->weld_entry(u"destination-edit"_ustr)))
+ , mxDestinationButton(new
formula::RefButton(m_xBuilder->weld_button(u"destination-button"_ustr)))
+ , mxBtnOK(m_xBuilder->weld_button(u"ok"_ustr))
+ , mxBtnCancel(m_xBuilder->weld_button(u"cancel"_ustr))
+ , mxSourceFrame(m_xBuilder->weld_frame(u"frame2"_ustr))
, mxSourceLabel(mxSourceFrame->weld_label_widget())
- , mxDestFrame(m_xBuilder->weld_frame("frame1"))
+ , mxDestFrame(m_xBuilder->weld_frame(u"frame1"_ustr))
, mxDestLabel(mxDestFrame->weld_label_widget())
{
// Source UI
diff --git a/sc/source/ui/dbgui/consdlg.cxx b/sc/source/ui/dbgui/consdlg.cxx
index de1910cb4396..90da5447b1bd 100644
--- a/sc/source/ui/dbgui/consdlg.cxx
+++ b/sc/source/ui/dbgui/consdlg.cxx
@@ -67,7 +67,7 @@ public:
ScConsolidateDlg::ScConsolidateDlg(SfxBindings* pB, SfxChildWindow* pCW,
weld::Window* pParent,
const SfxItemSet& rArgSet)
- : ScAnyRefDlgController(pB, pCW, pParent,
"modules/scalc/ui/consolidatedialog.ui", "ConsolidateDialog")
+ : ScAnyRefDlgController(pB, pCW, pParent,
u"modules/scalc/ui/consolidatedialog.ui"_ustr, u"ConsolidateDialog"_ustr)
, aStrUndefined ( ScResId( SCSTR_UNDEFINED ) )
, theConsData ( static_cast<const ScConsolidateItem&>(
rArgSet.Get( rArgSet.GetPool()->
@@ -80,23 +80,23 @@ ScConsolidateDlg::ScConsolidateDlg(SfxBindings* pB,
SfxChildWindow* pCW, weld::W
, nAreaDataCount ( 0 )
, nWhichCons ( rArgSet.GetPool()->GetWhichIDFromSlotID(
SID_CONSOLIDATE ) )
, bDlgLostFocus ( false )
- , m_xLbFunc(m_xBuilder->weld_combo_box("func"))
- , m_xLbConsAreas(m_xBuilder->weld_tree_view("consareas"))
- , m_xLbDataArea(m_xBuilder->weld_combo_box("lbdataarea"))
- , m_xEdDataArea(new formula::RefEdit(m_xBuilder->weld_entry("eddataarea")))
- , m_xRbDataArea(new
formula::RefButton(m_xBuilder->weld_button("rbdataarea")))
- , m_xLbDestArea(m_xBuilder->weld_combo_box("lbdestarea"))
- , m_xEdDestArea(new formula::RefEdit(m_xBuilder->weld_entry("eddestarea")))
- , m_xRbDestArea(new
formula::RefButton(m_xBuilder->weld_button("rbdestarea")))
- , m_xBtnByRow(m_xBuilder->weld_check_button("byrow"))
- , m_xBtnByCol(m_xBuilder->weld_check_button("bycol"))
- , m_xBtnRefs(m_xBuilder->weld_check_button("refs"))
- , 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_xDataFT(m_xBuilder->weld_label("ftdataarea"))
- , m_xDestFT(m_xBuilder->weld_label("ftdestarea"))
+ , m_xLbFunc(m_xBuilder->weld_combo_box(u"func"_ustr))
+ , m_xLbConsAreas(m_xBuilder->weld_tree_view(u"consareas"_ustr))
+ , m_xLbDataArea(m_xBuilder->weld_combo_box(u"lbdataarea"_ustr))
+ , m_xEdDataArea(new
formula::RefEdit(m_xBuilder->weld_entry(u"eddataarea"_ustr)))
+ , m_xRbDataArea(new
formula::RefButton(m_xBuilder->weld_button(u"rbdataarea"_ustr)))
+ , m_xLbDestArea(m_xBuilder->weld_combo_box(u"lbdestarea"_ustr))
+ , m_xEdDestArea(new
formula::RefEdit(m_xBuilder->weld_entry(u"eddestarea"_ustr)))
+ , m_xRbDestArea(new
formula::RefButton(m_xBuilder->weld_button(u"rbdestarea"_ustr)))
+ , m_xBtnByRow(m_xBuilder->weld_check_button(u"byrow"_ustr))
+ , m_xBtnByCol(m_xBuilder->weld_check_button(u"bycol"_ustr))
+ , m_xBtnRefs(m_xBuilder->weld_check_button(u"refs"_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_xDataFT(m_xBuilder->weld_label(u"ftdataarea"_ustr))
+ , m_xDestFT(m_xBuilder->weld_label(u"ftdestarea"_ustr))
{
m_pRefInputEdit = m_xEdDataArea.get();
Init();
diff --git a/sc/source/ui/dbgui/csvtablebox.cxx
b/sc/source/ui/dbgui/csvtablebox.cxx
index 10dba1b810b3..109406467967 100644
--- a/sc/source/ui/dbgui/csvtablebox.cxx
+++ b/sc/source/ui/dbgui/csvtablebox.cxx
@@ -22,10 +22,10 @@
ScCsvTableBox::ScCsvTableBox(weld::Builder& rBuilder)
: mxRuler(new ScCsvRuler(maData, this))
- , mxGrid(new ScCsvGrid(maData, rBuilder.weld_menu("popup"), this))
- , mxScroll(rBuilder.weld_scrolled_window("scrolledwindow", true))
- , mxRulerWeld(new weld::CustomWeld(rBuilder, "csvruler", *mxRuler))
- , mxGridWeld(new weld::CustomWeld(rBuilder, "csvgrid", *mxGrid))
+ , mxGrid(new ScCsvGrid(maData, rBuilder.weld_menu(u"popup"_ustr), this))
+ , mxScroll(rBuilder.weld_scrolled_window(u"scrolledwindow"_ustr, true))
+ , mxRulerWeld(new weld::CustomWeld(rBuilder, u"csvruler"_ustr, *mxRuler))
+ , mxGridWeld(new weld::CustomWeld(rBuilder, u"csvgrid"_ustr, *mxGrid))
, maEndScrollIdle("ScCsvTableBox maEndScrollIdle")
{
Size aSize(mxScroll->get_approximate_digit_width() * 67,
diff --git a/sc/source/ui/dbgui/dapidata.cxx b/sc/source/ui/dbgui/dapidata.cxx
index 0bd08616502b..bc0df67ef17a 100644
--- a/sc/source/ui/dbgui/dapidata.cxx
+++ b/sc/source/ui/dbgui/dapidata.cxx
@@ -40,10 +40,10 @@ using namespace com::sun::star;
#define DP_TYPELIST_SQLNAT 3
ScDataPilotDatabaseDlg::ScDataPilotDatabaseDlg(weld::Window* pParent)
- : GenericDialogController(pParent, "modules/scalc/ui/selectdatasource.ui",
"SelectDataSourceDialog")
- , m_xLbDatabase(m_xBuilder->weld_combo_box("database"))
- , m_xCbObject(m_xBuilder->weld_combo_box("datasource"))
- , m_xLbType(m_xBuilder->weld_combo_box("type"))
+ : GenericDialogController(pParent,
u"modules/scalc/ui/selectdatasource.ui"_ustr, u"SelectDataSourceDialog"_ustr)
+ , m_xLbDatabase(m_xBuilder->weld_combo_box(u"database"_ustr))
+ , m_xCbObject(m_xBuilder->weld_combo_box(u"datasource"_ustr))
+ , m_xLbType(m_xBuilder->weld_combo_box(u"type"_ustr))
{
weld::WaitObject aWait(pParent); // initializing the database
service the first time takes a while
diff --git a/sc/source/ui/dbgui/dapitype.cxx b/sc/source/ui/dbgui/dapitype.cxx
index 41f58bd235b8..f16f0841d85a 100644
--- a/sc/source/ui/dbgui/dapitype.cxx
+++ b/sc/source/ui/dbgui/dapitype.cxx
@@ -23,14 +23,14 @@
#include <comphelper/lok.hxx>
ScDataPilotSourceTypeDlg::ScDataPilotSourceTypeDlg(weld::Window* pParent, bool
bEnableExternal)
- : GenericDialogController(pParent, "modules/scalc/ui/selectsource.ui",
"SelectSourceDialog")
- , m_xBtnSelection(m_xBuilder->weld_radio_button("selection"))
- , m_xBtnNamedRange(m_xBuilder->weld_radio_button("namedrange"))
- , m_xBtnDatabase(m_xBuilder->weld_radio_button("database"))
- , m_xBtnExternal(m_xBuilder->weld_radio_button("external"))
- , m_xLbNamedRange(m_xBuilder->weld_combo_box("rangelb"))
- , m_xBtnOk(m_xBuilder->weld_button("ok")) // for LOK jsdialog
- , m_xBtnCancel(m_xBuilder->weld_button("cancel")) // for LOK jsdialog
+ : GenericDialogController(pParent,
u"modules/scalc/ui/selectsource.ui"_ustr, u"SelectSourceDialog"_ustr)
+ , m_xBtnSelection(m_xBuilder->weld_radio_button(u"selection"_ustr))
+ , m_xBtnNamedRange(m_xBuilder->weld_radio_button(u"namedrange"_ustr))
+ , m_xBtnDatabase(m_xBuilder->weld_radio_button(u"database"_ustr))
+ , m_xBtnExternal(m_xBuilder->weld_radio_button(u"external"_ustr))
+ , m_xLbNamedRange(m_xBuilder->weld_combo_box(u"rangelb"_ustr))
+ , m_xBtnOk(m_xBuilder->weld_button(u"ok"_ustr)) // for LOK jsdialog
+ , m_xBtnCancel(m_xBuilder->weld_button(u"cancel"_ustr)) // for LOK jsdialog
{
m_xBtnSelection->connect_toggled( LINK(this, ScDataPilotSourceTypeDlg,
RadioClickHdl) );
m_xBtnNamedRange->connect_toggled( LINK(this, ScDataPilotSourceTypeDlg,
RadioClickHdl) );
@@ -105,12 +105,12 @@ IMPL_LINK_NOARG(ScDataPilotSourceTypeDlg, RadioClickHdl,
weld::Toggleable&, void
}
ScDataPilotServiceDlg::ScDataPilotServiceDlg(weld::Window* pParent, const
std::vector<OUString>& rServices)
- : GenericDialogController(pParent,
"modules/scalc/ui/dapiservicedialog.ui", "DapiserviceDialog")
- , m_xLbService(m_xBuilder->weld_combo_box("service"))
- , m_xEdSource(m_xBuilder->weld_entry("source"))
- , m_xEdName(m_xBuilder->weld_entry("name"))
- , m_xEdUser(m_xBuilder->weld_entry("user"))
- , m_xEdPasswd(m_xBuilder->weld_entry("password"))
+ : GenericDialogController(pParent,
u"modules/scalc/ui/dapiservicedialog.ui"_ustr, u"DapiserviceDialog"_ustr)
+ , m_xLbService(m_xBuilder->weld_combo_box(u"service"_ustr))
+ , m_xEdSource(m_xBuilder->weld_entry(u"source"_ustr))
+ , m_xEdName(m_xBuilder->weld_entry(u"name"_ustr))
+ , m_xEdUser(m_xBuilder->weld_entry(u"user"_ustr))
+ , m_xEdPasswd(m_xBuilder->weld_entry(u"password"_ustr))
{
for (const OUString& aName : rServices)
{
diff --git a/sc/source/ui/dbgui/dbnamdlg.cxx b/sc/source/ui/dbgui/dbnamdlg.cxx
index 68543eb6ce44..473fbc715215 100644
--- a/sc/source/ui/dbgui/dbnamdlg.cxx
+++ b/sc/source/ui/dbgui/dbnamdlg.cxx
@@ -123,30 +123,30 @@ static std::unique_ptr<DBSaveData> xSaveObj;
ScDbNameDlg::ScDbNameDlg(SfxBindings* pB, SfxChildWindow* pCW, weld::Window*
pParent,
ScViewData& rViewData)
: ScAnyRefDlgController(pB, pCW, pParent,
- "modules/scalc/ui/definedatabaserangedialog.ui",
"DefineDatabaseRangeDialog")
+ u"modules/scalc/ui/definedatabaserangedialog.ui"_ustr,
u"DefineDatabaseRangeDialog"_ustr)
, m_rViewData(rViewData)
, rDoc(rViewData.GetDocument())
, bRefInputMode(false)
, aAddrDetails(rDoc.GetAddressConvention(), 0, 0)
, aLocalDbCol(*(rDoc.GetDBCollection()))
- , m_xEdName(m_xBuilder->weld_entry_tree_view("entrygrid", "entry",
"entry-list"))
- , m_xAssignFrame(m_xBuilder->weld_frame("RangeFrame"))
- , m_xEdAssign(new formula::RefEdit(m_xBuilder->weld_entry("assign")))
- , m_xRbAssign(new formula::RefButton(m_xBuilder->weld_button("assignrb")))
- , m_xOptions(m_xBuilder->weld_widget("Options"))
- , m_xBtnHeader(m_xBuilder->weld_check_button("ContainsColumnLabels"))
- , m_xBtnTotals(m_xBuilder->weld_check_button("ContainsTotalsRow"))
- , m_xBtnDoSize(m_xBuilder->weld_check_button("InsertOrDeleteCells"))
- , m_xBtnKeepFmt(m_xBuilder->weld_check_button("KeepFormatting"))
- , m_xBtnStripData(m_xBuilder->weld_check_button("DontSaveImportedData"))
- , m_xFTSource(m_xBuilder->weld_label("Source"))
- , m_xFTOperations(m_xBuilder->weld_label("Operations"))
- , 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_xModifyPB(m_xBuilder->weld_button("modify"))
- , m_xInvalidFT(m_xBuilder->weld_label("invalid"))
+ , m_xEdName(m_xBuilder->weld_entry_tree_view(u"entrygrid"_ustr,
u"entry"_ustr, u"entry-list"_ustr))
+ , m_xAssignFrame(m_xBuilder->weld_frame(u"RangeFrame"_ustr))
+ , m_xEdAssign(new formula::RefEdit(m_xBuilder->weld_entry(u"assign"_ustr)))
+ , m_xRbAssign(new
formula::RefButton(m_xBuilder->weld_button(u"assignrb"_ustr)))
+ , m_xOptions(m_xBuilder->weld_widget(u"Options"_ustr))
+ , m_xBtnHeader(m_xBuilder->weld_check_button(u"ContainsColumnLabels"_ustr))
+ , m_xBtnTotals(m_xBuilder->weld_check_button(u"ContainsTotalsRow"_ustr))
+ , m_xBtnDoSize(m_xBuilder->weld_check_button(u"InsertOrDeleteCells"_ustr))
+ , m_xBtnKeepFmt(m_xBuilder->weld_check_button(u"KeepFormatting"_ustr))
+ ,
m_xBtnStripData(m_xBuilder->weld_check_button(u"DontSaveImportedData"_ustr))
+ , m_xFTSource(m_xBuilder->weld_label(u"Source"_ustr))
+ , m_xFTOperations(m_xBuilder->weld_label(u"Operations"_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_xModifyPB(m_xBuilder->weld_button(u"modify"_ustr))
+ , m_xInvalidFT(m_xBuilder->weld_label(u"invalid"_ustr))
, m_xFrameLabel(m_xAssignFrame->weld_label_widget())
{
m_xEdName->set_height_request_by_rows(4);
diff --git a/sc/source/ui/dbgui/dpgroupdlg.cxx
b/sc/source/ui/dbgui/dpgroupdlg.cxx
index 550695cc3199..b69527488f8a 100644
--- a/sc/source/ui/dbgui/dpgroupdlg.cxx
+++ b/sc/source/ui/dbgui/dpgroupdlg.cxx
@@ -150,14 +150,14 @@ void ScDPDateGroupEditHelper::ImplSetValue( double fValue
)
}
ScDPNumGroupDlg::ScDPNumGroupDlg(weld::Window* pParent, const
ScDPNumGroupInfo& rInfo)
- : GenericDialogController(pParent, "modules/scalc/ui/groupbynumber.ui",
"PivotTableGroupByNumber")
- , mxRbAutoStart(m_xBuilder->weld_radio_button("auto_start"))
- , mxRbManStart(m_xBuilder->weld_radio_button("manual_start"))
- , mxEdStart(new ScDoubleField(m_xBuilder->weld_entry("edit_start")))
- , mxRbAutoEnd(m_xBuilder->weld_radio_button("auto_end"))
- , mxRbManEnd(m_xBuilder->weld_radio_button("manual_end"))
- , mxEdEnd(new ScDoubleField(m_xBuilder->weld_entry("edit_end")))
- , mxEdBy(new ScDoubleField(m_xBuilder->weld_entry("edit_by")))
+ : GenericDialogController(pParent,
u"modules/scalc/ui/groupbynumber.ui"_ustr, u"PivotTableGroupByNumber"_ustr)
+ , mxRbAutoStart(m_xBuilder->weld_radio_button(u"auto_start"_ustr))
+ , mxRbManStart(m_xBuilder->weld_radio_button(u"manual_start"_ustr))
+ , mxEdStart(new ScDoubleField(m_xBuilder->weld_entry(u"edit_start"_ustr)))
+ , mxRbAutoEnd(m_xBuilder->weld_radio_button(u"auto_end"_ustr))
+ , mxRbManEnd(m_xBuilder->weld_radio_button(u"manual_end"_ustr))
+ , mxEdEnd(new ScDoubleField(m_xBuilder->weld_entry(u"edit_end"_ustr)))
+ , mxEdBy(new ScDoubleField(m_xBuilder->weld_entry(u"edit_by"_ustr)))
, maStartHelper(*mxRbAutoStart, *mxRbManStart, *mxEdStart)
, maEndHelper(*mxRbAutoEnd, *mxRbManEnd, *mxEdEnd)
{
@@ -201,18 +201,18 @@ ScDPNumGroupInfo ScDPNumGroupDlg::GetGroupInfo() const
ScDPDateGroupDlg::ScDPDateGroupDlg(weld::Window* pParent,
const ScDPNumGroupInfo& rInfo, sal_Int32 nDatePart, const Date&
rNullDate)
- : GenericDialogController(pParent, "modules/scalc/ui/groupbydate.ui",
"PivotTableGroupByDate")
- , mxRbAutoStart(m_xBuilder->weld_radio_button("auto_start"))
- , mxRbManStart(m_xBuilder->weld_radio_button("manual_start"))
- , mxEdStart(new SvtCalendarBox(m_xBuilder->weld_menu_button("start_date")))
- , mxRbAutoEnd(m_xBuilder->weld_radio_button("auto_end"))
- , mxRbManEnd(m_xBuilder->weld_radio_button("manual_end"))
- , mxEdEnd(new SvtCalendarBox(m_xBuilder->weld_menu_button("end_date")))
- , mxRbNumDays(m_xBuilder->weld_radio_button("days"))
- , mxRbUnits(m_xBuilder->weld_radio_button("intervals"))
- , mxEdNumDays(m_xBuilder->weld_spin_button("days_value"))
- , mxLbUnits(m_xBuilder->weld_tree_view("interval_list"))
- , mxBtnOk(m_xBuilder->weld_button("ok"))
+ : GenericDialogController(pParent,
u"modules/scalc/ui/groupbydate.ui"_ustr, u"PivotTableGroupByDate"_ustr)
+ , mxRbAutoStart(m_xBuilder->weld_radio_button(u"auto_start"_ustr))
+ , mxRbManStart(m_xBuilder->weld_radio_button(u"manual_start"_ustr))
+ , mxEdStart(new
SvtCalendarBox(m_xBuilder->weld_menu_button(u"start_date"_ustr)))
+ , mxRbAutoEnd(m_xBuilder->weld_radio_button(u"auto_end"_ustr))
+ , mxRbManEnd(m_xBuilder->weld_radio_button(u"manual_end"_ustr))
+ , mxEdEnd(new
SvtCalendarBox(m_xBuilder->weld_menu_button(u"end_date"_ustr)))
+ , mxRbNumDays(m_xBuilder->weld_radio_button(u"days"_ustr))
+ , mxRbUnits(m_xBuilder->weld_radio_button(u"intervals"_ustr))
+ , mxEdNumDays(m_xBuilder->weld_spin_button(u"days_value"_ustr))
+ , mxLbUnits(m_xBuilder->weld_tree_view(u"interval_list"_ustr))
+ , mxBtnOk(m_xBuilder->weld_button(u"ok"_ustr))
, maStartHelper(*mxRbAutoStart, *mxRbManStart, *mxEdStart, rNullDate)
, maEndHelper(*mxRbAutoEnd, *mxRbManEnd, *mxEdEnd, rNullDate)
{
diff --git a/sc/source/ui/dbgui/filtdlg.cxx b/sc/source/ui/dbgui/filtdlg.cxx
index 73dd94696a17..e238ff61a2ed 100644
--- a/sc/source/ui/dbgui/filtdlg.cxx
+++ b/sc/source/ui/dbgui/filtdlg.cxx
@@ -53,7 +53,7 @@ ScFilterDlg::EntryList::EntryList() :
ScFilterDlg::ScFilterDlg(SfxBindings* pB, SfxChildWindow* pCW, weld::Window*
pParent,
const SfxItemSet& rArgSet)
: ScAnyRefDlgController(pB, pCW, pParent,
- "modules/scalc/ui/standardfilterdialog.ui", "StandardFilterDialog")
+ u"modules/scalc/ui/standardfilterdialog.ui"_ustr,
u"StandardFilterDialog"_ustr)
, aStrUndefined(ScResId(SCSTR_UNDEFINED))
, aStrNone(ScResId(SCSTR_NONE))
, aStrEmpty(ScResId(SCSTR_FILTER_EMPTY))
@@ -67,47 +67,47 @@ ScFilterDlg::ScFilterDlg(SfxBindings* pB, SfxChildWindow*
pCW, weld::Window* pPa
, pDoc(nullptr)
, nSrcTab(0)
, bRefInputMode(false)
- , m_xLbConnect1(m_xBuilder->weld_combo_box("connect1"))
- , m_xLbField1(m_xBuilder->weld_combo_box("field1"))
- , m_xLbCond1(m_xBuilder->weld_combo_box("cond1"))
- , m_xEdVal1(m_xBuilder->weld_combo_box("val1"))
- , m_xLbColor1(m_xBuilder->weld_combo_box("color1"))
- , m_xBtnRemove1(m_xBuilder->weld_button("remove1"))
- , m_xLbConnect2(m_xBuilder->weld_combo_box("connect2"))
- , m_xLbField2(m_xBuilder->weld_combo_box("field2"))
- , m_xLbCond2(m_xBuilder->weld_combo_box("cond2"))
- , m_xEdVal2(m_xBuilder->weld_combo_box("val2"))
- , m_xLbColor2(m_xBuilder->weld_combo_box("color2"))
- , m_xBtnRemove2(m_xBuilder->weld_button("remove2"))
- , m_xLbConnect3(m_xBuilder->weld_combo_box("connect3"))
- , m_xLbField3(m_xBuilder->weld_combo_box("field3"))
- , m_xLbCond3(m_xBuilder->weld_combo_box("cond3"))
- , m_xEdVal3(m_xBuilder->weld_combo_box("val3"))
- , m_xLbColor3(m_xBuilder->weld_combo_box("color3"))
- , m_xBtnRemove3(m_xBuilder->weld_button("remove3"))
- , m_xLbConnect4(m_xBuilder->weld_combo_box("connect4"))
- , m_xLbField4(m_xBuilder->weld_combo_box("field4"))
- , m_xLbCond4(m_xBuilder->weld_combo_box("cond4"))
- , m_xEdVal4(m_xBuilder->weld_combo_box("val4"))
- , m_xLbColor4(m_xBuilder->weld_combo_box("color4"))
- , m_xBtnRemove4(m_xBuilder->weld_button("remove4"))
- , m_xContents(m_xBuilder->weld_widget("grid"))
- , m_xScrollBar(m_xBuilder->weld_scrolled_window("scrollbar", true))
- , m_xExpander(m_xBuilder->weld_expander("more"))
- , m_xBtnClear(m_xBuilder->weld_button("clear"))
- , m_xBtnOk(m_xBuilder->weld_button("ok"))
- , m_xBtnCancel(m_xBuilder->weld_button("cancel"))
- , m_xBtnCase(m_xBuilder->weld_check_button("case"))
- , m_xBtnRegExp(m_xBuilder->weld_check_button("regexp"))
- , m_xBtnHeader(m_xBuilder->weld_check_button("header"))
- , m_xBtnUnique(m_xBuilder->weld_check_button("unique"))
- , m_xBtnCopyResult(m_xBuilder->weld_check_button("copyresult"))
- , m_xLbCopyArea(m_xBuilder->weld_combo_box("lbcopyarea"))
- , m_xEdCopyArea(new formula::RefEdit(m_xBuilder->weld_entry("edcopyarea")))
- , m_xRbCopyArea(new
formula::RefButton(m_xBuilder->weld_button("rbcopyarea")))
- , m_xBtnDestPers(m_xBuilder->weld_check_button("destpers"))
- , m_xFtDbAreaLabel(m_xBuilder->weld_label("dbarealabel"))
- , m_xFtDbArea(m_xBuilder->weld_label("dbarea"))
+ , m_xLbConnect1(m_xBuilder->weld_combo_box(u"connect1"_ustr))
+ , m_xLbField1(m_xBuilder->weld_combo_box(u"field1"_ustr))
+ , m_xLbCond1(m_xBuilder->weld_combo_box(u"cond1"_ustr))
+ , m_xEdVal1(m_xBuilder->weld_combo_box(u"val1"_ustr))
+ , m_xLbColor1(m_xBuilder->weld_combo_box(u"color1"_ustr))
+ , m_xBtnRemove1(m_xBuilder->weld_button(u"remove1"_ustr))
+ , m_xLbConnect2(m_xBuilder->weld_combo_box(u"connect2"_ustr))
+ , m_xLbField2(m_xBuilder->weld_combo_box(u"field2"_ustr))
+ , m_xLbCond2(m_xBuilder->weld_combo_box(u"cond2"_ustr))
+ , m_xEdVal2(m_xBuilder->weld_combo_box(u"val2"_ustr))
+ , m_xLbColor2(m_xBuilder->weld_combo_box(u"color2"_ustr))
+ , m_xBtnRemove2(m_xBuilder->weld_button(u"remove2"_ustr))
+ , m_xLbConnect3(m_xBuilder->weld_combo_box(u"connect3"_ustr))
+ , m_xLbField3(m_xBuilder->weld_combo_box(u"field3"_ustr))
+ , m_xLbCond3(m_xBuilder->weld_combo_box(u"cond3"_ustr))
+ , m_xEdVal3(m_xBuilder->weld_combo_box(u"val3"_ustr))
+ , m_xLbColor3(m_xBuilder->weld_combo_box(u"color3"_ustr))
+ , m_xBtnRemove3(m_xBuilder->weld_button(u"remove3"_ustr))
+ , m_xLbConnect4(m_xBuilder->weld_combo_box(u"connect4"_ustr))
+ , m_xLbField4(m_xBuilder->weld_combo_box(u"field4"_ustr))
+ , m_xLbCond4(m_xBuilder->weld_combo_box(u"cond4"_ustr))
+ , m_xEdVal4(m_xBuilder->weld_combo_box(u"val4"_ustr))
+ , m_xLbColor4(m_xBuilder->weld_combo_box(u"color4"_ustr))
+ , m_xBtnRemove4(m_xBuilder->weld_button(u"remove4"_ustr))
+ , m_xContents(m_xBuilder->weld_widget(u"grid"_ustr))
+ , m_xScrollBar(m_xBuilder->weld_scrolled_window(u"scrollbar"_ustr, true))
+ , m_xExpander(m_xBuilder->weld_expander(u"more"_ustr))
+ , m_xBtnClear(m_xBuilder->weld_button(u"clear"_ustr))
+ , m_xBtnOk(m_xBuilder->weld_button(u"ok"_ustr))
+ , m_xBtnCancel(m_xBuilder->weld_button(u"cancel"_ustr))
+ , m_xBtnCase(m_xBuilder->weld_check_button(u"case"_ustr))
+ , m_xBtnRegExp(m_xBuilder->weld_check_button(u"regexp"_ustr))
+ , m_xBtnHeader(m_xBuilder->weld_check_button(u"header"_ustr))
+ , m_xBtnUnique(m_xBuilder->weld_check_button(u"unique"_ustr))
+ , m_xBtnCopyResult(m_xBuilder->weld_check_button(u"copyresult"_ustr))
+ , m_xLbCopyArea(m_xBuilder->weld_combo_box(u"lbcopyarea"_ustr))
+ , m_xEdCopyArea(new
formula::RefEdit(m_xBuilder->weld_entry(u"edcopyarea"_ustr)))
+ , m_xRbCopyArea(new
formula::RefButton(m_xBuilder->weld_button(u"rbcopyarea"_ustr)))
+ , m_xBtnDestPers(m_xBuilder->weld_check_button(u"destpers"_ustr))
+ , m_xFtDbAreaLabel(m_xBuilder->weld_label(u"dbarealabel"_ustr))
+ , m_xFtDbArea(m_xBuilder->weld_label(u"dbarea"_ustr))
{
m_xExpander->connect_expanded(LINK(this, ScFilterDlg, MoreExpandedHdl));
m_xEdCopyArea->SetReferences(this, m_xFtDbAreaLabel.get());
@@ -181,7 +181,7 @@ void ScFilterDlg::Init( const SfxItemSet& rArgSet )
m_xLbConnect3->connect_changed( LINK( this, ScFilterDlg, LbSelectHdl ) );
m_xLbConnect4->connect_changed( LINK( this, ScFilterDlg, LbSelectHdl ) );
- m_xLbField1->append_text("0000000000");
+ m_xLbField1->append_text(u"0000000000"_ustr);
m_xLbField1->set_active(0);
auto nPrefWidth = m_xLbField1->get_preferred_size().Width();
m_xLbField1->clear();
diff --git a/sc/source/ui/dbgui/pfiltdlg.cxx b/sc/source/ui/dbgui/pfiltdlg.cxx
index 544db7640a5b..3da6b50ebe52 100644
--- a/sc/source/ui/dbgui/pfiltdlg.cxx
+++ b/sc/source/ui/dbgui/pfiltdlg.cxx
@@ -38,7 +38,7 @@
ScPivotFilterDlg::ScPivotFilterDlg(weld::Window* pParent, const SfxItemSet&
rArgSet,
SCTAB nSourceTab )
- : GenericDialogController(pParent,
"modules/scalc/ui/pivotfilterdialog.ui", "PivotFilterDialog")
+ : GenericDialogController(pParent,
u"modules/scalc/ui/pivotfilterdialog.ui"_ustr, u"PivotFilterDialog"_ustr)
, aStrNone(ScResId(SCSTR_NONE))
, aStrEmpty(ScResId(SCSTR_FILTER_EMPTY))
, aStrNotEmpty(ScResId(SCSTR_FILTER_NOTEMPTY))
@@ -48,21 +48,21 @@ ScPivotFilterDlg::ScPivotFilterDlg(weld::Window* pParent,
const SfxItemSet& rArg
, pViewData(nullptr)
, pDoc(nullptr)
, nSrcTab(nSourceTab) // is not in QueryParam
- , m_xLbField1(m_xBuilder->weld_combo_box("field1"))
- , m_xLbCond1(m_xBuilder->weld_combo_box("cond1"))
- , m_xEdVal1(m_xBuilder->weld_combo_box("val1"))
- , m_xLbConnect1(m_xBuilder->weld_combo_box("connect1"))
- , m_xLbField2(m_xBuilder->weld_combo_box("field2"))
- , m_xLbCond2(m_xBuilder->weld_combo_box("cond2"))
- , m_xEdVal2(m_xBuilder->weld_combo_box("val2"))
- , m_xLbConnect2(m_xBuilder->weld_combo_box("connect2"))
- , m_xLbField3(m_xBuilder->weld_combo_box("field3"))
- , m_xLbCond3(m_xBuilder->weld_combo_box("cond3"))
- , m_xEdVal3(m_xBuilder->weld_combo_box("val3"))
- , m_xBtnCase(m_xBuilder->weld_check_button("case"))
- , m_xBtnRegExp(m_xBuilder->weld_check_button("regexp"))
- , m_xBtnUnique(m_xBuilder->weld_check_button("unique"))
- , m_xFtDbArea(m_xBuilder->weld_label("dbarea"))
+ , m_xLbField1(m_xBuilder->weld_combo_box(u"field1"_ustr))
+ , m_xLbCond1(m_xBuilder->weld_combo_box(u"cond1"_ustr))
+ , m_xEdVal1(m_xBuilder->weld_combo_box(u"val1"_ustr))
+ , m_xLbConnect1(m_xBuilder->weld_combo_box(u"connect1"_ustr))
+ , m_xLbField2(m_xBuilder->weld_combo_box(u"field2"_ustr))
+ , m_xLbCond2(m_xBuilder->weld_combo_box(u"cond2"_ustr))
+ , m_xEdVal2(m_xBuilder->weld_combo_box(u"val2"_ustr))
+ , m_xLbConnect2(m_xBuilder->weld_combo_box(u"connect2"_ustr))
+ , m_xLbField3(m_xBuilder->weld_combo_box(u"field3"_ustr))
+ , m_xLbCond3(m_xBuilder->weld_combo_box(u"cond3"_ustr))
+ , m_xEdVal3(m_xBuilder->weld_combo_box(u"val3"_ustr))
+ , m_xBtnCase(m_xBuilder->weld_check_button(u"case"_ustr))
+ , m_xBtnRegExp(m_xBuilder->weld_check_button(u"regexp"_ustr))
+ , m_xBtnUnique(m_xBuilder->weld_check_button(u"unique"_ustr))
+ , m_xFtDbArea(m_xBuilder->weld_label(u"dbarea"_ustr))
{
Init( rArgSet );
}
diff --git a/sc/source/ui/dbgui/pvfundlg.cxx b/sc/source/ui/dbgui/pvfundlg.cxx
index 7f97e2576795..8a605fd6d9fe 100644
--- a/sc/source/ui/dbgui/pvfundlg.cxx
+++ b/sc/source/ui/dbgui/pvfundlg.cxx
@@ -236,16 +236,16 @@ namespace
ScDPFunctionDlg::ScDPFunctionDlg(
weld::Widget* pParent, const ScDPLabelDataVector& rLabelVec,
const ScDPLabelData& rLabelData, const ScPivotFuncData& rFuncData)
- : GenericDialogController(pParent, "modules/scalc/ui/datafielddialog.ui",
"DataFieldDialog")
- , mxLbFunc(new
ScDPFunctionListBox(m_xBuilder->weld_tree_view("functions")))
- , mxFtName(m_xBuilder->weld_label("name"))
- , mxLbType(m_xBuilder->weld_combo_box("type"))
- , mxFtBaseField(m_xBuilder->weld_label("basefieldft"))
- , mxLbBaseField(m_xBuilder->weld_combo_box("basefield"))
- , mxFtBaseItem(m_xBuilder->weld_label("baseitemft"))
- , mxLbBaseItem(m_xBuilder->weld_combo_box("baseitem"))
- , mxBtnOk(m_xBuilder->weld_button("ok"))
- , mxBtnCancel(m_xBuilder->weld_button("cancel"))
+ : GenericDialogController(pParent,
u"modules/scalc/ui/datafielddialog.ui"_ustr, u"DataFieldDialog"_ustr)
+ , mxLbFunc(new
ScDPFunctionListBox(m_xBuilder->weld_tree_view(u"functions"_ustr)))
+ , mxFtName(m_xBuilder->weld_label(u"name"_ustr))
+ , mxLbType(m_xBuilder->weld_combo_box(u"type"_ustr))
+ , mxFtBaseField(m_xBuilder->weld_label(u"basefieldft"_ustr))
+ , mxLbBaseField(m_xBuilder->weld_combo_box(u"basefield"_ustr))
+ , mxFtBaseItem(m_xBuilder->weld_label(u"baseitemft"_ustr))
+ , mxLbBaseItem(m_xBuilder->weld_combo_box(u"baseitem"_ustr))
+ , mxBtnOk(m_xBuilder->weld_button(u"ok"_ustr))
+ , mxBtnCancel(m_xBuilder->weld_button(u"cancel"_ustr))
, mrLabelVec(rLabelVec)
, mbEmptyItem(false)
{
@@ -459,20 +459,20 @@ IMPL_LINK_NOARG(ScDPFunctionDlg, DblClickHdl,
weld::TreeView&, bool)
ScDPSubtotalDlg::ScDPSubtotalDlg(weld::Widget* pParent, ScDPObject& rDPObj,
const ScDPLabelData& rLabelData, const ScPivotFuncData& rFuncData,
const ScDPNameVec& rDataFields, bool bEnableLayout)
- : GenericDialogController(pParent, "modules/scalc/ui/pivotfielddialog.ui",
"PivotFieldDialog")
+ : GenericDialogController(pParent,
u"modules/scalc/ui/pivotfielddialog.ui"_ustr, u"PivotFieldDialog"_ustr)
, mrDPObj(rDPObj)
, mrDataFields(rDataFields)
, maLabelData(rLabelData)
, mbEnableLayout(bEnableLayout)
- , mxRbNone(m_xBuilder->weld_radio_button("none"))
- , mxRbAuto(m_xBuilder->weld_radio_button("auto"))
- , mxRbUser(m_xBuilder->weld_radio_button("user"))
- , mxLbFunc(new
ScDPFunctionListBox(m_xBuilder->weld_tree_view("functions")))
- , mxFtName(m_xBuilder->weld_label("name"))
- , mxCbShowAll(m_xBuilder->weld_check_button("showall"))
- , mxBtnOk(m_xBuilder->weld_button("ok"))
- , mxBtnCancel(m_xBuilder->weld_button("cancel"))
- , mxBtnOptions(m_xBuilder->weld_button("options"))
+ , mxRbNone(m_xBuilder->weld_radio_button(u"none"_ustr))
+ , mxRbAuto(m_xBuilder->weld_radio_button(u"auto"_ustr))
+ , mxRbUser(m_xBuilder->weld_radio_button(u"user"_ustr))
+ , mxLbFunc(new
ScDPFunctionListBox(m_xBuilder->weld_tree_view(u"functions"_ustr)))
+ , mxFtName(m_xBuilder->weld_label(u"name"_ustr))
+ , mxCbShowAll(m_xBuilder->weld_check_button(u"showall"_ustr))
+ , mxBtnOk(m_xBuilder->weld_button(u"ok"_ustr))
+ , mxBtnCancel(m_xBuilder->weld_button(u"cancel"_ustr))
+ , mxBtnOptions(m_xBuilder->weld_button(u"options"_ustr))
{
mxLbFunc->set_selection_mode(SelectionMode::Multiple);
mxLbFunc->set_size_request(-1, mxLbFunc->get_height_rows(8));
@@ -650,29 +650,29 @@ namespace
ScDPSubtotalOptDlg::ScDPSubtotalOptDlg(weld::Window* pParent, ScDPObject&
rDPObj,
const ScDPLabelData& rLabelData, const ScDPNameVec& rDataFields,
bool bEnableLayout )
- : GenericDialogController(pParent,
"modules/scalc/ui/datafieldoptionsdialog.ui",
- "DataFieldOptionsDialog")
- , m_xLbSortBy(m_xBuilder->weld_combo_box("sortby"))
- , m_xRbSortAsc(m_xBuilder->weld_radio_button("ascending"))
- , m_xRbSortDesc(m_xBuilder->weld_radio_button("descending"))
- , m_xRbSortMan(m_xBuilder->weld_radio_button("manual"))
- , m_xLayoutFrame(m_xBuilder->weld_widget("layoutframe"))
- , m_xLbLayout(m_xBuilder->weld_combo_box("layout"))
- , m_xCbLayoutEmpty(m_xBuilder->weld_check_button("emptyline"))
- , m_xCbRepeatItemLabels(m_xBuilder->weld_check_button("repeatitemlabels"))
- , m_xCbShow(m_xBuilder->weld_check_button("show"))
- , m_xNfShow(m_xBuilder->weld_spin_button("items"))
- , m_xFtShow(m_xBuilder->weld_label("showft"))
- , m_xFtShowFrom(m_xBuilder->weld_label("showfromft"))
- , m_xLbShowFrom(m_xBuilder->weld_combo_box("from"))
- , m_xFtShowUsing(m_xBuilder->weld_label("usingft"))
- , m_xLbShowUsing(m_xBuilder->weld_combo_box("using"))
- , m_xHideFrame(m_xBuilder->weld_widget("hideframe"))
- , m_xLbHide(m_xBuilder->weld_tree_view("hideitems"))
- , m_xFtHierarchy(m_xBuilder->weld_label("hierarchyft"))
- , m_xLbHierarchy(m_xBuilder->weld_combo_box("hierarchy"))
- , m_xBtnOk(m_xBuilder->weld_button("ok"))
- , m_xBtnCancel(m_xBuilder->weld_button("cancel"))
+ : GenericDialogController(pParent,
u"modules/scalc/ui/datafieldoptionsdialog.ui"_ustr,
+ u"DataFieldOptionsDialog"_ustr)
+ , m_xLbSortBy(m_xBuilder->weld_combo_box(u"sortby"_ustr))
+ , m_xRbSortAsc(m_xBuilder->weld_radio_button(u"ascending"_ustr))
+ , m_xRbSortDesc(m_xBuilder->weld_radio_button(u"descending"_ustr))
+ , m_xRbSortMan(m_xBuilder->weld_radio_button(u"manual"_ustr))
+ , m_xLayoutFrame(m_xBuilder->weld_widget(u"layoutframe"_ustr))
+ , m_xLbLayout(m_xBuilder->weld_combo_box(u"layout"_ustr))
+ , m_xCbLayoutEmpty(m_xBuilder->weld_check_button(u"emptyline"_ustr))
+ ,
m_xCbRepeatItemLabels(m_xBuilder->weld_check_button(u"repeatitemlabels"_ustr))
+ , m_xCbShow(m_xBuilder->weld_check_button(u"show"_ustr))
+ , m_xNfShow(m_xBuilder->weld_spin_button(u"items"_ustr))
+ , m_xFtShow(m_xBuilder->weld_label(u"showft"_ustr))
+ , m_xFtShowFrom(m_xBuilder->weld_label(u"showfromft"_ustr))
+ , m_xLbShowFrom(m_xBuilder->weld_combo_box(u"from"_ustr))
+ , m_xFtShowUsing(m_xBuilder->weld_label(u"usingft"_ustr))
+ , m_xLbShowUsing(m_xBuilder->weld_combo_box(u"using"_ustr))
+ , m_xHideFrame(m_xBuilder->weld_widget(u"hideframe"_ustr))
+ , m_xLbHide(m_xBuilder->weld_tree_view(u"hideitems"_ustr))
+ , m_xFtHierarchy(m_xBuilder->weld_label(u"hierarchyft"_ustr))
+ , m_xLbHierarchy(m_xBuilder->weld_combo_box(u"hierarchy"_ustr))
+ , m_xBtnOk(m_xBuilder->weld_button(u"ok"_ustr))
+ , m_xBtnCancel(m_xBuilder->weld_button(u"cancel"_ustr))
, mrDPObj(rDPObj)
, maLabelData(rLabelData)
{
@@ -898,9 +898,9 @@ IMPL_LINK_NOARG(ScDPSubtotalOptDlg, SelectHdl,
weld::ComboBox&, void)
}
ScDPShowDetailDlg::ScDPShowDetailDlg(weld::Window* pParent, ScDPObject&
rDPObj, css::sheet::DataPilotFieldOrientation nOrient)
- : GenericDialogController(pParent, "modules/scalc/ui/showdetaildialog.ui",
"ShowDetail")
+ : GenericDialogController(pParent,
u"modules/scalc/ui/showdetaildialog.ui"_ustr, u"ShowDetail"_ustr)
, mrDPObj(rDPObj)
- , mxLbDims(m_xBuilder->weld_tree_view("dimsTreeview"))
+ , mxLbDims(m_xBuilder->weld_tree_view(u"dimsTreeview"_ustr))
{
ScDPSaveData* pSaveData = rDPObj.GetSaveData();
tools::Long nDimCount = rDPObj.GetDimCount();
diff --git a/sc/source/ui/dbgui/scendlg.cxx b/sc/source/ui/dbgui/scendlg.cxx
index 543914e14660..38da57a5849e 100644
--- a/sc/source/ui/dbgui/scendlg.cxx
+++ b/sc/source/ui/dbgui/scendlg.cxx
@@ -35,20 +35,20 @@
#include <scendlg.hxx>
ScNewScenarioDlg::ScNewScenarioDlg(weld::Window* pParent, const OUString&
rName, bool bEdit, bool bSheetProtected)
- : GenericDialogController(pParent, "modules/scalc/ui/scenariodialog.ui",
"ScenarioDialog")
+ : GenericDialogController(pParent,
u"modules/scalc/ui/scenariodialog.ui"_ustr, u"ScenarioDialog"_ustr)
, aDefScenarioName(rName)
, bIsEdit(bEdit)
- , m_xEdName(m_xBuilder->weld_entry("name"))
- , m_xEdComment(m_xBuilder->weld_text_view("comment"))
- , m_xCbShowFrame(m_xBuilder->weld_check_button("showframe"))
- , m_xLbColor(new ColorListBox(m_xBuilder->weld_menu_button("bordercolor"),
[this] { return m_xDialog.get(); }))
- , m_xCbTwoWay(m_xBuilder->weld_check_button("copyback"))
- , m_xCbCopyAll(m_xBuilder->weld_check_button("copysheet"))
- , m_xCbProtect(m_xBuilder->weld_check_button("preventchanges"))
- , m_xBtnOk(m_xBuilder->weld_button("ok"))
- , m_xAltTitle(m_xBuilder->weld_label("alttitle"))
- , m_xCreatedFt(m_xBuilder->weld_label("createdft"))
- , m_xOnFt(m_xBuilder->weld_label("onft"))
+ , m_xEdName(m_xBuilder->weld_entry(u"name"_ustr))
+ , m_xEdComment(m_xBuilder->weld_text_view(u"comment"_ustr))
+ , m_xCbShowFrame(m_xBuilder->weld_check_button(u"showframe"_ustr))
+ , m_xLbColor(new
ColorListBox(m_xBuilder->weld_menu_button(u"bordercolor"_ustr), [this] { return
m_xDialog.get(); }))
+ , m_xCbTwoWay(m_xBuilder->weld_check_button(u"copyback"_ustr))
+ , m_xCbCopyAll(m_xBuilder->weld_check_button(u"copysheet"_ustr))
+ , m_xCbProtect(m_xBuilder->weld_check_button(u"preventchanges"_ustr))
+ , m_xBtnOk(m_xBuilder->weld_button(u"ok"_ustr))
+ , m_xAltTitle(m_xBuilder->weld_label(u"alttitle"_ustr))
+ , m_xCreatedFt(m_xBuilder->weld_label(u"createdft"_ustr))
+ , m_xOnFt(m_xBuilder->weld_label(u"onft"_ustr))
{
m_xEdComment->set_size_request(m_xEdComment->get_approximate_digit_width()
* 60,
m_xEdComment->get_height_rows(6));
diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx
b/sc/source/ui/dbgui/scuiasciiopt.cxx
index 22f2867c3545..304424806aa5 100644
--- a/sc/source/ui/dbgui/scuiasciiopt.cxx
+++ b/sc/source/ui/dbgui/scuiasciiopt.cxx
@@ -87,19 +87,19 @@ enum CSVImportOptionsIndex
// If not, options are neither loaded nor saved.
const ::std::vector<OUString> CSVImportOptionNames =
{
- "MergeDelimiters",
- "Separators",
- "TextSeparators",
- "FixedWidth",
- "RemoveSpace",
- "EvaluateFormulas",
- "FromRow",
- "CharSet",
- "QuotedFieldAsText",
- "DetectSpecialNumbers",
- "DetectScientificNumbers",
- "Language",
- "SkipEmptyCells"
+ u"MergeDelimiters"_ustr,
+ u"Separators"_ustr,
+ u"TextSeparators"_ustr,
+ u"FixedWidth"_ustr,
+ u"RemoveSpace"_ustr,
+ u"EvaluateFormulas"_ustr,
+ u"FromRow"_ustr,
+ u"CharSet"_ustr,
+ u"QuotedFieldAsText"_ustr,
+ u"DetectSpecialNumbers"_ustr,
+ u"DetectScientificNumbers"_ustr,
+ u"Language"_ustr,
+ u"SkipEmptyCells"_ustr
};
constexpr OUStringLiteral aSep_Path =
u"Office.Calc/Dialogs/CSVImport";
constexpr OUStringLiteral aSep_Path_Clpbrd =
u"Office.Calc/Dialogs/ClipboardTextImport";
@@ -318,38 +318,38 @@ static void lcl_SaveSeparators(
ScImportAsciiDlg::ScImportAsciiDlg(weld::Window* pParent, std::u16string_view
aDatName,
SvStream* pInStream, ScImportAsciiCall
eCall,
const ScAsciiOptions* aOptions)
- : GenericDialogController(pParent, "modules/scalc/ui/textimportcsv.ui",
"TextImportCsvDialog")
+ : GenericDialogController(pParent,
u"modules/scalc/ui/textimportcsv.ui"_ustr, u"TextImportCsvDialog"_ustr)
, mpDatStream(pInStream)
, mnStreamPos(pInStream ? pInStream->Tell() : 0)
, mnRowPosCount(0)
, mcTextSep(ScAsciiOptions::cDefaultTextSep)
, meCall(eCall)
, mbDetectSep(eCall != SC_TEXTTOCOLUMNS)
- , mxFtCharSet(m_xBuilder->weld_label("textcharset"))
- , mxLbCharSet(new
SvxTextEncodingBox(m_xBuilder->weld_combo_box("charset")))
- , mxFtCustomLang(m_xBuilder->weld_label("textlanguage"))
- , mxLbCustomLang(new
SvxLanguageBox(m_xBuilder->weld_combo_box("language")))
- , mxFtRow(m_xBuilder->weld_label("textfromrow"))
- , mxNfRow(m_xBuilder->weld_spin_button("fromrow"))
- , mxRbFixed(m_xBuilder->weld_radio_button("tofixedwidth"))
- , mxRbSeparated(m_xBuilder->weld_radio_button("toseparatedby"))
- , mxCkbTab(m_xBuilder->weld_check_button("tab"))
- , mxCkbSemicolon(m_xBuilder->weld_check_button("semicolon"))
- , mxCkbComma(m_xBuilder->weld_check_button("comma"))
- , mxCkbRemoveSpace(m_xBuilder->weld_check_button("removespace"))
- , mxCkbSpace(m_xBuilder->weld_check_button("space"))
- , mxCkbOther(m_xBuilder->weld_check_button("other"))
- , mxEdOther(m_xBuilder->weld_entry("inputother"))
- , mxCkbAsOnce(m_xBuilder->weld_check_button("mergedelimiters"))
- , mxFtTextSep(m_xBuilder->weld_label("texttextdelimiter"))
- , mxCbTextSep(m_xBuilder->weld_combo_box("textdelimiter"))
- , mxCkbQuotedAsText(m_xBuilder->weld_check_button("quotedfieldastext"))
- , mxCkbDetectNumber(m_xBuilder->weld_check_button("detectspecialnumbers"))
- ,
mxCkbDetectScientificNumber(m_xBuilder->weld_check_button("detectscientificnumbers"))
- , mxCkbEvaluateFormulas(m_xBuilder->weld_check_button("evaluateformulas"))
- , mxCkbSkipEmptyCells(m_xBuilder->weld_check_button("skipemptycells"))
- , mxLbType(m_xBuilder->weld_combo_box("columntype"))
- , mxAltTitle(m_xBuilder->weld_label("textalttitle"))
+ , mxFtCharSet(m_xBuilder->weld_label(u"textcharset"_ustr))
+ , mxLbCharSet(new
SvxTextEncodingBox(m_xBuilder->weld_combo_box(u"charset"_ustr)))
+ , mxFtCustomLang(m_xBuilder->weld_label(u"textlanguage"_ustr))
+ , mxLbCustomLang(new
SvxLanguageBox(m_xBuilder->weld_combo_box(u"language"_ustr)))
+ , mxFtRow(m_xBuilder->weld_label(u"textfromrow"_ustr))
+ , mxNfRow(m_xBuilder->weld_spin_button(u"fromrow"_ustr))
+ , mxRbFixed(m_xBuilder->weld_radio_button(u"tofixedwidth"_ustr))
+ , mxRbSeparated(m_xBuilder->weld_radio_button(u"toseparatedby"_ustr))
+ , mxCkbTab(m_xBuilder->weld_check_button(u"tab"_ustr))
+ , mxCkbSemicolon(m_xBuilder->weld_check_button(u"semicolon"_ustr))
+ , mxCkbComma(m_xBuilder->weld_check_button(u"comma"_ustr))
+ , mxCkbRemoveSpace(m_xBuilder->weld_check_button(u"removespace"_ustr))
+ , mxCkbSpace(m_xBuilder->weld_check_button(u"space"_ustr))
+ , mxCkbOther(m_xBuilder->weld_check_button(u"other"_ustr))
+ , mxEdOther(m_xBuilder->weld_entry(u"inputother"_ustr))
+ , mxCkbAsOnce(m_xBuilder->weld_check_button(u"mergedelimiters"_ustr))
+ , mxFtTextSep(m_xBuilder->weld_label(u"texttextdelimiter"_ustr))
+ , mxCbTextSep(m_xBuilder->weld_combo_box(u"textdelimiter"_ustr))
+ ,
mxCkbQuotedAsText(m_xBuilder->weld_check_button(u"quotedfieldastext"_ustr))
+ ,
mxCkbDetectNumber(m_xBuilder->weld_check_button(u"detectspecialnumbers"_ustr))
+ ,
mxCkbDetectScientificNumber(m_xBuilder->weld_check_button(u"detectscientificnumbers"_ustr))
+ ,
mxCkbEvaluateFormulas(m_xBuilder->weld_check_button(u"evaluateformulas"_ustr))
+ ,
mxCkbSkipEmptyCells(m_xBuilder->weld_check_button(u"skipemptycells"_ustr))
+ , mxLbType(m_xBuilder->weld_combo_box(u"columntype"_ustr))
+ , mxAltTitle(m_xBuilder->weld_label(u"textalttitle"_ustr))
, mxTableBox(new ScCsvTableBox(*m_xBuilder))
{
OUString aName = m_xDialog->get_title();
@@ -373,7 +373,7 @@ ScImportAsciiDlg::ScImportAsciiDlg(weld::Window* pParent,
std::u16string_view aD
bool bIsTSV = (o3tl::endsWithIgnoreAsciiCase(aDatName, ".tsv") ||
o3tl::endsWithIgnoreAsciiCase(aDatName, ".tab"));
// Default options are set in
officecfg/registry/schema/org/openoffice/Office/Calc.xcs
- OUString sFieldSeparators(",; ");
+ OUString sFieldSeparators(u",; "_ustr);
OUString sTextSeparators(mcTextSep);
bool bMergeDelimiters = false;
bool bFixedWidth = false;
@@ -630,7 +630,7 @@ ScImportAsciiDlg::ScImportAsciiDlg(weld::Window* pParent,
std::u16string_view aD
}
if (comphelper::LibreOfficeKit::isActive())
- m_xBuilder->weld_button("cancel")->hide();
+ m_xBuilder->weld_button(u"cancel"_ustr)->hide();
m_xDialog->SetInstallLOKNotifierHdl(LINK(this, ScImportAsciiDlg,
InstallLOKNotifierHdl));
}
diff --git a/sc/source/ui/dbgui/scuiimoptdlg.cxx
b/sc/source/ui/dbgui/scuiimoptdlg.cxx
index 6e2bebd3536e..535bb52c0576 100644
--- a/sc/source/ui/dbgui/scuiimoptdlg.cxx
+++ b/sc/source/ui/dbgui/scuiimoptdlg.cxx
@@ -110,21 +110,21 @@ ScImportOptionsDlg::ScImportOptionsDlg(weld::Window*
pParent, bool bAscii,
const OUString* pStrTitle,
bool bMultiByte, bool
bOnlyDbtoolsEncodings,
bool bImport)
- : GenericDialogController(pParent, "modules/scalc/ui/imoptdialog.ui",
"ImOptDialog")
+ : GenericDialogController(pParent,
u"modules/scalc/ui/imoptdialog.ui"_ustr, u"ImOptDialog"_ustr)
, m_bIsAsciiImport(bAscii)
- , m_xFieldFrame(m_xBuilder->weld_frame("fieldframe"))
- , m_xFtCharset(m_xBuilder->weld_label("charsetft"))
- , m_xEncGrid(m_xBuilder->weld_widget("grid2"))
- , m_xFtFieldSep(m_xBuilder->weld_label("fieldft"))
- , m_xEdFieldSep(m_xBuilder->weld_combo_box("field"))
- , m_xFtTextSep(m_xBuilder->weld_label("textft"))
- , m_xEdTextSep(m_xBuilder->weld_combo_box("text"))
- , m_xCbShown(m_xBuilder->weld_check_button("asshown"))
- , m_xCbFormulas(m_xBuilder->weld_check_button("formulas"))
- , m_xCbQuoteAll(m_xBuilder->weld_check_button("quoteall"))
- , m_xCbFixed(m_xBuilder->weld_check_button("fixedwidth"))
- , m_xLbCharset(new
SvxTextEncodingBox(m_xBuilder->weld_combo_box("charsetdropdown")))
- , m_xTvCharset(new
SvxTextEncodingTreeView(m_xBuilder->weld_tree_view("charsetlist")))
+ , m_xFieldFrame(m_xBuilder->weld_frame(u"fieldframe"_ustr))
+ , m_xFtCharset(m_xBuilder->weld_label(u"charsetft"_ustr))
+ , m_xEncGrid(m_xBuilder->weld_widget(u"grid2"_ustr))
+ , m_xFtFieldSep(m_xBuilder->weld_label(u"fieldft"_ustr))
+ , m_xEdFieldSep(m_xBuilder->weld_combo_box(u"field"_ustr))
+ , m_xFtTextSep(m_xBuilder->weld_label(u"textft"_ustr))
+ , m_xEdTextSep(m_xBuilder->weld_combo_box(u"text"_ustr))
+ , m_xCbShown(m_xBuilder->weld_check_button(u"asshown"_ustr))
+ , m_xCbFormulas(m_xBuilder->weld_check_button(u"formulas"_ustr))
+ , m_xCbQuoteAll(m_xBuilder->weld_check_button(u"quoteall"_ustr))
+ , m_xCbFixed(m_xBuilder->weld_check_button(u"fixedwidth"_ustr))
+ , m_xLbCharset(new
SvxTextEncodingBox(m_xBuilder->weld_combo_box(u"charsetdropdown"_ustr)))
+ , m_xTvCharset(new
SvxTextEncodingTreeView(m_xBuilder->weld_tree_view(u"charsetlist"_ustr)))
{
if (bAscii)
{
diff --git a/sc/source/ui/dbgui/sfiltdlg.cxx b/sc/source/ui/dbgui/sfiltdlg.cxx
index f30efbe89f19..33c1955e6e0d 100644
--- a/sc/source/ui/dbgui/sfiltdlg.cxx
+++ b/sc/source/ui/dbgui/sfiltdlg.cxx
@@ -53,7 +53,7 @@ namespace
ScSpecialFilterDlg::ScSpecialFilterDlg( SfxBindings* pB, SfxChildWindow* pCW,
weld::Window* pParent,
const SfxItemSet& rArgSet )
- : ScAnyRefDlgController(pB, pCW, pParent,
"modules/scalc/ui/advancedfilterdialog.ui", "AdvancedFilterDialog")
+ : ScAnyRefDlgController(pB, pCW, pParent,
u"modules/scalc/ui/advancedfilterdialog.ui"_ustr, u"AdvancedFilterDialog"_ustr)
, aStrUndefined ( ScResId(SCSTR_UNDEFINED) )
, nWhichQuery ( rArgSet.GetPool()->GetWhichIDFromSlotID( SID_QUERY ) )
, theQueryData ( static_cast<const ScQueryItem&>(
@@ -62,24 +62,24 @@ ScSpecialFilterDlg::ScSpecialFilterDlg( SfxBindings* pB,
SfxChildWindow* pCW, we
, pDoc(nullptr)
, bRefInputMode(false)
, m_pRefInputEdit(nullptr)
- , m_xLbFilterArea(m_xBuilder->weld_combo_box("lbfilterarea"))
- , m_xEdFilterArea(new
formula::RefEdit(m_xBuilder->weld_entry("edfilterarea")))
- , m_xRbFilterArea(new
formula::RefButton(m_xBuilder->weld_button("rbfilterarea")))
- , m_xExpander(m_xBuilder->weld_expander("more"))
- , m_xBtnCase(m_xBuilder->weld_check_button("case"))
- , m_xBtnRegExp(m_xBuilder->weld_check_button("regexp"))
- , m_xBtnHeader(m_xBuilder->weld_check_button("header"))
- , m_xBtnUnique(m_xBuilder->weld_check_button("unique"))
- , m_xBtnCopyResult(m_xBuilder->weld_check_button("copyresult"))
- , m_xLbCopyArea(m_xBuilder->weld_combo_box("lbcopyarea"))
- , m_xEdCopyArea(new formula::RefEdit(m_xBuilder->weld_entry("edcopyarea")))
- , m_xRbCopyArea(new
formula::RefButton(m_xBuilder->weld_button("rbcopyarea")))
- , m_xBtnDestPers(m_xBuilder->weld_check_button("destpers"))
- , m_xFtDbAreaLabel(m_xBuilder->weld_label("dbarealabel"))
- , m_xFtDbArea(m_xBuilder->weld_label("dbarea"))
- , m_xBtnOk(m_xBuilder->weld_button("ok"))
- , m_xBtnCancel(m_xBuilder->weld_button("cancel"))
- , m_xFilterFrame(m_xBuilder->weld_frame("filterframe"))
+ , m_xLbFilterArea(m_xBuilder->weld_combo_box(u"lbfilterarea"_ustr))
+ , m_xEdFilterArea(new
formula::RefEdit(m_xBuilder->weld_entry(u"edfilterarea"_ustr)))
+ , m_xRbFilterArea(new
formula::RefButton(m_xBuilder->weld_button(u"rbfilterarea"_ustr)))
+ , m_xExpander(m_xBuilder->weld_expander(u"more"_ustr))
+ , m_xBtnCase(m_xBuilder->weld_check_button(u"case"_ustr))
+ , m_xBtnRegExp(m_xBuilder->weld_check_button(u"regexp"_ustr))
+ , m_xBtnHeader(m_xBuilder->weld_check_button(u"header"_ustr))
+ , m_xBtnUnique(m_xBuilder->weld_check_button(u"unique"_ustr))
+ , m_xBtnCopyResult(m_xBuilder->weld_check_button(u"copyresult"_ustr))
+ , m_xLbCopyArea(m_xBuilder->weld_combo_box(u"lbcopyarea"_ustr))
+ , m_xEdCopyArea(new
formula::RefEdit(m_xBuilder->weld_entry(u"edcopyarea"_ustr)))
+ , m_xRbCopyArea(new
formula::RefButton(m_xBuilder->weld_button(u"rbcopyarea"_ustr)))
+ , m_xBtnDestPers(m_xBuilder->weld_check_button(u"destpers"_ustr))
+ , m_xFtDbAreaLabel(m_xBuilder->weld_label(u"dbarealabel"_ustr))
+ , m_xFtDbArea(m_xBuilder->weld_label(u"dbarea"_ustr))
+ , m_xBtnOk(m_xBuilder->weld_button(u"ok"_ustr))
+ , m_xBtnCancel(m_xBuilder->weld_button(u"cancel"_ustr))
+ , m_xFilterFrame(m_xBuilder->weld_frame(u"filterframe"_ustr))
, m_xFilterLabel(m_xFilterFrame->weld_label_widget())
{
m_xEdFilterArea->SetReferences(this, m_xFilterLabel.get());
diff --git a/sc/source/ui/dbgui/sortdlg.cxx b/sc/source/ui/dbgui/sortdlg.cxx
index 43978d1b8585..c2ecda133e0d 100644
--- a/sc/source/ui/dbgui/sortdlg.cxx
+++ b/sc/source/ui/dbgui/sortdlg.cxx
@@ -25,13 +25,13 @@
#include <unotools/viewoptions.hxx>
ScSortDlg::ScSortDlg(weld::Window* pParent, const SfxItemSet* pArgSet)
- : SfxTabDialogController(pParent, "modules/scalc/ui/sortdialog.ui",
"SortDialog", pArgSet)
+ : SfxTabDialogController(pParent, u"modules/scalc/ui/sortdialog.ui"_ustr,
u"SortDialog"_ustr, pArgSet)
{
- AddTabPage("criteria", ScTabPageSortFields::Create, nullptr);
- AddTabPage("options", ScTabPageSortOptions::Create, nullptr);
+ AddTabPage(u"criteria"_ustr, ScTabPageSortFields::Create, nullptr);
+ AddTabPage(u"options"_ustr, ScTabPageSortOptions::Create, nullptr);
// restore dialog size
- SvtViewOptions aDlgOpt(EViewType::Dialog, "SortDialog");
+ SvtViewOptions aDlgOpt(EViewType::Dialog, u"SortDialog"_ustr);
if (aDlgOpt.Exists())
m_xDialog->set_window_state(aDlgOpt.GetWindowState());
}
@@ -39,17 +39,17 @@ ScSortDlg::ScSortDlg(weld::Window* pParent, const
SfxItemSet* pArgSet)
ScSortDlg::~ScSortDlg()
{
// tdf#153852 - Make of sort dialog resizable (and remember size)
- SvtViewOptions aDlgOpt(EViewType::Dialog, "SortDialog");
+ SvtViewOptions aDlgOpt(EViewType::Dialog, u"SortDialog"_ustr);
OUString sWindowState =
m_xDialog->get_window_state(vcl::WindowDataMask::PosSize);
aDlgOpt.SetWindowState(sWindowState);
}
ScSortWarningDlg::ScSortWarningDlg(weld::Window* pParent,
std::u16string_view rExtendText, std::u16string_view rCurrentText)
- : GenericDialogController(pParent, "modules/scalc/ui/sortwarning.ui",
"SortWarning")
- , m_xFtText(m_xBuilder->weld_label("sorttext"))
- , m_xBtnExtSort(m_xBuilder->weld_button("extend"))
- , m_xBtnCurSort(m_xBuilder->weld_button("current"))
+ : GenericDialogController(pParent,
u"modules/scalc/ui/sortwarning.ui"_ustr, u"SortWarning"_ustr)
+ , m_xFtText(m_xBuilder->weld_label(u"sorttext"_ustr))
+ , m_xBtnExtSort(m_xBuilder->weld_button(u"extend"_ustr))
+ , m_xBtnCurSort(m_xBuilder->weld_button(u"current"_ustr))
{
OUString sTextName = m_xFtText->get_label();
sTextName = sTextName.replaceFirst("%1", rExtendText);
diff --git a/sc/source/ui/dbgui/sortkeydlg.cxx
b/sc/source/ui/dbgui/sortkeydlg.cxx
index 0e9f05870a16..c4c4e72d6b22 100644
--- a/sc/source/ui/dbgui/sortkeydlg.cxx
+++ b/sc/source/ui/dbgui/sortkeydlg.cxx
@@ -16,12 +16,12 @@
#include <strings.hrc>
ScSortKeyItem::ScSortKeyItem(weld::Container* pParent)
- : m_xBuilder(Application::CreateBuilder(pParent,
"modules/scalc/ui/sortkey.ui"))
- , m_xFrame(m_xBuilder->weld_frame("SortKeyFrame"))
- , m_xLbSort(m_xBuilder->weld_combo_box("sortlb"))
- , m_xBtnUp(m_xBuilder->weld_radio_button("up"))
- , m_xBtnDown(m_xBuilder->weld_radio_button("down"))
- , m_xLabel(m_xBuilder->weld_label("lbColRow"))
+ : m_xBuilder(Application::CreateBuilder(pParent,
u"modules/scalc/ui/sortkey.ui"_ustr))
+ , m_xFrame(m_xBuilder->weld_frame(u"SortKeyFrame"_ustr))
+ , m_xLbSort(m_xBuilder->weld_combo_box(u"sortlb"_ustr))
+ , m_xBtnUp(m_xBuilder->weld_radio_button(u"up"_ustr))
+ , m_xBtnDown(m_xBuilder->weld_radio_button(u"down"_ustr))
+ , m_xLabel(m_xBuilder->weld_label(u"lbColRow"_ustr))
, m_pParent(pParent)
{
// tdf#136155 let the other elements in the dialog determine the width of
the
diff --git a/sc/source/ui/dbgui/subtdlg.cxx b/sc/source/ui/dbgui/subtdlg.cxx
index 924716a6ff10..b549e5c2f33b 100644
--- a/sc/source/ui/dbgui/subtdlg.cxx
+++ b/sc/source/ui/dbgui/subtdlg.cxx
@@ -24,13 +24,13 @@
#include <scui_def.hxx>
ScSubTotalDlg::ScSubTotalDlg(weld::Window* pParent, const SfxItemSet& rArgSet)
- : SfxTabDialogController(pParent, "modules/scalc/ui/subtotaldialog.ui",
"SubTotalDialog", &rArgSet)
- , m_xBtnRemove(m_xBuilder->weld_button("remove"))
+ : SfxTabDialogController(pParent,
u"modules/scalc/ui/subtotaldialog.ui"_ustr, u"SubTotalDialog"_ustr, &rArgSet)
+ , m_xBtnRemove(m_xBuilder->weld_button(u"remove"_ustr))
{
- AddTabPage("1stgroup", ScTpSubTotalGroup1::Create, nullptr);
- AddTabPage("2ndgroup", ScTpSubTotalGroup2::Create, nullptr);
- AddTabPage("3rdgroup", ScTpSubTotalGroup3::Create, nullptr);
- AddTabPage("options", ScTpSubTotalOptions::Create, nullptr);
+ AddTabPage(u"1stgroup"_ustr, ScTpSubTotalGroup1::Create, nullptr);
+ AddTabPage(u"2ndgroup"_ustr, ScTpSubTotalGroup2::Create, nullptr);
+ AddTabPage(u"3rdgroup"_ustr, ScTpSubTotalGroup3::Create, nullptr);
+ AddTabPage(u"options"_ustr, ScTpSubTotalOptions::Create, nullptr);
m_xBtnRemove->connect_clicked( LINK( this, ScSubTotalDlg, RemoveHdl ) );
}
diff --git a/sc/source/ui/dbgui/textimportoptions.cxx
b/sc/source/ui/dbgui/textimportoptions.cxx
index e13bdfbd4a45..b91f8eb6d1bd 100644
--- a/sc/source/ui/dbgui/textimportoptions.cxx
+++ b/sc/source/ui/dbgui/textimportoptions.cxx
@@ -26,14 +26,14 @@
#include <i18nlangtag/languagetag.hxx>
ScTextImportOptionsDlg::ScTextImportOptionsDlg(weld::Window* pParent)
- : GenericDialogController(pParent,
"modules/scalc/ui/textimportoptions.ui", "TextImportOptionsDialog")
- , m_xBtnOk(m_xBuilder->weld_button("ok"))
- , m_xRbAutomatic(m_xBuilder->weld_radio_button("automatic"))
- , m_xRbCustom(m_xBuilder->weld_radio_button("custom"))
- , m_xCkbConvertDate(m_xBuilder->weld_check_button("convertdata"))
- ,
m_xCkbConvertScientific(m_xBuilder->weld_check_button("convertscientificnotation"))
- , m_xCkbKeepAsking(m_xBuilder->weld_check_button("keepasking"))
- , m_xLbCustomLang(new SvxLanguageBox(m_xBuilder->weld_combo_box("lang")))
+ : GenericDialogController(pParent,
u"modules/scalc/ui/textimportoptions.ui"_ustr, u"TextImportOptionsDialog"_ustr)
+ , m_xBtnOk(m_xBuilder->weld_button(u"ok"_ustr))
+ , m_xRbAutomatic(m_xBuilder->weld_radio_button(u"automatic"_ustr))
+ , m_xRbCustom(m_xBuilder->weld_radio_button(u"custom"_ustr))
+ , m_xCkbConvertDate(m_xBuilder->weld_check_button(u"convertdata"_ustr))
+ ,
m_xCkbConvertScientific(m_xBuilder->weld_check_button(u"convertscientificnotation"_ustr))
+ , m_xCkbKeepAsking(m_xBuilder->weld_check_button(u"keepasking"_ustr))
+ , m_xLbCustomLang(new
SvxLanguageBox(m_xBuilder->weld_combo_box(u"lang"_ustr)))
{
init();
}
diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx
index 3cc3e90e3b22..91a7a25d3630 100644
--- a/sc/source/ui/dbgui/tpsort.cxx
+++ b/sc/source/ui/dbgui/tpsort.cxx
@@ -69,7 +69,7 @@ using namespace com::sun::star;
// Sort Criteria Tab page
ScTabPageSortFields::ScTabPageSortFields(weld::Container* pPage,
weld::DialogController* pController, const SfxItemSet& rArgSet)
- : SfxTabPage(pPage, pController, "modules/scalc/ui/sortcriteriapage.ui",
"SortCriteriaPage", &rArgSet)
+ : SfxTabPage(pPage, pController,
u"modules/scalc/ui/sortcriteriapage.ui"_ustr, u"SortCriteriaPage"_ustr,
&rArgSet)
,
m_aIdle("ScTabPageSortFields Scroll To End Idle"),
@@ -86,12 +86,12 @@ ScTabPageSortFields::ScTabPageSortFields(weld::Container*
pPage, weld::DialogCon
// show actual size of the sorting keys without limiting them to the
default size
nSortKeyCount(std::max(aSortData.GetSortKeyCount(),
static_cast<sal_uInt16>(DEFSORT)))
- , m_xTop(m_xBuilder->weld_container("TopWindow"))
- , m_xBtnHeader(m_xBuilder->weld_check_button("cbHeader"))
- , m_xBtnTopDown(m_xBuilder->weld_radio_button("rbTopDown"))
- , m_xBtnLeftRight(m_xBuilder->weld_radio_button("rbLeftRight"))
- , m_xScrolledWindow(m_xBuilder->weld_scrolled_window("SortCriteriaPage"))
- , m_xBox(m_xBuilder->weld_container("SortKeyWindow"))
+ , m_xTop(m_xBuilder->weld_container(u"TopWindow"_ustr))
+ , m_xBtnHeader(m_xBuilder->weld_check_button(u"cbHeader"_ustr))
+ , m_xBtnTopDown(m_xBuilder->weld_radio_button(u"rbTopDown"_ustr))
+ , m_xBtnLeftRight(m_xBuilder->weld_radio_button(u"rbLeftRight"_ustr))
+ ,
m_xScrolledWindow(m_xBuilder->weld_scrolled_window(u"SortCriteriaPage"_ustr))
+ , m_xBox(m_xBuilder->weld_container(u"SortKeyWindow"_ustr))
, m_aSortWin(m_xBox.get())
{
// tdf#147722 set some nominal small default height so the height adapts
@@ -490,7 +490,7 @@ void ScTabPageSortFields::AddSortKey( sal_uInt16 nItem )
// Sort option Tab Page:
ScTabPageSortOptions::ScTabPageSortOptions(weld::Container* pPage,
weld::DialogController* pController, const SfxItemSet& rArgSet)
- : SfxTabPage(pPage, pController, "modules/scalc/ui/sortoptionspage.ui",
"SortOptionsPage", &rArgSet)
+ : SfxTabPage(pPage, pController,
u"modules/scalc/ui/sortoptionspage.ui"_ustr, u"SortOptionsPage"_ustr, &rArgSet)
, aStrUndefined(ScResId(SCSTR_UNDEFINED))
, aStrCommentsRowLabel(ScResId(SCSTR_NOTES_ROW_LABEL))
, aStrCommentsColLabel(ScResId(SCSTR_NOTES_COL_LABEL))
@@ -500,19 +500,19 @@
ScTabPageSortOptions::ScTabPageSortOptions(weld::Container* pPage, weld::DialogC
, aSortData(rArgSet.Get(nWhichSort).GetSortData())
, pViewData(nullptr)
, pDoc(nullptr)
- , m_xBtnCase(m_xBuilder->weld_check_button("case"))
- , m_xBtnFormats(m_xBuilder->weld_check_button("formats"))
- , m_xBtnNaturalSort(m_xBuilder->weld_check_button("naturalsort"))
- , m_xBtnCopyResult(m_xBuilder->weld_check_button("copyresult"))
- , m_xLbOutPos(m_xBuilder->weld_combo_box("outarealb"))
- , m_xEdOutPos(m_xBuilder->weld_entry("outareaed"))
- , m_xBtnSortUser(m_xBuilder->weld_check_button("sortuser"))
- , m_xLbSortUser(m_xBuilder->weld_combo_box("sortuserlb"))
- , m_xLbLanguage(new SvxLanguageBox(m_xBuilder->weld_combo_box("language")))
- , m_xFtAlgorithm(m_xBuilder->weld_label("algorithmft"))
- , m_xLbAlgorithm(m_xBuilder->weld_combo_box("algorithmlb"))
- , m_xBtnIncComments(m_xBuilder->weld_check_button("includenotes"))
- , m_xBtnIncImages(m_xBuilder->weld_check_button("includeimages"))
+ , m_xBtnCase(m_xBuilder->weld_check_button(u"case"_ustr))
+ , m_xBtnFormats(m_xBuilder->weld_check_button(u"formats"_ustr))
+ , m_xBtnNaturalSort(m_xBuilder->weld_check_button(u"naturalsort"_ustr))
+ , m_xBtnCopyResult(m_xBuilder->weld_check_button(u"copyresult"_ustr))
+ , m_xLbOutPos(m_xBuilder->weld_combo_box(u"outarealb"_ustr))
+ , m_xEdOutPos(m_xBuilder->weld_entry(u"outareaed"_ustr))
+ , m_xBtnSortUser(m_xBuilder->weld_check_button(u"sortuser"_ustr))
+ , m_xLbSortUser(m_xBuilder->weld_combo_box(u"sortuserlb"_ustr))
+ , m_xLbLanguage(new
SvxLanguageBox(m_xBuilder->weld_combo_box(u"language"_ustr)))
+ , m_xFtAlgorithm(m_xBuilder->weld_label(u"algorithmft"_ustr))
+ , m_xLbAlgorithm(m_xBuilder->weld_combo_box(u"algorithmlb"_ustr))
+ , m_xBtnIncComments(m_xBuilder->weld_check_button(u"includenotes"_ustr))
+ , m_xBtnIncImages(m_xBuilder->weld_check_button(u"includeimages"_ustr))
{
m_xLbSortUser->set_size_request(m_xLbSortUser->get_approximate_digit_width() *
50, -1);
m_xLbSortUser->set_accessible_description(ScResId(STR_A11Y_DESC_SORTUSER));
diff --git a/sc/source/ui/dbgui/tpsubt.cxx b/sc/source/ui/dbgui/tpsubt.cxx
index 4c123f7598c8..c657f482da34 100644
--- a/sc/source/ui/dbgui/tpsubt.cxx
+++ b/sc/source/ui/dbgui/tpsubt.cxx
@@ -39,7 +39,7 @@
// Subtotals group tabpage:
ScTpSubTotalGroup::ScTpSubTotalGroup(weld::Container* pPage,
weld::DialogController* pController, const SfxItemSet& rArgSet, const
sal_uInt16& rTabNumber)
- : SfxTabPage(pPage, pController, "modules/scalc/ui/subtotalgrppage.ui",
"SubTotalGrpPage", &rArgSet)
+ : SfxTabPage(pPage, pController,
u"modules/scalc/ui/subtotalgrppage.ui"_ustr, u"SubTotalGrpPage"_ustr, &rArgSet)
, aStrNone(ScResId(SCSTR_NONE))
, aStrColumn(ScResId(SCSTR_COLUMN_LETTER))
, pViewData(nullptr)
@@ -47,10 +47,10 @@ ScTpSubTotalGroup::ScTpSubTotalGroup(weld::Container*
pPage, weld::DialogControl
, nWhichSubTotals(rArgSet.GetPool()->GetWhichIDFromSlotID(SID_SUBTOTALS))
, rSubTotalData(rArgSet.Get(nWhichSubTotals).GetSubTotalData())
, nFieldCount(0)
- , mxLbGroup(m_xBuilder->weld_combo_box("group_by"))
- , mxLbColumns(m_xBuilder->weld_tree_view("columns"))
- , mxLbFunctions(m_xBuilder->weld_tree_view("functions"))
- ,
mxLbSelectAllColumns(m_xBuilder->weld_check_button("select_all_columns_button"))
+ , mxLbGroup(m_xBuilder->weld_combo_box(u"group_by"_ustr))
+ , mxLbColumns(m_xBuilder->weld_tree_view(u"columns"_ustr))
+ , mxLbFunctions(m_xBuilder->weld_tree_view(u"functions"_ustr))
+ ,
mxLbSelectAllColumns(m_xBuilder->weld_check_button(u"select_all_columns_button"_ustr))
{
for (size_t i = 0; i < SAL_N_ELEMENTS(SCSTR_SUBTOTALS); ++i)
mxLbFunctions->append_text(ScResId(SCSTR_SUBTOTALS[i]));
@@ -124,7 +124,7 @@ bool ScTpSubTotalGroup::DoReset( sal_uInt16
nGroupNo,
for (int nLbEntry = 0, nCount = mxLbColumns->n_children(); nLbEntry <
nCount; ++nLbEntry)
{
mxLbColumns->set_toggle(nLbEntry, TRISTATE_FALSE);
- mxLbColumns->set_id(nLbEntry, "0");
+ mxLbColumns->set_id(nLbEntry, u"0"_ustr);
}
mxLbFunctions->select(0);
@@ -271,7 +271,7 @@ void ScTpSubTotalGroup::FillListBoxes()
mxLbColumns->insert(i);
mxLbColumns->set_toggle(i, TRISTATE_FALSE);
mxLbColumns->set_text(i, aFieldName, 0);
- mxLbColumns->set_id(i, "0");
+ mxLbColumns->set_id(i, u"0"_ustr);
i++;
}
mxLbColumns->thaw();
@@ -438,21 +438,21 @@ bool ScTpSubTotalGroup3::FillItemSet( SfxItemSet* rArgSet
) { return FILLSET(3);
ScTpSubTotalOptions::ScTpSubTotalOptions(weld::Container* pPage,
weld::DialogController* pController, const SfxItemSet& rArgSet)
: SfxTabPage ( pPage, pController,
- "modules/scalc/ui/subtotaloptionspage.ui",
"SubTotalOptionsPage",
+ u"modules/scalc/ui/subtotaloptionspage.ui"_ustr,
u"SubTotalOptionsPage"_ustr,
&rArgSet ),
pViewData ( nullptr ),
pDoc ( nullptr ),
nWhichSubTotals ( rArgSet.GetPool()->GetWhichIDFromSlotID(
SID_SUBTOTALS ) ),
rSubTotalData ( rArgSet.Get( nWhichSubTotals ).GetSubTotalData()
)
- , m_xBtnPagebreak(m_xBuilder->weld_check_button("pagebreak"))
- , m_xBtnCase(m_xBuilder->weld_check_button("case"))
- , m_xBtnSort(m_xBuilder->weld_check_button("sort"))
- , m_xFlSort(m_xBuilder->weld_label("label2"))
- , m_xBtnAscending(m_xBuilder->weld_radio_button("ascending"))
- , m_xBtnDescending(m_xBuilder->weld_radio_button("descending"))
- , m_xBtnFormats(m_xBuilder->weld_check_button("formats"))
- , m_xBtnUserDef(m_xBuilder->weld_check_button("btnuserdef"))
- , m_xLbUserDef(m_xBuilder->weld_combo_box("lbuserdef"))
+ , m_xBtnPagebreak(m_xBuilder->weld_check_button(u"pagebreak"_ustr))
+ , m_xBtnCase(m_xBuilder->weld_check_button(u"case"_ustr))
+ , m_xBtnSort(m_xBuilder->weld_check_button(u"sort"_ustr))
+ , m_xFlSort(m_xBuilder->weld_label(u"label2"_ustr))
+ , m_xBtnAscending(m_xBuilder->weld_radio_button(u"ascending"_ustr))
+ , m_xBtnDescending(m_xBuilder->weld_radio_button(u"descending"_ustr))
+ , m_xBtnFormats(m_xBuilder->weld_check_button(u"formats"_ustr))
+ , m_xBtnUserDef(m_xBuilder->weld_check_button(u"btnuserdef"_ustr))
+ , m_xLbUserDef(m_xBuilder->weld_combo_box(u"lbuserdef"_ustr))
{
m_xLbUserDef->set_accessible_description(ScResId(STR_A11Y_DESC_USERDEF));
m_xBtnUserDef->set_accessible_description(ScResId(STR_A11Y_DESC_USERDEF));
diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx
index 99d9eba039da..8924e451231c 100644
--- a/sc/source/ui/dbgui/validate.cxx
+++ b/sc/source/ui/dbgui/validate.cxx
@@ -89,21 +89,21 @@ static bool isLOKMobilePhone()
ScValidationDlg::ScValidationDlg(weld::Window* pParent, const SfxItemSet*
pArgSet,
ScTabViewShell *pTabViewSh)
: ScValidationDlgBase(pParent,
- "modules/scalc/ui/validationdialog.ui", "ValidationDialog", pArgSet,
nullptr)
+ u"modules/scalc/ui/validationdialog.ui"_ustr,
u"ValidationDialog"_ustr, pArgSet, nullptr)
, m_pTabVwSh(pTabViewSh)
- , m_sValuePageId("criteria")
+ , m_sValuePageId(u"criteria"_ustr)
, m_bOwnRefHdlr(false)
, m_bRefInputting(false)
- , m_xHBox(m_xBuilder->weld_container("refinputbox"))
+ , m_xHBox(m_xBuilder->weld_container(u"refinputbox"_ustr))
{
AddTabPage(m_sValuePageId, ScTPValidationValue::Create, nullptr);
- AddTabPage("inputhelp", ScTPValidationHelp::Create, nullptr);
- AddTabPage("erroralert", ScTPValidationError::Create, nullptr);
+ AddTabPage(u"inputhelp"_ustr, ScTPValidationHelp::Create, nullptr);
+ AddTabPage(u"erroralert"_ustr, ScTPValidationError::Create, nullptr);
if (isLOKMobilePhone())
{
- m_xBuilder->weld_button("cancel")->hide();
- m_xBuilder->weld_button("help")->hide();
+ m_xBuilder->weld_button(u"cancel"_ustr)->hide();
+ m_xBuilder->weld_button(u"help"_ustr)->hide();
}
}
@@ -353,8 +353,8 @@ bool lclGetStringListFromFormula( OUString& rStringList,
const OUString& rFmlaSt
} // namespace
ScTPValidationValue::ScTPValidationValue(weld::Container* pPage,
weld::DialogController* pController, const SfxItemSet& rArgSet)
- : SfxTabPage(pPage, pController,
"modules/scalc/ui/validationcriteriapage.ui",
- "ValidationCriteriaPage", &rArgSet)
+ : SfxTabPage(pPage, pController,
u"modules/scalc/ui/validationcriteriapage.ui"_ustr,
+ u"ValidationCriteriaPage"_ustr, &rArgSet)
, maStrMin(ScResId(SCSTR_VALID_MINIMUM))
, maStrMax(ScResId(SCSTR_VALID_MAXIMUM))
, maStrValue(ScResId(SCSTR_VALID_VALUE))
@@ -712,10 +712,10 @@ IMPL_LINK_NOARG(ScTPValidationValue, CheckHdl,
weld::Toggleable&, void)
// Input Help Page
ScTPValidationHelp::ScTPValidationHelp(weld::Container* pPage,
weld::DialogController* pController, const SfxItemSet& rArgSet)
- : SfxTabPage(pPage, pController,
"modules/scalc/ui/validationhelptabpage.ui", "ValidationHelpTabPage", &rArgSet)
- , m_xTsbHelp(m_xBuilder->weld_check_button("tsbhelp"))
- , m_xEdtTitle(m_xBuilder->weld_entry("title"))
- , m_xEdInputHelp(m_xBuilder->weld_text_view("inputhelp_text"))
+ : SfxTabPage(pPage, pController,
u"modules/scalc/ui/validationhelptabpage.ui"_ustr,
u"ValidationHelpTabPage"_ustr, &rArgSet)
+ , m_xTsbHelp(m_xBuilder->weld_check_button(u"tsbhelp"_ustr))
+ , m_xEdtTitle(m_xBuilder->weld_entry(u"title"_ustr))
+ , m_xEdInputHelp(m_xBuilder->weld_text_view(u"inputhelp_text"_ustr))
{
m_xEdInputHelp->set_size_request(m_xEdInputHelp->get_approximate_digit_width()
* 40, m_xEdInputHelp->get_height_rows(13));
}
@@ -763,14 +763,14 @@ ScTPValidationError::ScTPValidationError(weld::Container*
pPage, weld::DialogCon
const SfxItemSet& rArgSet)
: SfxTabPage ( pPage, pController,
- "modules/scalc/ui/erroralerttabpage.ui",
"ErrorAlertTabPage",
+ u"modules/scalc/ui/erroralerttabpage.ui"_ustr,
u"ErrorAlertTabPage"_ustr,
&rArgSet )
- , m_xTsbShow(m_xBuilder->weld_check_button("tsbshow"))
- , m_xLbAction(m_xBuilder->weld_combo_box("actionCB"))
- , m_xBtnSearch(m_xBuilder->weld_button("browseBtn"))
- , m_xEdtTitle(m_xBuilder->weld_entry("erroralert_title"))
- , m_xFtError(m_xBuilder->weld_label("errormsg_label"))
- , m_xEdError(m_xBuilder->weld_text_view("errorMsg"))
+ , m_xTsbShow(m_xBuilder->weld_check_button(u"tsbshow"_ustr))
+ , m_xLbAction(m_xBuilder->weld_combo_box(u"actionCB"_ustr))
+ , m_xBtnSearch(m_xBuilder->weld_button(u"browseBtn"_ustr))
+ , m_xEdtTitle(m_xBuilder->weld_entry(u"erroralert_title"_ustr))
+ , m_xFtError(m_xBuilder->weld_label(u"errormsg_label"_ustr))
+ , m_xEdError(m_xBuilder->weld_text_view(u"errorMsg"_ustr))
{
m_xEdError->set_size_request(m_xEdError->get_approximate_digit_width() *
40, m_xEdError->get_height_rows(12));
Init();
