sw/source/ui/fldui/DateFormFieldDialog.cxx | 7 ++- sw/source/ui/fldui/DropDownFieldDialog.cxx | 12 +++--- sw/source/ui/fldui/DropDownFormFieldDialog.cxx | 16 ++++---- sw/source/ui/fldui/changedb.cxx | 14 +++---- sw/source/ui/fldui/flddb.cxx | 28 +++++++-------- sw/source/ui/fldui/flddinf.cxx | 24 ++++++------- sw/source/ui/fldui/flddok.cxx | 32 ++++++++--------- sw/source/ui/fldui/fldedt.cxx | 8 ++-- sw/source/ui/fldui/fldfunc.cxx | 46 ++++++++++++------------- sw/source/ui/fldui/fldpage.cxx | 4 +- sw/source/ui/fldui/fldref.cxx | 28 +++++++-------- sw/source/ui/fldui/fldtdlg.cxx | 40 ++++++++++----------- sw/source/ui/fldui/fldvar.cxx | 38 ++++++++++---------- sw/source/ui/fldui/inpdlg.cxx | 12 +++--- sw/source/ui/fldui/javaedit.cxx | 22 +++++------ 15 files changed, 166 insertions(+), 165 deletions(-)
New commits: commit d620821608a4b89d10ce4b93aa03e6e6d5d04fa8 Author: Noel Grandin <[email protected]> AuthorDate: Mon Jun 3 12:08:21 2024 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Mon Jun 3 14:36:20 2024 +0200 loplugin:ostr in sw/.../fldui Change-Id: If2c0761dc0c607cf5a0275f240521c0aaa916888 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168363 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> diff --git a/sw/source/ui/fldui/DateFormFieldDialog.cxx b/sw/source/ui/fldui/DateFormFieldDialog.cxx index 24461c47d6b2..85baf0ed62f5 100644 --- a/sw/source/ui/fldui/DateFormFieldDialog.cxx +++ b/sw/source/ui/fldui/DateFormFieldDialog.cxx @@ -19,11 +19,12 @@ namespace sw { DateFormFieldDialog::DateFormFieldDialog(weld::Widget* pParent, sw::mark::IDateFieldmark* pDateField, SwDoc& rDoc) - : GenericDialogController(pParent, "modules/swriter/ui/dateformfielddialog.ui", - "DateFormFieldDialog") + : GenericDialogController(pParent, u"modules/swriter/ui/dateformfielddialog.ui"_ustr, + u"DateFormFieldDialog"_ustr) , m_pDateField(pDateField) , m_pNumberFormatter(rDoc.GetNumberFormatter()) - , m_xFormatLB(new SwNumFormatTreeView(m_xBuilder->weld_tree_view("date_formats_treeview"))) + , m_xFormatLB( + new SwNumFormatTreeView(m_xBuilder->weld_tree_view(u"date_formats_treeview"_ustr))) { m_xFormatLB->SetFormatType(SvNumFormatType::DATE); m_xFormatLB->SetAutomaticLanguage(true); diff --git a/sw/source/ui/fldui/DropDownFieldDialog.cxx b/sw/source/ui/fldui/DropDownFieldDialog.cxx index d85bc5365bee..b5dc3e36ebea 100644 --- a/sw/source/ui/fldui/DropDownFieldDialog.cxx +++ b/sw/source/ui/fldui/DropDownFieldDialog.cxx @@ -29,15 +29,15 @@ using namespace ::com::sun::star; // edit insert-field sw::DropDownFieldDialog::DropDownFieldDialog(weld::Widget *pParent, SwWrtShell &rS, SwField* pField, bool bPrevButton, bool bNextButton) - : GenericDialogController(pParent, "modules/swriter/ui/dropdownfielddialog.ui", "DropdownFieldDialog") + : GenericDialogController(pParent, u"modules/swriter/ui/dropdownfielddialog.ui"_ustr, u"DropdownFieldDialog"_ustr) , m_rSh( rS ) , m_pDropField(nullptr) , m_pPressedButton(nullptr) - , m_xListItemsLB(m_xBuilder->weld_tree_view("list")) - , m_xOKPB(m_xBuilder->weld_button("ok")) - , m_xPrevPB(m_xBuilder->weld_button("prev")) - , m_xNextPB(m_xBuilder->weld_button("next")) - , m_xEditPB(m_xBuilder->weld_button("edit")) + , m_xListItemsLB(m_xBuilder->weld_tree_view(u"list"_ustr)) + , m_xOKPB(m_xBuilder->weld_button(u"ok"_ustr)) + , m_xPrevPB(m_xBuilder->weld_button(u"prev"_ustr)) + , m_xNextPB(m_xBuilder->weld_button(u"next"_ustr)) + , m_xEditPB(m_xBuilder->weld_button(u"edit"_ustr)) { m_xListItemsLB->set_size_request(m_xListItemsLB->get_approximate_digit_width() * 24, m_xListItemsLB->get_height_rows(12)); diff --git a/sw/source/ui/fldui/DropDownFormFieldDialog.cxx b/sw/source/ui/fldui/DropDownFormFieldDialog.cxx index a28d9f1f5fab..dab673c45da5 100644 --- a/sw/source/ui/fldui/DropDownFormFieldDialog.cxx +++ b/sw/source/ui/fldui/DropDownFormFieldDialog.cxx @@ -19,16 +19,16 @@ namespace sw { DropDownFormFieldDialog::DropDownFormFieldDialog(weld::Widget* pParent, mark::IFieldmark* pDropDownField) - : GenericDialogController(pParent, "modules/swriter/ui/dropdownformfielddialog.ui", - "DropDownFormFieldDialog") + : GenericDialogController(pParent, u"modules/swriter/ui/dropdownformfielddialog.ui"_ustr, + u"DropDownFormFieldDialog"_ustr) , m_pDropDownField(pDropDownField) , m_bListHasChanged(false) - , m_xListItemEntry(m_xBuilder->weld_entry("item_entry")) - , m_xListAddButton(m_xBuilder->weld_button("add_button")) - , m_xListItemsTreeView(m_xBuilder->weld_tree_view("items_treeview")) - , m_xListRemoveButton(m_xBuilder->weld_button("remove_button")) - , m_xListUpButton(m_xBuilder->weld_button("up_button")) - , m_xListDownButton(m_xBuilder->weld_button("down_button")) + , m_xListItemEntry(m_xBuilder->weld_entry(u"item_entry"_ustr)) + , m_xListAddButton(m_xBuilder->weld_button(u"add_button"_ustr)) + , m_xListItemsTreeView(m_xBuilder->weld_tree_view(u"items_treeview"_ustr)) + , m_xListRemoveButton(m_xBuilder->weld_button(u"remove_button"_ustr)) + , m_xListUpButton(m_xBuilder->weld_button(u"up_button"_ustr)) + , m_xListDownButton(m_xBuilder->weld_button(u"down_button"_ustr)) { m_xListItemEntry->connect_key_press(LINK(this, DropDownFormFieldDialog, KeyPressedHdl)); m_xListItemEntry->connect_changed(LINK(this, DropDownFormFieldDialog, EntryChangedHdl)); diff --git a/sw/source/ui/fldui/changedb.cxx b/sw/source/ui/fldui/changedb.cxx index 97bd44809114..169e8c269fda 100644 --- a/sw/source/ui/fldui/changedb.cxx +++ b/sw/source/ui/fldui/changedb.cxx @@ -41,14 +41,14 @@ using namespace ::com::sun::star::uno; // edit insert-field SwChangeDBDlg::SwChangeDBDlg(SwView const & rVw) - : SfxDialogController(rVw.GetViewFrame().GetFrameWeld(), "modules/swriter/ui/exchangedatabases.ui", - "ExchangeDatabasesDialog") + : SfxDialogController(rVw.GetViewFrame().GetFrameWeld(), u"modules/swriter/ui/exchangedatabases.ui"_ustr, + u"ExchangeDatabasesDialog"_ustr) , m_pSh(rVw.GetWrtShellPtr()) - , m_xUsedDBTLB(m_xBuilder->weld_tree_view("inuselb")) - , m_xAvailDBTLB(new SwDBTreeList(m_xBuilder->weld_tree_view("availablelb"))) - , m_xAddDBPB(m_xBuilder->weld_button("browse")) - , m_xDocDBNameFT(m_xBuilder->weld_label("dbnameft")) - , m_xDefineBT(m_xBuilder->weld_button("ok")) + , m_xUsedDBTLB(m_xBuilder->weld_tree_view(u"inuselb"_ustr)) + , m_xAvailDBTLB(new SwDBTreeList(m_xBuilder->weld_tree_view(u"availablelb"_ustr))) + , m_xAddDBPB(m_xBuilder->weld_button(u"browse"_ustr)) + , m_xDocDBNameFT(m_xBuilder->weld_label(u"dbnameft"_ustr)) + , m_xDefineBT(m_xBuilder->weld_button(u"ok"_ustr)) { int nWidth = m_xUsedDBTLB->get_approximate_digit_width() * 25; int nHeight = m_xUsedDBTLB->get_height_rows(8); diff --git a/sw/source/ui/fldui/flddb.cxx b/sw/source/ui/fldui/flddb.cxx index d9e101a31b53..0e6374e2b45e 100644 --- a/sw/source/ui/fldui/flddb.cxx +++ b/sw/source/ui/fldui/flddb.cxx @@ -31,21 +31,21 @@ #define USER_DATA_VERSION USER_DATA_VERSION_1 SwFieldDBPage::SwFieldDBPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet *const pCoreSet) - : SwFieldPage(pPage, pController, "modules/swriter/ui/flddbpage.ui", "FieldDbPage", pCoreSet) + : SwFieldPage(pPage, pController, u"modules/swriter/ui/flddbpage.ui"_ustr, u"FieldDbPage"_ustr, pCoreSet) , m_nOldFormat(0) , m_nOldSubType(0) - , m_xTypeLB(m_xBuilder->weld_tree_view("type")) - , m_xDatabaseTLB(new SwDBTreeList(m_xBuilder->weld_tree_view("select"))) - , m_xAddDBPB(m_xBuilder->weld_button("browse")) - , m_xCondition(m_xBuilder->weld_widget("condgroup")) - , m_xConditionED(new ConditionEdit<weld::Entry>(m_xBuilder->weld_entry("condition"))) - , m_xValue(m_xBuilder->weld_widget("recgroup")) - , m_xValueED(m_xBuilder->weld_entry("recnumber")) - , m_xDBFormatRB(m_xBuilder->weld_radio_button("fromdatabasecb")) - , m_xNewFormatRB(m_xBuilder->weld_radio_button("userdefinedcb")) - , m_xNumFormatLB(new NumFormatListBox(m_xBuilder->weld_combo_box("numformat"))) - , m_xFormatLB(m_xBuilder->weld_combo_box("format")) - , m_xFormat(m_xBuilder->weld_widget("formatframe")) + , m_xTypeLB(m_xBuilder->weld_tree_view(u"type"_ustr)) + , m_xDatabaseTLB(new SwDBTreeList(m_xBuilder->weld_tree_view(u"select"_ustr))) + , m_xAddDBPB(m_xBuilder->weld_button(u"browse"_ustr)) + , m_xCondition(m_xBuilder->weld_widget(u"condgroup"_ustr)) + , m_xConditionED(new ConditionEdit<weld::Entry>(m_xBuilder->weld_entry(u"condition"_ustr))) + , m_xValue(m_xBuilder->weld_widget(u"recgroup"_ustr)) + , m_xValueED(m_xBuilder->weld_entry(u"recnumber"_ustr)) + , m_xDBFormatRB(m_xBuilder->weld_radio_button(u"fromdatabasecb"_ustr)) + , m_xNewFormatRB(m_xBuilder->weld_radio_button(u"userdefinedcb"_ustr)) + , m_xNumFormatLB(new NumFormatListBox(m_xBuilder->weld_combo_box(u"numformat"_ustr))) + , m_xFormatLB(m_xBuilder->weld_combo_box(u"format"_ustr)) + , m_xFormat(m_xBuilder->weld_widget(u"formatframe"_ustr)) { SetTypeSel(-1); //TODO @@ -402,7 +402,7 @@ void SwFieldDBPage::TypeHdl(const weld::TreeView* pBox) { m_xValueED->set_text(OUString()); if (bCond) - m_xConditionED->set_text("TRUE"); + m_xConditionED->set_text(u"TRUE"_ustr); else m_xConditionED->set_text(OUString()); } diff --git a/sw/source/ui/fldui/flddinf.cxx b/sw/source/ui/fldui/flddinf.cxx index 7cb69c1d0e49..24c81eb10edb 100644 --- a/sw/source/ui/fldui/flddinf.cxx +++ b/sw/source/ui/fldui/flddinf.cxx @@ -51,20 +51,20 @@ void FillFieldSelect(weld::TreeView& rListBox) } SwFieldDokInfPage::SwFieldDokInfPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet *const pCoreSet) - : SwFieldPage(pPage, pController, "modules/swriter/ui/flddocinfopage.ui", "FieldDocInfoPage", pCoreSet) + : SwFieldPage(pPage, pController, u"modules/swriter/ui/flddocinfopage.ui"_ustr, u"FieldDocInfoPage"_ustr, pCoreSet) , m_nOldSel(0) , m_nOldFormat(0) - , m_xTypeList(m_xBuilder->weld_tree_view("type-list")) - , m_xTypeTree(m_xBuilder->weld_tree_view("type-tree")) + , m_xTypeList(m_xBuilder->weld_tree_view(u"type-list"_ustr)) + , m_xTypeTree(m_xBuilder->weld_tree_view(u"type-tree"_ustr)) // tdf#104278 have two tree views, one with expander and one without, the one with is only used // when there are custom properties which use the expander, so the common case of no custom // properties doesn't have an 'unexplained' expander margin , m_pTypeView(m_xTypeTree.get()) - , m_xSelection(m_xBuilder->weld_widget("selectframe")) - , m_xSelectionLB(m_xBuilder->weld_tree_view("select")) - , m_xFormat(m_xBuilder->weld_widget("formatframe")) - , m_xFormatLB(new SwNumFormatTreeView(m_xBuilder->weld_tree_view("format"))) - , m_xFixedCB(m_xBuilder->weld_check_button("fixed")) + , m_xSelection(m_xBuilder->weld_widget(u"selectframe"_ustr)) + , m_xSelectionLB(m_xBuilder->weld_tree_view(u"select"_ustr)) + , m_xFormat(m_xBuilder->weld_widget(u"formatframe"_ustr)) + , m_xFormatLB(new SwNumFormatTreeView(m_xBuilder->weld_tree_view(u"format"_ustr))) + , m_xFixedCB(m_xBuilder->weld_check_button(u"fixed"_ustr)) { m_xTypeList->make_sorted(); m_xTypeTree->make_sorted(); @@ -87,7 +87,7 @@ SwFieldDokInfPage::SwFieldDokInfPage(weld::Container* pPage, weld::DialogControl pItem->GetValue() >>= m_xCustomPropertySet; // uitests - m_pTypeView->set_buildable_name("type-docinf"); + m_pTypeView->set_buildable_name(u"type-docinf"_ustr); m_xSelectionLB->set_buildable_name(m_xSelectionLB->get_buildable_name() + "-docinf"); m_xFormatLB->set_buildable_name(m_xFormatLB->get_buildable_name() + "-docinf"); } @@ -110,19 +110,19 @@ void SwFieldDokInfPage::Reset(const SfxItemSet* ) if (aCustomProperties.hasElements()) { m_xTypeList->hide(); - m_xTypeList->set_buildable_name("type-list"); + m_xTypeList->set_buildable_name(u"type-list"_ustr); m_xTypeTree->show(); m_pTypeView = m_xTypeTree.get(); } else { m_xTypeTree->hide(); - m_xTypeTree->set_buildable_name("type-tree"); + m_xTypeTree->set_buildable_name(u"type-tree"_ustr); m_xTypeList->show(); m_pTypeView = m_xTypeList.get(); } - m_pTypeView->set_buildable_name("type-docinf"); + m_pTypeView->set_buildable_name(u"type-docinf"_ustr); // initialise TypeListBox m_pTypeView->freeze(); diff --git a/sw/source/ui/fldui/flddok.cxx b/sw/source/ui/fldui/flddok.cxx index 5cb38a38aca9..bb1048a94563 100644 --- a/sw/source/ui/fldui/flddok.cxx +++ b/sw/source/ui/fldui/flddok.cxx @@ -32,24 +32,24 @@ #define USER_DATA_VERSION USER_DATA_VERSION_1 SwFieldDokPage::SwFieldDokPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet *const pCoreSet) - : SwFieldPage(pPage, pController, "modules/swriter/ui/flddocumentpage.ui", - "FieldDocumentPage", pCoreSet) + : SwFieldPage(pPage, pController, u"modules/swriter/ui/flddocumentpage.ui"_ustr, + u"FieldDocumentPage"_ustr, pCoreSet) , m_nOldSel(0) , m_nOldFormat(0) - , m_xTypeLB(m_xBuilder->weld_tree_view("type")) - , m_xSelection(m_xBuilder->weld_widget("selectframe")) - , m_xSelectionLB(m_xBuilder->weld_tree_view("select")) - , m_xValueFT(m_xBuilder->weld_label("valueft")) - , m_xValueED(m_xBuilder->weld_entry("value")) - , m_xLevelFT(m_xBuilder->weld_label("levelft")) - , m_xLevelED(m_xBuilder->weld_combo_box("level")) - , m_xDateFT(m_xBuilder->weld_label("daysft")) - , m_xTimeFT(m_xBuilder->weld_label("minutesft")) - , m_xDateOffsetED(m_xBuilder->weld_spin_button("offset")) - , m_xFormat(m_xBuilder->weld_widget("formatframe")) - , m_xFormatLB(m_xBuilder->weld_tree_view("format")) - , m_xNumFormatLB(new SwNumFormatTreeView(m_xBuilder->weld_tree_view("numformat"))) - , m_xFixedCB(m_xBuilder->weld_check_button("fixed")) + , m_xTypeLB(m_xBuilder->weld_tree_view(u"type"_ustr)) + , m_xSelection(m_xBuilder->weld_widget(u"selectframe"_ustr)) + , m_xSelectionLB(m_xBuilder->weld_tree_view(u"select"_ustr)) + , m_xValueFT(m_xBuilder->weld_label(u"valueft"_ustr)) + , m_xValueED(m_xBuilder->weld_entry(u"value"_ustr)) + , m_xLevelFT(m_xBuilder->weld_label(u"levelft"_ustr)) + , m_xLevelED(m_xBuilder->weld_combo_box(u"level"_ustr)) + , m_xDateFT(m_xBuilder->weld_label(u"daysft"_ustr)) + , m_xTimeFT(m_xBuilder->weld_label(u"minutesft"_ustr)) + , m_xDateOffsetED(m_xBuilder->weld_spin_button(u"offset"_ustr)) + , m_xFormat(m_xBuilder->weld_widget(u"formatframe"_ustr)) + , m_xFormatLB(m_xBuilder->weld_tree_view(u"format"_ustr)) + , m_xNumFormatLB(new SwNumFormatTreeView(m_xBuilder->weld_tree_view(u"numformat"_ustr))) + , m_xFixedCB(m_xBuilder->weld_check_button(u"fixed"_ustr)) { m_xTypeLB->make_sorted(); m_xFormatLB->make_sorted(); diff --git a/sw/source/ui/fldui/fldedt.cxx b/sw/source/ui/fldui/fldedt.cxx index 94273c93dcae..c51960e23bec 100644 --- a/sw/source/ui/fldui/fldedt.cxx +++ b/sw/source/ui/fldui/fldedt.cxx @@ -99,11 +99,11 @@ void SwFieldEditDlg::EnsureSelection(SwField *pCurField, SwFieldMgr &rMgr) SwFieldEditDlg::SwFieldEditDlg(SwView const & rVw) : SfxSingleTabDialogController(rVw.GetViewFrame().GetFrameWeld(), nullptr, - "modules/swriter/ui/editfielddialog.ui", "EditFieldDialog") + u"modules/swriter/ui/editfielddialog.ui"_ustr, u"EditFieldDialog"_ustr) , m_pSh(rVw.GetWrtShellPtr()) - , m_xPrevBT(m_xBuilder->weld_button("prev")) - , m_xNextBT(m_xBuilder->weld_button("next")) - , m_xAddressBT(m_xBuilder->weld_button("edit")) + , m_xPrevBT(m_xBuilder->weld_button(u"prev"_ustr)) + , m_xNextBT(m_xBuilder->weld_button(u"next"_ustr)) + , m_xAddressBT(m_xBuilder->weld_button(u"edit"_ustr)) { SwFieldMgr aMgr(m_pSh); diff --git a/sw/source/ui/fldui/fldfunc.cxx b/sw/source/ui/fldui/fldfunc.cxx index ce29dd991d3b..0a553522985c 100644 --- a/sw/source/ui/fldui/fldfunc.cxx +++ b/sw/source/ui/fldui/fldfunc.cxx @@ -34,31 +34,31 @@ using namespace ::com::sun::star; SwFieldFuncPage::SwFieldFuncPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet *const pCoreSet) - : SwFieldPage(pPage, pController, "modules/swriter/ui/fldfuncpage.ui", "FieldFuncPage", pCoreSet) + : SwFieldPage(pPage, pController, u"modules/swriter/ui/fldfuncpage.ui"_ustr, u"FieldFuncPage"_ustr, pCoreSet) , m_nOldFormat(0) , m_bDropDownLBChanged(false) - , m_xTypeLB(m_xBuilder->weld_tree_view("type")) - , m_xSelectionLB(m_xBuilder->weld_tree_view("select")) - , m_xFormat(m_xBuilder->weld_widget("formatframe")) - , m_xFormatLB(m_xBuilder->weld_tree_view("format")) - , m_xNameFT(m_xBuilder->weld_label("nameft")) - , m_xNameED(new ConditionEdit<weld::Entry>(m_xBuilder->weld_entry("condFunction"))) - , m_xValueGroup(m_xBuilder->weld_widget("valuegroup")) - , m_xValueFT(m_xBuilder->weld_label("valueft")) - , m_xValueED(m_xBuilder->weld_entry("value")) - , m_xCond1FT(m_xBuilder->weld_label("cond1ft")) - , m_xCond1ED(new ConditionEdit<weld::Entry>(m_xBuilder->weld_entry("cond1"))) - , m_xCond2FT(m_xBuilder->weld_label("cond2ft")) - , m_xCond2ED(new ConditionEdit<weld::Entry>(m_xBuilder->weld_entry("cond2"))) - , m_xMacroBT(m_xBuilder->weld_button("macro")) - , m_xListGroup(m_xBuilder->weld_widget("listgroup")) - , m_xListItemED(m_xBuilder->weld_entry("item")) - , m_xListAddPB(m_xBuilder->weld_button("add")) - , m_xListItemsLB(m_xBuilder->weld_tree_view("listitems")) - , m_xListRemovePB(m_xBuilder->weld_button("remove")) - , m_xListUpPB(m_xBuilder->weld_button("up")) - , m_xListDownPB(m_xBuilder->weld_button("down")) - , m_xListNameED(m_xBuilder->weld_entry("listname")) + , m_xTypeLB(m_xBuilder->weld_tree_view(u"type"_ustr)) + , m_xSelectionLB(m_xBuilder->weld_tree_view(u"select"_ustr)) + , m_xFormat(m_xBuilder->weld_widget(u"formatframe"_ustr)) + , m_xFormatLB(m_xBuilder->weld_tree_view(u"format"_ustr)) + , m_xNameFT(m_xBuilder->weld_label(u"nameft"_ustr)) + , m_xNameED(new ConditionEdit<weld::Entry>(m_xBuilder->weld_entry(u"condFunction"_ustr))) + , m_xValueGroup(m_xBuilder->weld_widget(u"valuegroup"_ustr)) + , m_xValueFT(m_xBuilder->weld_label(u"valueft"_ustr)) + , m_xValueED(m_xBuilder->weld_entry(u"value"_ustr)) + , m_xCond1FT(m_xBuilder->weld_label(u"cond1ft"_ustr)) + , m_xCond1ED(new ConditionEdit<weld::Entry>(m_xBuilder->weld_entry(u"cond1"_ustr))) + , m_xCond2FT(m_xBuilder->weld_label(u"cond2ft"_ustr)) + , m_xCond2ED(new ConditionEdit<weld::Entry>(m_xBuilder->weld_entry(u"cond2"_ustr))) + , m_xMacroBT(m_xBuilder->weld_button(u"macro"_ustr)) + , m_xListGroup(m_xBuilder->weld_widget(u"listgroup"_ustr)) + , m_xListItemED(m_xBuilder->weld_entry(u"item"_ustr)) + , m_xListAddPB(m_xBuilder->weld_button(u"add"_ustr)) + , m_xListItemsLB(m_xBuilder->weld_tree_view(u"listitems"_ustr)) + , m_xListRemovePB(m_xBuilder->weld_button(u"remove"_ustr)) + , m_xListUpPB(m_xBuilder->weld_button(u"up"_ustr)) + , m_xListDownPB(m_xBuilder->weld_button(u"down"_ustr)) + , m_xListNameED(m_xBuilder->weld_entry(u"listname"_ustr)) { FillFieldSelect(*m_xSelectionLB); FillFieldSelect(*m_xFormatLB); diff --git a/sw/source/ui/fldui/fldpage.cxx b/sw/source/ui/fldui/fldpage.cxx index 7e7f5ade3b86..11923d34ee93 100644 --- a/sw/source/ui/fldui/fldpage.cxx +++ b/sw/source/ui/fldui/fldpage.cxx @@ -89,9 +89,9 @@ void SwFieldPage::Init() { SwDoc* pDoc = pSh->GetDoc(); pSh->InsertFieldType( SwSetExpFieldType( pDoc, - "HTML_ON", 1)); + u"HTML_ON"_ustr, 1)); pSh->InsertFieldType( SwSetExpFieldType(pDoc, - "HTML_OFF", 1)); + u"HTML_OFF"_ustr, 1)); } } diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx index 434e10a6a2f2..672465d713d9 100644 --- a/sw/source/ui/fldui/fldref.cxx +++ b/sw/source/ui/fldui/fldref.cxx @@ -66,22 +66,22 @@ enum FMT_REF_IDX } SwFieldRefPage::SwFieldRefPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet *const pCoreSet ) - : SwFieldPage(pPage, pController, "modules/swriter/ui/fldrefpage.ui", "FieldRefPage", pCoreSet) + : SwFieldPage(pPage, pController, u"modules/swriter/ui/fldrefpage.ui"_ustr, u"FieldRefPage"_ustr, pCoreSet) , mpSavedSelectedTextNode(nullptr) , mnSavedSelectedPos(0) - , m_xTypeLB(m_xBuilder->weld_tree_view("type")) - , m_xSelection(m_xBuilder->weld_widget("selectframe")) - , m_xSelectionLB(m_xBuilder->weld_tree_view("select")) - , m_xSelectionToolTipLB(m_xBuilder->weld_tree_view("selecttip")) - , m_xFormat(m_xBuilder->weld_widget("formatframe")) - , m_xFormatLB(m_xBuilder->weld_tree_view("format")) - , m_xNameFT(m_xBuilder->weld_label("nameft")) - , m_xNameED(m_xBuilder->weld_entry("name")) - , m_xValueED(m_xBuilder->weld_entry("value")) - , m_xFilterED(m_xBuilder->weld_entry("filter")) - , m_xStylerefFlags(m_xBuilder->weld_widget("stylerefflagsframe")) - , m_xStylerefFromBottomCB(m_xBuilder->weld_check_button("stylereffrombottomcheckbox")) - , m_xStylerefHideNonNumericalCB(m_xBuilder->weld_check_button("stylerefhidenonnumericalcheckbox")) + , m_xTypeLB(m_xBuilder->weld_tree_view(u"type"_ustr)) + , m_xSelection(m_xBuilder->weld_widget(u"selectframe"_ustr)) + , m_xSelectionLB(m_xBuilder->weld_tree_view(u"select"_ustr)) + , m_xSelectionToolTipLB(m_xBuilder->weld_tree_view(u"selecttip"_ustr)) + , m_xFormat(m_xBuilder->weld_widget(u"formatframe"_ustr)) + , m_xFormatLB(m_xBuilder->weld_tree_view(u"format"_ustr)) + , m_xNameFT(m_xBuilder->weld_label(u"nameft"_ustr)) + , m_xNameED(m_xBuilder->weld_entry(u"name"_ustr)) + , m_xValueED(m_xBuilder->weld_entry(u"value"_ustr)) + , m_xFilterED(m_xBuilder->weld_entry(u"filter"_ustr)) + , m_xStylerefFlags(m_xBuilder->weld_widget(u"stylerefflagsframe"_ustr)) + , m_xStylerefFromBottomCB(m_xBuilder->weld_check_button(u"stylereffrombottomcheckbox"_ustr)) + , m_xStylerefHideNonNumericalCB(m_xBuilder->weld_check_button(u"stylerefhidenonnumericalcheckbox"_ustr)) { m_xSelectionLB->make_sorted(); // #i83479# diff --git a/sw/source/ui/fldui/fldtdlg.cxx b/sw/source/ui/fldui/fldtdlg.cxx index 9504a2d4c022..f649a24416b1 100644 --- a/sw/source/ui/fldui/fldtdlg.cxx +++ b/sw/source/ui/fldui/fldtdlg.cxx @@ -49,7 +49,7 @@ // carrier of the dialog SwFieldDlg::SwFieldDlg(SfxBindings* pB, SwChildWinWrapper* pCW, weld::Window *pParent) - : SfxTabDialogController(pParent, "modules/swriter/ui/fielddialog.ui", "FieldDialog") + : SfxTabDialogController(pParent, u"modules/swriter/ui/fielddialog.ui"_ustr, u"FieldDialog"_ustr) , m_pChildWin(pCW) , m_pBindings(pB) , m_bDataBaseMode(false) @@ -60,19 +60,19 @@ SwFieldDlg::SwFieldDlg(SfxBindings* pB, SwChildWinWrapper* pCW, weld::Window *pP GetCancelButton().connect_clicked(LINK(this, SwFieldDlg, CancelHdl)); GetOKButton().connect_clicked(LINK(this, SwFieldDlg, OKHdl)); - AddTabPage("document", SwFieldDokPage::Create, nullptr); - AddTabPage("variables", SwFieldVarPage::Create, nullptr); - AddTabPage("docinfo", SwFieldDokInfPage::Create, nullptr); + AddTabPage(u"document"_ustr, SwFieldDokPage::Create, nullptr); + AddTabPage(u"variables"_ustr, SwFieldVarPage::Create, nullptr); + AddTabPage(u"docinfo"_ustr, SwFieldDokInfPage::Create, nullptr); if (!m_bHtmlMode) { - AddTabPage("ref", SwFieldRefPage::Create, nullptr); - AddTabPage("functions", SwFieldFuncPage::Create, nullptr); + AddTabPage(u"ref"_ustr, SwFieldRefPage::Create, nullptr); + AddTabPage(u"functions"_ustr, SwFieldFuncPage::Create, nullptr); utl::OConfigurationTreeRoot aCfgRoot = utl::OConfigurationTreeRoot::createWithComponentContext( ::comphelper::getProcessComponentContext(), - "/org.openoffice.Office.DataAccess/Policies/Features/Writer", + u"/org.openoffice.Office.DataAccess/Policies/Features/Writer"_ustr, -1, utl::OConfigurationTreeRoot::CM_READONLY); @@ -81,20 +81,20 @@ SwFieldDlg::SwFieldDlg(SfxBindings* pB, SwChildWinWrapper* pCW, weld::Window *pP aCfgRoot.getNodeValue(u"DatabaseFields"_ustr) >>= bDatabaseFields; if (bDatabaseFields) - AddTabPage("database", SwFieldDBPage::Create, nullptr); + AddTabPage(u"database"_ustr, SwFieldDBPage::Create, nullptr); else #endif - RemoveTabPage("database"); + RemoveTabPage(u"database"_ustr); } else { - RemoveTabPage("ref"); - RemoveTabPage("functions"); - RemoveTabPage("database"); + RemoveTabPage(u"ref"_ustr); + RemoveTabPage(u"functions"_ustr); + RemoveTabPage(u"database"_ustr); } if (comphelper::LibreOfficeKit::isActive()) - RemoveTabPage("database"); + RemoveTabPage(u"database"_ustr); } SwFieldDlg::~SwFieldDlg() @@ -265,24 +265,24 @@ void SwFieldDlg::ActivateDatabasePage() { #if HAVE_FEATURE_DBCONNECTIVITY && !ENABLE_FUZZERS m_bDataBaseMode = true; - ShowPage("database"); + ShowPage(u"database"_ustr); SfxTabPage* pDBPage = GetTabPage(u"database"); if( pDBPage ) { static_cast<SwFieldDBPage*>(pDBPage)->ActivateMailMergeAddress(); } //remove all other pages - RemoveTabPage("document"); - RemoveTabPage("variables"); - RemoveTabPage("docinfo"); - RemoveTabPage("ref"); - RemoveTabPage("functions"); + RemoveTabPage(u"document"_ustr); + RemoveTabPage(u"variables"_ustr); + RemoveTabPage(u"docinfo"_ustr); + RemoveTabPage(u"ref"_ustr); + RemoveTabPage(u"functions"_ustr); #endif } void SwFieldDlg::ShowReferencePage() { - ShowPage("ref"); + ShowPage(u"ref"_ustr); } void SwFieldDlg::PageCreated(const OUString& rId, SfxTabPage& rPage) diff --git a/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx index 4190aa81f29c..a950a5054529 100644 --- a/sw/source/ui/fldui/fldvar.cxx +++ b/sw/source/ui/fldui/fldvar.cxx @@ -40,24 +40,24 @@ #define USER_DATA_VERSION USER_DATA_VERSION_1 SwFieldVarPage::SwFieldVarPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet *const pCoreSet ) - : SwFieldPage(pPage, pController, "modules/swriter/ui/fldvarpage.ui", "FieldVarPage", pCoreSet) - , m_xTypeLB(m_xBuilder->weld_tree_view("type")) - , m_xSelection(m_xBuilder->weld_widget("selectframe")) - , m_xSelectionLB(m_xBuilder->weld_tree_view("select")) - , m_xNameFT(m_xBuilder->weld_label("nameft")) - , m_xNameED(m_xBuilder->weld_entry("name")) - , m_xValueFT(m_xBuilder->weld_label("valueft")) - , m_xValueED(new ConditionEdit<weld::TextView>(m_xBuilder->weld_text_view("value"))) - , m_xFormat(m_xBuilder->weld_widget("formatframe")) - , m_xNumFormatLB(new SwNumFormatTreeView(m_xBuilder->weld_tree_view("numformat"))) - , m_xFormatLB(m_xBuilder->weld_tree_view("format")) - , m_xChapterFrame(m_xBuilder->weld_widget("chapterframe")) - , m_xChapterLevelLB(m_xBuilder->weld_combo_box("level")) - , m_xInvisibleCB(m_xBuilder->weld_check_button("invisible")) - , m_xSeparatorFT(m_xBuilder->weld_label("separatorft")) - , m_xSeparatorED(m_xBuilder->weld_entry("separator")) - , m_xNewPB(m_xBuilder->weld_button("apply")) - , m_xDelPB(m_xBuilder->weld_button("delete")) + : SwFieldPage(pPage, pController, u"modules/swriter/ui/fldvarpage.ui"_ustr, u"FieldVarPage"_ustr, pCoreSet) + , m_xTypeLB(m_xBuilder->weld_tree_view(u"type"_ustr)) + , m_xSelection(m_xBuilder->weld_widget(u"selectframe"_ustr)) + , m_xSelectionLB(m_xBuilder->weld_tree_view(u"select"_ustr)) + , m_xNameFT(m_xBuilder->weld_label(u"nameft"_ustr)) + , m_xNameED(m_xBuilder->weld_entry(u"name"_ustr)) + , m_xValueFT(m_xBuilder->weld_label(u"valueft"_ustr)) + , m_xValueED(new ConditionEdit<weld::TextView>(m_xBuilder->weld_text_view(u"value"_ustr))) + , m_xFormat(m_xBuilder->weld_widget(u"formatframe"_ustr)) + , m_xNumFormatLB(new SwNumFormatTreeView(m_xBuilder->weld_tree_view(u"numformat"_ustr))) + , m_xFormatLB(m_xBuilder->weld_tree_view(u"format"_ustr)) + , m_xChapterFrame(m_xBuilder->weld_widget(u"chapterframe"_ustr)) + , m_xChapterLevelLB(m_xBuilder->weld_combo_box(u"level"_ustr)) + , m_xInvisibleCB(m_xBuilder->weld_check_button(u"invisible"_ustr)) + , m_xSeparatorFT(m_xBuilder->weld_label(u"separatorft"_ustr)) + , m_xSeparatorED(m_xBuilder->weld_entry(u"separator"_ustr)) + , m_xNewPB(m_xBuilder->weld_button(u"apply"_ustr)) + , m_xDelPB(m_xBuilder->weld_button(u"delete"_ustr)) , m_nOldFormat(0) , m_bInit(true) { @@ -1266,7 +1266,7 @@ sal_uInt16 SwFieldVarPage::GetGroup() void SwFieldVarPage::FillUserData() { - OUString sData = USER_DATA_VERSION ";"; + OUString sData = u"" USER_DATA_VERSION ";"_ustr; sal_Int32 nTypeSel = m_xTypeLB->get_selected_index(); if( -1 == nTypeSel ) nTypeSel = USHRT_MAX; diff --git a/sw/source/ui/fldui/inpdlg.cxx b/sw/source/ui/fldui/inpdlg.cxx index f5ed2c33e934..54c6b15ed844 100644 --- a/sw/source/ui/fldui/inpdlg.cxx +++ b/sw/source/ui/fldui/inpdlg.cxx @@ -28,17 +28,17 @@ // edit field-insert SwFieldInputDlg::SwFieldInputDlg(weld::Widget *pParent, SwWrtShell &rS, SwField* pField, bool bPrevButton, bool bNextButton) - : GenericDialogController(pParent, "modules/swriter/ui/inputfielddialog.ui", "InputFieldDialog") + : GenericDialogController(pParent, u"modules/swriter/ui/inputfielddialog.ui"_ustr, u"InputFieldDialog"_ustr) , m_rSh( rS ) , m_pInpField(nullptr) , m_pSetField(nullptr) , m_pUsrType(nullptr) , m_pPressedButton(nullptr) - , m_xLabelED(m_xBuilder->weld_entry("name")) - , m_xEditED(m_xBuilder->weld_text_view("text")) - , m_xPrevBT(m_xBuilder->weld_button("prev")) - , m_xNextBT(m_xBuilder->weld_button("next")) - , m_xOKBT(m_xBuilder->weld_button("ok")) + , m_xLabelED(m_xBuilder->weld_entry(u"name"_ustr)) + , m_xEditED(m_xBuilder->weld_text_view(u"text"_ustr)) + , m_xPrevBT(m_xBuilder->weld_button(u"prev"_ustr)) + , m_xNextBT(m_xBuilder->weld_button(u"next"_ustr)) + , m_xOKBT(m_xBuilder->weld_button(u"ok"_ustr)) { m_xEditED->set_size_request(-1, m_xEditED->get_height_rows(8)); diff --git a/sw/source/ui/fldui/javaedit.cxx b/sw/source/ui/fldui/javaedit.cxx index b13c9828d8c5..f5bdc486ae88 100644 --- a/sw/source/ui/fldui/javaedit.cxx +++ b/sw/source/ui/fldui/javaedit.cxx @@ -34,19 +34,19 @@ using namespace ::com::sun::star; SwJavaEditDialog::SwJavaEditDialog(weld::Window* pParent, SwWrtShell* pWrtSh) - : GenericDialogController(pParent, "modules/swriter/ui/insertscript.ui", "InsertScriptDialog") + : GenericDialogController(pParent, u"modules/swriter/ui/insertscript.ui"_ustr, u"InsertScriptDialog"_ustr) , m_bNew(true) , m_bIsUrl(false) , m_pSh(pWrtSh) - , m_xTypeED(m_xBuilder->weld_entry("scripttype")) - , m_xUrlRB(m_xBuilder->weld_radio_button("url")) - , m_xEditRB(m_xBuilder->weld_radio_button("text")) - , m_xUrlPB(m_xBuilder->weld_button("browse")) - , m_xUrlED(m_xBuilder->weld_entry("urlentry")) - , m_xEditED(m_xBuilder->weld_text_view("textentry")) - , m_xOKBtn(m_xBuilder->weld_button("ok")) - , m_xPrevBtn(m_xBuilder->weld_button("previous")) - , m_xNextBtn(m_xBuilder->weld_button("next")) + , m_xTypeED(m_xBuilder->weld_entry(u"scripttype"_ustr)) + , m_xUrlRB(m_xBuilder->weld_radio_button(u"url"_ustr)) + , m_xEditRB(m_xBuilder->weld_radio_button(u"text"_ustr)) + , m_xUrlPB(m_xBuilder->weld_button(u"browse"_ustr)) + , m_xUrlED(m_xBuilder->weld_entry(u"urlentry"_ustr)) + , m_xEditED(m_xBuilder->weld_text_view(u"textentry"_ustr)) + , m_xOKBtn(m_xBuilder->weld_button(u"ok"_ustr)) + , m_xPrevBtn(m_xBuilder->weld_button(u"previous"_ustr)) + , m_xNextBtn(m_xBuilder->weld_button(u"next"_ustr)) { // install handler m_xPrevBtn->connect_clicked( LINK( this, SwJavaEditDialog, PrevHdl ) ); @@ -229,7 +229,7 @@ IMPL_LINK_NOARG( SwJavaEditDialog, InsertFileHdl, weld::Button&, void ) { m_pFileDlg.reset(new ::sfx2::FileDialogHelper( ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE, - FileDialogFlags::Insert, "swriter", SfxFilterFlags::NONE, SfxFilterFlags::NONE, m_xDialog.get())); + FileDialogFlags::Insert, u"swriter"_ustr, SfxFilterFlags::NONE, SfxFilterFlags::NONE, m_xDialog.get())); } m_pFileDlg->SetContext(sfx2::FileDialogHelper::WriterInsertScript); m_pFileDlg->StartExecuteModal( LINK( this, SwJavaEditDialog, DlgClosedHdl ) );
