cui/inc/dlgname.hxx | 2 cui/source/customize/CommandCategoryListBox.cxx | 10 cui/source/customize/CustomNotebookbarGenerator.cxx | 23 + cui/source/customize/SvxConfigPageHelper.cxx | 24 +- cui/source/customize/SvxMenuConfigPage.cxx | 50 ++-- cui/source/customize/SvxNotebookbarConfigPage.cxx | 20 - cui/source/customize/SvxToolbarConfigPage.cxx | 62 ++--- cui/source/customize/acccfg.cxx | 39 +-- cui/source/customize/cfg.cxx | 120 +++++----- cui/source/customize/cfgutil.cxx | 44 +-- cui/source/customize/eventdlg.cxx | 14 - cui/source/customize/macropg.cxx | 30 +- cui/source/dialogs/AdditionsDialog.cxx | 71 +++-- cui/source/dialogs/DiagramDialog.cxx | 18 - cui/source/dialogs/FontFeaturesDialog.cxx | 21 - cui/source/dialogs/GraphicTestsDialog.cxx | 16 - cui/source/dialogs/ImageViewerDialog.cxx | 4 cui/source/dialogs/QrCodeGenDialog.cxx | 40 +-- cui/source/dialogs/SignSignatureLineDialog.cxx | 42 +-- cui/source/dialogs/SignatureLineDialog.cxx | 56 ++-- cui/source/dialogs/SpellDialog.cxx | 62 ++--- cui/source/dialogs/about.cxx | 38 +-- cui/source/dialogs/colorpicker.cxx | 54 ++-- cui/source/dialogs/cuifmsearch.cxx | 54 ++-- cui/source/dialogs/cuigaldlg.cxx | 84 +++---- cui/source/dialogs/cuigrfflt.cxx | 32 +- cui/source/dialogs/cuihyperdlg.cxx | 26 +- cui/source/dialogs/cuiimapwnd.cxx | 14 - cui/source/dialogs/cuitbxform.cxx | 5 cui/source/dialogs/dlgname.cxx | 59 ++-- cui/source/dialogs/hangulhanjadlg.cxx | 100 ++++---- cui/source/dialogs/hldocntp.cxx | 16 - cui/source/dialogs/hldoctp.cxx | 16 - cui/source/dialogs/hlinettp.cxx | 6 cui/source/dialogs/hlmailtp.cxx | 10 cui/source/dialogs/hlmarkwn.cxx | 18 - cui/source/dialogs/hltpbase.cxx | 14 - cui/source/dialogs/hyphen.cxx | 18 - cui/source/dialogs/insdlg.cxx | 92 +++---- cui/source/dialogs/insrc.cxx | 8 cui/source/dialogs/linkdlg.cxx | 24 +- cui/source/dialogs/multipat.cxx | 16 - cui/source/dialogs/newtabledlg.cxx | 6 cui/source/dialogs/passwdomdlg.cxx | 44 +-- cui/source/dialogs/pastedlg.cxx | 8 cui/source/dialogs/postdlg.cxx | 18 - cui/source/dialogs/screenshotannotationdlg.cxx | 28 +- cui/source/dialogs/scriptdlg.cxx | 50 ++-- cui/source/dialogs/sdrcelldlg.cxx | 34 +- cui/source/dialogs/showcols.cxx | 6 cui/source/dialogs/splitcelldlg.cxx | 10 cui/source/dialogs/srchxtra.cxx | 40 +-- cui/source/dialogs/thesdlg.cxx | 16 - cui/source/dialogs/tipofthedaydlg.cxx | 15 - cui/source/dialogs/toolbarmodedlg.cxx | 33 +- cui/source/dialogs/whatsnew.cxx | 12 - cui/source/dialogs/widgettestdlg.cxx | 12 - cui/source/dialogs/zoom.cxx | 28 +- cui/source/factory/cuiexp.cxx | 4 cui/source/factory/dlgfact.cxx | 4 cui/source/factory/dlgfact.hxx | 2 cui/source/inc/FontFeaturesDialog.hxx | 10 cui/source/options/certpath.cxx | 14 - cui/source/options/connpooloptions.cxx | 32 +- cui/source/options/dbregister.cxx | 12 - cui/source/options/doclinkdialog.cxx | 20 - cui/source/options/fontsubs.cxx | 36 +-- cui/source/options/optaboutconfig.cxx | 32 +- cui/source/options/optaccessibility.cxx | 36 +-- cui/source/options/optasian.cxx | 38 +-- cui/source/options/optbasic.cxx | 20 - cui/source/options/optchart.cxx | 24 +- cui/source/options/optcolor.cxx | 70 ++--- cui/source/options/optctl.cxx | 20 - cui/source/options/optdeepl.cxx | 10 cui/source/options/optdict.cxx | 36 +-- cui/source/options/optfltr.cxx | 60 ++--- cui/source/options/optgdlg.cxx | 238 ++++++++++---------- cui/source/options/optgenrl.cxx | 108 ++++----- cui/source/options/opthtml.cxx | 68 ++--- cui/source/options/optinet2.cxx | 134 +++++------ cui/source/options/optjava.cxx | 68 ++--- cui/source/options/optjsearch.cxx | 80 +++--- cui/source/options/optlanguagetool.cxx | 41 +-- cui/source/options/optlingu.cxx | 72 +++--- cui/source/options/optopencl.cxx | 12 - cui/source/options/optpath.cxx | 12 - cui/source/options/optsave.cxx | 82 +++--- cui/source/options/optupdt.cxx | 104 ++++---- cui/source/options/personalization.cxx | 20 - cui/source/options/securityoptions.cxx | 58 ++-- cui/source/options/treeopt.cxx | 54 ++-- cui/source/options/treeopthelper.cxx | 142 +++++------ cui/source/options/tsaurls.cxx | 12 - cui/source/options/webconninfo.cxx | 12 - cui/source/tabpages/TextColumnsPage.cxx | 9 cui/source/tabpages/align.cxx | 50 ++-- cui/source/tabpages/autocdlg.cxx | 152 ++++++------ cui/source/tabpages/backgrnd.cxx | 2 cui/source/tabpages/bbdlg.cxx | 16 - cui/source/tabpages/border.cxx | 66 ++--- cui/source/tabpages/chardlg.cxx | 182 +++++++-------- cui/source/tabpages/connect.cxx | 38 +-- cui/source/tabpages/grfpage.cxx | 46 +-- cui/source/tabpages/labdlg.cxx | 38 +-- cui/source/tabpages/macroass.cxx | 20 - cui/source/tabpages/measure.cxx | 32 +- cui/source/tabpages/numfmt.cxx | 58 ++-- cui/source/tabpages/numpages.cxx | 210 ++++++++--------- cui/source/tabpages/page.cxx | 86 +++---- cui/source/tabpages/paragrph.cxx | 154 ++++++------ cui/source/tabpages/swpossizetabpage.cxx | 62 ++--- cui/source/tabpages/tabarea.cxx | 12 - cui/source/tabpages/tabline.cxx | 12 - cui/source/tabpages/tabstpge.cxx | 50 ++-- cui/source/tabpages/textanim.cxx | 50 ++-- cui/source/tabpages/textattr.cxx | 34 +- cui/source/tabpages/tparea.cxx | 22 - cui/source/tabpages/tpbitmap.cxx | 56 ++-- cui/source/tabpages/tpcolor.cxx | 76 +++--- cui/source/tabpages/tpgradnt.cxx | 54 ++-- cui/source/tabpages/tphatch.cxx | 38 +-- cui/source/tabpages/tpline.cxx | 80 +++--- cui/source/tabpages/tplnedef.cxx | 66 ++--- cui/source/tabpages/tplneend.cxx | 52 ++-- cui/source/tabpages/tppattern.cxx | 30 +- cui/source/tabpages/tpshadow.cxx | 24 +- cui/source/tabpages/tptrans.cxx | 40 +-- cui/source/tabpages/transfrm.cxx | 96 ++++---- 129 files changed, 2828 insertions(+), 2814 deletions(-)
New commits: commit ecf6f6f25663e81ebf18589b895a22bc5b6ffbab Author: Noel Grandin <[email protected]> AuthorDate: Tue May 7 08:51:06 2024 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Tue May 7 12:20:06 2024 +0200 loplugin:ostr in cui Change-Id: I593eb3c02768423fc8cea8d93c112655860228d9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167258 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> diff --git a/cui/inc/dlgname.hxx b/cui/inc/dlgname.hxx index deb55df1c962..d12b8edb1bea 100644 --- a/cui/inc/dlgname.hxx +++ b/cui/inc/dlgname.hxx @@ -37,7 +37,7 @@ private: public: SvxNameDialog(weld::Window* pWindow, const OUString& rName, const OUString& rDesc, - const OUString& rTitle = ""); + const OUString& rTitle = u""_ustr); OUString GetName() const { return m_xEdtName->get_text(); } diff --git a/cui/source/customize/CommandCategoryListBox.cxx b/cui/source/customize/CommandCategoryListBox.cxx index f7f3295a921d..3c75cb15dc4c 100644 --- a/cui/source/customize/CommandCategoryListBox.cxx +++ b/cui/source/customize/CommandCategoryListBox.cxx @@ -139,7 +139,7 @@ void CommandCategoryListBox::Init(const css::uno::Reference<css::uno::XComponent } // Separate the "All commands"category from the actual categories - m_xControl->append_separator(""); + m_xControl->append_separator(u""_ustr); typedef std::pair<OUString, sal_Int16> str_id; std::vector<str_id> aCategories; @@ -184,7 +184,7 @@ void CommandCategoryListBox::Init(const css::uno::Reference<css::uno::XComponent } // Separate regular commands from styles and macros - m_xControl->append_separator(""); + m_xControl->append_separator(u""_ustr); // Add macros category m_aGroupInfo.push_back( @@ -270,7 +270,7 @@ OUString CommandCategoryListBox::getCommandName(const OUString& sCommand) if (xModuleConf.is()) { ::comphelper::SequenceAsHashMap lProps(xModuleConf->getByName(sCommand)); - sUIName = lProps.getUnpackedValueOrDefault("Name", OUString()); + sUIName = lProps.getUnpackedValueOrDefault(u"Name"_ustr, OUString()); } } catch (const css::uno::RuntimeException&) @@ -569,12 +569,12 @@ void CommandCategoryListBox::addChildren( continue; } - css::uno::Any value = xPropSet->getPropertyValue("URI"); + css::uno::Any value = xPropSet->getPropertyValue(u"URI"_ustr); value >>= uri; try { - value = xPropSet->getPropertyValue("Description"); + value = xPropSet->getPropertyValue(u"Description"_ustr); value >>= description; } catch (css::uno::Exception&) diff --git a/cui/source/customize/CustomNotebookbarGenerator.cxx b/cui/source/customize/CustomNotebookbarGenerator.cxx index 1d013654d8f7..20610dc9b096 100644 --- a/cui/source/customize/CustomNotebookbarGenerator.cxx +++ b/cui/source/customize/CustomNotebookbarGenerator.cxx @@ -42,13 +42,13 @@ static OUString lcl_activeAppName(vcl::EnumContext::Application eApp) switch (eApp) { case vcl::EnumContext::Application::Writer: - return "ActiveWriter"; + return u"ActiveWriter"_ustr; case vcl::EnumContext::Application::Calc: - return "ActiveCalc"; + return u"ActiveCalc"_ustr; case vcl::EnumContext::Application::Impress: - return "ActiveImpress"; + return u"ActiveImpress"_ustr; case vcl::EnumContext::Application::Draw: - return "ActiveDraw"; + return u"ActiveDraw"_ustr; default: return OUString(); } @@ -59,13 +59,13 @@ static OUString lcl_getAppName(vcl::EnumContext::Application eApp) switch (eApp) { case vcl::EnumContext::Application::Writer: - return "Writer"; + return u"Writer"_ustr; case vcl::EnumContext::Application::Calc: - return "Calc"; + return u"Calc"_ustr; case vcl::EnumContext::Application::Impress: - return "Impress"; + return u"Impress"_ustr; case vcl::EnumContext::Application::Draw: - return "Draw"; + return u"Draw"_ustr; default: return OUString(); } @@ -89,8 +89,8 @@ static OUString getAppNameRegistryPath() static OUString customizedUIPathBuffer() { - OUString sDirPath("${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE( - "bootstrap") ":UserInstallation}/user/config/soffice.cfg/"); + OUString sDirPath(u"${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE( + "bootstrap") ":UserInstallation}/user/config/soffice.cfg/"_ustr); rtl::Bootstrap::expandMacros(sDirPath); return sDirPath; } @@ -217,7 +217,8 @@ void CustomNotebookbarGenerator::getFileNameAndAppName(OUString& sAppName, return; const auto xContext = comphelper::getProcessComponentContext(); - utl::OConfigurationTreeRoot aRoot(xContext, "org.openoffice.Office.UI.ToolbarMode/", false); + utl::OConfigurationTreeRoot aRoot(xContext, u"org.openoffice.Office.UI.ToolbarMode/"_ustr, + false); const Reference<frame::XFrame>& xFrame = pFrame->GetFrame().GetFrameInterface(); const Reference<frame::XModuleManager> xModuleManager = frame::ModuleManager::create(xContext); diff --git a/cui/source/customize/SvxConfigPageHelper.cxx b/cui/source/customize/SvxConfigPageHelper.cxx index 59a2cdb64017..522dfd3eb721 100644 --- a/cui/source/customize/SvxConfigPageHelper.cxx +++ b/cui/source/customize/SvxConfigPageHelper.cxx @@ -206,29 +206,29 @@ OUString SvxConfigPageHelper::GetModuleName(std::u16string_view aModuleId) { if (aModuleId == u"com.sun.star.text.TextDocument" || aModuleId == u"com.sun.star.text.GlobalDocument") - return "Writer"; + return u"Writer"_ustr; else if (aModuleId == u"com.sun.star.text.WebDocument") - return "Writer/Web"; + return u"Writer/Web"_ustr; else if (aModuleId == u"com.sun.star.drawing.DrawingDocument") - return "Draw"; + return u"Draw"_ustr; else if (aModuleId == u"com.sun.star.presentation.PresentationDocument") - return "Impress"; + return u"Impress"_ustr; else if (aModuleId == u"com.sun.star.sheet.SpreadsheetDocument") - return "Calc"; + return u"Calc"_ustr; else if (aModuleId == u"com.sun.star.script.BasicIDE") - return "Basic"; + return u"Basic"_ustr; else if (aModuleId == u"com.sun.star.formula.FormulaProperties") - return "Math"; + return u"Math"_ustr; else if (aModuleId == u"com.sun.star.sdb.RelationDesign") - return "Relation Design"; + return u"Relation Design"_ustr; else if (aModuleId == u"com.sun.star.sdb.QueryDesign") - return "Query Design"; + return u"Query Design"_ustr; else if (aModuleId == u"com.sun.star.sdb.TableDesign") - return "Table Design"; + return u"Table Design"_ustr; else if (aModuleId == u"com.sun.star.sdb.DataSourceBrowser") - return "Data Source Browser"; + return u"Data Source Browser"_ustr; else if (aModuleId == u"com.sun.star.sdb.DatabaseDocument") - return "Database"; + return u"Database"_ustr; return OUString(); } diff --git a/cui/source/customize/SvxMenuConfigPage.cxx b/cui/source/customize/SvxMenuConfigPage.cxx index 4ee5ce9be0ca..2a75181ae95a 100644 --- a/cui/source/customize/SvxMenuConfigPage.cxx +++ b/cui/source/customize/SvxMenuConfigPage.cxx @@ -40,10 +40,10 @@ SvxMenuConfigPage::SvxMenuConfigPage(weld::Container* pPage, weld::DialogControl : SvxConfigPage(pPage, pController, rSet) , m_bIsMenuBar(bIsMenuBar) { - m_xGearBtn = m_xBuilder->weld_menu_button("menugearbtn"); + m_xGearBtn = m_xBuilder->weld_menu_button(u"menugearbtn"_ustr); m_xGearBtn->show(); m_xContentsListBox.reset( - new SvxMenuEntriesListBox(m_xBuilder->weld_tree_view("menucontents"), this)); + new SvxMenuEntriesListBox(m_xBuilder->weld_tree_view(u"menucontents"_ustr), this)); weld::TreeView& rTreeView = m_xContentsListBox->get_widget(); m_xDropTargetHelper.reset(new SvxConfigPageFunctionDropTarget(*this, rTreeView)); rTreeView.connect_size_allocate(LINK(this, SvxMenuConfigPage, MenuEntriesSizeAllocHdl)); @@ -75,9 +75,9 @@ SvxMenuConfigPage::SvxMenuConfigPage(weld::Container* pPage, weld::DialogControl m_xResetBtn->connect_clicked(LINK(this, SvxMenuConfigPage, ResetMenuHdl)); // These operations are not possible on menus/context menus yet - m_xModifyBtn->remove_item("changeIcon"); - m_xModifyBtn->remove_item("resetIcon"); - m_xModifyBtn->remove_item("restoreItem"); + m_xModifyBtn->remove_item(u"changeIcon"_ustr); + m_xModifyBtn->remove_item(u"resetIcon"_ustr); + m_xModifyBtn->remove_item(u"restoreItem"_ustr); if (!bIsMenuBar) { @@ -185,9 +185,9 @@ void SvxMenuConfigPage::UpdateButtonStates() if (pMenuData && m_bIsMenuBar) { // Add option (gear_add) will always be enabled - m_xGearBtn->set_item_sensitive("menu_gear_delete", pMenuData->IsDeletable()); - m_xGearBtn->set_item_sensitive("menu_gear_rename", pMenuData->IsRenamable()); - m_xGearBtn->set_item_sensitive("menu_gear_move", pMenuData->IsMovable()); + m_xGearBtn->set_item_sensitive(u"menu_gear_delete"_ustr, pMenuData->IsDeletable()); + m_xGearBtn->set_item_sensitive(u"menu_gear_rename"_ustr, pMenuData->IsRenamable()); + m_xGearBtn->set_item_sensitive(u"menu_gear_move"_ustr, pMenuData->IsMovable()); } } @@ -532,14 +532,14 @@ IMPL_LINK(SvxMenuConfigPage, ContentContextMenuHdl, const CommandEvent&, rCEvt, bool bIsValidSelection = (m_xContentsListBox->n_children() != 0 && nSelectIndex != -1); std::unique_ptr<weld::Builder> xBuilder( - Application::CreateBuilder(&rTreeView, "cui/ui/entrycontextmenu.ui")); - auto xContextMenu = xBuilder->weld_menu("menu"); - xContextMenu->set_visible("add", false); - xContextMenu->set_visible("remove", bIsValidSelection); - xContextMenu->set_visible("rename", bIsValidSelection && !bIsSeparator); - xContextMenu->set_visible("changeIcon", false); - xContextMenu->set_visible("resetIcon", false); - xContextMenu->set_visible("restoreDefault", false); + Application::CreateBuilder(&rTreeView, u"cui/ui/entrycontextmenu.ui"_ustr)); + auto xContextMenu = xBuilder->weld_menu(u"menu"_ustr); + xContextMenu->set_visible(u"add"_ustr, false); + xContextMenu->set_visible(u"remove"_ustr, bIsValidSelection); + xContextMenu->set_visible(u"rename"_ustr, bIsValidSelection && !bIsSeparator); + xContextMenu->set_visible(u"changeIcon"_ustr, false); + xContextMenu->set_visible(u"resetIcon"_ustr, false); + xContextMenu->set_visible(u"restoreDefault"_ustr, false); OUString sCommand(xContextMenu->popup_at_rect( &rTreeView, tools::Rectangle(rCEvt.GetMousePosPixel(), Size(1, 1)))); @@ -549,7 +549,7 @@ IMPL_LINK(SvxMenuConfigPage, ContentContextMenuHdl, const CommandEvent&, rCEvt, } else if (sCommand == "rename") { - ModifyItemHdl("renameItem"); + ModifyItemHdl(u"renameItem"_ustr); } else if (!sCommand.isEmpty()) SAL_WARN("cui.customize", "Unknown context menu action: " << sCommand); @@ -571,14 +571,14 @@ IMPL_LINK(SvxMenuConfigPage, FunctionContextMenuHdl, const CommandEvent&, rCEvt, SelectFunctionHdl(rTreeView); std::unique_ptr<weld::Builder> xBuilder( - Application::CreateBuilder(&rTreeView, "cui/ui/entrycontextmenu.ui")); - auto xContextMenu = xBuilder->weld_menu("menu"); - xContextMenu->set_visible("add", true); - xContextMenu->set_visible("remove", false); - xContextMenu->set_visible("rename", false); - xContextMenu->set_visible("changeIcon", false); - xContextMenu->set_visible("resetIcon", false); - xContextMenu->set_visible("restoreDefault", false); + Application::CreateBuilder(&rTreeView, u"cui/ui/entrycontextmenu.ui"_ustr)); + auto xContextMenu = xBuilder->weld_menu(u"menu"_ustr); + xContextMenu->set_visible(u"add"_ustr, true); + xContextMenu->set_visible(u"remove"_ustr, false); + xContextMenu->set_visible(u"rename"_ustr, false); + xContextMenu->set_visible(u"changeIcon"_ustr, false); + xContextMenu->set_visible(u"resetIcon"_ustr, false); + xContextMenu->set_visible(u"restoreDefault"_ustr, false); OUString sCommand(xContextMenu->popup_at_rect( &rTreeView, tools::Rectangle(rCEvt.GetMousePosPixel(), Size(1, 1)))); diff --git a/cui/source/customize/SvxNotebookbarConfigPage.cxx b/cui/source/customize/SvxNotebookbarConfigPage.cxx index 7389d05b91d2..a503e4312e9d 100644 --- a/cui/source/customize/SvxNotebookbarConfigPage.cxx +++ b/cui/source/customize/SvxNotebookbarConfigPage.cxx @@ -77,21 +77,21 @@ static OUString getFileName(std::u16string_view aFileName) else if (aFileName == u"notebookbar_groupedbar_compact.ui") return CuiResId(RID_CUISTR_GROUPEDBAR_COMPACT); else - return "None"; + return u"None"_ustr; } static OUString getModuleId(std::u16string_view sModuleName) { if (sModuleName == u"Writer") - return "com.sun.star.text.TextDocument"; + return u"com.sun.star.text.TextDocument"_ustr; else if (sModuleName == u"Draw") - return "com.sun.star.drawing.DrawingDocument"; + return u"com.sun.star.drawing.DrawingDocument"_ustr; else if (sModuleName == u"Impress") - return "com.sun.star.presentation.PresentationDocument"; + return u"com.sun.star.presentation.PresentationDocument"_ustr; else if (sModuleName == u"Calc") - return "com.sun.star.sheet.SpreadsheetDocument"; + return u"com.sun.star.sheet.SpreadsheetDocument"_ustr; else - return "None"; + return u"None"_ustr; } SvxNotebookbarConfigPage::SvxNotebookbarConfigPage(weld::Container* pPage, @@ -116,7 +116,7 @@ SvxNotebookbarConfigPage::SvxNotebookbarConfigPage(weld::Container* pPage, rCommandCategoryBox.hide(); m_xContentsListBox.reset( - new SvxNotebookbarEntriesListBox(m_xBuilder->weld_tree_view("toolcontents"), this)); + new SvxNotebookbarEntriesListBox(m_xBuilder->weld_tree_view(u"toolcontents"_ustr), this)); m_xDropTargetHelper.reset( new SvxConfigPageFunctionDropTarget(*this, m_xContentsListBox->get_widget())); weld::TreeView& rTreeView = m_xContentsListBox->get_widget(); @@ -149,8 +149,8 @@ void SvxNotebookbarConfigPage::Init() m_xSaveInListBox->append(sSaveInListBoxID, sScopeName); m_xSaveInListBox->set_active_id(sSaveInListBoxID); - m_xTopLevelListBox->append("NotebookBar", CuiResId(RID_CUISTR_ALL_COMMANDS)); - m_xTopLevelListBox->set_active_id("NotebookBar"); + m_xTopLevelListBox->append(u"NotebookBar"_ustr, CuiResId(RID_CUISTR_ALL_COMMANDS)); + m_xTopLevelListBox->set_active_id(u"NotebookBar"_ustr); SelectElement(); } @@ -223,7 +223,7 @@ void SvxConfigPage::InsertEntryIntoNotebookbarTabUI(std::u16string_view sClassId if (sClassId == u"GtkSeparatorMenuItem" || sClassId == u"GtkSeparator") { - rTreeView.set_text(rIter, "--------------------------------------------", 0); + rTreeView.set_text(rIter, u"--------------------------------------------"_ustr, 0); } else { diff --git a/cui/source/customize/SvxToolbarConfigPage.cxx b/cui/source/customize/SvxToolbarConfigPage.cxx index 1997de819d29..a1ba639f0e27 100644 --- a/cui/source/customize/SvxToolbarConfigPage.cxx +++ b/cui/source/customize/SvxToolbarConfigPage.cxx @@ -46,12 +46,12 @@ SvxToolbarConfigPage::SvxToolbarConfigPage(weld::Container* pPage, const SfxItemSet& rSet) : SvxConfigPage(pPage, pController, rSet) { - m_xGearBtn = m_xBuilder->weld_menu_button("toolbargearbtn"); + m_xGearBtn = m_xBuilder->weld_menu_button(u"toolbargearbtn"_ustr); m_xGearBtn->show(); m_xContainer->set_help_id(HID_SVX_CONFIG_TOOLBAR); m_xContentsListBox.reset( - new SvxToolbarEntriesListBox(m_xBuilder->weld_tree_view("toolcontents"), this)); + new SvxToolbarEntriesListBox(m_xBuilder->weld_tree_view(u"toolcontents"_ustr), this)); m_xDropTargetHelper.reset( new SvxConfigPageFunctionDropTarget(*this, m_xContentsListBox->get_widget())); @@ -95,10 +95,10 @@ SvxToolbarConfigPage::SvxToolbarConfigPage(weld::Container* pPage, m_xResetBtn->connect_clicked(LINK(this, SvxToolbarConfigPage, ResetToolbarHdl)); // "Insert Submenu" is irrelevant to the toolbars - m_xInsertBtn->remove_item("insertsubmenu"); + m_xInsertBtn->remove_item(u"insertsubmenu"_ustr); // Gear menu's "Move" action is irrelevant to the toolbars - m_xGearBtn->set_item_sensitive("toolbar_gear_move", false); + m_xGearBtn->set_item_sensitive(u"toolbar_gear_move"_ustr, false); // default toolbar to select is standardbar unless a different one // has been passed in @@ -482,7 +482,7 @@ IMPL_LINK(SvxToolbarConfigPage, ModifyItemHdl, const OUString&, rIdent, void) aNewName = aNameDialog.GetName(); if (aNewName.isEmpty()) // tdf#80758 - Accelerator character ("~") is passed as - pEntry->SetName("~"); // the button name in case of empty values. + pEntry->SetName(u"~"_ustr); // the button name in case of empty values. else pEntry->SetName(aNewName); @@ -686,8 +686,10 @@ void SvxToolbarConfigPage::UpdateButtonStates() // Handle the gear button // "toolbar_gear_add" option is always enabled - m_xGearBtn->set_item_sensitive("toolbar_gear_delete", pToolbar && pToolbar->IsDeletable()); - m_xGearBtn->set_item_sensitive("toolbar_gear_rename", pToolbar && pToolbar->IsRenamable()); + m_xGearBtn->set_item_sensitive(u"toolbar_gear_delete"_ustr, + pToolbar && pToolbar->IsDeletable()); + m_xGearBtn->set_item_sensitive(u"toolbar_gear_rename"_ustr, + pToolbar && pToolbar->IsRenamable()); } short SvxToolbarConfigPage::QueryReset() @@ -728,17 +730,17 @@ void SvxToolbarConfigPage::SelectElement() { case 0: { - m_xGearBtn->set_item_active("toolbar_gear_iconOnly", true); + m_xGearBtn->set_item_active(u"toolbar_gear_iconOnly"_ustr, true); break; } case 1: { - m_xGearBtn->set_item_active("toolbar_gear_textOnly", true); + m_xGearBtn->set_item_active(u"toolbar_gear_textOnly"_ustr, true); break; } case 2: { - m_xGearBtn->set_item_active("toolbar_gear_iconAndText", true); + m_xGearBtn->set_item_active(u"toolbar_gear_iconAndText"_ustr, true); break; } } @@ -867,27 +869,27 @@ IMPL_LINK(SvxToolbarConfigPage, ContentContextMenuHdl, const CommandEvent&, rCEv bool bIsValidSelection = (m_xContentsListBox->n_children() != 0 && nSelectIndex != -1); std::unique_ptr<weld::Builder> xBuilder( - Application::CreateBuilder(&rTreeView, "cui/ui/entrycontextmenu.ui")); - auto xContextMenu = xBuilder->weld_menu("menu"); - xContextMenu->set_visible("add", false); - xContextMenu->set_visible("remove", bIsValidSelection); - xContextMenu->set_visible("rename", bIsValidSelection && !bIsSeparator); - xContextMenu->set_visible("changeIcon", bIsValidSelection && !bIsSeparator); - xContextMenu->set_visible("resetIcon", bIsValidSelection && !bIsSeparator); - xContextMenu->set_visible("restoreDefault", bIsValidSelection && !bIsSeparator); + Application::CreateBuilder(&rTreeView, u"cui/ui/entrycontextmenu.ui"_ustr)); + auto xContextMenu = xBuilder->weld_menu(u"menu"_ustr); + xContextMenu->set_visible(u"add"_ustr, false); + xContextMenu->set_visible(u"remove"_ustr, bIsValidSelection); + xContextMenu->set_visible(u"rename"_ustr, bIsValidSelection && !bIsSeparator); + xContextMenu->set_visible(u"changeIcon"_ustr, bIsValidSelection && !bIsSeparator); + xContextMenu->set_visible(u"resetIcon"_ustr, bIsValidSelection && !bIsSeparator); + xContextMenu->set_visible(u"restoreDefault"_ustr, bIsValidSelection && !bIsSeparator); OUString sCommand(xContextMenu->popup_at_rect( &rTreeView, tools::Rectangle(rCEvt.GetMousePosPixel(), Size(1, 1)))); if (sCommand == "remove") RemoveCommandHdl(*m_xRemoveCommandButton); else if (sCommand == "rename") - ModifyItemHdl("renameItem"); + ModifyItemHdl(u"renameItem"_ustr); else if (sCommand == "changeIcon") - ModifyItemHdl("changeIcon"); + ModifyItemHdl(u"changeIcon"_ustr); else if (sCommand == "resetIcon") - ModifyItemHdl("resetIcon"); + ModifyItemHdl(u"resetIcon"_ustr); else if (sCommand == "restoreDefault") - ModifyItemHdl("restoreItem"); + ModifyItemHdl(u"restoreItem"_ustr); else if (!sCommand.isEmpty()) SAL_WARN("cui.customize", "Unknown context menu action: " << sCommand); return true; @@ -907,14 +909,14 @@ IMPL_LINK(SvxToolbarConfigPage, FunctionContextMenuHdl, const CommandEvent&, rCE rTreeView.select(*xIter); SelectFunctionHdl(rTreeView); std::unique_ptr<weld::Builder> xBuilder( - Application::CreateBuilder(&rTreeView, "cui/ui/entrycontextmenu.ui")); - auto xContextMenu = xBuilder->weld_menu("menu"); - xContextMenu->set_visible("add", true); - xContextMenu->set_visible("remove", false); - xContextMenu->set_visible("rename", false); - xContextMenu->set_visible("changeIcon", false); - xContextMenu->set_visible("resetIcon", false); - xContextMenu->set_visible("restoreDefault", false); + Application::CreateBuilder(&rTreeView, u"cui/ui/entrycontextmenu.ui"_ustr)); + auto xContextMenu = xBuilder->weld_menu(u"menu"_ustr); + xContextMenu->set_visible(u"add"_ustr, true); + xContextMenu->set_visible(u"remove"_ustr, false); + xContextMenu->set_visible(u"rename"_ustr, false); + xContextMenu->set_visible(u"changeIcon"_ustr, false); + xContextMenu->set_visible(u"resetIcon"_ustr, false); + xContextMenu->set_visible(u"restoreDefault"_ustr, false); OUString sCommand(xContextMenu->popup_at_rect( &rTreeView, tools::Rectangle(rCEvt.GetMousePosPixel(), Size(1, 1)))); diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx index 027ac72968e8..04924b9a8f57 100644 --- a/cui/source/customize/acccfg.cxx +++ b/cui/source/customize/acccfg.cxx @@ -852,7 +852,8 @@ IMPL_LINK(SfxAcceleratorConfigPage, KeyInputHdl, const KeyEvent&, rKey, bool) SfxAcceleratorConfigPage::SfxAcceleratorConfigPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& aSet) - : SfxTabPage(pPage, pController, "cui/ui/accelconfigpage.ui", "AccelConfigPage", &aSet) + : SfxTabPage(pPage, pController, u"cui/ui/accelconfigpage.ui"_ustr, u"AccelConfigPage"_ustr, + &aSet) #if HAVE_FEATURE_SCRIPTING , m_pMacroInfoItem() #endif @@ -863,18 +864,18 @@ SfxAcceleratorConfigPage::SfxAcceleratorConfigPage(weld::Container* pPage, , m_bStylesInfoInitialized(false) , m_aUpdateDataTimer("SfxAcceleratorConfigPage UpdateDataTimer") , m_aFillGroupIdle("SfxAcceleratorConfigPage m_aFillGroupIdle") - , m_xEntriesBox(m_xBuilder->weld_tree_view("shortcuts")) - , m_xOfficeButton(m_xBuilder->weld_radio_button("office")) - , m_xModuleButton(m_xBuilder->weld_radio_button("module")) - , m_xChangeButton(m_xBuilder->weld_button("change")) - , m_xRemoveButton(m_xBuilder->weld_button("delete")) - , m_xGroupLBox(new CuiConfigGroupListBox(m_xBuilder->weld_tree_view("category"))) - , m_xFunctionBox(new CuiConfigFunctionListBox(m_xBuilder->weld_tree_view("function"))) - , m_xKeyBox(m_xBuilder->weld_tree_view("keys")) - , m_xSearchEdit(m_xBuilder->weld_entry("searchEntry")) - , m_xLoadButton(m_xBuilder->weld_button("load")) - , m_xSaveButton(m_xBuilder->weld_button("save")) - , m_xResetButton(m_xBuilder->weld_button("reset")) + , m_xEntriesBox(m_xBuilder->weld_tree_view(u"shortcuts"_ustr)) + , m_xOfficeButton(m_xBuilder->weld_radio_button(u"office"_ustr)) + , m_xModuleButton(m_xBuilder->weld_radio_button(u"module"_ustr)) + , m_xChangeButton(m_xBuilder->weld_button(u"change"_ustr)) + , m_xRemoveButton(m_xBuilder->weld_button(u"delete"_ustr)) + , m_xGroupLBox(new CuiConfigGroupListBox(m_xBuilder->weld_tree_view(u"category"_ustr))) + , m_xFunctionBox(new CuiConfigFunctionListBox(m_xBuilder->weld_tree_view(u"function"_ustr))) + , m_xKeyBox(m_xBuilder->weld_tree_view(u"keys"_ustr)) + , m_xSearchEdit(m_xBuilder->weld_entry(u"searchEntry"_ustr)) + , m_xLoadButton(m_xBuilder->weld_button(u"load"_ustr)) + , m_xSaveButton(m_xBuilder->weld_button(u"save"_ustr)) + , m_xResetButton(m_xBuilder->weld_button(u"reset"_ustr)) { Size aSize(m_xEntriesBox->get_approximate_digit_width() * 40, m_xEntriesBox->get_height_rows(10)); @@ -977,7 +978,7 @@ void SfxAcceleratorConfigPage::InitAccCfg() m_sModuleLongName = xModuleManager->identify(m_xFrame); comphelper::SequenceAsHashMap lModuleProps(xModuleManager->getByName(m_sModuleLongName)); m_sModuleUIName - = lModuleProps.getUnpackedValueOrDefault("ooSetupFactoryUIName", OUString()); + = lModuleProps.getUnpackedValueOrDefault(u"ooSetupFactoryUIName"_ustr, OUString()); // get global accelerator configuration m_xGlobal = css::ui::GlobalAcceleratorConfiguration::create(m_xContext); @@ -1428,7 +1429,7 @@ IMPL_LINK_NOARG(SfxAcceleratorConfigPage, SaveHdl, sfx2::FileDialogHelper*, void xUIConfigProps->getPropertyValue(MEDIATYPE_PROPNAME) >>= sMediaType; if (sMediaType.isEmpty()) xUIConfigProps->setPropertyValue( - MEDIATYPE_PROPNAME, uno::Any(OUString("application/vnd.sun.xml.ui.configuration"))); + MEDIATYPE_PROPNAME, uno::Any(u"application/vnd.sun.xml.ui.configuration"_ustr)); uno::Reference<ui::XUIConfigurationManager2> xCfgMgr = ui::UIConfigurationManager::create(m_xContext); @@ -1482,7 +1483,7 @@ void SfxAcceleratorConfigPage::StartFileDialog(StartFileDialogType nType, const m_pFileDlg->SetTitle(rTitle); m_pFileDlg->AddFilter(aFilterAllStr, FILEDIALOG_FILTER_ALL); - m_pFileDlg->AddFilter(aFilterCfgStr, "*.cfg"); + m_pFileDlg->AddFilter(aFilterCfgStr, u"*.cfg"_ustr); m_pFileDlg->SetCurrentFilter(aFilterCfgStr); m_pFileDlg->SetContext(sfx2::FileDialogHelper::AcceleratorConfig); @@ -1501,10 +1502,10 @@ bool SfxAcceleratorConfigPage::FillItemSet(SfxItemSet*) css::uno::Reference<css::beans::XPropertySet> xFrameProps(m_xFrame, css::uno::UNO_QUERY_THROW); css::uno::Reference<css::frame::XLayoutManager> xLayoutManager; - xFrameProps->getPropertyValue("LayoutManager") >>= xLayoutManager; + xFrameProps->getPropertyValue(u"LayoutManager"_ustr) >>= xLayoutManager; css::uno::Reference<css::beans::XPropertySet> xLayoutProps(xLayoutManager, css::uno::UNO_QUERY_THROW); - xLayoutProps->setPropertyValue("RefreshContextToolbarToolTip", css::uno::Any(true)); + xLayoutProps->setPropertyValue(u"RefreshContextToolbarToolTip"_ustr, css::uno::Any(true)); } catch (const uno::RuntimeException&) { @@ -1580,7 +1581,7 @@ OUString SfxAcceleratorConfigPage::GetLabel4Command(const OUString& sCommand) if (xModuleConf.is()) { ::comphelper::SequenceAsHashMap lProps(xModuleConf->getByName(sCommand)); - OUString sLabel = lProps.getUnpackedValueOrDefault("Name", OUString()); + OUString sLabel = lProps.getUnpackedValueOrDefault(u"Name"_ustr, OUString()); if (!sLabel.isEmpty()) return sLabel; } diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index ff5702121755..ca717c2632c7 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -206,24 +206,24 @@ static std::unique_ptr<SfxTabPage> CreateSvxEventConfigPage( weld::Container* pP * *****************************************************************************/ SvxConfigDialog::SvxConfigDialog(weld::Window * pParent, const SfxItemSet* pInSet) - : SfxTabDialogController(pParent, "cui/ui/customizedialog.ui", "CustomizeDialog", pInSet) + : SfxTabDialogController(pParent, u"cui/ui/customizedialog.ui"_ustr, u"CustomizeDialog"_ustr, pInSet) { SvxConfigPageHelper::InitImageType(); - AddTabPage("menus", CreateSvxMenuConfigPage, nullptr); - AddTabPage("toolbars", CreateSvxToolbarConfigPage, nullptr); - AddTabPage("notebookbar", CreateSvxNotebookbarConfigPage, nullptr); - AddTabPage("contextmenus", CreateSvxContextMenuConfigPage, nullptr); - AddTabPage("keyboard", CreateKeyboardConfigPage, nullptr); - AddTabPage("events", CreateSvxEventConfigPage, nullptr); + AddTabPage(u"menus"_ustr, CreateSvxMenuConfigPage, nullptr); + AddTabPage(u"toolbars"_ustr, CreateSvxToolbarConfigPage, nullptr); + AddTabPage(u"notebookbar"_ustr, CreateSvxNotebookbarConfigPage, nullptr); + AddTabPage(u"contextmenus"_ustr, CreateSvxContextMenuConfigPage, nullptr); + AddTabPage(u"keyboard"_ustr, CreateKeyboardConfigPage, nullptr); + AddTabPage(u"events"_ustr, CreateSvxEventConfigPage, nullptr); if (const SfxPoolItem* pItem = pInSet->GetItem(SID_CONFIG)) { OUString text = static_cast<const SfxStringItem*>(pItem)->GetValue(); if (text.startsWith( ITEM_TOOLBAR_URL ) ) - SetCurPageId("toolbars"); + SetCurPageId(u"toolbars"_ustr); else if (text.startsWith( ITEM_EVENT_URL) ) - SetCurPageId("events"); + SetCurPageId(u"events"_ustr); } #if HAVE_FEATURE_SCRIPTING else if (pInSet->GetItemIfSet(SID_MACROINFO)) @@ -231,7 +231,7 @@ SvxConfigDialog::SvxConfigDialog(weld::Window * pParent, const SfxItemSet* pInSe // for the "assign" button in the Basic Macros chooser automatically switch // to the keyboard tab in which this macro will be pre-selected for assigning // to a keystroke - SetCurPageId("keyboard"); + SetCurPageId(u"keyboard"_ustr); } #endif } @@ -251,10 +251,10 @@ void SvxConfigDialog::SetFrame(const css::uno::Reference<css::frame::XFrame>& xF aModuleId != "com.sun.star.sheet.SpreadsheetDocument" && aModuleId != "com.sun.star.presentation.PresentationDocument" && aModuleId != "com.sun.star.drawing.DrawingDocument") - RemoveTabPage("notebookbar"); + RemoveTabPage(u"notebookbar"_ustr); if (aModuleId == "com.sun.star.frame.StartModule") - RemoveTabPage("keyboard"); + RemoveTabPage(u"keyboard"_ustr); } void SvxConfigDialog::PageCreated(const OUString &rId, SfxTabPage& rPage) @@ -422,7 +422,7 @@ MenuSaveInData::GetEntries() { if ( pRootEntry == nullptr ) { - pRootEntry.reset( new SvxConfigEntry( "MainMenus", OUString(), true, /*bParentData*/false) ); + pRootEntry.reset( new SvxConfigEntry( u"MainMenus"_ustr, OUString(), true, /*bParentData*/false) ); if ( m_xMenuSettings.is() ) { @@ -742,7 +742,7 @@ SvxEntries* ContextMenuSaveInData::GetEntries() { std::unordered_map< OUString, bool > aMenuInfo; - m_pRootEntry.reset( new SvxConfigEntry( "ContextMenus", OUString(), true, /*bParentData*/false ) ); + m_pRootEntry.reset( new SvxConfigEntry( u"ContextMenus"_ustr, OUString(), true, /*bParentData*/false ) ); css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > > aElementsInfo; try { @@ -1000,30 +1000,30 @@ IMPL_LINK(SvxMenuEntriesListBox, QueryTooltip, const weld::TreeIter&, rIter, OUS * *****************************************************************************/ SvxConfigPage::SvxConfigPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet) - : SfxTabPage(pPage, pController, "cui/ui/menuassignpage.ui", "MenuAssignPage", &rSet) + : SfxTabPage(pPage, pController, u"cui/ui/menuassignpage.ui"_ustr, u"MenuAssignPage"_ustr, &rSet) , m_aUpdateDataTimer( "SvxConfigPage UpdateDataTimer" ) , bInitialised(false) , pCurrentSaveInData(nullptr) - , m_xCommandCategoryListBox(new CommandCategoryListBox(m_xBuilder->weld_combo_box("commandcategorylist"))) - , m_xFunctions(new CuiConfigFunctionListBox(m_xBuilder->weld_tree_view("functions"))) - , m_xCategoryLabel(m_xBuilder->weld_label("categorylabel")) - , m_xDescriptionFieldLb(m_xBuilder->weld_label("descriptionlabel")) - , m_xDescriptionField(m_xBuilder->weld_text_view("desc")) - , m_xLeftFunctionLabel(m_xBuilder->weld_label("leftfunctionlabel")) - , m_xSearchEdit(m_xBuilder->weld_entry("searchEntry")) - , m_xSearchLabel(m_xBuilder->weld_label("searchlabel")) - , m_xCustomizeLabel(m_xBuilder->weld_label("customizelabel")) - , m_xTopLevelListBox(m_xBuilder->weld_combo_box("toplevellist")) - , m_xMoveUpButton(m_xBuilder->weld_button("up")) - , m_xMoveDownButton(m_xBuilder->weld_button("down")) - , m_xSaveInListBox(m_xBuilder->weld_combo_box("savein")) - , m_xCustomizeBox(m_xBuilder->weld_widget("customizebox")) - , m_xInsertBtn(m_xBuilder->weld_menu_button("insert")) - , m_xModifyBtn(m_xBuilder->weld_menu_button("modify")) - , m_xResetBtn(m_xBuilder->weld_button("defaultsbtn")) - , m_xCommandButtons(m_xBuilder->weld_widget("arrowgrid")) - , m_xAddCommandButton(m_xBuilder->weld_button("add")) - , m_xRemoveCommandButton(m_xBuilder->weld_button("remove")) + , m_xCommandCategoryListBox(new CommandCategoryListBox(m_xBuilder->weld_combo_box(u"commandcategorylist"_ustr))) + , m_xFunctions(new CuiConfigFunctionListBox(m_xBuilder->weld_tree_view(u"functions"_ustr))) + , m_xCategoryLabel(m_xBuilder->weld_label(u"categorylabel"_ustr)) + , m_xDescriptionFieldLb(m_xBuilder->weld_label(u"descriptionlabel"_ustr)) + , m_xDescriptionField(m_xBuilder->weld_text_view(u"desc"_ustr)) + , m_xLeftFunctionLabel(m_xBuilder->weld_label(u"leftfunctionlabel"_ustr)) + , m_xSearchEdit(m_xBuilder->weld_entry(u"searchEntry"_ustr)) + , m_xSearchLabel(m_xBuilder->weld_label(u"searchlabel"_ustr)) + , m_xCustomizeLabel(m_xBuilder->weld_label(u"customizelabel"_ustr)) + , m_xTopLevelListBox(m_xBuilder->weld_combo_box(u"toplevellist"_ustr)) + , m_xMoveUpButton(m_xBuilder->weld_button(u"up"_ustr)) + , m_xMoveDownButton(m_xBuilder->weld_button(u"down"_ustr)) + , m_xSaveInListBox(m_xBuilder->weld_combo_box(u"savein"_ustr)) + , m_xCustomizeBox(m_xBuilder->weld_widget(u"customizebox"_ustr)) + , m_xInsertBtn(m_xBuilder->weld_menu_button(u"insert"_ustr)) + , m_xModifyBtn(m_xBuilder->weld_menu_button(u"modify"_ustr)) + , m_xResetBtn(m_xBuilder->weld_button(u"defaultsbtn"_ustr)) + , m_xCommandButtons(m_xBuilder->weld_widget(u"arrowgrid"_ustr)) + , m_xAddCommandButton(m_xBuilder->weld_button(u"add"_ustr)) + , m_xRemoveCommandButton(m_xBuilder->weld_button(u"remove"_ustr)) { CustomNotebookbarGenerator::getFileNameAndAppName(m_sAppName, m_sFileName); @@ -1676,7 +1676,7 @@ IMPL_LINK_NOARG(SvxConfigPage, SelectFunctionHdl, weld::TreeView&, void) m_xAddCommandButton->set_sensitive(false); m_xRemoveCommandButton->set_sensitive(false); - m_xDescriptionField->set_text(""); + m_xDescriptionField->set_text(u""_ustr); } UpdateButtonStates(); @@ -1780,12 +1780,12 @@ bool SvxConfigPage::MoveEntryData(int nSourceEntry, int nTargetEntry) SvxMainMenuOrganizerDialog::SvxMainMenuOrganizerDialog( weld::Window* pParent, SvxEntries* entries, SvxConfigEntry const * selection, bool bCreateMenu ) - : GenericDialogController(pParent, "cui/ui/movemenu.ui", "MoveMenuDialog") - , m_xMenuBox(m_xBuilder->weld_widget("namebox")) - , m_xMenuNameEdit(m_xBuilder->weld_entry("menuname")) - , m_xMenuListBox(m_xBuilder->weld_tree_view("menulist")) - , m_xMoveUpButton(m_xBuilder->weld_button("up")) - , m_xMoveDownButton(m_xBuilder->weld_button("down")) + : GenericDialogController(pParent, u"cui/ui/movemenu.ui"_ustr, u"MoveMenuDialog"_ustr) + , m_xMenuBox(m_xBuilder->weld_widget(u"namebox"_ustr)) + , m_xMenuNameEdit(m_xBuilder->weld_entry(u"menuname"_ustr)) + , m_xMenuListBox(m_xBuilder->weld_tree_view(u"menulist"_ustr)) + , m_xMoveUpButton(m_xBuilder->weld_button(u"up"_ustr)) + , m_xMoveDownButton(m_xBuilder->weld_button(u"down"_ustr)) { m_xMenuListBox->set_size_request(-1, m_xMenuListBox->get_height_rows(12)); @@ -2036,7 +2036,7 @@ void ToolbarSaveInData::SetSystemStyle( uno::Reference< beans::XPropertySet > xPropSet( xFrame, uno::UNO_QUERY ); if ( xPropSet.is() ) { - uno::Any a = xPropSet->getPropertyValue( "LayoutManager" ); + uno::Any a = xPropSet->getPropertyValue( u"LayoutManager"_ustr ); a >>= xLayoutManager; } @@ -2182,7 +2182,7 @@ SvxEntries* ToolbarSaveInData::GetEntries() if ( pRootEntry == nullptr ) { - pRootEntry.reset( new SvxConfigEntry( "MainToolbars", OUString(), true, /*bParentData*/false) ); + pRootEntry.reset( new SvxConfigEntry( u"MainToolbars"_ustr, OUString(), true, /*bParentData*/false) ); const uno::Sequence< uno::Sequence < beans::PropertyValue > > info = GetConfigManager()->getUIElementsInfo( @@ -2691,9 +2691,9 @@ void ToolbarSaveInData::LoadToolbar( } SvxNewToolbarDialog::SvxNewToolbarDialog(weld::Window* pWindow, const OUString& rName) - : GenericDialogController(pWindow, "cui/ui/newtoolbardialog.ui", "NewToolbarDialog") - , m_xEdtName(m_xBuilder->weld_entry("edit")) - , m_xSaveInListBox(m_xBuilder->weld_combo_box("savein")) + : GenericDialogController(pWindow, u"cui/ui/newtoolbardialog.ui"_ustr, u"NewToolbarDialog"_ustr) + , m_xEdtName(m_xBuilder->weld_entry(u"edit"_ustr)) + , m_xSaveInListBox(m_xBuilder->weld_combo_box(u"savein"_ustr)) { m_xEdtName->set_text(rName); m_xEdtName->select_region(0, -1); @@ -2711,14 +2711,14 @@ SvxNewToolbarDialog::~SvxNewToolbarDialog() SvxIconSelectorDialog::SvxIconSelectorDialog(weld::Window *pWindow, uno::Reference< css::ui::XImageManager > xImageManager, uno::Reference< css::ui::XImageManager > xParentImageManager) - : GenericDialogController(pWindow, "cui/ui/iconselectordialog.ui", "IconSelector") + : GenericDialogController(pWindow, u"cui/ui/iconselectordialog.ui"_ustr, u"IconSelector"_ustr) , m_xImageManager(std::move(xImageManager)) , m_xParentImageManager(std::move(xParentImageManager)) - , m_xTbSymbol(new ValueSet(m_xBuilder->weld_scrolled_window("symbolswin", true))) - , m_xTbSymbolWin(new weld::CustomWeld(*m_xBuilder, "symbolsToolbar", *m_xTbSymbol)) - , m_xFtNote(m_xBuilder->weld_label("noteLabel")) - , m_xBtnImport(m_xBuilder->weld_button("importButton")) - , m_xBtnDelete(m_xBuilder->weld_button("deleteButton")) + , m_xTbSymbol(new ValueSet(m_xBuilder->weld_scrolled_window(u"symbolswin"_ustr, true))) + , m_xTbSymbolWin(new weld::CustomWeld(*m_xBuilder, u"symbolsToolbar"_ustr, *m_xTbSymbol)) + , m_xFtNote(m_xBuilder->weld_label(u"noteLabel"_ustr)) + , m_xBtnImport(m_xBuilder->weld_button(u"importButton"_ustr)) + , m_xBtnDelete(m_xBuilder->weld_button(u"deleteButton"_ustr)) { typedef std::unordered_map< OUString, bool > ImageInfo; @@ -2956,7 +2956,7 @@ bool SvxIconSelectorDialog::ReplaceGraphicItem( const OUString& aURL ) { uno::Reference< graphic::XGraphic > xGraphic; - uno::Sequence< beans::PropertyValue > aMediaProps{ comphelper::makePropertyValue("URL", aURL) }; + uno::Sequence< beans::PropertyValue > aMediaProps{ comphelper::makePropertyValue(u"URL"_ustr, aURL) }; css::awt::Size aSize; bool bOK = false; @@ -2966,7 +2966,7 @@ bool SvxIconSelectorDialog::ReplaceGraphicItem( uno::Reference< beans::XPropertySet > props = m_xGraphProvider->queryGraphicDescriptor( aMediaProps ); - uno::Any a = props->getPropertyValue( "SizePixel" ); + uno::Any a = props->getPropertyValue( u"SizePixel"_ustr ); a >>= aSize; if (0 == aSize.Width || 0 == aSize.Height) return false; @@ -3026,7 +3026,7 @@ namespace { OUString name; OUString message = CuiResId( RID_CUISTR_REPLACE_ICON_WARNING ); - OUString placeholder("%ICONNAME" ); + OUString placeholder(u"%ICONNAME"_ustr ); sal_Int32 pos = message.indexOf( placeholder ); if ( pos != -1 ) { @@ -3159,14 +3159,14 @@ bool SvxIconSelectorDialog::ImportGraphic( const OUString& aURL ) { bool result = false; - uno::Sequence< beans::PropertyValue > aMediaProps{ comphelper::makePropertyValue("URL", aURL) }; + uno::Sequence< beans::PropertyValue > aMediaProps{ comphelper::makePropertyValue(u"URL"_ustr, aURL) }; try { uno::Reference< beans::XPropertySet > props = m_xGraphProvider->queryGraphicDescriptor( aMediaProps ); - uno::Any a = props->getPropertyValue("SizePixel"); + uno::Any a = props->getPropertyValue(u"SizePixel"_ustr); uno::Reference< graphic::XGraphic > xGraphic = m_xGraphProvider->queryGraphic( aMediaProps ); if ( xGraphic.is() ) @@ -3224,8 +3224,8 @@ bool SvxIconSelectorDialog::ImportGraphic( const OUString& aURL ) * *******************************************************************************/ SvxIconChangeDialog::SvxIconChangeDialog(weld::Window *pWindow, const OUString& rMessage) - : MessageDialogController(pWindow, "cui/ui/iconchangedialog.ui", "IconChange", "grid") - , m_xLineEditDescription(m_xBuilder->weld_text_view("addrTextview")) + : MessageDialogController(pWindow, u"cui/ui/iconchangedialog.ui"_ustr, u"IconChange"_ustr, u"grid"_ustr) + , m_xLineEditDescription(m_xBuilder->weld_text_view(u"addrTextview"_ustr)) { m_xLineEditDescription->set_size_request(m_xLineEditDescription->get_approximate_digit_width() * 48, m_xLineEditDescription->get_text_height() * 8); diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx index 5875b977a434..1cc1895a490a 100644 --- a/cui/source/customize/cfgutil.cxx +++ b/cui/source/customize/cfgutil.cxx @@ -232,7 +232,7 @@ std::vector< SfxStyleInfo_Impl > SfxStylesInfo_Impl::getStyles(const OUString& s xStyleSet->getByName(aStyleInfo.sStyle) >>= xStyle; if (!xStyle.is()) continue; - xStyle->getPropertyValue("DisplayName") >>= aStyleInfo.sLabel; + xStyle->getPropertyValue(u"DisplayName"_ustr) >>= aStyleInfo.sLabel; } catch(const css::uno::RuntimeException&) { throw; } @@ -521,8 +521,8 @@ void CuiConfigGroupListBox::FillScriptList(const css::uno::Reference< css::scrip xRootNode->getChildNodes(); bool bIsRootNode = false; - OUString user("user"); - OUString share("share"); + OUString user(u"user"_ustr); + OUString share(u"share"_ustr); if ( xRootNode->getName() == "Root" ) { bIsRootNode = true; @@ -740,7 +740,7 @@ OUString CuiConfigGroupListBox::GetImage( Any aAny = xModuleManager->getByName(appModule); if( !( aAny >>= moduleDescr ) ) { - throw RuntimeException("SFTreeListBox::Init: failed to get PropertyValue"); + throw RuntimeException(u"SFTreeListBox::Init: failed to get PropertyValue"_ustr); } for ( sal_Int32 pos = moduleDescr.getLength(); pos--; ) { @@ -810,7 +810,7 @@ OUString CuiConfigGroupListBox::MapCommand2UIName(const OUString& sCommand) if (xModuleConf.is()) { ::comphelper::SequenceAsHashMap lProps(xModuleConf->getByName(sCommand)); - sUIName = lProps.getUnpackedValueOrDefault("Name", OUString()); + sUIName = lProps.getUnpackedValueOrDefault(u"Name"_ustr, OUString()); } } catch(const css::uno::RuntimeException&) @@ -902,12 +902,12 @@ void CuiConfigGroupListBox::GroupSelected() } Any value = - xPropSet->getPropertyValue("URI"); + xPropSet->getPropertyValue(u"URI"_ustr); value >>= uri; try { - value = xPropSet->getPropertyValue("Description"); + value = xPropSet->getPropertyValue(u"Description"_ustr); value >>= description; } catch (Exception &) { @@ -1129,16 +1129,16 @@ void CuiConfigGroupListBox::SelectMacro( const SfxMacroInfoItem *pItem ) SvxScriptSelectorDialog::SvxScriptSelectorDialog( weld::Window* pParent, const css::uno::Reference< css::frame::XFrame >& xFrame) - : GenericDialogController(pParent, "cui/ui/macroselectordialog.ui", "MacroSelectorDialog") - , m_xDialogDescription(m_xBuilder->weld_label("helpmacro")) - , m_xCategories(new CuiConfigGroupListBox(m_xBuilder->weld_tree_view("categories"))) - , m_xCommands(new CuiConfigFunctionListBox(m_xBuilder->weld_tree_view("commands"))) - , m_xLibraryFT(m_xBuilder->weld_label("libraryft")) - , m_xMacronameFT(m_xBuilder->weld_label("macronameft")) - , m_xOKButton(m_xBuilder->weld_button("ok")) - , m_xCancelButton(m_xBuilder->weld_button("cancel")) - , m_xDescriptionText(m_xBuilder->weld_text_view("description")) - , m_xDescriptionFrame(m_xBuilder->weld_frame("descriptionframe")) + : GenericDialogController(pParent, u"cui/ui/macroselectordialog.ui"_ustr, u"MacroSelectorDialog"_ustr) + , m_xDialogDescription(m_xBuilder->weld_label(u"helpmacro"_ustr)) + , m_xCategories(new CuiConfigGroupListBox(m_xBuilder->weld_tree_view(u"categories"_ustr))) + , m_xCommands(new CuiConfigFunctionListBox(m_xBuilder->weld_tree_view(u"commands"_ustr))) + , m_xLibraryFT(m_xBuilder->weld_label(u"libraryft"_ustr)) + , m_xMacronameFT(m_xBuilder->weld_label(u"macronameft"_ustr)) + , m_xOKButton(m_xBuilder->weld_button(u"ok"_ustr)) + , m_xCancelButton(m_xBuilder->weld_button(u"cancel"_ustr)) + , m_xDescriptionText(m_xBuilder->weld_text_view(u"description"_ustr)) + , m_xDescriptionFrame(m_xBuilder->weld_frame(u"descriptionframe"_ustr)) { m_xCancelButton->show(); m_xDialogDescription->show(); @@ -1209,11 +1209,11 @@ IMPL_LINK(SvxScriptSelectorDialog, ContextMenuHdl, const CommandEvent&, rCEvt, b if (rCEvt.GetCommand() != CommandEventId::ContextMenu || !xTreeView.n_children()) return false; - std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(&xTreeView, "modules/BasicIDE/ui/sortmenu.ui")); - std::unique_ptr<weld::Menu> xPopup(xBuilder->weld_menu("sortmenu")); - std::unique_ptr<weld::Menu> xDropMenu(xBuilder->weld_menu("sortsubmenu")); - xDropMenu->set_active("alphabetically", xTreeView.get_sort_order()); - xDropMenu->set_active("properorder", !xTreeView.get_sort_order()); + std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(&xTreeView, u"modules/BasicIDE/ui/sortmenu.ui"_ustr)); + std::unique_ptr<weld::Menu> xPopup(xBuilder->weld_menu(u"sortmenu"_ustr)); + std::unique_ptr<weld::Menu> xDropMenu(xBuilder->weld_menu(u"sortsubmenu"_ustr)); + xDropMenu->set_active(u"alphabetically"_ustr, xTreeView.get_sort_order()); + xDropMenu->set_active(u"properorder"_ustr, !xTreeView.get_sort_order()); OUString sCommand(xPopup->popup_at_rect(&xTreeView, tools::Rectangle(rCEvt.GetMousePosPixel(), Size(1,1)))); if (sCommand == "alphabetically") diff --git a/cui/source/customize/eventdlg.cxx b/cui/source/customize/eventdlg.cxx index 755fd16b416a..b78aabf6ed62 100644 --- a/cui/source/customize/eventdlg.cxx +++ b/cui/source/customize/eventdlg.cxx @@ -38,14 +38,14 @@ using namespace ::com::sun::star; SvxEventConfigPage::SvxEventConfigPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet, SvxEventConfigPage::EarlyInit) - : SvxMacroTabPage_(pPage, pController, "cui/ui/eventsconfigpage.ui", "EventsConfigPage", rSet) - , m_xSaveInListBox(m_xBuilder->weld_combo_box("savein")) + : SvxMacroTabPage_(pPage, pController, u"cui/ui/eventsconfigpage.ui"_ustr, u"EventsConfigPage"_ustr, rSet) + , m_xSaveInListBox(m_xBuilder->weld_combo_box(u"savein"_ustr)) { - mpImpl->xEventLB = m_xBuilder->weld_tree_view("events"); - mpImpl->xAssignPB = m_xBuilder->weld_button("macro"); - mpImpl->xDeletePB = m_xBuilder->weld_button("delete"); - mpImpl->xDeleteAllPB = m_xBuilder->weld_button("deleteall"); - mpImpl->xAssignComponentPB = m_xBuilder->weld_button("component"); + mpImpl->xEventLB = m_xBuilder->weld_tree_view(u"events"_ustr); + mpImpl->xAssignPB = m_xBuilder->weld_button(u"macro"_ustr); + mpImpl->xDeletePB = m_xBuilder->weld_button(u"delete"_ustr); + mpImpl->xDeleteAllPB = m_xBuilder->weld_button(u"deleteall"_ustr); + mpImpl->xAssignComponentPB = m_xBuilder->weld_button(u"component"_ustr); mpImpl->xEventLB->set_size_request(mpImpl->xEventLB->get_approximate_digit_width() * 70, mpImpl->xEventLB->get_height_rows(20)); diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx index 79197be4bf43..a352ea4b97dc 100644 --- a/cui/source/customize/macropg.cxx +++ b/cui/source/customize/macropg.cxx @@ -504,7 +504,7 @@ void SvxMacroTabPage_::GenericHandler_Impl(const weld::Button* pBtn) IMPL_LINK_NOARG(SvxMacroTabPage_, DeleteAllHdl_Impl, weld::Button&, void) { - OUString sEventType = "Script" ; + OUString sEventType = u"Script"_ustr ; OUString sEmptyString; mpImpl->xEventLB->all_foreach([this, &sEventType, &sEmptyString](weld::TreeIter& rEntry) { @@ -608,8 +608,8 @@ Any SvxMacroTabPage_::GetPropsByName( const OUString& eventName, EventsHash& eve ::comphelper::NamedValueCollection aProps; if ( !(rAssignedEvent.first.isEmpty() || rAssignedEvent.second.isEmpty()) ) { - aProps.put( "EventType", rAssignedEvent.first ); - aProps.put( "Script", rAssignedEvent.second ); + aProps.put( u"EventType"_ustr, rAssignedEvent.first ); + aProps.put( u"Script"_ustr, rAssignedEvent.second ); } aReturn <<= aProps.getPropertyValues(); @@ -625,8 +625,8 @@ EventPair SvxMacroTabPage_::GetPairFromAny( const Any& aAny ) if( aAny >>= props ) { ::comphelper::NamedValueCollection aProps( props ); - type = aProps.getOrDefault( "EventType", type ); - url = aProps.getOrDefault( "Script", url ); + type = aProps.getOrDefault( u"EventType"_ustr, type ); + url = aProps.getOrDefault( u"Script"_ustr, url ); } return std::make_pair( type, url ); } @@ -636,15 +636,15 @@ SvxMacroTabPage::SvxMacroTabPage(weld::Container* pPage, weld::DialogController* const SfxItemSet& rSet, Reference< container::XNameReplace > const & xNameReplace, sal_uInt16 nSelectedIndex) - : SvxMacroTabPage_(pPage, pController, "cui/ui/macroassignpage.ui", "MacroAssignPage", rSet) + : SvxMacroTabPage_(pPage, pController, u"cui/ui/macroassignpage.ui"_ustr, u"MacroAssignPage"_ustr, rSet) { - mpImpl->xEventLB = m_xBuilder->weld_tree_view("assignments"); + mpImpl->xEventLB = m_xBuilder->weld_tree_view(u"assignments"_ustr); mpImpl->xEventLB->set_size_request(mpImpl->xEventLB->get_approximate_digit_width() * 70, mpImpl->xEventLB->get_height_rows(9)); - mpImpl->xAssignPB = m_xBuilder->weld_button("assign"); - mpImpl->xDeletePB = m_xBuilder->weld_button("delete"); - mpImpl->xDeleteAllPB = m_xBuilder->weld_button("deleteall"); - mpImpl->xAssignComponentPB = m_xBuilder->weld_button("component"); + mpImpl->xAssignPB = m_xBuilder->weld_button(u"assign"_ustr); + mpImpl->xDeletePB = m_xBuilder->weld_button(u"delete"_ustr); + mpImpl->xDeleteAllPB = m_xBuilder->weld_button(u"deleteall"_ustr); + mpImpl->xAssignComponentPB = m_xBuilder->weld_button(u"component"_ustr); SetFrame( _rxDocumentFrame ); @@ -681,10 +681,10 @@ IMPL_LINK_NOARG(AssignComponentDialog, ButtonHandler, weld::Button&, void) } AssignComponentDialog::AssignComponentDialog(weld::Window* pParent, OUString aURL) - : GenericDialogController(pParent, "cui/ui/assigncomponentdialog.ui", "AssignComponent") + : GenericDialogController(pParent, u"cui/ui/assigncomponentdialog.ui"_ustr, u"AssignComponent"_ustr) , maURL(std::move( aURL )) - , mxMethodEdit(m_xBuilder->weld_entry("methodEntry")) - , mxOKButton(m_xBuilder->weld_button("ok")) + , mxMethodEdit(m_xBuilder->weld_entry(u"methodEntry"_ustr)) + , mxOKButton(m_xBuilder->weld_button(u"ok"_ustr)) { mxOKButton->connect_clicked(LINK(this, AssignComponentDialog, ButtonHandler)); @@ -709,7 +709,7 @@ IMPL_LINK_NOARG(SvxMacroAssignSingleTabDialog, OKHdl_Impl, weld::Button&, void) SvxMacroAssignSingleTabDialog::SvxMacroAssignSingleTabDialog(weld::Window *pParent, const SfxItemSet& rSet) - : SfxSingleTabDialogController(pParent, &rSet, "cui/ui/macroassigndialog.ui", "MacroAssignDialog") + : SfxSingleTabDialogController(pParent, &rSet, u"cui/ui/macroassigndialog.ui"_ustr, u"MacroAssignDialog"_ustr) { GetOKButton().connect_clicked(LINK(this, SvxMacroAssignSingleTabDialog, OKHdl_Impl)); } diff --git a/cui/source/dialogs/AdditionsDialog.cxx b/cui/source/dialogs/AdditionsDialog.cxx index a0d2061e531c..61bee50455b3 100644 --- a/cui/source/dialogs/AdditionsDialog.cxx +++ b/cui/source/dialogs/AdditionsDialog.cxx @@ -202,8 +202,8 @@ bool getPreviewFile(const AdditionInfo& aAdditionInfo, OUString& sPreviewFile) = ucb::SimpleFileAccess::create(comphelper::getProcessComponentContext()); // copy the images to the user's additions folder - OUString userFolder = "${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER - "/" SAL_CONFIGFILE("bootstrap") "::UserInstallation}"; + OUString userFolder = u"${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER + "/" SAL_CONFIGFILE("bootstrap") "::UserInstallation}"_ustr; rtl::Bootstrap::expandMacros(userFolder); userFolder += "/user/additions/" + aAdditionInfo.sExtensionID + "/"; @@ -425,17 +425,17 @@ void SearchAndParseThread::execute() } AdditionsDialog::AdditionsDialog(weld::Window* pParent, const OUString& sAdditionsTag) - : GenericDialogController(pParent, "cui/ui/additionsdialog.ui", "AdditionsDialog") + : GenericDialogController(pParent, u"cui/ui/additionsdialog.ui"_ustr, u"AdditionsDialog"_ustr) , m_aSearchDataTimer("AdditionsDialog SearchDataTimer") - , m_xEntrySearch(m_xBuilder->weld_entry("entrySearch")) - , m_xButtonClose(m_xBuilder->weld_button("buttonClose")) - , m_xContentWindow(m_xBuilder->weld_scrolled_window("contentWindow")) - , m_xContentGrid(m_xBuilder->weld_container("contentGrid")) - , m_xLabelProgress(m_xBuilder->weld_label("labelProgress")) - , m_xGearBtn(m_xBuilder->weld_menu_button("buttonGear")) + , m_xEntrySearch(m_xBuilder->weld_entry(u"entrySearch"_ustr)) + , m_xButtonClose(m_xBuilder->weld_button(u"buttonClose"_ustr)) + , m_xContentWindow(m_xBuilder->weld_scrolled_window(u"contentWindow"_ustr)) + , m_xContentGrid(m_xBuilder->weld_container(u"contentGrid"_ustr)) + , m_xLabelProgress(m_xBuilder->weld_label(u"labelProgress"_ustr)) + , m_xGearBtn(m_xBuilder->weld_menu_button(u"buttonGear"_ustr)) { m_xGearBtn->connect_selected(LINK(this, AdditionsDialog, GearHdl)); - m_xGearBtn->set_item_active("gear_sort_voting", true); + m_xGearBtn->set_item_active(u"gear_sort_voting"_ustr, true); m_aSearchDataTimer.SetInvokeHandler(LINK(this, AdditionsDialog, ImplUpdateDataHdl)); m_aSearchDataTimer.SetTimeout(EDIT_UPDATEDATA_TIMEOUT); @@ -451,7 +451,7 @@ AdditionsDialog::AdditionsDialog(weld::Window* pParent, const OUString& sAdditio OUString titlePrefix = CuiResId(RID_CUISTR_ADDITIONS_DIALOG_TITLE_PREFIX); if (!m_sTag.isEmpty()) { // tdf#142564 localize extension category names - OUString sDialogTitle = ""; + OUString sDialogTitle = u""_ustr; if (sAdditionsTag == "Templates") { sDialogTitle = CuiResId(RID_CUISTR_ADDITIONS_TEMPLATES); @@ -597,27 +597,27 @@ bool AdditionsDialog::sortByDownload(const AdditionInfo& a, const AdditionInfo& AdditionsItem::AdditionsItem(weld::Widget* pParent, AdditionsDialog* pParentDialog, const AdditionInfo& additionInfo) - : m_xBuilder(Application::CreateBuilder(pParent, "cui/ui/additionsfragment.ui")) - , m_xContainer(m_xBuilder->weld_widget("additionsEntry")) - , m_xImageScreenshot(m_xBuilder->weld_image("imageScreenshot")) - , m_xButtonInstall(m_xBuilder->weld_button("buttonInstall")) - , m_xLinkButtonWebsite(m_xBuilder->weld_link_button("btnWebsite")) - , m_xLabelName(m_xBuilder->weld_label("lbName")) - , m_xLabelAuthor(m_xBuilder->weld_label("labelAuthor")) - , m_xLabelDescription(m_xBuilder->weld_label("labelDescription")) - , m_xLabelLicense(m_xBuilder->weld_label("lbLicenseText")) - , m_xLabelVersion(m_xBuilder->weld_label("lbVersionText")) - , m_xLinkButtonComments(m_xBuilder->weld_link_button("linkButtonComments")) - , m_xImageVoting1(m_xBuilder->weld_image("imageVoting1")) - , m_xImageVoting2(m_xBuilder->weld_image("imageVoting2")) - , m_xImageVoting3(m_xBuilder->weld_image("imageVoting3")) - , m_xImageVoting4(m_xBuilder->weld_image("imageVoting4")) - , m_xImageVoting5(m_xBuilder->weld_image("imageVoting5")) - , m_xLabelDownloadNumber(m_xBuilder->weld_label("labelDownloadNumber")) - , m_xButtonShowMore(m_xBuilder->weld_button("buttonShowMore")) + : m_xBuilder(Application::CreateBuilder(pParent, u"cui/ui/additionsfragment.ui"_ustr)) + , m_xContainer(m_xBuilder->weld_widget(u"additionsEntry"_ustr)) + , m_xImageScreenshot(m_xBuilder->weld_image(u"imageScreenshot"_ustr)) + , m_xButtonInstall(m_xBuilder->weld_button(u"buttonInstall"_ustr)) + , m_xLinkButtonWebsite(m_xBuilder->weld_link_button(u"btnWebsite"_ustr)) + , m_xLabelName(m_xBuilder->weld_label(u"lbName"_ustr)) + , m_xLabelAuthor(m_xBuilder->weld_label(u"labelAuthor"_ustr)) + , m_xLabelDescription(m_xBuilder->weld_label(u"labelDescription"_ustr)) + , m_xLabelLicense(m_xBuilder->weld_label(u"lbLicenseText"_ustr)) + , m_xLabelVersion(m_xBuilder->weld_label(u"lbVersionText"_ustr)) + , m_xLinkButtonComments(m_xBuilder->weld_link_button(u"linkButtonComments"_ustr)) + , m_xImageVoting1(m_xBuilder->weld_image(u"imageVoting1"_ustr)) + , m_xImageVoting2(m_xBuilder->weld_image(u"imageVoting2"_ustr)) + , m_xImageVoting3(m_xBuilder->weld_image(u"imageVoting3"_ustr)) + , m_xImageVoting4(m_xBuilder->weld_image(u"imageVoting4"_ustr)) + , m_xImageVoting5(m_xBuilder->weld_image(u"imageVoting5"_ustr)) + , m_xLabelDownloadNumber(m_xBuilder->weld_label(u"labelDownloadNumber"_ustr)) + , m_xButtonShowMore(m_xBuilder->weld_button(u"buttonShowMore"_ustr)) , m_pParentDialog(pParentDialog) - , m_sDownloadURL("") - , m_sExtensionID("") + , m_sDownloadURL(u""_ustr) + , m_sExtensionID(u""_ustr) { SolarMutexGuard aGuard; @@ -687,8 +687,8 @@ bool AdditionsItem::getExtensionFile(OUString& sExtensionFile) = ucb::SimpleFileAccess::create(comphelper::getProcessComponentContext()); // copy the extensions' files to the user's additions folder - OUString userFolder = "${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER - "/" SAL_CONFIGFILE("bootstrap") "::UserInstallation}"; + OUString userFolder = u"${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER + "/" SAL_CONFIGFILE("bootstrap") "::UserInstallation}"_ustr; rtl::Bootstrap::expandMacros(userFolder); userFolder += "/user/additions/" + m_sExtensionID + "/"; @@ -763,8 +763,9 @@ IMPL_LINK_NOARG(AdditionsItem, InstallHdl, weld::Button&, void) uno::Reference<task::XAbortChannel> xAbortChannel; try { - m_pParentDialog->m_xExtensionManager->addExtension( - aExtensionFile, uno::Sequence<beans::NamedValue>(), "user", xAbortChannel, pCmdEnv); + m_pParentDialog->m_xExtensionManager->addExtension(aExtensionFile, + uno::Sequence<beans::NamedValue>(), + u"user"_ustr, xAbortChannel, pCmdEnv); m_xButtonInstall->set_label(CuiResId(RID_CUISTR_ADDITIONS_INSTALLEDBUTTON)); } catch (const ucb::CommandFailedException) diff --git a/cui/source/dialogs/DiagramDialog.cxx b/cui/source/dialogs/DiagramDialog.cxx index b63d6cb6e313..a2499056210c 100644 --- a/cui/source/dialogs/DiagramDialog.cxx +++ b/cui/source/dialogs/DiagramDialog.cxx @@ -18,14 +18,14 @@ #include <svx/diagram/IDiagramHelper.hxx> DiagramDialog::DiagramDialog(weld::Window* pWindow, SdrObjGroup& rDiagram) - : GenericDialogController(pWindow, "cui/ui/diagramdialog.ui", "DiagramDialog") + : GenericDialogController(pWindow, u"cui/ui/diagramdialog.ui"_ustr, u"DiagramDialog"_ustr) , m_rDiagram(rDiagram) , m_nUndos(0) - , mpBtnCancel(m_xBuilder->weld_button("btnCancel")) - , mpBtnAdd(m_xBuilder->weld_button("btnAdd")) - , mpBtnRemove(m_xBuilder->weld_button("btnRemove")) - , mpTreeDiagram(m_xBuilder->weld_tree_view("treeDiagram")) - , mpTextAdd(m_xBuilder->weld_text_view("textAdd")) + , mpBtnCancel(m_xBuilder->weld_button(u"btnCancel"_ustr)) + , mpBtnAdd(m_xBuilder->weld_button(u"btnAdd"_ustr)) + , mpBtnRemove(m_xBuilder->weld_button(u"btnRemove"_ustr)) + , mpTreeDiagram(m_xBuilder->weld_tree_view(u"treeDiagram"_ustr)) + , mpTextAdd(m_xBuilder->weld_text_view(u"textAdd"_ustr)) { mpBtnCancel->connect_clicked(LINK(this, DiagramDialog, OnAddCancel)); mpBtnAdd->connect_clicked(LINK(this, DiagramDialog, OnAddClick)); @@ -48,7 +48,7 @@ IMPL_LINK_NOARG(DiagramDialog, OnAddCancel, weld::Button&, void) // available (?) - but it does no harm either... while (0 != m_nUndos) { - comphelper::dispatchCommand(".uno:Undo", {}); + comphelper::dispatchCommand(u".uno:Undo"_ustr, {}); m_nUndos--; } @@ -89,7 +89,7 @@ IMPL_LINK_NOARG(DiagramDialog, OnAddClick, weld::Button&, void) std::unique_ptr<weld::TreeIter> pEntry(mpTreeDiagram->make_iterator()); mpTreeDiagram->insert(nullptr, -1, &sText, &sNodeId, nullptr, nullptr, false, pEntry.get()); mpTreeDiagram->select(*pEntry); - comphelper::dispatchCommand(".uno:RegenerateDiagram", {}); + comphelper::dispatchCommand(u".uno:RegenerateDiagram"_ustr, {}); } } @@ -125,7 +125,7 @@ IMPL_LINK_NOARG(DiagramDialog, OnRemoveClick, weld::Button&, void) } mpTreeDiagram->remove(*pEntry); - comphelper::dispatchCommand(".uno:RegenerateDiagram", {}); + comphelper::dispatchCommand(u".uno:RegenerateDiagram"_ustr, {}); } } } diff --git a/cui/source/dialogs/FontFeaturesDialog.cxx b/cui/source/dialogs/FontFeaturesDialog.cxx index e9aba0a6e409..feb7f401025c 100644 --- a/cui/source/dialogs/FontFeaturesDialog.cxx +++ b/cui/source/dialogs/FontFeaturesDialog.cxx @@ -20,16 +20,17 @@ using namespace css; namespace cui { FontFeaturesDialog::FontFeaturesDialog(weld::Window* pParent, OUString aFontName) - : GenericDialogController(pParent, "cui/ui/fontfeaturesdialog.ui", "FontFeaturesDialog") + : GenericDialogController(pParent, u"cui/ui/fontfeaturesdialog.ui"_ustr, + u"FontFeaturesDialog"_ustr) , m_sFontName(std::move(aFontName)) - , m_xContentWindow(m_xBuilder->weld_scrolled_window("contentWindow")) - , m_xContentBox(m_xBuilder->weld_container("contentBox")) - , m_xContentGrid(m_xBuilder->weld_container("contentGrid")) - , m_xStylisticSetsBox(m_xBuilder->weld_container("stylisticSetsBox")) - , m_xStylisticSetsGrid(m_xBuilder->weld_container("stylisticSetsGrid")) - , m_xCharacterVariantsBox(m_xBuilder->weld_container("characterVariantsBox")) - , m_xCharacterVariantsGrid(m_xBuilder->weld_container("characterVariantsGrid")) - , m_xPreviewWindow(new weld::CustomWeld(*m_xBuilder, "preview", m_aPreviewWindow)) + , m_xContentWindow(m_xBuilder->weld_scrolled_window(u"contentWindow"_ustr)) + , m_xContentBox(m_xBuilder->weld_container(u"contentBox"_ustr)) + , m_xContentGrid(m_xBuilder->weld_container(u"contentGrid"_ustr)) + , m_xStylisticSetsBox(m_xBuilder->weld_container(u"stylisticSetsBox"_ustr)) + , m_xStylisticSetsGrid(m_xBuilder->weld_container(u"stylisticSetsGrid"_ustr)) + , m_xCharacterVariantsBox(m_xBuilder->weld_container(u"characterVariantsBox"_ustr)) + , m_xCharacterVariantsGrid(m_xBuilder->weld_container(u"characterVariantsGrid"_ustr)) + , m_xPreviewWindow(new weld::CustomWeld(*m_xBuilder, u"preview"_ustr, m_aPreviewWindow)) { initialize(); } @@ -103,7 +104,7 @@ int FontFeaturesDialog::fillGrid(std::vector<vcl::font::Feature> const& rFontFea if (rFontFeature.m_aDefinition) aDefinition = rFontFeature.m_aDefinition; if (!aDefinition) - aDefinition = { nFontFeatureCode, "" }; + aDefinition = { nFontFeatureCode, u""_ustr }; if (rFontFeature.isStylisticSet()) { diff --git a/cui/source/dialogs/GraphicTestsDialog.cxx b/cui/source/dialogs/GraphicTestsDialog.cxx index ad0c25aab1f5..49525d71bb62 100644 --- a/cui/source/dialogs/GraphicTestsDialog.cxx +++ b/cui/source/dialogs/GraphicTestsDialog.cxx @@ -25,10 +25,10 @@ GraphicTestEntry::GraphicTestEntry(weld::Container* pParent, weld::Dialog* pDialog, OUString aTestName, OUString aTestStatus, Bitmap aTestBitmap) - : m_xBuilder(Application::CreateBuilder(pParent, "cui/ui/graphictestentry.ui")) - , m_xContainer(m_xBuilder->weld_container("gptestbox")) - , m_xTestLabel(m_xBuilder->weld_label("gptestlabel")) - , m_xTestButton(m_xBuilder->weld_button("gptestbutton")) + : m_xBuilder(Application::CreateBuilder(pParent, u"cui/ui/graphictestentry.ui"_ustr)) + , m_xContainer(m_xBuilder->weld_container(u"gptestbox"_ustr)) + , m_xTestLabel(m_xBuilder->weld_label(u"gptestlabel"_ustr)) + , m_xTestButton(m_xBuilder->weld_button(u"gptestbutton"_ustr)) , m_xResultBitmap(aTestBitmap) { m_xParentDialog = pDialog; @@ -57,10 +57,10 @@ IMPL_LINK(GraphicTestEntry, HandleResultViewRequest, weld::Button&, rButton, voi } GraphicsTestsDialog::GraphicsTestsDialog(weld::Container* pParent) - : GenericDialogController(pParent, "cui/ui/graphictestdlg.ui", "GraphicTestsDialog") - , m_xResultLog(m_xBuilder->weld_text_view("gptest_txtVW")) - , m_xDownloadResults(m_xBuilder->weld_button("gptest_downld")) - , m_xContainerBox(m_xBuilder->weld_box("gptest_box")) + : GenericDialogController(pParent, u"cui/ui/graphictestdlg.ui"_ustr, u"GraphicTestsDialog"_ustr) + , m_xResultLog(m_xBuilder->weld_text_view(u"gptest_txtVW"_ustr)) + , m_xDownloadResults(m_xBuilder->weld_button(u"gptest_downld"_ustr)) + , m_xContainerBox(m_xBuilder->weld_box(u"gptest_box"_ustr)) { OUString userProfile = comphelper::BackupFileHelper::getUserProfileURL(); m_xZipFileUrl = userProfile + "/GraphicTestResults.zip"; diff --git a/cui/source/dialogs/ImageViewerDialog.cxx b/cui/source/dialogs/ImageViewerDialog.cxx index b245c8c08b60..d15960193d0f 100644 --- a/cui/source/dialogs/ImageViewerDialog.cxx +++ b/cui/source/dialogs/ImageViewerDialog.cxx @@ -11,8 +11,8 @@ #include <ImageViewerDialog.hxx> ImageViewerDialog::ImageViewerDialog(weld::Dialog* pParent, BitmapEx aBitmap, OUString atitle) - : GenericDialogController(pParent, "cui/ui/imageviewer.ui", "ImageViewerDialog") - , m_xDisplayImage(m_xBuilder->weld_image("ImgVW_mainImage")) + : GenericDialogController(pParent, u"cui/ui/imageviewer.ui"_ustr, u"ImageViewerDialog"_ustr) + , m_xDisplayImage(m_xBuilder->weld_image(u"ImgVW_mainImage"_ustr)) { m_xDialog->set_title(atitle); aBitmap.Scale(Size(300, 300), BmpScaleFlag::Fast); diff --git a/cui/source/dialogs/QrCodeGenDialog.cxx b/cui/source/dialogs/QrCodeGenDialog.cxx index d99290404629..ae712ed7a2ca 100644 --- a/cui/source/dialogs/QrCodeGenDialog.cxx +++ b/cui/source/dialogs/QrCodeGenDialog.cxx @@ -169,15 +169,15 @@ OString GenerateQRCode(std::u16string_view aQRText, tools::Long aQRECC, int aQRB QrCodeGenDialog::QrCodeGenDialog(weld::Widget* pParent, Reference<XModel> xModel, bool bEditExisting) - : GenericDialogController(pParent, "cui/ui/qrcodegen.ui", "QrCodeGenDialog") + : GenericDialogController(pParent, u"cui/ui/qrcodegen.ui"_ustr, u"QrCodeGenDialog"_ustr) , m_xModel(std::move(xModel)) - , m_xEdittext(m_xBuilder->weld_text_view("edit_text")) - , m_xECC{ m_xBuilder->weld_radio_button("button_low"), - m_xBuilder->weld_radio_button("button_medium"), - m_xBuilder->weld_radio_button("button_quartile"), - m_xBuilder->weld_radio_button("button_high") } - , m_xSpinBorder(m_xBuilder->weld_spin_button("edit_margin")) - , m_xComboType(m_xBuilder->weld_combo_box("choose_type")) + , m_xEdittext(m_xBuilder->weld_text_view(u"edit_text"_ustr)) + , m_xECC{ m_xBuilder->weld_radio_button(u"button_low"_ustr), + m_xBuilder->weld_radio_button(u"button_medium"_ustr), + m_xBuilder->weld_radio_button(u"button_quartile"_ustr), + m_xBuilder->weld_radio_button(u"button_high"_ustr) } + , m_xSpinBorder(m_xBuilder->weld_spin_button(u"edit_margin"_ustr)) + , m_xComboType(m_xBuilder->weld_combo_box(u"choose_type"_ustr)) #if ENABLE_ZXING , mpParent(pParent) #endif @@ -203,7 +203,7 @@ QrCodeGenDialog::QrCodeGenDialog(weld::Widget* pParent, Reference<XModel> xModel // Read properties from selected QR Code css::drawing::BarCode aBarCode; - xProps->getPropertyValue("BarCodeProperties") >>= aBarCode; + xProps->getPropertyValue(u"BarCodeProperties"_ustr) >>= aBarCode; m_xEdittext->set_text(aBarCode.Payload); @@ -320,7 +320,7 @@ void QrCodeGenDialog::Apply() Reference<XComponentContext> xContext(comphelper::getProcessComponentContext()); Reference<XGraphicProvider> xProvider = css::graphic::GraphicProvider::create(xContext); - Sequence<PropertyValue> aMediaProperties{ comphelper::makePropertyValue("InputStream", + Sequence<PropertyValue> aMediaProperties{ comphelper::makePropertyValue(u"InputStream"_ustr, xInputStream) }; Reference<XGraphic> xGraphic(xProvider->queryGraphic(aMediaProperties)); @@ -330,13 +330,13 @@ void QrCodeGenDialog::Apply() xShapeProps = m_xExistingShapeProperties; else xShapeProps.set(Reference<lang::XMultiServiceFactory>(m_xModel, UNO_QUERY_THROW) - ->createInstance("com.sun.star.drawing.GraphicObjectShape"), + ->createInstance(u"com.sun.star.drawing.GraphicObjectShape"_ustr), UNO_QUERY); - xShapeProps->setPropertyValue("Graphic", Any(xGraphic)); + xShapeProps->setPropertyValue(u"Graphic"_ustr, Any(xGraphic)); // Set QRCode properties - xShapeProps->setPropertyValue("BarCodeProperties", Any(aBarCode)); + xShapeProps->setPropertyValue(u"BarCodeProperties"_ustr, Any(aBarCode)); if (bIsExistingQRCode) return; @@ -349,12 +349,12 @@ void QrCodeGenDialog::Apply() xShape->setSize(aShapeSize); // Default anchoring - xShapeProps->setPropertyValue("AnchorType", Any(TextContentAnchorType_AT_PARAGRAPH)); + xShapeProps->setPropertyValue(u"AnchorType"_ustr, Any(TextContentAnchorType_AT_PARAGRAPH)); const Reference<XServiceInfo> xServiceInfo(m_xModel, UNO_QUERY_THROW); // Writer - if (xServiceInfo->supportsService("com.sun.star.text.TextDocument")) + if (xServiceInfo->supportsService(u"com.sun.star.text.TextDocument"_ustr)) { Reference<XTextContent> xTextContent(xShape, UNO_QUERY_THROW); Reference<XTextViewCursorSupplier> xViewCursorSupplier(m_xModel->getCurrentController(), @@ -368,11 +368,11 @@ void QrCodeGenDialog::Apply() } // Calc - else if (xServiceInfo->supportsService("com.sun.star.sheet.SpreadsheetDocument")) + else if (xServiceInfo->supportsService(u"com.sun.star.sheet.SpreadsheetDocument"_ustr)) { Reference<XPropertySet> xSheetCell(m_xModel->getCurrentSelection(), UNO_QUERY_THROW); awt::Point aCellPosition; - xSheetCell->getPropertyValue("Position") >>= aCellPosition; + xSheetCell->getPropertyValue(u"Position"_ustr) >>= aCellPosition; xShape->setPosition(aCellPosition); Reference<XSpreadsheetView> xView(m_xModel->getCurrentController(), UNO_QUERY_THROW); @@ -386,8 +386,8 @@ void QrCodeGenDialog::Apply() } //Impress and Draw - else if (xServiceInfo->supportsService("com.sun.star.presentation.PresentationDocument") - || xServiceInfo->supportsService("com.sun.star.drawing.DrawingDocument")) + else if (xServiceInfo->supportsService(u"com.sun.star.presentation.PresentationDocument"_ustr) + || xServiceInfo->supportsService(u"com.sun.star.drawing.DrawingDocument"_ustr)) { Reference<XDrawView> xView(m_xModel->getCurrentController(), UNO_QUERY_THROW); Reference<XDrawPage> xPage(xView->getCurrentPage(), UNO_SET_THROW); @@ -400,7 +400,7 @@ void QrCodeGenDialog::Apply() else { //Not implemented for math,base and other apps. - throw uno::RuntimeException("Not implemented"); + throw uno::RuntimeException(u"Not implemented"_ustr); } #endif } diff --git a/cui/source/dialogs/SignSignatureLineDialog.cxx b/cui/source/dialogs/SignSignatureLineDialog.cxx index d3e0bfb5b65e..183fb04c82fb 100644 --- a/cui/source/dialogs/SignSignatureLineDialog.cxx +++ b/cui/source/dialogs/SignSignatureLineDialog.cxx @@ -48,17 +48,17 @@ using namespace css::security; using namespace css::ui::dialogs; SignSignatureLineDialog::SignSignatureLineDialog(weld::Widget* pParent, Reference<XModel> xModel) - : SignatureLineDialogBase(pParent, std::move(xModel), "cui/ui/signsignatureline.ui", - "SignSignatureLineDialog") - , m_xEditName(m_xBuilder->weld_entry("edit_name")) - , m_xEditComment(m_xBuilder->weld_text_view("edit_comment")) - , m_xBtnLoadImage(m_xBuilder->weld_button("btn_load_image")) - , m_xBtnClearImage(m_xBuilder->weld_button("btn_clear_image")) - , m_xBtnChooseCertificate(m_xBuilder->weld_button("btn_select_certificate")) - , m_xBtnSign(m_xBuilder->weld_button("ok")) - , m_xLabelHint(m_xBuilder->weld_label("label_hint")) - , m_xLabelHintText(m_xBuilder->weld_label("label_hint_text")) - , m_xLabelAddComment(m_xBuilder->weld_label("label_add_comment")) + : SignatureLineDialogBase(pParent, std::move(xModel), u"cui/ui/signsignatureline.ui"_ustr, + u"SignSignatureLineDialog"_ustr) + , m_xEditName(m_xBuilder->weld_entry(u"edit_name"_ustr)) + , m_xEditComment(m_xBuilder->weld_text_view(u"edit_comment"_ustr)) + , m_xBtnLoadImage(m_xBuilder->weld_button(u"btn_load_image"_ustr)) + , m_xBtnClearImage(m_xBuilder->weld_button(u"btn_clear_image"_ustr)) + , m_xBtnChooseCertificate(m_xBuilder->weld_button(u"btn_select_certificate"_ustr)) + , m_xBtnSign(m_xBuilder->weld_button(u"ok"_ustr)) + , m_xLabelHint(m_xBuilder->weld_label(u"label_hint"_ustr)) + , m_xLabelHintText(m_xBuilder->weld_label(u"label_hint_text"_ustr)) + , m_xLabelAddComment(m_xBuilder->weld_label(u"label_add_comment"_ustr)) , m_bShowSignDate(false) { Reference<container::XIndexAccess> xIndexAccess(m_xModel->getCurrentSelection(), @@ -66,7 +66,7 @@ SignSignatureLineDialog::SignSignatureLineDialog(weld::Widget* pParent, Referenc m_xShapeProperties.set(xIndexAccess->getByIndex(0), UNO_QUERY_THROW); bool bIsSignatureLine(false); - m_xShapeProperties->getPropertyValue("IsSignatureLine") >>= bIsSignatureLine; + m_xShapeProperties->getPropertyValue(u"IsSignatureLine"_ustr) >>= bIsSignatureLine; if (!bIsSignatureLine) { SAL_WARN("cui.dialogs", "No signature line selected!"); @@ -80,17 +80,17 @@ SignSignatureLineDialog::SignSignatureLineDialog(weld::Widget* pParent, Referenc m_xEditName->connect_changed(LINK(this, SignSignatureLineDialog, entryChanged)); // Read properties from selected signature line - m_xShapeProperties->getPropertyValue("SignatureLineId") >>= m_aSignatureLineId; - m_xShapeProperties->getPropertyValue("SignatureLineSuggestedSignerName") + m_xShapeProperties->getPropertyValue(u"SignatureLineId"_ustr) >>= m_aSignatureLineId; + m_xShapeProperties->getPropertyValue(u"SignatureLineSuggestedSignerName"_ustr) >>= m_aSuggestedSignerName; - m_xShapeProperties->getPropertyValue("SignatureLineSuggestedSignerTitle") + m_xShapeProperties->getPropertyValue(u"SignatureLineSuggestedSignerTitle"_ustr) >>= m_aSuggestedSignerTitle; OUString aSigningInstructions; - m_xShapeProperties->getPropertyValue("SignatureLineSigningInstructions") + m_xShapeProperties->getPropertyValue(u"SignatureLineSigningInstructions"_ustr) >>= aSigningInstructions; - m_xShapeProperties->getPropertyValue("SignatureLineShowSignDate") >>= m_bShowSignDate; + m_xShapeProperties->getPropertyValue(u"SignatureLineShowSignDate"_ustr) >>= m_bShowSignDate; bool bCanAddComment(false); - m_xShapeProperties->getPropertyValue("SignatureLineCanAddComment") >>= bCanAddComment; + m_xShapeProperties->getPropertyValue(u"SignatureLineCanAddComment"_ustr) >>= bCanAddComment; if (aSigningInstructions.isEmpty()) { @@ -132,7 +132,7 @@ IMPL_LINK_NOARG(SignSignatureLineDialog, loadImage, weld::Button&, void) return; Reference<XGraphicProvider> xProvider = GraphicProvider::create(xContext); - Sequence<PropertyValue> aMediaProperties{ comphelper::makePropertyValue("URL", + Sequence<PropertyValue> aMediaProperties{ comphelper::makePropertyValue(u"URL"_ustr, aSelectedFiles[0]) }; m_xSignatureImage = xProvider->queryGraphic(aMediaProperties); m_sOriginalImageBtnLabel = m_xBtnLoadImage->get_label(); @@ -232,10 +232,10 @@ css::uno::Reference<css::graphic::XGraphic> SignSignatureLineDialog::getSignedGr if (!XOutBitmap::GraphicToBase64(aGraphic, aGraphicInBase64, false)) SAL_WARN("cui.dialogs", "Could not convert graphic to base64"); - OUString aImagePart = "<image y=\"825\" x=\"1300\" " + OUString aImagePart = u"<image y=\"825\" x=\"1300\" " "xlink:href=\"data:[MIMETYPE];base64,[BASE64_IMG]>\" " "preserveAspectRatio=\"xMidYMid\" height=\"1520\" " - "width=\"7600\" />"; + "width=\"7600\" />"_ustr; aImagePart = aImagePart.replaceAll( "[MIMETYPE]", GraphicMimeTypeHelper::GetMimeTypeForXGraphic(m_xSignatureImage)); aImagePart = aImagePart.replaceAll("[BASE64_IMG]", aGraphicInBase64); diff --git a/cui/source/dialogs/SignatureLineDialog.cxx b/cui/source/dialogs/SignatureLineDialog.cxx index 224dcdecd4bb..aece41a3d89d 100644 --- a/cui/source/dialogs/SignatureLineDialog.cxx +++ b/cui/source/dialogs/SignatureLineDialog.cxx @@ -42,14 +42,14 @@ using namespace css::graphic; SignatureLineDialog::SignatureLineDialog(weld::Widget* pParent, Reference<XModel> xModel, bool bEditExisting) - : SignatureLineDialogBase(pParent, std::move(xModel), "cui/ui/signatureline.ui", - "SignatureLineDialog") - , m_xEditName(m_xBuilder->weld_entry("edit_name")) - , m_xEditTitle(m_xBuilder->weld_entry("edit_title")) - , m_xEditEmail(m_xBuilder->weld_entry("edit_email")) - , m_xEditInstructions(m_xBuilder->weld_text_view("edit_instructions")) - , m_xCheckboxCanAddComments(m_xBuilder->weld_check_button("checkbox_can_add_comments")) - , m_xCheckboxShowSignDate(m_xBuilder->weld_check_button("checkbox_show_sign_date")) + : SignatureLineDialogBase(pParent, std::move(xModel), u"cui/ui/signatureline.ui"_ustr, + u"SignatureLineDialog"_ustr) + , m_xEditName(m_xBuilder->weld_entry(u"edit_name"_ustr)) + , m_xEditTitle(m_xBuilder->weld_entry(u"edit_title"_ustr)) + , m_xEditEmail(m_xBuilder->weld_entry(u"edit_email"_ustr)) + , m_xEditInstructions(m_xBuilder->weld_text_view(u"edit_instructions"_ustr)) + , m_xCheckboxCanAddComments(m_xBuilder->weld_check_button(u"checkbox_can_add_comments"_ustr)) + , m_xCheckboxShowSignDate(m_xBuilder->weld_check_button(u"checkbox_show_sign_date"_ustr)) { m_xEditInstructions->set_size_request(m_xEditInstructions->get_approximate_digit_width() * 48, m_xEditInstructions->get_text_height() * 5); @@ -67,24 +67,24 @@ SignatureLineDialog::SignatureLineDialog(weld::Widget* pParent, Reference<XModel Reference<XPropertySet> xProps(xIndexAccess->getByIndex(0), UNO_QUERY_THROW); // Read properties from selected signature line - xProps->getPropertyValue("SignatureLineId") >>= m_aSignatureLineId; + xProps->getPropertyValue(u"SignatureLineId"_ustr) >>= m_aSignatureLineId; OUString aSuggestedSignerName; - xProps->getPropertyValue("SignatureLineSuggestedSignerName") >>= aSuggestedSignerName; + xProps->getPropertyValue(u"SignatureLineSuggestedSignerName"_ustr) >>= aSuggestedSignerName; m_xEditName->set_text(aSuggestedSignerName); OUString aSuggestedSignerTitle; - xProps->getPropertyValue("SignatureLineSuggestedSignerTitle") >>= aSuggestedSignerTitle; + xProps->getPropertyValue(u"SignatureLineSuggestedSignerTitle"_ustr) >>= aSuggestedSignerTitle; m_xEditTitle->set_text(aSuggestedSignerTitle); OUString aSuggestedSignerEmail; - xProps->getPropertyValue("SignatureLineSuggestedSignerEmail") >>= aSuggestedSignerEmail; + xProps->getPropertyValue(u"SignatureLineSuggestedSignerEmail"_ustr) >>= aSuggestedSignerEmail; m_xEditEmail->set_text(aSuggestedSignerEmail); OUString aSigningInstructions; - xProps->getPropertyValue("SignatureLineSigningInstructions") >>= aSigningInstructions; + xProps->getPropertyValue(u"SignatureLineSigningInstructions"_ustr) >>= aSigningInstructions; m_xEditInstructions->set_text(aSigningInstructions); bool bCanAddComments = false; - xProps->getPropertyValue("SignatureLineCanAddComment") >>= bCanAddComments; + xProps->getPropertyValue(u"SignatureLineCanAddComment"_ustr) >>= bCanAddComments; m_xCheckboxCanAddComments->set_active(bCanAddComments); bool bShowSignDate = false; - xProps->getPropertyValue("SignatureLineShowSignDate") >>= bShowSignDate; + xProps->getPropertyValue(u"SignatureLineShowSignDate"_ustr) >>= bShowSignDate; m_xCheckboxShowSignDate->set_active(bShowSignDate); // Mark this as existing shape @@ -123,26 +123,26 @@ void SignatureLineDialog::Apply() xShapeProps = m_xExistingShapeProperties; else xShapeProps.set(Reference<lang::XMultiServiceFactory>(m_xModel, UNO_QUERY_THROW) - ->createInstance("com.sun.star.drawing.GraphicObjectShape"), + ->createInstance(u"com.sun.star.drawing.GraphicObjectShape"_ustr), UNO_QUERY); - xShapeProps->setPropertyValue("Graphic", Any(xGraphic)); - xShapeProps->setPropertyValue("SignatureLineUnsignedImage", Any(xGraphic)); + xShapeProps->setPropertyValue(u"Graphic"_ustr, Any(xGraphic)); + xShapeProps->setPropertyValue(u"SignatureLineUnsignedImage"_ustr, Any(xGraphic)); // Set signature line properties - xShapeProps->setPropertyValue("IsSignatureLine", Any(true)); - xShapeProps->setPropertyValue("SignatureLineId", Any(m_aSignatureLineId)); + xShapeProps->setPropertyValue(u"IsSignatureLine"_ustr, Any(true)); + xShapeProps->setPropertyValue(u"SignatureLineId"_ustr, Any(m_aSignatureLineId)); if (!aSignerName.isEmpty()) - xShapeProps->setPropertyValue("SignatureLineSuggestedSignerName", Any(aSignerName)); + xShapeProps->setPropertyValue(u"SignatureLineSuggestedSignerName"_ustr, Any(aSignerName)); if (!aSignerTitle.isEmpty()) - xShapeProps->setPropertyValue("SignatureLineSuggestedSignerTitle", Any(aSignerTitle)); + xShapeProps->setPropertyValue(u"SignatureLineSuggestedSignerTitle"_ustr, Any(aSignerTitle)); if (!aSignerEmail.isEmpty()) - xShapeProps->setPropertyValue("SignatureLineSuggestedSignerEmail", Any(aSignerEmail)); + xShapeProps->setPropertyValue(u"SignatureLineSuggestedSignerEmail"_ustr, Any(aSignerEmail)); if (!aSigningInstructions.isEmpty()) - xShapeProps->setPropertyValue("SignatureLineSigningInstructions", + xShapeProps->setPropertyValue(u"SignatureLineSigningInstructions"_ustr, Any(aSigningInstructions)); - xShapeProps->setPropertyValue("SignatureLineShowSignDate", Any(bShowSignDate)); - xShapeProps->setPropertyValue("SignatureLineCanAddComment", Any(bCanAddComments)); + xShapeProps->setPropertyValue(u"SignatureLineShowSignDate"_ustr, Any(bShowSignDate)); + xShapeProps->setPropertyValue(u"SignatureLineCanAddComment"_ustr, Any(bCanAddComments)); if (bIsExistingSignatureLine) return; @@ -155,7 +155,7 @@ void SignatureLineDialog::Apply() xShape->setSize(aShapeSize); // Default anchoring - xShapeProps->setPropertyValue("AnchorType", Any(TextContentAnchorType_AT_PARAGRAPH)); + xShapeProps->setPropertyValue(u"AnchorType"_ustr, Any(TextContentAnchorType_AT_PARAGRAPH)); // Writer const Reference<XTextDocument> xTextDocument(m_xModel, UNO_QUERY); @@ -179,7 +179,7 @@ void SignatureLineDialog::Apply() Reference<XPropertySet> xSheetCell(m_xModel->getCurrentSelection(), UNO_QUERY_THROW); awt::Point aCellPosition; - xSheetCell->getPropertyValue("Position") >>= aCellPosition; + xSheetCell->getPropertyValue(u"Position"_ustr) >>= aCellPosition; xShape->setPosition(aCellPosition); Reference<XSpreadsheetView> xView(m_xModel->getCurrentController(), UNO_QUERY_THROW); diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx index bc45db96e25e..a0c9819f0485 100644 --- a/cui/source/dialogs/SpellDialog.cxx +++ b/cui/source/dialogs/SpellDialog.cxx @@ -160,37 +160,37 @@ sal_uInt16 SpellUndoAction_Impl::GetId()const SpellDialog::SpellDialog(SpellDialogChildWindow* pChildWindow, weld::Window * pParent, SfxBindings* _pBindings) : SfxModelessDialogController (_pBindings, pChildWindow, - pParent, "cui/ui/spellingdialog.ui", "SpellingDialog") + pParent, u"cui/ui/spellingdialog.ui"_ustr, u"SpellingDialog"_ustr) , aDialogUndoLink(LINK (this, SpellDialog, DialogUndoHdl)) , m_pInitHdlEvent(nullptr) , bFocusLocked(true) , rParent(*pChildWindow) , pImpl( new SpellDialog_Impl ) - , m_xAltTitle(m_xBuilder->weld_label("alttitleft")) - , m_xResumeFT(m_xBuilder->weld_label("resumeft")) - , m_xNoSuggestionsFT(m_xBuilder->weld_label("nosuggestionsft")) - , m_xLanguageFT(m_xBuilder->weld_label("languageft")) - , m_xLanguageLB(new SvxLanguageBox(m_xBuilder->weld_combo_box("languagelb"))) - , m_xExplainFT(m_xBuilder->weld_label("explain")) - , m_xExplainLink(m_xBuilder->weld_link_button("explainlink")) - , m_xNotInDictFT(m_xBuilder->weld_label("notindictft")) - , m_xSentenceED(new SentenceEditWindow_Impl(m_xBuilder->weld_scrolled_window("scrolledwindow", true))) - , m_xSuggestionFT(m_xBuilder->weld_label("suggestionsft")) - , m_xSuggestionLB(m_xBuilder->weld_tree_view("suggestionslb")) - , m_xIgnorePB(m_xBuilder->weld_button("ignore")) - , m_xIgnoreAllPB(m_xBuilder->weld_button("ignoreall")) - , m_xIgnoreRulePB(m_xBuilder->weld_button("ignorerule")) - , m_xAddToDictPB(m_xBuilder->weld_button("add")) - , m_xAddToDictMB(m_xBuilder->weld_menu_button("addmb")) - , m_xChangePB(m_xBuilder->weld_button("change")) - , m_xChangeAllPB(m_xBuilder->weld_button("changeall")) - , m_xAutoCorrPB(m_xBuilder->weld_button("autocorrect")) - , m_xCheckGrammarCB(m_xBuilder->weld_check_button("checkgrammar")) - , m_xOptionsPB(m_xBuilder->weld_button("options")) - , m_xUndoPB(m_xBuilder->weld_button("undo")) - , m_xClosePB(m_xBuilder->weld_button("close")) - , m_xToolbar(m_xBuilder->weld_toolbar("toolbar")) - , m_xSentenceEDWeld(new weld::CustomWeld(*m_xBuilder, "sentence", *m_xSentenceED)) + , m_xAltTitle(m_xBuilder->weld_label(u"alttitleft"_ustr)) + , m_xResumeFT(m_xBuilder->weld_label(u"resumeft"_ustr)) + , m_xNoSuggestionsFT(m_xBuilder->weld_label(u"nosuggestionsft"_ustr)) + , m_xLanguageFT(m_xBuilder->weld_label(u"languageft"_ustr)) + , m_xLanguageLB(new SvxLanguageBox(m_xBuilder->weld_combo_box(u"languagelb"_ustr))) + , m_xExplainFT(m_xBuilder->weld_label(u"explain"_ustr)) + , m_xExplainLink(m_xBuilder->weld_link_button(u"explainlink"_ustr)) + , m_xNotInDictFT(m_xBuilder->weld_label(u"notindictft"_ustr)) + , m_xSentenceED(new SentenceEditWindow_Impl(m_xBuilder->weld_scrolled_window(u"scrolledwindow"_ustr, true))) + , m_xSuggestionFT(m_xBuilder->weld_label(u"suggestionsft"_ustr)) + , m_xSuggestionLB(m_xBuilder->weld_tree_view(u"suggestionslb"_ustr)) + , m_xIgnorePB(m_xBuilder->weld_button(u"ignore"_ustr)) + , m_xIgnoreAllPB(m_xBuilder->weld_button(u"ignoreall"_ustr)) + , m_xIgnoreRulePB(m_xBuilder->weld_button(u"ignorerule"_ustr)) + , m_xAddToDictPB(m_xBuilder->weld_button(u"add"_ustr)) + , m_xAddToDictMB(m_xBuilder->weld_menu_button(u"addmb"_ustr)) + , m_xChangePB(m_xBuilder->weld_button(u"change"_ustr)) + , m_xChangeAllPB(m_xBuilder->weld_button(u"changeall"_ustr)) + , m_xAutoCorrPB(m_xBuilder->weld_button(u"autocorrect"_ustr)) + , m_xCheckGrammarCB(m_xBuilder->weld_check_button(u"checkgrammar"_ustr)) + , m_xOptionsPB(m_xBuilder->weld_button(u"options"_ustr)) + , m_xUndoPB(m_xBuilder->weld_button(u"undo"_ustr)) + , m_xClosePB(m_xBuilder->weld_button(u"close"_ustr)) + , m_xToolbar(m_xBuilder->weld_toolbar(u"toolbar"_ustr)) + , m_xSentenceEDWeld(new weld::CustomWeld(*m_xBuilder, u"sentence"_ustr, *m_xSentenceED)) { m_xSentenceED->SetSpellDialog(this); m_xSentenceED->Init(m_xToolbar.get()); @@ -1035,7 +1035,7 @@ bool SpellDialog::GetNextSentence_Impl(std::unique_ptr<UndoChangeGroupGuard>* pG SpellErrorDescription aDesc( false, elem.xAlternatives->getWord(), elem.xAlternatives->getLocale(), elem.xAlternatives->getAlternatives(), nullptr); SfxGrabBagItem aSpellErrorDescription(EE_CHAR_GRABBAG); - aSpellErrorDescription.GetGrabBag()["SpellErrorDescription"] <<= aDesc.toSequence(); + aSpellErrorDescription.GetGrabBag()[u"SpellErrorDescription"_ustr] <<= aDesc.toSequence(); m_xSentenceED->SetAttrib(aSpellErrorDescription, nStartPosition, nEndPosition); } else if(elem.bIsGrammarError ) @@ -1064,7 +1064,7 @@ bool SpellDialog::GetNextSentence_Impl(std::unique_ptr<UndoChangeGroupGuard>* pG &sFullCommentURL ); SfxGrabBagItem aSpellErrorDescriptionItem(EE_CHAR_GRABBAG); - aSpellErrorDescriptionItem.GetGrabBag()["SpellErrorDescription"] <<= aDesc.toSequence(); + aSpellErrorDescriptionItem.GetGrabBag()[u"SpellErrorDescription"_ustr] <<= aDesc.toSequence(); m_xSentenceED->SetAttrib(aSpellErrorDescriptionItem, nStartPosition, nEndPosition); } @@ -1249,7 +1249,7 @@ namespace { css::uno::Sequence<css::uno::Any> aSequence; const auto pGrabBag = static_cast<const SfxGrabBagItem*>(rEECharAttrib.pAttr)->GetGrabBag(); - const auto iter = pGrabBag.find("SpellErrorDescription"); + const auto iter = pGrabBag.find(u"SpellErrorDescription"_ustr); assert(iter != pGrabBag.end()); iter->second >>= aSequence; rSpellErrorDescription.fromSequence(aSequence); @@ -1856,7 +1856,7 @@ int SentenceEditWindow_Impl::ChangeMarkedWord(const OUString& rNewWord, Language if (bSpellErrorDescription) { SfxGrabBagItem aSpellErrorDescriptionItem(EE_CHAR_GRABBAG); - aSpellErrorDescriptionItem.GetGrabBag()["SpellErrorDescription"] <<= aSpellErrorDescription.toSequence(); + aSpellErrorDescriptionItem.GetGrabBag()[u"SpellErrorDescription"_ustr] <<= aSpellErrorDescription.toSequence(); SetAttrib(aSpellErrorDescriptionItem, m_nErrorStart, m_nErrorEnd); } SetAttrib(SvxLanguageItem(eLanguage, EE_CHAR_LANGUAGE), m_nErrorStart, m_nErrorEnd); @@ -1914,7 +1914,7 @@ void SentenceEditWindow_Impl::SetAlternatives( const Reference< XSpellAlternativ } SpellErrorDescription aDesc( false, aWord, std::move(aLocale), aAlts, nullptr); SfxGrabBagItem aSpellErrorDescription(EE_CHAR_GRABBAG); - aSpellErrorDescription.GetGrabBag()["SpellErrorDescription"] <<= aDesc.toSequence(); + aSpellErrorDescription.GetGrabBag()[u"SpellErrorDescription"_ustr] <<= aDesc.toSequence(); SetAttrib(aSpellErrorDescription, m_nErrorStart, m_nErrorEnd); } diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx index ce82e418cf9e..353d23b16f07 100644 --- a/cui/source/dialogs/about.cxx +++ b/cui/source/dialogs/about.cxx @@ -55,22 +55,22 @@ using namespace ::com::sun::star::uno; AboutDialog::AboutDialog(weld::Window *pParent) - : GenericDialogController(pParent, "cui/ui/aboutdialog.ui", "AboutDialog"), - m_pCreditsButton(m_xBuilder->weld_link_button("btnCredits")), - m_pWebsiteButton(m_xBuilder->weld_link_button("btnWebsite")), - m_pReleaseNotesButton(m_xBuilder->weld_link_button("btnReleaseNotes")), - m_pCloseButton(m_xBuilder->weld_button("btnClose")), - m_pCopyButton(m_xBuilder->weld_button("btnCopyVersion")), - m_pBrandImage(m_xBuilder->weld_image("imBrand")), - m_pAboutImage(m_xBuilder->weld_image("imAbout")), - m_pVersionLabel(m_xBuilder->weld_label("lbVersionString")), - m_pBuildCaption(m_xBuilder->weld_label("lbBuild")), - m_pBuildLabel(m_xBuilder->weld_link_button("lbBuildString")), - m_pEnvLabel(m_xBuilder->weld_label("lbEnvString")), - m_pUILabel(m_xBuilder->weld_label("lbUIString")), - m_pLocaleLabel(m_xBuilder->weld_label("lbLocaleString")), - m_pMiscLabel(m_xBuilder->weld_label("lbMiscString")), - m_pCopyrightLabel(m_xBuilder->weld_label("lbCopyright")) { + : GenericDialogController(pParent, u"cui/ui/aboutdialog.ui"_ustr, u"AboutDialog"_ustr), + m_pCreditsButton(m_xBuilder->weld_link_button(u"btnCredits"_ustr)), + m_pWebsiteButton(m_xBuilder->weld_link_button(u"btnWebsite"_ustr)), + m_pReleaseNotesButton(m_xBuilder->weld_link_button(u"btnReleaseNotes"_ustr)), + m_pCloseButton(m_xBuilder->weld_button(u"btnClose"_ustr)), + m_pCopyButton(m_xBuilder->weld_button(u"btnCopyVersion"_ustr)), + m_pBrandImage(m_xBuilder->weld_image(u"imBrand"_ustr)), + m_pAboutImage(m_xBuilder->weld_image(u"imAbout"_ustr)), + m_pVersionLabel(m_xBuilder->weld_label(u"lbVersionString"_ustr)), + m_pBuildCaption(m_xBuilder->weld_label(u"lbBuild"_ustr)), + m_pBuildLabel(m_xBuilder->weld_link_button(u"lbBuildString"_ustr)), + m_pEnvLabel(m_xBuilder->weld_label(u"lbEnvString"_ustr)), + m_pUILabel(m_xBuilder->weld_label(u"lbUIString"_ustr)), + m_pLocaleLabel(m_xBuilder->weld_label(u"lbLocaleString"_ustr)), + m_pMiscLabel(m_xBuilder->weld_label(u"lbMiscString"_ustr)), + m_pCopyrightLabel(m_xBuilder->weld_label(u"lbCopyright"_ustr)) { // Labels m_pVersionLabel->set_label(GetVersionString()); @@ -148,7 +148,7 @@ bool AboutDialog::IsStringValidGitHash(std::u16string_view hash) { OUString AboutDialog::GetVersionString() { OUString arch; - auto const ok = rtl::Bootstrap::get("_ARCH", arch); + auto const ok = rtl::Bootstrap::get(u"_ARCH"_ustr, arch); assert(ok); (void) ok; OUString sVersion = CuiResId(TranslateId(nullptr, "%ABOUTBOXPRODUCTVERSION%ABOUTBOXPRODUCTVERSIONSUFFIX")) + " (" + arch + ")"; @@ -161,7 +161,7 @@ OUString AboutDialog::GetVersionString() { OUString AboutDialog::GetBuildString() { - OUString sBuildId(utl::Bootstrap::getBuildIdData("")); + OUString sBuildId(utl::Bootstrap::getBuildIdData(u""_ustr)); SAL_WARN_IF(sBuildId.isEmpty(), "cui.dialogs", "No BUILDID in bootstrap file"); return sBuildId; @@ -192,7 +192,7 @@ OUString AboutDialog::GetLocaleString(const bool bLocalized) { if (bLocalized) sUILocaleStr = CuiResId(RID_CUISTR_ABOUT_UILOCALE); else - sUILocaleStr = Translate::get(RID_CUISTR_ABOUT_UILOCALE, Translate::Create("cui", LanguageTag("en-US"))); + sUILocaleStr = Translate::get(RID_CUISTR_ABOUT_UILOCALE, Translate::Create("cui", LanguageTag(u"en-US"_ustr))); if (sUILocaleStr.indexOf("$LOCALE") == -1) { SAL_WARN("cui.dialogs", "translated uilocale string in translations " diff --git a/cui/source/dialogs/colorpicker.cxx b/cui/source/dialogs/colorpicker.cxx index 290025929d5a..6ca351c883d4 100644 --- a/cui/source/dialogs/colorpicker.cxx +++ b/cui/source/dialogs/colorpicker.cxx @@ -802,30 +802,30 @@ private: } ColorPickerDialog::ColorPickerDialog(weld::Window* pParent, Color nColor, sal_Int16 nDialogMode) - : SfxDialogController(pParent, "cui/ui/colorpickerdialog.ui", "ColorPicker") - , m_xColorField(new weld::CustomWeld(*m_xBuilder, "colorField", m_aColorField)) - , m_xColorSlider(new weld::CustomWeld(*m_xBuilder, "colorSlider", m_aColorSlider)) - , m_xColorPreview(new weld::CustomWeld(*m_xBuilder, "preview", m_aColorPreview)) - , m_xColorPrevious(new weld::CustomWeld(*m_xBuilder, "previous", m_aColorPrevious)) - , m_xFISliderLeft(m_xBuilder->weld_widget("leftImage")) - , m_xFISliderRight(m_xBuilder->weld_widget("rightImage")) - , m_xRBRed(m_xBuilder->weld_radio_button("redRadiobutton")) - , m_xRBGreen(m_xBuilder->weld_radio_button("greenRadiobutton")) - , m_xRBBlue(m_xBuilder->weld_radio_button("blueRadiobutton")) - , m_xRBHue(m_xBuilder->weld_radio_button("hueRadiobutton")) -e ... etc. - the rest is truncated
