sw/source/ui/misc/bookmark.cxx | 31 ++++++----- sw/source/ui/misc/contentcontroldlg.cxx | 47 +++++++++-------- sw/source/ui/misc/contentcontrollistitemdlg.cxx | 10 +-- sw/source/ui/misc/docfnote.cxx | 42 +++++++-------- sw/source/ui/misc/glosbib.cxx | 16 +++--- sw/source/ui/misc/glossary.cxx | 62 +++++++++++------------ sw/source/ui/misc/insfnote.cxx | 22 ++++---- sw/source/ui/misc/linenum.cxx | 38 +++++++------- sw/source/ui/misc/num.cxx | 64 ++++++++++++------------ sw/source/ui/misc/outline.cxx | 40 +++++++-------- sw/source/ui/misc/pagenumberdlg.cxx | 21 ++++--- sw/source/ui/misc/pgfnote.cxx | 2 sw/source/ui/misc/pggrid.cxx | 44 ++++++++-------- sw/source/ui/misc/srtdlg.cxx | 50 +++++++++--------- sw/source/ui/misc/swmodalredlineacceptdlg.cxx | 8 +-- sw/source/ui/misc/titlepage.cxx | 30 +++++------ sw/source/ui/misc/translatelangselect.cxx | 10 +-- 17 files changed, 270 insertions(+), 267 deletions(-)
New commits: commit a2b7dca2eb1da105fe139b3f14bb9dfaae11d549 Author: Noel Grandin <[email protected]> AuthorDate: Wed Jun 5 10:18:31 2024 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Wed Jun 5 13:19:05 2024 +0200 loplugin:ostr in sw/.../misc Change-Id: Id64ac6bdebe93af6364ccf39d4ae8df333e775d1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168425 Reviewed-by: Noel Grandin <[email protected]> Tested-by: Jenkins diff --git a/sw/source/ui/misc/bookmark.cxx b/sw/source/ui/misc/bookmark.cxx index 40cebea7ead7..6f882bad5d15 100644 --- a/sw/source/ui/misc/bookmark.cxx +++ b/sw/source/ui/misc/bookmark.cxx @@ -312,7 +312,7 @@ bool SwInsertBookmarkDlg::ValidateBookmarks() if (HaveBookmarksChanged()) { PopulateTable(); - m_xEditBox->set_text(""); + m_xEditBox->set_text(u""_ustr); return false; } return true; @@ -363,21 +363,22 @@ void SwInsertBookmarkDlg::PopulateTable() SwInsertBookmarkDlg::SwInsertBookmarkDlg(weld::Window* pParent, SwWrtShell& rS, OUString const* const pSelected) - : SfxDialogController(pParent, "modules/swriter/ui/insertbookmark.ui", "InsertBookmarkDialog") + : SfxDialogController(pParent, u"modules/swriter/ui/insertbookmark.ui"_ustr, + u"InsertBookmarkDialog"_ustr) , m_rSh(rS) , m_nLastBookmarksCount(0) , m_bSorted(false) - , m_xEditBox(m_xBuilder->weld_entry("name")) - , m_xInsertBtn(m_xBuilder->weld_button("insert")) - , m_xDeleteBtn(m_xBuilder->weld_button("delete")) - , m_xGotoBtn(m_xBuilder->weld_button("goto")) - , m_xEditTextBtn(m_xBuilder->weld_button("edittext")) - , m_xRenameBtn(m_xBuilder->weld_button("rename")) - , m_xHideCB(m_xBuilder->weld_check_button("hide")) - , m_xConditionFT(m_xBuilder->weld_label("condlabel")) - , m_xConditionED(new ConditionEdit(m_xBuilder->weld_entry("withcond"))) - , m_xBookmarksBox(new BookmarkTable(m_xBuilder->weld_tree_view("bookmarks"))) - , m_xForbiddenChars(m_xBuilder->weld_label("lbForbiddenChars")) + , m_xEditBox(m_xBuilder->weld_entry(u"name"_ustr)) + , m_xInsertBtn(m_xBuilder->weld_button(u"insert"_ustr)) + , m_xDeleteBtn(m_xBuilder->weld_button(u"delete"_ustr)) + , m_xGotoBtn(m_xBuilder->weld_button(u"goto"_ustr)) + , m_xEditTextBtn(m_xBuilder->weld_button(u"edittext"_ustr)) + , m_xRenameBtn(m_xBuilder->weld_button(u"rename"_ustr)) + , m_xHideCB(m_xBuilder->weld_check_button(u"hide"_ustr)) + , m_xConditionFT(m_xBuilder->weld_label(u"condlabel"_ustr)) + , m_xConditionED(new ConditionEdit(m_xBuilder->weld_entry(u"withcond"_ustr))) + , m_xBookmarksBox(new BookmarkTable(m_xBuilder->weld_tree_view(u"bookmarks"_ustr))) + , m_xForbiddenChars(m_xBuilder->weld_label(u"lbForbiddenChars"_ustr)) { m_xBookmarksBox->connect_changed(LINK(this, SwInsertBookmarkDlg, SelectionChangedHdl)); m_xBookmarksBox->connect_row_activated(LINK(this, SwInsertBookmarkDlg, DoubleClickHdl)); @@ -423,7 +424,7 @@ SwInsertBookmarkDlg::SwInsertBookmarkDlg(weld::Window* pParent, SwWrtShell& rS, m_xConditionFT->set_sensitive(false); // restore dialog size - SvtViewOptions aDlgOpt(EViewType::Dialog, "BookmarkDialog"); + SvtViewOptions aDlgOpt(EViewType::Dialog, u"BookmarkDialog"_ustr); if (aDlgOpt.Exists()) m_xDialog->set_window_state(aDlgOpt.GetWindowState()); @@ -443,7 +444,7 @@ SwInsertBookmarkDlg::SwInsertBookmarkDlg(weld::Window* pParent, SwWrtShell& rS, SwInsertBookmarkDlg::~SwInsertBookmarkDlg() { // tdf#146261 - Remember size of bookmark dialog - SvtViewOptions aDlgOpt(EViewType::Dialog, "BookmarkDialog"); + SvtViewOptions aDlgOpt(EViewType::Dialog, u"BookmarkDialog"_ustr); OUString sWindowState = m_xDialog->get_window_state(vcl::WindowDataMask::PosSize); aDlgOpt.SetWindowState(sWindowState); } diff --git a/sw/source/ui/misc/contentcontroldlg.cxx b/sw/source/ui/misc/contentcontroldlg.cxx index 101a2f8aa7d2..752ddf8e1ae4 100644 --- a/sw/source/ui/misc/contentcontroldlg.cxx +++ b/sw/source/ui/misc/contentcontroldlg.cxx @@ -34,30 +34,31 @@ using namespace com::sun::star; SwContentControlDlg::SwContentControlDlg(weld::Window* pParent, SwWrtShell& rWrtShell) - : SfxDialogController(pParent, "modules/swriter/ui/contentcontroldlg.ui", - "ContentControlDialog") + : SfxDialogController(pParent, u"modules/swriter/ui/contentcontroldlg.ui"_ustr, + u"ContentControlDialog"_ustr) , m_rWrtShell(rWrtShell) - , m_xShowingPlaceHolderCB(m_xBuilder->weld_check_button("showing_place_holder")) - , m_xAlias(m_xBuilder->weld_entry("aliasentry")) - , m_xTag(m_xBuilder->weld_entry("tagentry")) - , m_xId(m_xBuilder->weld_spin_button("idspinbutton")) - , m_xTabIndex(m_xBuilder->weld_spin_button("tabindexspinbutton")) - , m_xCheckboxFrame(m_xBuilder->weld_frame("checkboxframe")) - , m_xCheckedState(m_xBuilder->weld_entry("checkboxcheckedentry")) - , m_xCheckedStateBtn(m_xBuilder->weld_button("btncheckboxchecked")) - , m_xUncheckedState(m_xBuilder->weld_entry("checkboxuncheckedentry")) - , m_xUncheckedStateBtn(m_xBuilder->weld_button("btncheckboxunchecked")) - , m_xListItemsFrame(m_xBuilder->weld_frame("listitemsframe")) - , m_xListItems(m_xBuilder->weld_tree_view("listitems")) - , m_xListItemButtons(m_xBuilder->weld_box("listitembuttons")) - , m_xInsertBtn(m_xBuilder->weld_button("add")) - , m_xRenameBtn(m_xBuilder->weld_button("modify")) - , m_xDeleteBtn(m_xBuilder->weld_button("remove")) - , m_xMoveUpBtn(m_xBuilder->weld_button("moveup")) - , m_xMoveDownBtn(m_xBuilder->weld_button("movedown")) - , m_xDateFrame(m_xBuilder->weld_frame("dateframe")) - , m_xDateFormat(new SwNumFormatTreeView(m_xBuilder->weld_tree_view("date_formats_treeview"))) - , m_xOk(m_xBuilder->weld_button("ok")) + , m_xShowingPlaceHolderCB(m_xBuilder->weld_check_button(u"showing_place_holder"_ustr)) + , m_xAlias(m_xBuilder->weld_entry(u"aliasentry"_ustr)) + , m_xTag(m_xBuilder->weld_entry(u"tagentry"_ustr)) + , m_xId(m_xBuilder->weld_spin_button(u"idspinbutton"_ustr)) + , m_xTabIndex(m_xBuilder->weld_spin_button(u"tabindexspinbutton"_ustr)) + , m_xCheckboxFrame(m_xBuilder->weld_frame(u"checkboxframe"_ustr)) + , m_xCheckedState(m_xBuilder->weld_entry(u"checkboxcheckedentry"_ustr)) + , m_xCheckedStateBtn(m_xBuilder->weld_button(u"btncheckboxchecked"_ustr)) + , m_xUncheckedState(m_xBuilder->weld_entry(u"checkboxuncheckedentry"_ustr)) + , m_xUncheckedStateBtn(m_xBuilder->weld_button(u"btncheckboxunchecked"_ustr)) + , m_xListItemsFrame(m_xBuilder->weld_frame(u"listitemsframe"_ustr)) + , m_xListItems(m_xBuilder->weld_tree_view(u"listitems"_ustr)) + , m_xListItemButtons(m_xBuilder->weld_box(u"listitembuttons"_ustr)) + , m_xInsertBtn(m_xBuilder->weld_button(u"add"_ustr)) + , m_xRenameBtn(m_xBuilder->weld_button(u"modify"_ustr)) + , m_xDeleteBtn(m_xBuilder->weld_button(u"remove"_ustr)) + , m_xMoveUpBtn(m_xBuilder->weld_button(u"moveup"_ustr)) + , m_xMoveDownBtn(m_xBuilder->weld_button(u"movedown"_ustr)) + , m_xDateFrame(m_xBuilder->weld_frame(u"dateframe"_ustr)) + , m_xDateFormat( + new SwNumFormatTreeView(m_xBuilder->weld_tree_view(u"date_formats_treeview"_ustr))) + , m_xOk(m_xBuilder->weld_button(u"ok"_ustr)) { m_xCheckedStateBtn->connect_clicked(LINK(this, SwContentControlDlg, SelectCharHdl)); m_xUncheckedStateBtn->connect_clicked(LINK(this, SwContentControlDlg, SelectCharHdl)); diff --git a/sw/source/ui/misc/contentcontrollistitemdlg.cxx b/sw/source/ui/misc/contentcontrollistitemdlg.cxx index 624f0bd23dda..5901ac6ad85c 100644 --- a/sw/source/ui/misc/contentcontrollistitemdlg.cxx +++ b/sw/source/ui/misc/contentcontrollistitemdlg.cxx @@ -23,12 +23,12 @@ SwContentControlListItemDlg::SwContentControlListItemDlg(weld::Widget* pParent, SwContentControlListItem& rItem) - : GenericDialogController(pParent, "modules/swriter/ui/contentcontrollistitemdlg.ui", - "ContentControlListItemDialog") + : GenericDialogController(pParent, u"modules/swriter/ui/contentcontrollistitemdlg.ui"_ustr, + u"ContentControlListItemDialog"_ustr) , m_rItem(rItem) - , m_xDisplayNameED(m_xBuilder->weld_entry("displayname")) - , m_xValueED(m_xBuilder->weld_entry("value")) - , m_xOk(m_xBuilder->weld_button("ok")) + , m_xDisplayNameED(m_xBuilder->weld_entry(u"displayname"_ustr)) + , m_xValueED(m_xBuilder->weld_entry(u"value"_ustr)) + , m_xOk(m_xBuilder->weld_button(u"ok"_ustr)) { m_xOk->connect_clicked(LINK(this, SwContentControlListItemDlg, OkHdl)); m_xDisplayNameED->set_text(rItem.m_aDisplayText); diff --git a/sw/source/ui/misc/docfnote.cxx b/sw/source/ui/misc/docfnote.cxx index 3e0f8cb9abc0..a53cbab73814 100644 --- a/sw/source/ui/misc/docfnote.cxx +++ b/sw/source/ui/misc/docfnote.cxx @@ -36,15 +36,15 @@ #include <memory> SwFootNoteOptionDlg::SwFootNoteOptionDlg(weld::Window *pParent, SwWrtShell &rS) - : SfxTabDialogController(pParent, "modules/swriter/ui/footendnotedialog.ui", "FootEndnoteDialog") + : SfxTabDialogController(pParent, u"modules/swriter/ui/footendnotedialog.ui"_ustr, u"FootEndnoteDialog"_ustr) , m_rSh( rS ) { RemoveResetButton(); GetOKButton().connect_clicked(LINK(this, SwFootNoteOptionDlg, OkHdl)); - AddTabPage("footnotes", SwFootNoteOptionPage::Create, nullptr); - AddTabPage("endnotes", SwEndNoteOptionPage::Create, nullptr); + AddTabPage(u"footnotes"_ustr, SwFootNoteOptionPage::Create, nullptr); + AddTabPage(u"endnotes"_ustr, SwEndNoteOptionPage::Create, nullptr); } void SwFootNoteOptionDlg::PageCreated(const OUString& /*rId*/, SfxTabPage &rPage) @@ -67,28 +67,28 @@ IMPL_LINK(SwFootNoteOptionDlg, OkHdl, weld::Button&, rBtn, void) SwEndNoteOptionPage::SwEndNoteOptionPage(weld::Container* pPage, weld::DialogController* pController, bool bEN, const SfxItemSet &rSet) : SfxTabPage(pPage, pController, - bEN ? OUString("modules/swriter/ui/endnotepage.ui") : OUString("modules/swriter/ui/footnotepage.ui"), - bEN ? OUString("EndnotePage") : OUString("FootnotePage"), + bEN ? u"modules/swriter/ui/endnotepage.ui"_ustr : u"modules/swriter/ui/footnotepage.ui"_ustr, + bEN ? u"EndnotePage"_ustr : u"FootnotePage"_ustr, &rSet) , m_pSh(nullptr) , m_bPosDoc(false) , m_bEndNote(bEN) - , m_xNumViewBox(new SwNumberingTypeListBox(m_xBuilder->weld_combo_box("numberinglb"))) - , m_xOffsetLbl(m_xBuilder->weld_label("offset")) - , m_xOffsetField(m_xBuilder->weld_spin_button("offsetnf")) - , m_xNumCountBox(m_xBuilder->weld_combo_box("countinglb")) - , m_xPrefixED(m_xBuilder->weld_entry("prefix")) - , m_xSuffixED(m_xBuilder->weld_entry("suffix")) - , m_xPosPageBox(m_xBuilder->weld_radio_button("pospagecb")) - , m_xPosChapterBox(m_xBuilder->weld_radio_button("posdoccb")) - , m_xStylesContainer(m_xBuilder->weld_widget("allstyles")) - , m_xParaTemplBox(m_xBuilder->weld_combo_box("parastylelb")) - , m_xPageTemplLbl(m_xBuilder->weld_label("pagestyleft")) - , m_xPageTemplBox(m_xBuilder->weld_combo_box("pagestylelb")) - , m_xFootnoteCharAnchorTemplBox(m_xBuilder->weld_combo_box("charanchorstylelb")) - , m_xFootnoteCharTextTemplBox(m_xBuilder->weld_combo_box("charstylelb")) - , m_xContEdit(m_xBuilder->weld_entry("conted")) - , m_xContFromEdit(m_xBuilder->weld_entry("contfromed")) + , m_xNumViewBox(new SwNumberingTypeListBox(m_xBuilder->weld_combo_box(u"numberinglb"_ustr))) + , m_xOffsetLbl(m_xBuilder->weld_label(u"offset"_ustr)) + , m_xOffsetField(m_xBuilder->weld_spin_button(u"offsetnf"_ustr)) + , m_xNumCountBox(m_xBuilder->weld_combo_box(u"countinglb"_ustr)) + , m_xPrefixED(m_xBuilder->weld_entry(u"prefix"_ustr)) + , m_xSuffixED(m_xBuilder->weld_entry(u"suffix"_ustr)) + , m_xPosPageBox(m_xBuilder->weld_radio_button(u"pospagecb"_ustr)) + , m_xPosChapterBox(m_xBuilder->weld_radio_button(u"posdoccb"_ustr)) + , m_xStylesContainer(m_xBuilder->weld_widget(u"allstyles"_ustr)) + , m_xParaTemplBox(m_xBuilder->weld_combo_box(u"parastylelb"_ustr)) + , m_xPageTemplLbl(m_xBuilder->weld_label(u"pagestyleft"_ustr)) + , m_xPageTemplBox(m_xBuilder->weld_combo_box(u"pagestylelb"_ustr)) + , m_xFootnoteCharAnchorTemplBox(m_xBuilder->weld_combo_box(u"charanchorstylelb"_ustr)) + , m_xFootnoteCharTextTemplBox(m_xBuilder->weld_combo_box(u"charstylelb"_ustr)) + , m_xContEdit(m_xBuilder->weld_entry(u"conted"_ustr)) + , m_xContFromEdit(m_xBuilder->weld_entry(u"contfromed"_ustr)) { m_xNumViewBox->Reload(SwInsertNumTypes::Extended); if (!m_bEndNote) diff --git a/sw/source/ui/misc/glosbib.cxx b/sw/source/ui/misc/glosbib.cxx index ed74973a1b84..da9b4b1220b2 100644 --- a/sw/source/ui/misc/glosbib.cxx +++ b/sw/source/ui/misc/glosbib.cxx @@ -42,16 +42,16 @@ SwGlossaryGroupDlg::SwGlossaryGroupDlg(weld::Window * pParent, std::vector<OUString> const& rPathArr, SwGlossaryHdl *pHdl) - : SfxDialogController(pParent, "modules/swriter/ui/editcategories.ui", - "EditCategoriesDialog") + : SfxDialogController(pParent, u"modules/swriter/ui/editcategories.ui"_ustr, + u"EditCategoriesDialog"_ustr) , m_pParent(pParent) , m_pGlosHdl(pHdl) - , m_xNameED(m_xBuilder->weld_entry("name")) - , m_xPathLB(m_xBuilder->weld_combo_box("pathlb")) - , m_xGroupTLB(m_xBuilder->weld_tree_view("group")) - , m_xNewPB(m_xBuilder->weld_button("new")) - , m_xDelPB(m_xBuilder->weld_button("delete")) - , m_xRenamePB(m_xBuilder->weld_button("rename")) + , m_xNameED(m_xBuilder->weld_entry(u"name"_ustr)) + , m_xPathLB(m_xBuilder->weld_combo_box(u"pathlb"_ustr)) + , m_xGroupTLB(m_xBuilder->weld_tree_view(u"group"_ustr)) + , m_xNewPB(m_xBuilder->weld_button(u"new"_ustr)) + , m_xDelPB(m_xBuilder->weld_button(u"delete"_ustr)) + , m_xRenamePB(m_xBuilder->weld_button(u"rename"_ustr)) { int nWidth = m_xGroupTLB->get_approximate_digit_width() * 34; m_xPathLB->set_size_request(nWidth, -1); diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx index 9508c62c518d..a1c6e69fa980 100644 --- a/sw/source/ui/misc/glossary.cxx +++ b/sw/source/ui/misc/glossary.cxx @@ -139,13 +139,13 @@ IMPL_LINK(SwNewGlosNameDlg, TextFilterHdl, OUString&, rTest, bool) } SwNewGlosNameDlg::SwNewGlosNameDlg(SwGlossaryDlg* pParent, const OUString& rOldName, const OUString& rOldShort) - : GenericDialogController(pParent->getDialog(), "modules/swriter/ui/renameautotextdialog.ui", "RenameAutoTextDialog") + : GenericDialogController(pParent->getDialog(), u"modules/swriter/ui/renameautotextdialog.ui"_ustr, u"RenameAutoTextDialog"_ustr) , m_pParent(pParent) - , m_xNewName(m_xBuilder->weld_entry("newname")) - , m_xNewShort(m_xBuilder->weld_entry("newsc")) - , m_xOk(m_xBuilder->weld_button("ok")) - , m_xOldName(m_xBuilder->weld_entry("oldname")) - , m_xOldShort(m_xBuilder->weld_entry("oldsc")) + , m_xNewName(m_xBuilder->weld_entry(u"newname"_ustr)) + , m_xNewShort(m_xBuilder->weld_entry(u"newsc"_ustr)) + , m_xOk(m_xBuilder->weld_button(u"ok"_ustr)) + , m_xOldName(m_xBuilder->weld_entry(u"oldname"_ustr)) + , m_xOldShort(m_xBuilder->weld_entry(u"oldsc"_ustr)) { m_xNewShort->connect_insert_text(LINK(this, SwNewGlosNameDlg, TextFilterHdl)); @@ -289,7 +289,7 @@ public: SwGlossaryDlg::SwGlossaryDlg(const SfxViewFrame& rViewFrame, SwGlossaryHdl * pGlosHdl, SwWrtShell *pWrtShell) - : SfxDialogController(rViewFrame.GetFrameWeld(), "modules/swriter/ui/autotext.ui", "AutoTextDialog") + : SfxDialogController(rViewFrame.GetFrameWeld(), u"modules/swriter/ui/autotext.ui"_ustr, u"AutoTextDialog"_ustr) , m_sReadonlyPath(SwResId(STR_READONLY_PATH)) , m_pGlossaryHdl(pGlosHdl) , m_bResume(false) @@ -298,24 +298,24 @@ SwGlossaryDlg::SwGlossaryDlg(const SfxViewFrame& rViewFrame, , m_bIsOld(false) , m_bIsDocReadOnly(false) , m_pShell(pWrtShell) - , m_xInsertTipCB(m_xBuilder->weld_check_button("inserttip")) - , m_xNameED(m_xBuilder->weld_entry("name")) - , m_xShortNameLbl(m_xBuilder->weld_label("shortnameft")) - , m_xShortNameEdit(m_xBuilder->weld_entry("shortname")) - , m_xCategoryBox(m_xBuilder->weld_tree_view("category")) - , m_xFileRelCB(m_xBuilder->weld_check_button("relfile")) - , m_xNetRelCB(m_xBuilder->weld_check_button("relnet")) - , m_xInsertBtn(m_xBuilder->weld_button("ok")) - , m_xEditBtn(m_xBuilder->weld_menu_button("autotext")) - , m_xBibBtn(m_xBuilder->weld_button("categories")) - , m_xPathBtn(m_xBuilder->weld_button("path")) + , m_xInsertTipCB(m_xBuilder->weld_check_button(u"inserttip"_ustr)) + , m_xNameED(m_xBuilder->weld_entry(u"name"_ustr)) + , m_xShortNameLbl(m_xBuilder->weld_label(u"shortnameft"_ustr)) + , m_xShortNameEdit(m_xBuilder->weld_entry(u"shortname"_ustr)) + , m_xCategoryBox(m_xBuilder->weld_tree_view(u"category"_ustr)) + , m_xFileRelCB(m_xBuilder->weld_check_button(u"relfile"_ustr)) + , m_xNetRelCB(m_xBuilder->weld_check_button(u"relnet"_ustr)) + , m_xInsertBtn(m_xBuilder->weld_button(u"ok"_ustr)) + , m_xEditBtn(m_xBuilder->weld_menu_button(u"autotext"_ustr)) + , m_xBibBtn(m_xBuilder->weld_button(u"categories"_ustr)) + , m_xPathBtn(m_xBuilder->weld_button(u"path"_ustr)) { m_xCategoryBox->set_size_request(m_xCategoryBox->get_approximate_digit_width() * 52, m_xCategoryBox->get_height_rows(12)); Link<SwOneExampleFrame&,void> aLink(LINK(this, SwGlossaryDlg, PreviewLoadedHdl)); m_xExampleFrame.reset(new SwOneExampleFrame(EX_SHOW_ONLINE_LAYOUT, &aLink)); - m_xExampleFrameWin.reset(new weld::CustomWeld(*m_xBuilder, "example", *m_xExampleFrame)); + m_xExampleFrameWin.reset(new weld::CustomWeld(*m_xBuilder, u"example"_ustr, *m_xExampleFrame)); Size aSize = m_xExampleFrame->GetDrawingArea()->get_ref_device().LogicToPixel( Size(82, 124), MapMode(MapUnit::MapAppFont)); m_xExampleFrame->set_size_request(aSize.Width(), aSize.Height()); @@ -409,7 +409,7 @@ IMPL_LINK(SwGlossaryDlg, GrpSelect, weld::TreeView&, rBox, void) ShowAutoText(::GetCurrGlosGroup(), m_xShortNameEdit->get_text()); } else - ShowAutoText("", ""); + ShowAutoText(u""_ustr, u""_ustr); // update controls NameModify(*m_xShortNameEdit); if (SfxRequest::HasMacroRecorder(m_pShell->GetView().GetViewFrame())) @@ -523,17 +523,17 @@ IMPL_LINK_NOARG( SwGlossaryDlg, EnableHdl, weld::Toggleable&, void ) const bool bHasEntry = !aEditText.isEmpty() && !m_xShortNameEdit->get_text().isEmpty(); const bool bExists = nullptr != DoesBlockExist(aEditText, m_xShortNameEdit->get_text()); const bool bIsGroup = bEntry && !m_xCategoryBox->get_iter_depth(*xEntry); - m_xEditBtn->set_item_visible("new", m_bSelection && bHasEntry && !bExists); - m_xEditBtn->set_item_visible("newtext", m_bSelection && bHasEntry && !bExists); - m_xEditBtn->set_item_visible("copy", bExists && !bIsGroup); - m_xEditBtn->set_item_visible("replace", m_bSelection && bExists && !bIsGroup && !m_bIsOld ); - m_xEditBtn->set_item_visible("replacetext", m_bSelection && bExists && !bIsGroup && !m_bIsOld ); - m_xEditBtn->set_item_visible("edit", bExists && !bIsGroup ); - m_xEditBtn->set_item_visible("rename", bExists && !bIsGroup ); - m_xEditBtn->set_item_visible("delete", bExists && !bIsGroup ); - m_xEditBtn->set_item_visible("macro", bExists && !bIsGroup && !m_bIsOld && + m_xEditBtn->set_item_visible(u"new"_ustr, m_bSelection && bHasEntry && !bExists); + m_xEditBtn->set_item_visible(u"newtext"_ustr, m_bSelection && bHasEntry && !bExists); + m_xEditBtn->set_item_visible(u"copy"_ustr, bExists && !bIsGroup); + m_xEditBtn->set_item_visible(u"replace"_ustr, m_bSelection && bExists && !bIsGroup && !m_bIsOld ); + m_xEditBtn->set_item_visible(u"replacetext"_ustr, m_bSelection && bExists && !bIsGroup && !m_bIsOld ); + m_xEditBtn->set_item_visible(u"edit"_ustr, bExists && !bIsGroup ); + m_xEditBtn->set_item_visible(u"rename"_ustr, bExists && !bIsGroup ); + m_xEditBtn->set_item_visible(u"delete"_ustr, bExists && !bIsGroup ); + m_xEditBtn->set_item_visible(u"macro"_ustr, bExists && !bIsGroup && !m_bIsOld && !m_pGlossaryHdl->IsReadOnly() ); - m_xEditBtn->set_item_visible("import", bIsGroup && !m_bIsOld && !m_pGlossaryHdl->IsReadOnly() ); + m_xEditBtn->set_item_visible(u"import"_ustr, bIsGroup && !m_bIsOld && !m_pGlossaryHdl->IsReadOnly() ); } IMPL_LINK(SwGlossaryDlg, MenuHdl, const OUString&, rItemIdent, void) @@ -736,7 +736,7 @@ IMPL_LINK_NOARG(SwGlossaryDlg, BibHdl, weld::Button&, void) Content aTestContent( sPath, uno::Reference< XCommandEnvironment >(), comphelper::getProcessComponentContext() ); - Any aAny = aTestContent.getPropertyValue( "IsReadOnly" ); + Any aAny = aTestContent.getPropertyValue( u"IsReadOnly"_ustr ); if(aAny.hasValue()) { bIsWritable = !*o3tl::doAccess<bool>(aAny); diff --git a/sw/source/ui/misc/insfnote.cxx b/sw/source/ui/misc/insfnote.cxx index 49a9e7070640..4ddc4c1f9117 100644 --- a/sw/source/ui/misc/insfnote.cxx +++ b/sw/source/ui/misc/insfnote.cxx @@ -148,21 +148,21 @@ IMPL_LINK( SwInsFootNoteDlg, NextPrevHdl, weld::Button&, rBtn, void ) } SwInsFootNoteDlg::SwInsFootNoteDlg(weld::Window *pParent, SwWrtShell &rShell, bool bEd) - : GenericDialogController(pParent, "modules/swriter/ui/insertfootnote.ui", "InsertFootnoteDialog") + : GenericDialogController(pParent, u"modules/swriter/ui/insertfootnote.ui"_ustr, u"InsertFootnoteDialog"_ustr) , m_rSh(rShell) , m_eCharSet(RTL_TEXTENCODING_DONTKNOW) , m_bExtCharAvailable(false) , m_bEdit(bEd) - , m_xNumberFrame(m_xBuilder->weld_widget("numberingframe")) - , m_xNumberAutoBtn(m_xBuilder->weld_radio_button("automatic")) - , m_xNumberCharBtn(m_xBuilder->weld_radio_button("character")) - , m_xNumberCharEdit(m_xBuilder->weld_entry("characterentry")) - , m_xNumberExtChar(m_xBuilder->weld_button("choosecharacter")) - , m_xFootnoteBtn(m_xBuilder->weld_radio_button("footnote")) - , m_xEndNoteBtn(m_xBuilder->weld_radio_button("endnote")) - , m_xOkBtn(m_xBuilder->weld_button("ok")) - , m_xPrevBT(m_xBuilder->weld_button("prev")) - , m_xNextBT(m_xBuilder->weld_button("next")) + , m_xNumberFrame(m_xBuilder->weld_widget(u"numberingframe"_ustr)) + , m_xNumberAutoBtn(m_xBuilder->weld_radio_button(u"automatic"_ustr)) + , m_xNumberCharBtn(m_xBuilder->weld_radio_button(u"character"_ustr)) + , m_xNumberCharEdit(m_xBuilder->weld_entry(u"characterentry"_ustr)) + , m_xNumberExtChar(m_xBuilder->weld_button(u"choosecharacter"_ustr)) + , m_xFootnoteBtn(m_xBuilder->weld_radio_button(u"footnote"_ustr)) + , m_xEndNoteBtn(m_xBuilder->weld_radio_button(u"endnote"_ustr)) + , m_xOkBtn(m_xBuilder->weld_button(u"ok"_ustr)) + , m_xPrevBT(m_xBuilder->weld_button(u"prev"_ustr)) + , m_xNextBT(m_xBuilder->weld_button(u"next"_ustr)) { m_xNumberAutoBtn->connect_toggled(LINK(this,SwInsFootNoteDlg,NumberToggleHdl)); m_xNumberCharBtn->connect_toggled(LINK(this,SwInsFootNoteDlg,NumberToggleHdl)); diff --git a/sw/source/ui/misc/linenum.cxx b/sw/source/ui/misc/linenum.cxx index 8e9ad04111bc..f1dbbce9f112 100644 --- a/sw/source/ui/misc/linenum.cxx +++ b/sw/source/ui/misc/linenum.cxx @@ -64,26 +64,26 @@ static void lcl_setLineNumbering(const OUString& rName, SwWrtShell* pSh, bool bL SwLineNumberingDlg::SwLineNumberingDlg(const SwView& rVw) : SfxDialogController(rVw.GetViewFrame().GetFrameWeld(), - "modules/swriter/ui/linenumbering.ui", "LineNumberingDialog") + u"modules/swriter/ui/linenumbering.ui"_ustr, u"LineNumberingDialog"_ustr) , m_pSh(rVw.GetWrtShellPtr()) - , m_xBodyContent(m_xBuilder->weld_widget("content")) - , m_xDivIntervalFT(m_xBuilder->weld_widget("every")) - , m_xDivIntervalNF(m_xBuilder->weld_spin_button("linesspin")) - , m_xDivRowsFT(m_xBuilder->weld_widget("lines")) - , m_xNumIntervalNF(m_xBuilder->weld_spin_button("intervalspin")) - , m_xCharStyleLB(m_xBuilder->weld_combo_box("styledropdown")) - , m_xFormatLB(new SwNumberingTypeListBox(m_xBuilder->weld_combo_box("formatdropdown"))) - , m_xPosLB(m_xBuilder->weld_combo_box("positiondropdown")) - , m_xOffsetMF(m_xBuilder->weld_metric_spin_button("spacingspin", FieldUnit::CM)) - , m_xDivisorED(m_xBuilder->weld_entry("textentry")) - , m_xCountEmptyLinesCB(m_xBuilder->weld_check_button("blanklines")) - , m_xCountFrameLinesCB(m_xBuilder->weld_check_button("linesintextframes")) - , m_xRestartEachPageCB(m_xBuilder->weld_check_button("restarteverynewpage")) - , m_xNumberingOnCB(m_xBuilder->weld_check_button("shownumbering")) - , m_xNumberingOnFooterHeader(m_xBuilder->weld_check_button("showfooterheadernumbering")) - , m_xOKButton(m_xBuilder->weld_button("ok")) - , m_xNumIntervalFT(m_xBuilder->weld_widget("interval")) - , m_xNumRowsFT(m_xBuilder->weld_widget("intervallines")) + , m_xBodyContent(m_xBuilder->weld_widget(u"content"_ustr)) + , m_xDivIntervalFT(m_xBuilder->weld_widget(u"every"_ustr)) + , m_xDivIntervalNF(m_xBuilder->weld_spin_button(u"linesspin"_ustr)) + , m_xDivRowsFT(m_xBuilder->weld_widget(u"lines"_ustr)) + , m_xNumIntervalNF(m_xBuilder->weld_spin_button(u"intervalspin"_ustr)) + , m_xCharStyleLB(m_xBuilder->weld_combo_box(u"styledropdown"_ustr)) + , m_xFormatLB(new SwNumberingTypeListBox(m_xBuilder->weld_combo_box(u"formatdropdown"_ustr))) + , m_xPosLB(m_xBuilder->weld_combo_box(u"positiondropdown"_ustr)) + , m_xOffsetMF(m_xBuilder->weld_metric_spin_button(u"spacingspin"_ustr, FieldUnit::CM)) + , m_xDivisorED(m_xBuilder->weld_entry(u"textentry"_ustr)) + , m_xCountEmptyLinesCB(m_xBuilder->weld_check_button(u"blanklines"_ustr)) + , m_xCountFrameLinesCB(m_xBuilder->weld_check_button(u"linesintextframes"_ustr)) + , m_xRestartEachPageCB(m_xBuilder->weld_check_button(u"restarteverynewpage"_ustr)) + , m_xNumberingOnCB(m_xBuilder->weld_check_button(u"shownumbering"_ustr)) + , m_xNumberingOnFooterHeader(m_xBuilder->weld_check_button(u"showfooterheadernumbering"_ustr)) + , m_xOKButton(m_xBuilder->weld_button(u"ok"_ustr)) + , m_xNumIntervalFT(m_xBuilder->weld_widget(u"interval"_ustr)) + , m_xNumRowsFT(m_xBuilder->weld_widget(u"intervallines"_ustr)) { m_xFormatLB->Reload(SwInsertNumTypes::Extended); diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx index fadef2466205..38763d825e29 100644 --- a/sw/source/ui/misc/num.cxx +++ b/sw/source/ui/misc/num.cxx @@ -46,7 +46,7 @@ static bool bLastRelative = false; //TODO, determine if SwNumPositionTabPage and SvxNumPositionTabPage can be //merged SwNumPositionTabPage::SwNumPositionTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet) - : SfxTabPage(pPage, pController, "modules/swriter/ui/outlinepositionpage.ui", "OutlinePositionPage", &rSet) + : SfxTabPage(pPage, pController, u"modules/swriter/ui/outlinepositionpage.ui"_ustr, u"OutlinePositionPage"_ustr, &rSet) , m_pSaveNum(nullptr) , m_pWrtSh(nullptr) , m_pOutlineDlg(nullptr) @@ -55,29 +55,29 @@ SwNumPositionTabPage::SwNumPositionTabPage(weld::Container* pPage, weld::DialogC , m_bPreset(false) , m_bInInintControl(false) , m_bLabelAlignmentPosAndSpaceModeActive(false) - , m_xLevelLB(m_xBuilder->weld_tree_view("levellb")) - , m_xPositionFrame(m_xBuilder->weld_widget("numberingframe")) - , m_xDistBorderFT(m_xBuilder->weld_label("indent")) - , m_xDistBorderMF(m_xBuilder->weld_metric_spin_button("indentmf", FieldUnit::CM)) - , m_xRelativeCB(m_xBuilder->weld_check_button("relative")) - , m_xIndentFT(m_xBuilder->weld_label("numberingwidth")) - , m_xIndentMF(m_xBuilder->weld_metric_spin_button("numberingwidthmf", FieldUnit::CM)) - , m_xDistNumFT(m_xBuilder->weld_label("numdist")) - , m_xDistNumMF(m_xBuilder->weld_metric_spin_button("numdistmf", FieldUnit::CM)) - , m_xAlignFT(m_xBuilder->weld_label("numalign")) - , m_xAlignLB(m_xBuilder->weld_combo_box("numalignlb")) - , m_xLabelFollowedByFT(m_xBuilder->weld_label("numfollowedby")) - , m_xLabelFollowedByLB(m_xBuilder->weld_combo_box("numfollowedbylb")) - , m_xListtabFT(m_xBuilder->weld_label("at")) - , m_xListtabMF(m_xBuilder->weld_metric_spin_button("atmf", FieldUnit::CM)) - , m_xAlign2FT(m_xBuilder->weld_label("num2align")) - , m_xAlign2LB(m_xBuilder->weld_combo_box("num2alignlb")) - , m_xAlignedAtFT(m_xBuilder->weld_label("alignedat")) - , m_xAlignedAtMF(m_xBuilder->weld_metric_spin_button("alignedatmf", FieldUnit::CM)) - , m_xIndentAtFT(m_xBuilder->weld_label("indentat")) - , m_xIndentAtMF(m_xBuilder->weld_metric_spin_button("indentatmf", FieldUnit::CM)) - , m_xStandardPB(m_xBuilder->weld_button("standard")) - , m_xPreviewWIN(new weld::CustomWeld(*m_xBuilder, "preview", m_aPreviewWIN)) + , m_xLevelLB(m_xBuilder->weld_tree_view(u"levellb"_ustr)) + , m_xPositionFrame(m_xBuilder->weld_widget(u"numberingframe"_ustr)) + , m_xDistBorderFT(m_xBuilder->weld_label(u"indent"_ustr)) + , m_xDistBorderMF(m_xBuilder->weld_metric_spin_button(u"indentmf"_ustr, FieldUnit::CM)) + , m_xRelativeCB(m_xBuilder->weld_check_button(u"relative"_ustr)) + , m_xIndentFT(m_xBuilder->weld_label(u"numberingwidth"_ustr)) + , m_xIndentMF(m_xBuilder->weld_metric_spin_button(u"numberingwidthmf"_ustr, FieldUnit::CM)) + , m_xDistNumFT(m_xBuilder->weld_label(u"numdist"_ustr)) + , m_xDistNumMF(m_xBuilder->weld_metric_spin_button(u"numdistmf"_ustr, FieldUnit::CM)) + , m_xAlignFT(m_xBuilder->weld_label(u"numalign"_ustr)) + , m_xAlignLB(m_xBuilder->weld_combo_box(u"numalignlb"_ustr)) + , m_xLabelFollowedByFT(m_xBuilder->weld_label(u"numfollowedby"_ustr)) + , m_xLabelFollowedByLB(m_xBuilder->weld_combo_box(u"numfollowedbylb"_ustr)) + , m_xListtabFT(m_xBuilder->weld_label(u"at"_ustr)) + , m_xListtabMF(m_xBuilder->weld_metric_spin_button(u"atmf"_ustr, FieldUnit::CM)) + , m_xAlign2FT(m_xBuilder->weld_label(u"num2align"_ustr)) + , m_xAlign2LB(m_xBuilder->weld_combo_box(u"num2alignlb"_ustr)) + , m_xAlignedAtFT(m_xBuilder->weld_label(u"alignedat"_ustr)) + , m_xAlignedAtMF(m_xBuilder->weld_metric_spin_button(u"alignedatmf"_ustr, FieldUnit::CM)) + , m_xIndentAtFT(m_xBuilder->weld_label(u"indentat"_ustr)) + , m_xIndentAtMF(m_xBuilder->weld_metric_spin_button(u"indentatmf"_ustr, FieldUnit::CM)) + , m_xStandardPB(m_xBuilder->weld_button(u"standard"_ustr)) + , m_xPreviewWIN(new weld::CustomWeld(*m_xBuilder, u"preview"_ustr, m_aPreviewWIN)) { SetExchangeSupport(); @@ -862,20 +862,20 @@ void SwNumPositionTabPage::SetModified() SwSvxNumBulletTabDialog::SwSvxNumBulletTabDialog(weld::Window* pParent, const SfxItemSet& rSwItemSet, SwWrtShell & rSh) - : SfxTabDialogController(pParent, "modules/swriter/ui/bulletsandnumbering.ui", "BulletsAndNumberingDialog", + : SfxTabDialogController(pParent, u"modules/swriter/ui/bulletsandnumbering.ui"_ustr, u"BulletsAndNumberingDialog"_ustr, &rSwItemSet) , m_rWrtSh(rSh) - , m_xDummyCombo(m_xBuilder->weld_combo_box("dummycombo")) + , m_xDummyCombo(m_xBuilder->weld_combo_box(u"dummycombo"_ustr)) { weld::Button* pButton = GetUserButton(); pButton->connect_clicked(LINK(this, SwSvxNumBulletTabDialog, RemoveNumberingHdl)); pButton->set_sensitive(m_rWrtSh.GetNumRuleAtCurrCursorPos() != nullptr); - AddTabPage("singlenum", RID_SVXPAGE_PICK_SINGLE_NUM ); - AddTabPage("bullets", RID_SVXPAGE_PICK_BULLET ); - AddTabPage("outlinenum", RID_SVXPAGE_PICK_NUM ); - AddTabPage("graphics", RID_SVXPAGE_PICK_BMP ); - AddTabPage("customize", RID_SVXPAGE_NUM_OPTIONS ); - AddTabPage("position", RID_SVXPAGE_NUM_POSITION ); + AddTabPage(u"singlenum"_ustr, RID_SVXPAGE_PICK_SINGLE_NUM ); + AddTabPage(u"bullets"_ustr, RID_SVXPAGE_PICK_BULLET ); + AddTabPage(u"outlinenum"_ustr, RID_SVXPAGE_PICK_NUM ); + AddTabPage(u"graphics"_ustr, RID_SVXPAGE_PICK_BMP ); + AddTabPage(u"customize"_ustr, RID_SVXPAGE_NUM_OPTIONS ); + AddTabPage(u"position"_ustr, RID_SVXPAGE_NUM_POSITION ); } SwSvxNumBulletTabDialog::~SwSvxNumBulletTabDialog() diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx index c216289a0b10..2249dba318b0 100644 --- a/sw/source/ui/misc/outline.cxx +++ b/sw/source/ui/misc/outline.cxx @@ -112,11 +112,11 @@ IMPL_LINK_NOARG(SwNumNamesDlg, DoubleClickHdl, weld::TreeView&, bool) SwNumNamesDlg::SwNumNamesDlg(weld::Window *pParent) : GenericDialogController(pParent, - "modules/swriter/ui/numberingnamedialog.ui", - "NumberingNameDialog") - , m_xFormEdit(m_xBuilder->weld_entry("entry")) - , m_xFormBox(m_xBuilder->weld_tree_view("form")) - , m_xOKBtn(m_xBuilder->weld_button("ok")) + u"modules/swriter/ui/numberingnamedialog.ui"_ustr, + u"NumberingNameDialog"_ustr) + , m_xFormEdit(m_xBuilder->weld_entry(u"entry"_ustr)) + , m_xFormBox(m_xBuilder->weld_tree_view(u"form"_ustr)) + , m_xOKBtn(m_xBuilder->weld_button(u"ok"_ustr)) { for (auto const& aID : OUTLINE_STYLE) m_xFormBox->append_text(SwResId(aID)); @@ -142,11 +142,11 @@ sal_uInt16 SwOutlineTabDialog::s_nNumLevel = 1; SwOutlineTabDialog::SwOutlineTabDialog(weld::Window* pParent, const SfxItemSet* pSwItemSet, SwWrtShell &rSh) - : SfxTabDialogController(pParent, "modules/swriter/ui/outlinenumbering.ui", "OutlineNumberingDialog", pSwItemSet) + : SfxTabDialogController(pParent, u"modules/swriter/ui/outlinenumbering.ui"_ustr, u"OutlineNumberingDialog"_ustr, pSwItemSet) , m_rWrtSh(rSh) , m_pChapterNumRules(SW_MOD()->GetChapterNumRules()) , m_bModified(m_rWrtSh.IsModified()) - , m_xMenuButton(m_xBuilder->weld_menu_button("format")) + , m_xMenuButton(m_xBuilder->weld_menu_button(u"format"_ustr)) { m_xMenuButton->connect_toggled(LINK(this, SwOutlineTabDialog, FormHdl)); m_xMenuButton->connect_selected(LINK(this, SwOutlineTabDialog, MenuSelectHdl)); @@ -161,8 +161,8 @@ SwOutlineTabDialog::SwOutlineTabDialog(weld::Window* pParent, const SfxItemSet* SetActNumLevel(nTmp < 0 ? USHRT_MAX : (1 << nTmp)); } - AddTabPage("position", &SwNumPositionTabPage::Create, nullptr); - AddTabPage("numbering", &SwOutlineSettingsTabPage::Create, nullptr); + AddTabPage(u"position"_ustr, &SwNumPositionTabPage::Create, nullptr); + AddTabPage(u"numbering"_ustr, &SwOutlineSettingsTabPage::Create, nullptr); OUString sHeadline; sal_uInt16 i; @@ -389,22 +389,22 @@ short SwOutlineTabDialog::Ok() SwOutlineSettingsTabPage::SwOutlineSettingsTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet) - : SfxTabPage(pPage, pController, "modules/swriter/ui/outlinenumberingpage.ui", "OutlineNumberingPage", &rSet) + : SfxTabPage(pPage, pController, u"modules/swriter/ui/outlinenumberingpage.ui"_ustr, u"OutlineNumberingPage"_ustr, &rSet) , m_aNoFormatName(SwResId(SW_STR_NONE)) , m_pSh(nullptr) , m_pNumRule(nullptr) , m_pCollNames(nullptr) , m_nActLevel(1) - , m_xLevelLB(m_xBuilder->weld_tree_view("level")) - , m_xCollBox(m_xBuilder->weld_combo_box("style")) - , m_xNumberBox(new SwNumberingTypeListBox(m_xBuilder->weld_combo_box("numbering"))) - , m_xCharFormatLB(m_xBuilder->weld_combo_box("charstyle")) - , m_xAllLevelFT(m_xBuilder->weld_label("sublevelsft")) - , m_xAllLevelNF(m_xBuilder->weld_spin_button("sublevelsnf")) - , m_xPrefixED(m_xBuilder->weld_entry("prefix")) - , m_xSuffixED(m_xBuilder->weld_entry("suffix")) - , m_xStartEdit(m_xBuilder->weld_spin_button("startat")) - , m_xPreviewWIN(new weld::CustomWeld(*m_xBuilder, "preview", m_aPreviewWIN)) + , m_xLevelLB(m_xBuilder->weld_tree_view(u"level"_ustr)) + , m_xCollBox(m_xBuilder->weld_combo_box(u"style"_ustr)) + , m_xNumberBox(new SwNumberingTypeListBox(m_xBuilder->weld_combo_box(u"numbering"_ustr))) + , m_xCharFormatLB(m_xBuilder->weld_combo_box(u"charstyle"_ustr)) + , m_xAllLevelFT(m_xBuilder->weld_label(u"sublevelsft"_ustr)) + , m_xAllLevelNF(m_xBuilder->weld_spin_button(u"sublevelsnf"_ustr)) + , m_xPrefixED(m_xBuilder->weld_entry(u"prefix"_ustr)) + , m_xSuffixED(m_xBuilder->weld_entry(u"suffix"_ustr)) + , m_xStartEdit(m_xBuilder->weld_spin_button(u"startat"_ustr)) + , m_xPreviewWIN(new weld::CustomWeld(*m_xBuilder, u"preview"_ustr, m_aPreviewWIN)) { SetExchangeSupport(); diff --git a/sw/source/ui/misc/pagenumberdlg.cxx b/sw/source/ui/misc/pagenumberdlg.cxx index fe965d69db19..d812cfaee60f 100644 --- a/sw/source/ui/misc/pagenumberdlg.cxx +++ b/sw/source/ui/misc/pagenumberdlg.cxx @@ -26,15 +26,16 @@ #include <tools/gen.hxx> SwPageNumberDlg::SwPageNumberDlg(weld::Window* pParent) - : SfxDialogController(pParent, "modules/swriter/ui/pagenumberdlg.ui", "PageNumberDialog") - , m_xOk(m_xBuilder->weld_button("ok")) - , m_xCancel(m_xBuilder->weld_button("cancel")) - , m_xPageNumberPosition(m_xBuilder->weld_combo_box("positionCombo")) - , m_xPageNumberAlignment(m_xBuilder->weld_combo_box("alignmentCombo")) - , m_xMirrorOnEvenPages(m_xBuilder->weld_check_button("mirrorCheckbox")) - , m_xIncludePageTotal(m_xBuilder->weld_check_button("pagetotalCheckbox")) - , m_xPageNumberTypeLB(new SvxPageNumberListBox(m_xBuilder->weld_combo_box("numfmtlb"))) - , m_xPreviewImage(m_xBuilder->weld_image("previewImage")) + : SfxDialogController(pParent, u"modules/swriter/ui/pagenumberdlg.ui"_ustr, + u"PageNumberDialog"_ustr) + , m_xOk(m_xBuilder->weld_button(u"ok"_ustr)) + , m_xCancel(m_xBuilder->weld_button(u"cancel"_ustr)) + , m_xPageNumberPosition(m_xBuilder->weld_combo_box(u"positionCombo"_ustr)) + , m_xPageNumberAlignment(m_xBuilder->weld_combo_box(u"alignmentCombo"_ustr)) + , m_xMirrorOnEvenPages(m_xBuilder->weld_check_button(u"mirrorCheckbox"_ustr)) + , m_xIncludePageTotal(m_xBuilder->weld_check_button(u"pagetotalCheckbox"_ustr)) + , m_xPageNumberTypeLB(new SvxPageNumberListBox(m_xBuilder->weld_combo_box(u"numfmtlb"_ustr))) + , m_xPreviewImage(m_xBuilder->weld_image(u"previewImage"_ustr)) , m_aPageNumberPosition(1) // bottom , m_aPageNumberAlignment(1) // center , m_nPageNumberType(SVX_NUM_CHARS_UPPER_LETTER) @@ -113,7 +114,7 @@ void SwPageNumberDlg::updateImage() pVirtualDev->SetBackground(Color(0xF0, 0xF0, 0xF0)); pVirtualDev->Erase(); - OUString sText = "#"; + OUString sText = u"#"_ustr; if (m_xIncludePageTotal->get_state() == TRISTATE_TRUE) { diff --git a/sw/source/ui/misc/pgfnote.cxx b/sw/source/ui/misc/pgfnote.cxx index 9ed64e3e3de6..8d35fb9ddc33 100644 --- a/sw/source/ui/misc/pgfnote.cxx +++ b/sw/source/ui/misc/pgfnote.cxx @@ -95,7 +95,7 @@ IMPL_LINK(SwFootNotePage, LineColorSelected_Impl, ColorListBox&, rColorBox, void } SwFootNotePage::SwFootNotePage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet &rSet) - : SfxTabPage(pPage, pController, "modules/swriter/ui/footnoteareapage.ui", "FootnoteAreaPage", &rSet) + : SfxTabPage(pPage, pController, u"modules/swriter/ui/footnoteareapage.ui"_ustr, u"FootnoteAreaPage"_ustr, &rSet) , m_lMaxHeight(0) , m_xMaxHeightPageBtn(m_xBuilder->weld_radio_button("maxheightpage")) , m_xMaxHeightBtn(m_xBuilder->weld_radio_button("maxheight")) diff --git a/sw/source/ui/misc/pggrid.cxx b/sw/source/ui/misc/pggrid.cxx index d50b4a93b172..7339d2695018 100644 --- a/sw/source/ui/misc/pggrid.cxx +++ b/sw/source/ui/misc/pggrid.cxx @@ -38,7 +38,7 @@ constexpr tools::Long constTwips_5mm = o3tl::toTwips(5, o3tl::Length::mm); SwTextGridPage::SwTextGridPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet &rSet) - : SfxTabPage(pPage, pController, "modules/swriter/ui/textgridpage.ui", "TextGridPage", &rSet) + : SfxTabPage(pPage, pController, u"modules/swriter/ui/textgridpage.ui"_ustr, u"TextGridPage"_ustr, &rSet) , m_nRubyUserValue(0) , m_bRubyUserValue(false) , m_aPageSize(constTwips_5mm, constTwips_5mm) @@ -46,27 +46,27 @@ SwTextGridPage::SwTextGridPage(weld::Container* pPage, weld::DialogController* p , m_bSquaredMode(false) , m_bHRulerChanged(false) , m_bVRulerChanged(false) - , m_xNoGridRB(m_xBuilder->weld_radio_button("radioRB_NOGRID")) - , m_xLinesGridRB(m_xBuilder->weld_radio_button("radioRB_LINESGRID")) - , m_xCharsGridRB(m_xBuilder->weld_radio_button("radioRB_CHARSGRID")) - , m_xSnapToCharsCB(m_xBuilder->weld_check_button("checkCB_SNAPTOCHARS")) - , m_xExampleWN(new weld::CustomWeld(*m_xBuilder, "drawingareaWN_EXAMPLE", m_aExampleWN)) - , m_xLayoutFL(m_xBuilder->weld_widget("frameFL_LAYOUT")) - , m_xLinesPerPageNF(m_xBuilder->weld_spin_button("spinNF_LINESPERPAGE")) - , m_xLinesRangeFT(m_xBuilder->weld_label("labelFT_LINERANGE")) - , m_xTextSizeMF(m_xBuilder->weld_metric_spin_button("spinMF_TEXTSIZE", FieldUnit::POINT)) - , m_xCharsPerLineFT(m_xBuilder->weld_label("labelFT_CHARSPERLINE")) - , m_xCharsPerLineNF(m_xBuilder->weld_spin_button("spinNF_CHARSPERLINE")) - , m_xCharsRangeFT(m_xBuilder->weld_label("labelFT_CHARRANGE")) - , m_xCharWidthFT(m_xBuilder->weld_label("labelFT_CHARWIDTH")) - , m_xCharWidthMF(m_xBuilder->weld_metric_spin_button("spinMF_CHARWIDTH", FieldUnit::POINT)) - , m_xRubySizeFT(m_xBuilder->weld_label("labelFT_RUBYSIZE")) - , m_xRubySizeMF(m_xBuilder->weld_metric_spin_button("spinMF_RUBYSIZE", FieldUnit::POINT)) - , m_xRubyBelowCB(m_xBuilder->weld_check_button("checkCB_RUBYBELOW")) - , m_xDisplayFL(m_xBuilder->weld_widget("frameFL_DISPLAY")) - , m_xDisplayCB(m_xBuilder->weld_check_button("checkCB_DISPLAY")) - , m_xPrintCB(m_xBuilder->weld_check_button("checkCB_PRINT")) - , m_xColorLB(new ColorListBox(m_xBuilder->weld_menu_button("listLB_COLOR"), + , m_xNoGridRB(m_xBuilder->weld_radio_button(u"radioRB_NOGRID"_ustr)) + , m_xLinesGridRB(m_xBuilder->weld_radio_button(u"radioRB_LINESGRID"_ustr)) + , m_xCharsGridRB(m_xBuilder->weld_radio_button(u"radioRB_CHARSGRID"_ustr)) + , m_xSnapToCharsCB(m_xBuilder->weld_check_button(u"checkCB_SNAPTOCHARS"_ustr)) + , m_xExampleWN(new weld::CustomWeld(*m_xBuilder, u"drawingareaWN_EXAMPLE"_ustr, m_aExampleWN)) + , m_xLayoutFL(m_xBuilder->weld_widget(u"frameFL_LAYOUT"_ustr)) + , m_xLinesPerPageNF(m_xBuilder->weld_spin_button(u"spinNF_LINESPERPAGE"_ustr)) + , m_xLinesRangeFT(m_xBuilder->weld_label(u"labelFT_LINERANGE"_ustr)) + , m_xTextSizeMF(m_xBuilder->weld_metric_spin_button(u"spinMF_TEXTSIZE"_ustr, FieldUnit::POINT)) + , m_xCharsPerLineFT(m_xBuilder->weld_label(u"labelFT_CHARSPERLINE"_ustr)) + , m_xCharsPerLineNF(m_xBuilder->weld_spin_button(u"spinNF_CHARSPERLINE"_ustr)) + , m_xCharsRangeFT(m_xBuilder->weld_label(u"labelFT_CHARRANGE"_ustr)) + , m_xCharWidthFT(m_xBuilder->weld_label(u"labelFT_CHARWIDTH"_ustr)) + , m_xCharWidthMF(m_xBuilder->weld_metric_spin_button(u"spinMF_CHARWIDTH"_ustr, FieldUnit::POINT)) + , m_xRubySizeFT(m_xBuilder->weld_label(u"labelFT_RUBYSIZE"_ustr)) + , m_xRubySizeMF(m_xBuilder->weld_metric_spin_button(u"spinMF_RUBYSIZE"_ustr, FieldUnit::POINT)) + , m_xRubyBelowCB(m_xBuilder->weld_check_button(u"checkCB_RUBYBELOW"_ustr)) + , m_xDisplayFL(m_xBuilder->weld_widget(u"frameFL_DISPLAY"_ustr)) + , m_xDisplayCB(m_xBuilder->weld_check_button(u"checkCB_DISPLAY"_ustr)) + , m_xPrintCB(m_xBuilder->weld_check_button(u"checkCB_PRINT"_ustr)) + , m_xColorLB(new ColorListBox(m_xBuilder->weld_menu_button(u"listLB_COLOR"_ustr), [this]{ return GetDialogController()->getDialog(); })) { Link<weld::SpinButton&,void> aLink = LINK(this, SwTextGridPage, CharorLineChangedHdl); diff --git a/sw/source/ui/misc/srtdlg.cxx b/sw/source/ui/misc/srtdlg.cxx index 97f2c1dc9b6e..b49efbf74130 100644 --- a/sw/source/ui/misc/srtdlg.cxx +++ b/sw/source/ui/misc/srtdlg.cxx @@ -88,32 +88,32 @@ static bool lcl_GetSelTable( SwWrtShell const &rSh, sal_uInt16& rX, sal_uInt16& // init list SwSortDlg::SwSortDlg(weld::Window* pParent, SwWrtShell &rShell) - : GenericDialogController(pParent, "modules/swriter/ui/sortdialog.ui", "SortDialog") + : GenericDialogController(pParent, u"modules/swriter/ui/sortdialog.ui"_ustr, u"SortDialog"_ustr) , m_pParent(pParent) - , m_xColLbl(m_xBuilder->weld_label("column")) - , m_xKeyCB1(m_xBuilder->weld_check_button("key1")) - , m_xColEdt1(m_xBuilder->weld_spin_button("colsb1")) - , m_xTypDLB1(m_xBuilder->weld_combo_box("typelb1")) - , m_xSortUp1RB(m_xBuilder->weld_radio_button("up1")) - , m_xSortDn1RB(m_xBuilder->weld_radio_button("down1")) - , m_xKeyCB2(m_xBuilder->weld_check_button("key2")) - , m_xColEdt2(m_xBuilder->weld_spin_button("colsb2")) - , m_xTypDLB2(m_xBuilder->weld_combo_box("typelb2")) - , m_xSortUp2RB(m_xBuilder->weld_radio_button("up2")) - , m_xSortDn2RB(m_xBuilder->weld_radio_button("down2")) - , m_xKeyCB3(m_xBuilder->weld_check_button("key3")) - , m_xColEdt3(m_xBuilder->weld_spin_button("colsb3")) - , m_xTypDLB3(m_xBuilder->weld_combo_box("typelb3")) - , m_xSortUp3RB(m_xBuilder->weld_radio_button("up3")) - , m_xSortDn3RB(m_xBuilder->weld_radio_button("down3")) - , m_xColumnRB(m_xBuilder->weld_radio_button("columns")) - , m_xRowRB(m_xBuilder->weld_radio_button("rows")) - , m_xDelimTabRB(m_xBuilder->weld_radio_button("tabs")) - , m_xDelimFreeRB(m_xBuilder->weld_radio_button("character")) - , m_xDelimEdt(m_xBuilder->weld_entry("separator")) - , m_xDelimPB(m_xBuilder->weld_button("delimpb")) - , m_xLangLB(new SvxLanguageBox(m_xBuilder->weld_combo_box("langlb"))) - , m_xCaseCB(m_xBuilder->weld_check_button("matchcase")) + , m_xColLbl(m_xBuilder->weld_label(u"column"_ustr)) + , m_xKeyCB1(m_xBuilder->weld_check_button(u"key1"_ustr)) + , m_xColEdt1(m_xBuilder->weld_spin_button(u"colsb1"_ustr)) + , m_xTypDLB1(m_xBuilder->weld_combo_box(u"typelb1"_ustr)) + , m_xSortUp1RB(m_xBuilder->weld_radio_button(u"up1"_ustr)) + , m_xSortDn1RB(m_xBuilder->weld_radio_button(u"down1"_ustr)) + , m_xKeyCB2(m_xBuilder->weld_check_button(u"key2"_ustr)) + , m_xColEdt2(m_xBuilder->weld_spin_button(u"colsb2"_ustr)) + , m_xTypDLB2(m_xBuilder->weld_combo_box(u"typelb2"_ustr)) + , m_xSortUp2RB(m_xBuilder->weld_radio_button(u"up2"_ustr)) + , m_xSortDn2RB(m_xBuilder->weld_radio_button(u"down2"_ustr)) + , m_xKeyCB3(m_xBuilder->weld_check_button(u"key3"_ustr)) + , m_xColEdt3(m_xBuilder->weld_spin_button(u"colsb3"_ustr)) + , m_xTypDLB3(m_xBuilder->weld_combo_box(u"typelb3"_ustr)) + , m_xSortUp3RB(m_xBuilder->weld_radio_button(u"up3"_ustr)) + , m_xSortDn3RB(m_xBuilder->weld_radio_button(u"down3"_ustr)) + , m_xColumnRB(m_xBuilder->weld_radio_button(u"columns"_ustr)) + , m_xRowRB(m_xBuilder->weld_radio_button(u"rows"_ustr)) + , m_xDelimTabRB(m_xBuilder->weld_radio_button(u"tabs"_ustr)) + , m_xDelimFreeRB(m_xBuilder->weld_radio_button(u"character"_ustr)) + , m_xDelimEdt(m_xBuilder->weld_entry(u"separator"_ustr)) + , m_xDelimPB(m_xBuilder->weld_button(u"delimpb"_ustr)) + , m_xLangLB(new SvxLanguageBox(m_xBuilder->weld_combo_box(u"langlb"_ustr))) + , m_xCaseCB(m_xBuilder->weld_check_button(u"matchcase"_ustr)) , m_aColText(SwResId(STR_COL)) , m_aRowText(SwResId(STR_ROW)) , m_aNumericText(SwResId(STR_NUMERIC)) diff --git a/sw/source/ui/misc/swmodalredlineacceptdlg.cxx b/sw/source/ui/misc/swmodalredlineacceptdlg.cxx index 8bc8baf755cc..8a103a4b9702 100644 --- a/sw/source/ui/misc/swmodalredlineacceptdlg.cxx +++ b/sw/source/ui/misc/swmodalredlineacceptdlg.cxx @@ -24,8 +24,8 @@ #include <swmodalredlineacceptdlg.hxx> SwModalRedlineAcceptDlg::SwModalRedlineAcceptDlg(weld::Window *pParent) - : SfxDialogController(pParent, "svx/ui/acceptrejectchangesdialog.ui", - "AcceptRejectChangesDialog") + : SfxDialogController(pParent, u"svx/ui/acceptrejectchangesdialog.ui"_ustr, + u"AcceptRejectChangesDialog"_ustr) , m_xContentArea(m_xDialog->weld_content_area()) { m_xDialog->set_modal(true); @@ -35,7 +35,7 @@ SwModalRedlineAcceptDlg::SwModalRedlineAcceptDlg(weld::Window *pParent) SvtViewOptions aDlgOpt(EViewType::Dialog, m_xDialog->get_help_id()); if (aDlgOpt.Exists()) { - css::uno::Any aUserItem = aDlgOpt.GetUserItem("UserItem"); + css::uno::Any aUserItem = aDlgOpt.GetUserItem(u"UserItem"_ustr); OUString sExtraData; aUserItem >>= sExtraData; m_xImplDlg->Initialize(sExtraData); @@ -50,7 +50,7 @@ SwModalRedlineAcceptDlg::~SwModalRedlineAcceptDlg() OUString sExtraData; m_xImplDlg->FillInfo(sExtraData); SvtViewOptions aDlgOpt(EViewType::Dialog, m_xDialog->get_help_id()); - aDlgOpt.SetUserItem("UserItem", css::uno::Any(sExtraData)); + aDlgOpt.SetUserItem(u"UserItem"_ustr, css::uno::Any(sExtraData)); m_xDialog->set_modal(false); } diff --git a/sw/source/ui/misc/titlepage.cxx b/sw/source/ui/misc/titlepage.cxx index 0d8c776cce64..8074ead5a3aa 100644 --- a/sw/source/ui/misc/titlepage.cxx +++ b/sw/source/ui/misc/titlepage.cxx @@ -145,23 +145,23 @@ sal_uInt16 SwTitlePageDlg::GetInsertPosition() const } SwTitlePageDlg::SwTitlePageDlg(weld::Window *pParent) - : SfxDialogController(pParent, "modules/swriter/ui/titlepage.ui", "DLG_TITLEPAGE") + : SfxDialogController(pParent, u"modules/swriter/ui/titlepage.ui"_ustr, u"DLG_TITLEPAGE"_ustr) , mpTitleDesc(nullptr) , mpIndexDesc(nullptr) , mpNormalDesc(nullptr) - , m_xUseExistingPagesRB(m_xBuilder->weld_radio_button("RB_USE_EXISTING_PAGES")) - , m_xInsertNewPagesRB(m_xBuilder->weld_radio_button("RB_INSERT_NEW_PAGES")) - , m_xPageCountNF(m_xBuilder->weld_spin_button("NF_PAGE_COUNT")) - , m_xDocumentStartRB(m_xBuilder->weld_radio_button("RB_DOCUMENT_START")) - , m_xPageStartRB(m_xBuilder->weld_radio_button("RB_PAGE_START")) - , m_xPageStartNF(m_xBuilder->weld_spin_button("NF_PAGE_START")) - , m_xRestartNumberingCB(m_xBuilder->weld_check_button("CB_RESTART_NUMBERING")) - , m_xRestartNumberingNF(m_xBuilder->weld_spin_button("NF_RESTART_NUMBERING")) - , m_xSetPageNumberCB(m_xBuilder->weld_check_button("CB_SET_PAGE_NUMBER")) - , m_xSetPageNumberNF(m_xBuilder->weld_spin_button("NF_SET_PAGE_NUMBER")) - , m_xPagePropertiesLB(m_xBuilder->weld_combo_box("LB_PAGE_PROPERTIES")) - , m_xPagePropertiesPB(m_xBuilder->weld_button("PB_PAGE_PROPERTIES")) - , m_xOkPB(m_xBuilder->weld_button("ok")) + , m_xUseExistingPagesRB(m_xBuilder->weld_radio_button(u"RB_USE_EXISTING_PAGES"_ustr)) + , m_xInsertNewPagesRB(m_xBuilder->weld_radio_button(u"RB_INSERT_NEW_PAGES"_ustr)) + , m_xPageCountNF(m_xBuilder->weld_spin_button(u"NF_PAGE_COUNT"_ustr)) + , m_xDocumentStartRB(m_xBuilder->weld_radio_button(u"RB_DOCUMENT_START"_ustr)) + , m_xPageStartRB(m_xBuilder->weld_radio_button(u"RB_PAGE_START"_ustr)) + , m_xPageStartNF(m_xBuilder->weld_spin_button(u"NF_PAGE_START"_ustr)) + , m_xRestartNumberingCB(m_xBuilder->weld_check_button(u"CB_RESTART_NUMBERING"_ustr)) + , m_xRestartNumberingNF(m_xBuilder->weld_spin_button(u"NF_RESTART_NUMBERING"_ustr)) + , m_xSetPageNumberCB(m_xBuilder->weld_check_button(u"CB_SET_PAGE_NUMBER"_ustr)) + , m_xSetPageNumberNF(m_xBuilder->weld_spin_button(u"NF_SET_PAGE_NUMBER"_ustr)) + , m_xPagePropertiesLB(m_xBuilder->weld_combo_box(u"LB_PAGE_PROPERTIES"_ustr)) + , m_xPagePropertiesPB(m_xBuilder->weld_button(u"PB_PAGE_PROPERTIES"_ustr)) + , m_xOkPB(m_xBuilder->weld_button(u"ok"_ustr)) { SwView* pView = GetActiveView(); if (!pView) @@ -268,7 +268,7 @@ IMPL_LINK_NOARG(SwTitlePageDlg, EditHdl, weld::Button&, void) return; SwWrtShell& rWrtShell = pView->GetWrtShell(); SwView& rView = rWrtShell.GetView(); - rView.GetDocShell()->FormatPage(getDialog(), m_xPagePropertiesLB->get_active_text(), "page", rWrtShell); + rView.GetDocShell()->FormatPage(getDialog(), m_xPagePropertiesLB->get_active_text(), u"page"_ustr, rWrtShell); rView.InvalidateRulerPos(); } diff --git a/sw/source/ui/misc/translatelangselect.cxx b/sw/source/ui/misc/translatelangselect.cxx index f03d64c7559a..061d0662e1dd 100644 --- a/sw/source/ui/misc/translatelangselect.cxx +++ b/sw/source/ui/misc/translatelangselect.cxx @@ -76,12 +76,12 @@ static const std::vector<SwLanguageListItem>& getLanguageVec() int SwTranslateLangSelectDlg::selectedLangIdx = -1; SwTranslateLangSelectDlg::SwTranslateLangSelectDlg(weld::Window* pParent, SwWrtShell& rSh) - : GenericDialogController(pParent, "modules/swriter/ui/translationdialog.ui", - "LanguageSelectDialog") + : GenericDialogController(pParent, u"modules/swriter/ui/translationdialog.ui"_ustr, + u"LanguageSelectDialog"_ustr) , m_rWrtSh(rSh) - , m_xLanguageListBox(m_xBuilder->weld_combo_box("combobox1")) - , m_xBtnCancel(m_xBuilder->weld_button("cancel")) - , m_xBtnTranslate(m_xBuilder->weld_button("translate")) + , m_xLanguageListBox(m_xBuilder->weld_combo_box(u"combobox1"_ustr)) + , m_xBtnCancel(m_xBuilder->weld_button(u"cancel"_ustr)) + , m_xBtnTranslate(m_xBuilder->weld_button(u"translate"_ustr)) , m_bTranslationStarted(false) , m_bCancelTranslation(false) {
