diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2024-05-30 10:06:57 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2024-05-30 17:21:46 +0200 |
commit | 0ba6f0678eb8749decc5e31aa4dff9f4858e3ab1 (patch) | |
tree | 45aa28c101332e738127d61670e59c5329602cd0 | |
parent | be568bf78939942153294727556a466e235e04d3 (diff) |
loplugin:ostr in sc/../optdlgfeature/gsoc24-lua
Change-Id: Ia441dd7c41cebec5fa40f9eb1e5b8fbb993b453a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168249
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
-rw-r--r-- | sc/source/ui/optdlg/calcoptionsdlg.cxx | 10 | ||||
-rw-r--r-- | sc/source/ui/optdlg/opredlin.cxx | 20 | ||||
-rw-r--r-- | sc/source/ui/optdlg/tpcalc.cxx | 74 | ||||
-rw-r--r-- | sc/source/ui/optdlg/tpcompatibility.cxx | 12 | ||||
-rw-r--r-- | sc/source/ui/optdlg/tpdefaults.cxx | 16 | ||||
-rw-r--r-- | sc/source/ui/optdlg/tpformula.cxx | 40 | ||||
-rw-r--r-- | sc/source/ui/optdlg/tpprint.cxx | 18 | ||||
-rw-r--r-- | sc/source/ui/optdlg/tpusrlst.cxx | 30 | ||||
-rw-r--r-- | sc/source/ui/optdlg/tpview.cxx | 176 |
9 files changed, 198 insertions, 198 deletions
diff --git a/sc/source/ui/optdlg/calcoptionsdlg.cxx b/sc/source/ui/optdlg/calcoptionsdlg.cxx index ec65fb9d8014..794c850c229e 100644 --- a/sc/source/ui/optdlg/calcoptionsdlg.cxx +++ b/sc/source/ui/optdlg/calcoptionsdlg.cxx @@ -57,14 +57,14 @@ sal_Int32 toSelectedItem( formula::FormulaGrammar::AddressConvention eConv ) } ScCalcOptionsDialog::ScCalcOptionsDialog(weld::Window* pParent, const ScCalcConfig& rConfig, bool bWriteConfig) - : GenericDialogController(pParent, "modules/scalc/ui/formulacalculationoptions.ui", "FormulaCalculationOptions") + : GenericDialogController(pParent, u"modules/scalc/ui/formulacalculationoptions.ui"_ustr, u"FormulaCalculationOptions"_ustr) , maConfig(rConfig) , mbSelectedEmptyStringAsZero(rConfig.mbEmptyStringAsZero) , mbWriteConfig(bWriteConfig) - , mxEmptyAsZero(m_xBuilder->weld_check_button("checkEmptyAsZero")) - , mxConversion(m_xBuilder->weld_combo_box("comboConversion")) - , mxCurrentDocOnly(m_xBuilder->weld_check_button("current_doc")) - , mxSyntax(m_xBuilder->weld_combo_box("comboSyntaxRef")) + , mxEmptyAsZero(m_xBuilder->weld_check_button(u"checkEmptyAsZero"_ustr)) + , mxConversion(m_xBuilder->weld_combo_box(u"comboConversion"_ustr)) + , mxCurrentDocOnly(m_xBuilder->weld_check_button(u"current_doc"_ustr)) + , mxSyntax(m_xBuilder->weld_combo_box(u"comboSyntaxRef"_ustr)) { mxConversion->set_active(static_cast<int>(rConfig.meStringConversion)); mxConversion->connect_changed(LINK(this, ScCalcOptionsDialog, ConversionModifiedHdl)); diff --git a/sc/source/ui/optdlg/opredlin.cxx b/sc/source/ui/optdlg/opredlin.cxx index 9d3c1835dfc3..a5613649ddc0 100644 --- a/sc/source/ui/optdlg/opredlin.cxx +++ b/sc/source/ui/optdlg/opredlin.cxx @@ -30,19 +30,19 @@ #include <opredlin.hxx> ScRedlineOptionsTabPage::ScRedlineOptionsTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet) - : SfxTabPage(pPage, pController, "modules/scalc/ui/optchangespage.ui", "OptChangesPage", &rSet) - , m_xContentColorLB(new ColorListBox(m_xBuilder->weld_menu_button("changes"), + : SfxTabPage(pPage, pController, u"modules/scalc/ui/optchangespage.ui"_ustr, u"OptChangesPage"_ustr, &rSet) + , m_xContentColorLB(new ColorListBox(m_xBuilder->weld_menu_button(u"changes"_ustr), [this]{ return GetDialogController()->getDialog(); })) - , m_xContentColorImg(m_xBuilder->weld_widget("lockchanges")) - , m_xRemoveColorLB(new ColorListBox(m_xBuilder->weld_menu_button("deletions"), + , m_xContentColorImg(m_xBuilder->weld_widget(u"lockchanges"_ustr)) + , m_xRemoveColorLB(new ColorListBox(m_xBuilder->weld_menu_button(u"deletions"_ustr), [this]{ return GetDialogController()->getDialog(); })) - , m_xRemoveColorImg(m_xBuilder->weld_widget("lockdeletions")) - , m_xInsertColorLB(new ColorListBox(m_xBuilder->weld_menu_button("entries"), + , m_xRemoveColorImg(m_xBuilder->weld_widget(u"lockdeletions"_ustr)) + , m_xInsertColorLB(new ColorListBox(m_xBuilder->weld_menu_button(u"entries"_ustr), [this]{ return GetDialogController()->getDialog(); })) - , m_xInsertColorImg(m_xBuilder->weld_widget("lockentries")) - , m_xMoveColorLB(new ColorListBox(m_xBuilder->weld_menu_button("insertions"), + , m_xInsertColorImg(m_xBuilder->weld_widget(u"lockentries"_ustr)) + , m_xMoveColorLB(new ColorListBox(m_xBuilder->weld_menu_button(u"insertions"_ustr), [this]{ return GetDialogController()->getDialog(); })) - , m_xMoveColorImg(m_xBuilder->weld_widget("lockinsertions")) + , m_xMoveColorImg(m_xBuilder->weld_widget(u"lockinsertions"_ustr)) { m_xContentColorLB->SetSlotId(SID_AUTHOR_COLOR); m_xRemoveColorLB->SetSlotId(SID_AUTHOR_COLOR); @@ -66,7 +66,7 @@ std::unique_ptr<SfxTabPage> ScRedlineOptionsTabPage::Create( weld::Container* pP OUString ScRedlineOptionsTabPage::GetAllStrings() { OUString sAllStrings; - OUString labels[] = { "label1", "label2", "label3", "label4", "label5" }; + OUString labels[] = { u"label1"_ustr, u"label2"_ustr, u"label3"_ustr, u"label4"_ustr, u"label5"_ustr }; for (const auto& label : labels) { diff --git a/sc/source/ui/optdlg/tpcalc.cxx b/sc/source/ui/optdlg/tpcalc.cxx index edeb306b668d..2a47d28c5e1d 100644 --- a/sc/source/ui/optdlg/tpcalc.cxx +++ b/sc/source/ui/optdlg/tpcalc.cxx @@ -33,47 +33,47 @@ #include <tpcalc.hxx> ScTpCalcOptions::ScTpCalcOptions(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rCoreAttrs) - : SfxTabPage(pPage, pController, "modules/scalc/ui/optcalculatepage.ui", "OptCalculatePage", &rCoreAttrs) + : SfxTabPage(pPage, pController, u"modules/scalc/ui/optcalculatepage.ui"_ustr, u"OptCalculatePage"_ustr, &rCoreAttrs) , pOldOptions(new ScDocOptions( rCoreAttrs.Get(SID_SCDOCOPTIONS).GetDocOptions())) , pLocalOptions(new ScDocOptions) - , m_xBtnIterate(m_xBuilder->weld_check_button("iterate")) - , m_xBtnIterateImg(m_xBuilder->weld_widget("lockiterate")) - , m_xFtSteps(m_xBuilder->weld_label("stepsft")) - , m_xEdSteps(m_xBuilder->weld_spin_button("steps")) - , m_xEdStepsImg(m_xBuilder->weld_widget("locksteps")) - , m_xFtEps(m_xBuilder->weld_label("minchangeft")) - , m_xEdEps(new ScDoubleField(m_xBuilder->weld_entry("minchange"))) - , m_xEdEpsImg(m_xBuilder->weld_widget("lockminchange")) - , m_xBtnDateStd(m_xBuilder->weld_radio_button("datestd")) - , m_xBtnDateSc10(m_xBuilder->weld_radio_button("datesc10")) - , m_xBtnDate1904(m_xBuilder->weld_radio_button("date1904")) - , m_xDateImg(m_xBuilder->weld_widget("lockdate")) - , m_xBtnCase(m_xBuilder->weld_check_button("case")) - , m_xBtnCaseImg(m_xBuilder->weld_widget("lockcase")) - , m_xBtnCalc(m_xBuilder->weld_check_button("calc")) - , m_xBtnCalcImg(m_xBuilder->weld_widget("lockcalc")) - , m_xBtnMatch(m_xBuilder->weld_check_button("match")) - , m_xBtnMatchImg(m_xBuilder->weld_widget("lockmatch")) - , m_xBtnWildcards(m_xBuilder->weld_radio_button("formulawildcards")) - , m_xBtnRegex(m_xBuilder->weld_radio_button("formularegex")) - , m_xBtnLiteral(m_xBuilder->weld_radio_button("formulaliteral")) - , m_xFormulaImg(m_xBuilder->weld_widget("lockformulawild")) - , m_xBtnLookUp(m_xBuilder->weld_check_button("lookup")) - , m_xBtnLookUpImg(m_xBuilder->weld_widget("locklookup")) - , m_xBtnGeneralPrec(m_xBuilder->weld_check_button("generalprec")) - , m_xBtnGeneralPrecImg(m_xBuilder->weld_widget("lockgeneralprec")) - , m_xFtPrec(m_xBuilder->weld_label("precft")) - , m_xEdPrec(m_xBuilder->weld_spin_button("prec")) - , m_xEdPrecImg(m_xBuilder->weld_widget("lockprec")) - , m_xBtnThread(m_xBuilder->weld_check_button("threadingenabled")) - , m_xBtnThreadImg(m_xBuilder->weld_widget("lockthreadingenabled")) + , m_xBtnIterate(m_xBuilder->weld_check_button(u"iterate"_ustr)) + , m_xBtnIterateImg(m_xBuilder->weld_widget(u"lockiterate"_ustr)) + , m_xFtSteps(m_xBuilder->weld_label(u"stepsft"_ustr)) + , m_xEdSteps(m_xBuilder->weld_spin_button(u"steps"_ustr)) + , m_xEdStepsImg(m_xBuilder->weld_widget(u"locksteps"_ustr)) + , m_xFtEps(m_xBuilder->weld_label(u"minchangeft"_ustr)) + , m_xEdEps(new ScDoubleField(m_xBuilder->weld_entry(u"minchange"_ustr))) + , m_xEdEpsImg(m_xBuilder->weld_widget(u"lockminchange"_ustr)) + , m_xBtnDateStd(m_xBuilder->weld_radio_button(u"datestd"_ustr)) + , m_xBtnDateSc10(m_xBuilder->weld_radio_button(u"datesc10"_ustr)) + , m_xBtnDate1904(m_xBuilder->weld_radio_button(u"date1904"_ustr)) + , m_xDateImg(m_xBuilder->weld_widget(u"lockdate"_ustr)) + , m_xBtnCase(m_xBuilder->weld_check_button(u"case"_ustr)) + , m_xBtnCaseImg(m_xBuilder->weld_widget(u"lockcase"_ustr)) + , m_xBtnCalc(m_xBuilder->weld_check_button(u"calc"_ustr)) + , m_xBtnCalcImg(m_xBuilder->weld_widget(u"lockcalc"_ustr)) + , m_xBtnMatch(m_xBuilder->weld_check_button(u"match"_ustr)) + , m_xBtnMatchImg(m_xBuilder->weld_widget(u"lockmatch"_ustr)) + , m_xBtnWildcards(m_xBuilder->weld_radio_button(u"formulawildcards"_ustr)) + , m_xBtnRegex(m_xBuilder->weld_radio_button(u"formularegex"_ustr)) + , m_xBtnLiteral(m_xBuilder->weld_radio_button(u"formulaliteral"_ustr)) + , m_xFormulaImg(m_xBuilder->weld_widget(u"lockformulawild"_ustr)) + , m_xBtnLookUp(m_xBuilder->weld_check_button(u"lookup"_ustr)) + , m_xBtnLookUpImg(m_xBuilder->weld_widget(u"locklookup"_ustr)) + , m_xBtnGeneralPrec(m_xBuilder->weld_check_button(u"generalprec"_ustr)) + , m_xBtnGeneralPrecImg(m_xBuilder->weld_widget(u"lockgeneralprec"_ustr)) + , m_xFtPrec(m_xBuilder->weld_label(u"precft"_ustr)) + , m_xEdPrec(m_xBuilder->weld_spin_button(u"prec"_ustr)) + , m_xEdPrecImg(m_xBuilder->weld_widget(u"lockprec"_ustr)) + , m_xBtnThread(m_xBuilder->weld_check_button(u"threadingenabled"_ustr)) + , m_xBtnThreadImg(m_xBuilder->weld_widget(u"lockthreadingenabled"_ustr)) { Init(); SetExchangeSupport(); css::uno::Reference < css::uno::XComponentContext > xContext(::comphelper::getProcessComponentContext()); - m_xReadWriteAccess = css::configuration::ReadWriteAccess::create(xContext, "*"); + m_xReadWriteAccess = css::configuration::ReadWriteAccess::create(xContext, u"*"_ustr); } ScTpCalcOptions::~ScTpCalcOptions() @@ -249,7 +249,7 @@ OUString ScTpCalcOptions::GetAllStrings() { OUString sAllStrings; OUString labels[] - = { "label5", "label1", "precft", "label2", "stepsft", "minchangeft", "label4", "label3" }; + = { u"label5"_ustr, u"label1"_ustr, u"precft"_ustr, u"label2"_ustr, u"stepsft"_ustr, u"minchangeft"_ustr, u"label4"_ustr, u"label3"_ustr }; for (const auto& label : labels) { @@ -258,7 +258,7 @@ OUString ScTpCalcOptions::GetAllStrings() } OUString checkButton[] - = { "case", "calc", "match", "lookup", "generalprec", "iterate", "threadingenabled" }; + = { u"case"_ustr, u"calc"_ustr, u"match"_ustr, u"lookup"_ustr, u"generalprec"_ustr, u"iterate"_ustr, u"threadingenabled"_ustr }; for (const auto& check : checkButton) { @@ -266,8 +266,8 @@ OUString ScTpCalcOptions::GetAllStrings() sAllStrings += pString->get_label() + " "; } - OUString radioButton[] = { "formulawildcards", "formularegex", "formulaliteral", - "datestd", "datesc10", "date1904" }; + OUString radioButton[] = { u"formulawildcards"_ustr, u"formularegex"_ustr, u"formulaliteral"_ustr, + u"datestd"_ustr, u"datesc10"_ustr, u"date1904"_ustr }; for (const auto& radio : radioButton) { diff --git a/sc/source/ui/optdlg/tpcompatibility.cxx b/sc/source/ui/optdlg/tpcompatibility.cxx index 64221cd2a9da..48e8a08b21ef 100644 --- a/sc/source/ui/optdlg/tpcompatibility.cxx +++ b/sc/source/ui/optdlg/tpcompatibility.cxx @@ -18,11 +18,11 @@ #include <optutil.hxx> ScTpCompatOptions::ScTpCompatOptions(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet &rCoreAttrs) - : SfxTabPage(pPage, pController, "modules/scalc/ui/optcompatibilitypage.ui", "OptCompatibilityPage", &rCoreAttrs) - , m_xLbKeyBindings(m_xBuilder->weld_combo_box("keybindings")) - , m_xLbKeyBindingsImg(m_xBuilder->weld_widget("lockkeybindings")) - , m_xBtnLink(m_xBuilder->weld_check_button("cellLinkCB")) - , m_xBtnLinkImg(m_xBuilder->weld_widget("lockcellLinkCB")) + : SfxTabPage(pPage, pController, u"modules/scalc/ui/optcompatibilitypage.ui"_ustr, u"OptCompatibilityPage"_ustr, &rCoreAttrs) + , m_xLbKeyBindings(m_xBuilder->weld_combo_box(u"keybindings"_ustr)) + , m_xLbKeyBindingsImg(m_xBuilder->weld_widget(u"lockkeybindings"_ustr)) + , m_xBtnLink(m_xBuilder->weld_check_button(u"cellLinkCB"_ustr)) + , m_xBtnLinkImg(m_xBuilder->weld_widget(u"lockcellLinkCB"_ustr)) { } @@ -38,7 +38,7 @@ std::unique_ptr<SfxTabPage> ScTpCompatOptions::Create(weld::Container* pPage, we OUString ScTpCompatOptions::GetAllStrings() { OUString sAllStrings; - OUString labels[] = { "label1", "label2" }; + OUString labels[] = { u"label1"_ustr, u"label2"_ustr }; for (const auto& label : labels) { diff --git a/sc/source/ui/optdlg/tpdefaults.cxx b/sc/source/ui/optdlg/tpdefaults.cxx index 4528da5e48b5..29bdd9a9a0d8 100644 --- a/sc/source/ui/optdlg/tpdefaults.cxx +++ b/sc/source/ui/optdlg/tpdefaults.cxx @@ -18,13 +18,13 @@ #include <config_features.h> ScTpDefaultsOptions::ScTpDefaultsOptions(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet &rCoreSet) - : SfxTabPage(pPage, pController, "modules/scalc/ui/optdefaultpage.ui", "OptDefaultPage", &rCoreSet) - , m_xEdNSheets(m_xBuilder->weld_spin_button("sheetsnumber")) - , m_xEdNSheetsImg(m_xBuilder->weld_widget("locksheetsnumber")) - , m_xEdSheetPrefix(m_xBuilder->weld_entry("sheetprefix")) - , m_xEdSheetPrefixImg(m_xBuilder->weld_widget("locksheetprefix")) - , m_xEdJumboSheets(m_xBuilder->weld_check_button("jumbo_sheets")) - , m_xEdJumboSheetsImg(m_xBuilder->weld_widget("lockjumbo_sheets")) + : SfxTabPage(pPage, pController, u"modules/scalc/ui/optdefaultpage.ui"_ustr, u"OptDefaultPage"_ustr, &rCoreSet) + , m_xEdNSheets(m_xBuilder->weld_spin_button(u"sheetsnumber"_ustr)) + , m_xEdNSheetsImg(m_xBuilder->weld_widget(u"locksheetsnumber"_ustr)) + , m_xEdSheetPrefix(m_xBuilder->weld_entry(u"sheetprefix"_ustr)) + , m_xEdSheetPrefixImg(m_xBuilder->weld_widget(u"locksheetprefix"_ustr)) + , m_xEdJumboSheets(m_xBuilder->weld_check_button(u"jumbo_sheets"_ustr)) + , m_xEdJumboSheetsImg(m_xBuilder->weld_widget(u"lockjumbo_sheets"_ustr)) { m_xEdNSheets->connect_changed( LINK(this, ScTpDefaultsOptions, NumModifiedHdl) ); m_xEdSheetPrefix->connect_changed( LINK(this, ScTpDefaultsOptions, PrefixModifiedHdl) ); @@ -47,7 +47,7 @@ std::unique_ptr<SfxTabPage> ScTpDefaultsOptions::Create(weld::Container* pPage, OUString ScTpDefaultsOptions::GetAllStrings() { OUString sAllStrings; - OUString labels[] = { "label1", "textsheetsnumber", "textsheetprefix" }; + OUString labels[] = { u"label1"_ustr, u"textsheetsnumber"_ustr, u"textsheetprefix"_ustr }; for (const auto& label : labels) { diff --git a/sc/source/ui/optdlg/tpformula.cxx b/sc/source/ui/optdlg/tpformula.cxx index 046cfc807e54..11d3f7189cd1 100644 --- a/sc/source/ui/optdlg/tpformula.cxx +++ b/sc/source/ui/optdlg/tpformula.cxx @@ -32,20 +32,20 @@ #include <unotools/localedatawrapper.hxx> ScTpFormulaOptions::ScTpFormulaOptions(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rCoreAttrs) - : SfxTabPage(pPage, pController, "modules/scalc/ui/optformula.ui", "OptFormula", &rCoreAttrs) + : SfxTabPage(pPage, pController, u"modules/scalc/ui/optformula.ui"_ustr, u"OptFormula"_ustr, &rCoreAttrs) , mnDecSep(0) - , mxLbFormulaSyntax(m_xBuilder->weld_combo_box("formulasyntax")) - , mxCbEnglishFuncName(m_xBuilder->weld_check_button("englishfuncname")) - , mxBtnCustomCalcDefault(m_xBuilder->weld_radio_button("calcdefault")) - , mxBtnCustomCalcCustom(m_xBuilder->weld_radio_button("calccustom")) - , mxBtnCustomCalcDetails(m_xBuilder->weld_button("details")) - , mxEdSepFuncArg(m_xBuilder->weld_entry("function")) - , mxEdSepArrayCol(m_xBuilder->weld_entry("arraycolumn")) - , mxEdSepArrayRow(m_xBuilder->weld_entry("arrayrow")) - , mxBtnSepReset(m_xBuilder->weld_button("reset")) - , mxLbOOXMLRecalcOptions(m_xBuilder->weld_combo_box("ooxmlrecalc")) - , mxLbODFRecalcOptions(m_xBuilder->weld_combo_box("odfrecalc")) - , mxLbRowHeightReCalcOptions(m_xBuilder->weld_combo_box("rowheightrecalc")) + , mxLbFormulaSyntax(m_xBuilder->weld_combo_box(u"formulasyntax"_ustr)) + , mxCbEnglishFuncName(m_xBuilder->weld_check_button(u"englishfuncname"_ustr)) + , mxBtnCustomCalcDefault(m_xBuilder->weld_radio_button(u"calcdefault"_ustr)) + , mxBtnCustomCalcCustom(m_xBuilder->weld_radio_button(u"calccustom"_ustr)) + , mxBtnCustomCalcDetails(m_xBuilder->weld_button(u"details"_ustr)) + , mxEdSepFuncArg(m_xBuilder->weld_entry(u"function"_ustr)) + , mxEdSepArrayCol(m_xBuilder->weld_entry(u"arraycolumn"_ustr)) + , mxEdSepArrayRow(m_xBuilder->weld_entry(u"arrayrow"_ustr)) + , mxBtnSepReset(m_xBuilder->weld_button(u"reset"_ustr)) + , mxLbOOXMLRecalcOptions(m_xBuilder->weld_combo_box(u"ooxmlrecalc"_ustr)) + , mxLbODFRecalcOptions(m_xBuilder->weld_combo_box(u"odfrecalc"_ustr)) + , mxLbRowHeightReCalcOptions(m_xBuilder->weld_combo_box(u"rowheightrecalc"_ustr)) { mxLbFormulaSyntax->append_text(ScResId(SCSTR_FORMULA_SYNTAX_CALC_A1)); mxLbFormulaSyntax->append_text(ScResId(SCSTR_FORMULA_SYNTAX_XL_A1)); @@ -262,11 +262,11 @@ std::unique_ptr<SfxTabPage> ScTpFormulaOptions::Create(weld::Container* pPage, w OUString ScTpFormulaOptions::GetAllStrings() { OUString sAllStrings; - OUString labels[] = { "label1", "formulasyntaxlabel", - "label3", "label6", - "label7", "label8", - "label2", "label4", - "label9", "label10" }; + OUString labels[] = { u"label1"_ustr, u"formulasyntaxlabel"_ustr, + u"label3"_ustr, u"label6"_ustr, + u"label7"_ustr, u"label8"_ustr, + u"label2"_ustr, u"label4"_ustr, + u"label9"_ustr, u"label10"_ustr }; for (const auto& label : labels) { @@ -274,7 +274,7 @@ OUString ScTpFormulaOptions::GetAllStrings() sAllStrings += pString->get_label() + " "; } - OUString radioButton[] = { "calcdefault", "calccustom" }; + OUString radioButton[] = { u"calcdefault"_ustr, u"calccustom"_ustr }; for (const auto& radio : radioButton) { @@ -282,7 +282,7 @@ OUString ScTpFormulaOptions::GetAllStrings() sAllStrings += pString->get_label() + " "; } - OUString buttons[] = { "reset", "details" }; + OUString buttons[] = { u"reset"_ustr, u"details"_ustr }; for (const auto& btn : buttons) { diff --git a/sc/source/ui/optdlg/tpprint.cxx b/sc/source/ui/optdlg/tpprint.cxx index fbcafe299ef5..75ad6cc7cab0 100644 --- a/sc/source/ui/optdlg/tpprint.cxx +++ b/sc/source/ui/optdlg/tpprint.cxx @@ -29,13 +29,13 @@ ScTpPrintOptions::ScTpPrintOptions( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rCoreAttrs ) - : SfxTabPage(pPage, pController, "modules/scalc/ui/optdlg.ui", "optCalcPrintPage", &rCoreAttrs ) - , m_xSkipEmptyPagesCB(m_xBuilder->weld_check_button("suppressCB")) - , m_xSkipEmptyPagesImg(m_xBuilder->weld_widget("locksuppressCB")) - , m_xSelectedSheetsCB(m_xBuilder->weld_check_button("printCB")) - , m_xSelectedSheetsImg(m_xBuilder->weld_widget("lockprintCB")) - , m_xForceBreaksCB(m_xBuilder->weld_check_button("forceBreaksCB")) - , m_xForceBreaksImg(m_xBuilder->weld_widget("lockforceBreaksCB")) + : SfxTabPage(pPage, pController, u"modules/scalc/ui/optdlg.ui"_ustr, u"optCalcPrintPage"_ustr, &rCoreAttrs ) + , m_xSkipEmptyPagesCB(m_xBuilder->weld_check_button(u"suppressCB"_ustr)) + , m_xSkipEmptyPagesImg(m_xBuilder->weld_widget(u"locksuppressCB"_ustr)) + , m_xSelectedSheetsCB(m_xBuilder->weld_check_button(u"printCB"_ustr)) + , m_xSelectedSheetsImg(m_xBuilder->weld_widget(u"lockprintCB"_ustr)) + , m_xForceBreaksCB(m_xBuilder->weld_check_button(u"forceBreaksCB"_ustr)) + , m_xForceBreaksImg(m_xBuilder->weld_widget(u"lockforceBreaksCB"_ustr)) { } @@ -96,7 +96,7 @@ void ScTpPrintOptions::Reset( const SfxItemSet* rCoreSet ) OUString ScTpPrintOptions::GetAllStrings() { OUString sAllStrings; - OUString labels[] = { "label1", "label2" }; + OUString labels[] = { u"label1"_ustr, u"label2"_ustr }; for (const auto& label : labels) { @@ -104,7 +104,7 @@ OUString ScTpPrintOptions::GetAllStrings() sAllStrings += pString->get_label() + " "; } - OUString checkButton[] = { "suppressCB", "forceBreaksCB", "printCB" }; + OUString checkButton[] = { u"suppressCB"_ustr, u"forceBreaksCB"_ustr, u"printCB"_ustr }; for (const auto& check : checkButton) { diff --git a/sc/source/ui/optdlg/tpusrlst.cxx b/sc/source/ui/optdlg/tpusrlst.cxx index f3999d562d55..3e7a19a7d8d3 100644 --- a/sc/source/ui/optdlg/tpusrlst.cxx +++ b/sc/source/ui/optdlg/tpusrlst.cxx @@ -49,20 +49,20 @@ const sal_Unicode cDelimiter = ','; ScTpUserLists::ScTpUserLists( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rCoreAttrs ) - : SfxTabPage(pPage, pController, "modules/scalc/ui/optsortlists.ui", "OptSortLists", + : SfxTabPage(pPage, pController, u"modules/scalc/ui/optsortlists.ui"_ustr, u"OptSortLists"_ustr, &rCoreAttrs ) - , mxFtLists(m_xBuilder->weld_label("listslabel")) - , mxLbLists(m_xBuilder->weld_tree_view("lists")) - , mxFtEntries(m_xBuilder->weld_label("entrieslabel")) - , mxEdEntries(m_xBuilder->weld_text_view("entries")) - , mxFtCopyFrom(m_xBuilder->weld_label("copyfromlabel")) - , mxEdCopyFrom(m_xBuilder->weld_entry("copyfrom")) - , mxBtnNew(m_xBuilder->weld_button("new")) - , mxBtnDiscard(m_xBuilder->weld_button("discard")) - , mxBtnAdd(m_xBuilder->weld_button("add")) - , mxBtnModify(m_xBuilder->weld_button("modify")) - , mxBtnRemove(m_xBuilder->weld_button("delete")) - , mxBtnCopy(m_xBuilder->weld_button("copy")) + , mxFtLists(m_xBuilder->weld_label(u"listslabel"_ustr)) + , mxLbLists(m_xBuilder->weld_tree_view(u"lists"_ustr)) + , mxFtEntries(m_xBuilder->weld_label(u"entrieslabel"_ustr)) + , mxEdEntries(m_xBuilder->weld_text_view(u"entries"_ustr)) + , mxFtCopyFrom(m_xBuilder->weld_label(u"copyfromlabel"_ustr)) + , mxEdCopyFrom(m_xBuilder->weld_entry(u"copyfrom"_ustr)) + , mxBtnNew(m_xBuilder->weld_button(u"new"_ustr)) + , mxBtnDiscard(m_xBuilder->weld_button(u"discard"_ustr)) + , mxBtnAdd(m_xBuilder->weld_button(u"add"_ustr)) + , mxBtnModify(m_xBuilder->weld_button(u"modify"_ustr)) + , mxBtnRemove(m_xBuilder->weld_button(u"delete"_ustr)) + , mxBtnCopy(m_xBuilder->weld_button(u"copy"_ustr)) , aStrQueryRemove ( ScResId( STR_QUERYREMOVE ) ) , aStrCopyList ( ScResId( STR_COPYLIST ) ) , aStrCopyFrom ( ScResId( STR_COPYFROM ) ) @@ -190,7 +190,7 @@ void ScTpUserLists::Reset( const SfxItemSet* rCoreAttrs ) OUString ScTpUserLists::GetAllStrings() { OUString sAllStrings; - OUString labels[] = { "listslabel", "entrieslabel", "copyfromlabel" }; + OUString labels[] = { u"listslabel"_ustr, u"entrieslabel"_ustr, u"copyfromlabel"_ustr }; for (const auto& label : labels) { @@ -198,7 +198,7 @@ OUString ScTpUserLists::GetAllStrings() sAllStrings += pString->get_label() + " "; } - OUString buttons[] = { "new", "discard", "add", "modify", "delete", "copy" }; + OUString buttons[] = { u"new"_ustr, u"discard"_ustr, u"add"_ustr, u"modify"_ustr, u"delete"_ustr, u"copy"_ustr }; for (const auto& btn : buttons) { diff --git a/sc/source/ui/optdlg/tpview.cxx b/sc/source/ui/optdlg/tpview.cxx index bb479173d8a7..c7722e931cde 100644 --- a/sc/source/ui/optdlg/tpview.cxx +++ b/sc/source/ui/optdlg/tpview.cxx @@ -35,56 +35,56 @@ #include <unotools/localedatawrapper.hxx> ScTpContentOptions::ScTpContentOptions(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rArgSet) - : SfxTabPage(pPage, pController, "modules/scalc/ui/tpviewpage.ui", "TpViewPage", &rArgSet) - , m_xGridLB(m_xBuilder->weld_combo_box("grid")) - , m_xGridImg(m_xBuilder->weld_widget("lockgrid")) - , m_xBreakCB(m_xBuilder->weld_check_button("break")) - , m_xBreakImg(m_xBuilder->weld_widget("lockbreak")) - , m_xGuideLineCB(m_xBuilder->weld_check_button("guideline")) - , m_xGuideLineImg(m_xBuilder->weld_widget("lockguideline")) - , m_xFormulaCB(m_xBuilder->weld_check_button("formula")) - , m_xFormulaImg(m_xBuilder->weld_widget("lockformula")) - , m_xNilCB(m_xBuilder->weld_check_button("nil")) - , m_xNilImg(m_xBuilder->weld_widget("locknil")) - , m_xAnnotCB(m_xBuilder->weld_check_button("annot")) - , m_xAnnotImg(m_xBuilder->weld_widget("lockannot")) - , m_xNoteAuthorCB(m_xBuilder->weld_check_button("cbNoteAuthor")) - , m_xNoteAuthorImg(m_xBuilder->weld_widget("imNoteAuthor")) - , m_xFormulaMarkCB(m_xBuilder->weld_check_button("formulamark")) - , m_xFormulaMarkImg(m_xBuilder->weld_widget("lockformulamark")) - , m_xValueCB(m_xBuilder->weld_check_button("value")) - , m_xValueImg(m_xBuilder->weld_widget("lockvalue")) - , m_xColRowHighCB(m_xBuilder->weld_check_button("colrowhigh")) - , m_xColRowHighImg(m_xBuilder->weld_widget("lockcolrowhigh")) - , m_xEditCellBgHighCB(m_xBuilder->weld_check_button("editcellbg")) - , m_xEditCellBgHighImg(m_xBuilder->weld_widget("lockeditcellbghigh")) - , m_xAnchorCB(m_xBuilder->weld_check_button("anchor")) - , m_xAnchorImg(m_xBuilder->weld_widget("lockanchor")) - , m_xRangeFindCB(m_xBuilder->weld_check_button("rangefind")) - , m_xRangeFindImg(m_xBuilder->weld_widget("lockrangefind")) - , m_xObjGrfLB(m_xBuilder->weld_combo_box("objgrf")) - , m_xObjGrfImg(m_xBuilder->weld_widget("lockobjgrf")) - , m_xDiagramLB(m_xBuilder->weld_combo_box("diagram")) - , m_xDiagramImg(m_xBuilder->weld_widget("lockdiagram")) - , m_xDrawLB(m_xBuilder->weld_combo_box("draw")) - , m_xDrawImg(m_xBuilder->weld_widget("lockdraw")) - , m_xSyncZoomCB(m_xBuilder->weld_check_button("synczoom")) - , m_xSyncZoomImg(m_xBuilder->weld_widget("locksynczoom")) - , m_xRowColHeaderCB(m_xBuilder->weld_check_button("rowcolheader")) - , m_xRowColHeaderImg(m_xBuilder->weld_widget("lockrowcolheader")) - , m_xHScrollCB(m_xBuilder->weld_check_button("hscroll")) - , m_xHScrollImg(m_xBuilder->weld_widget("lockhscroll")) - , m_xVScrollCB(m_xBuilder->weld_check_button("vscroll")) - , m_xVScrollImg(m_xBuilder->weld_widget("lockvscroll")) - , m_xTblRegCB(m_xBuilder->weld_check_button("tblreg")) - , m_xTblRegImg(m_xBuilder->weld_widget("locktblreg")) - , m_xOutlineCB(m_xBuilder->weld_check_button("outline")) - , m_xOutlineImg(m_xBuilder->weld_widget("lockoutline")) - , m_xSummaryCB(m_xBuilder->weld_check_button("cbSummary")) - , m_xSummaryImg(m_xBuilder->weld_widget("lockcbSummary")) - , m_xThemedCursorRB(m_xBuilder->weld_radio_button("rbThemedCursor")) - , m_xSystemCursorRB(m_xBuilder->weld_radio_button("rbSystemCursor")) - , m_xCursorImg(m_xBuilder->weld_widget("lockCursor")) + : SfxTabPage(pPage, pController, u"modules/scalc/ui/tpviewpage.ui"_ustr, u"TpViewPage"_ustr, &rArgSet) + , m_xGridLB(m_xBuilder->weld_combo_box(u"grid"_ustr)) + , m_xGridImg(m_xBuilder->weld_widget(u"lockgrid"_ustr)) + , m_xBreakCB(m_xBuilder->weld_check_button(u"break"_ustr)) + , m_xBreakImg(m_xBuilder->weld_widget(u"lockbreak"_ustr)) + , m_xGuideLineCB(m_xBuilder->weld_check_button(u"guideline"_ustr)) + , m_xGuideLineImg(m_xBuilder->weld_widget(u"lockguideline"_ustr)) + , m_xFormulaCB(m_xBuilder->weld_check_button(u"formula"_ustr)) + , m_xFormulaImg(m_xBuilder->weld_widget(u"lockformula"_ustr)) + , m_xNilCB(m_xBuilder->weld_check_button(u"nil"_ustr)) + , m_xNilImg(m_xBuilder->weld_widget(u"locknil"_ustr)) + , m_xAnnotCB(m_xBuilder->weld_check_button(u"annot"_ustr)) + , m_xAnnotImg(m_xBuilder->weld_widget(u"lockannot"_ustr)) + , m_xNoteAuthorCB(m_xBuilder->weld_check_button(u"cbNoteAuthor"_ustr)) + , m_xNoteAuthorImg(m_xBuilder->weld_widget(u"imNoteAuthor"_ustr)) + , m_xFormulaMarkCB(m_xBuilder->weld_check_button(u"formulamark"_ustr)) + , m_xFormulaMarkImg(m_xBuilder->weld_widget(u"lockformulamark"_ustr)) + , m_xValueCB(m_xBuilder->weld_check_button(u"value"_ustr)) + , m_xValueImg(m_xBuilder->weld_widget(u"lockvalue"_ustr)) + , m_xColRowHighCB(m_xBuilder->weld_check_button(u"colrowhigh"_ustr)) + , m_xColRowHighImg(m_xBuilder->weld_widget(u"lockcolrowhigh"_ustr)) + , m_xEditCellBgHighCB(m_xBuilder->weld_check_button(u"editcellbg"_ustr)) + , m_xEditCellBgHighImg(m_xBuilder->weld_widget(u"lockeditcellbghigh"_ustr)) + , m_xAnchorCB(m_xBuilder->weld_check_button(u"anchor"_ustr)) + , m_xAnchorImg(m_xBuilder->weld_widget(u"lockanchor"_ustr)) + , m_xRangeFindCB(m_xBuilder->weld_check_button(u"rangefind"_ustr)) + , m_xRangeFindImg(m_xBuilder->weld_widget(u"lockrangefind"_ustr)) + , m_xObjGrfLB(m_xBuilder->weld_combo_box(u"objgrf"_ustr)) + , m_xObjGrfImg(m_xBuilder->weld_widget(u"lockobjgrf"_ustr)) + , m_xDiagramLB(m_xBuilder->weld_combo_box(u"diagram"_ustr)) + , m_xDiagramImg(m_xBuilder->weld_widget(u"lockdiagram"_ustr)) + , m_xDrawLB(m_xBuilder->weld_combo_box(u"draw"_ustr)) + , m_xDrawImg(m_xBuilder->weld_widget(u"lockdraw"_ustr)) + , m_xSyncZoomCB(m_xBuilder->weld_check_button(u"synczoom"_ustr)) + , m_xSyncZoomImg(m_xBuilder->weld_widget(u"locksynczoom"_ustr)) + , m_xRowColHeaderCB(m_xBuilder->weld_check_button(u"rowcolheader"_ustr)) + , m_xRowColHeaderImg(m_xBuilder->weld_widget(u"lockrowcolheader"_ustr)) + , m_xHScrollCB(m_xBuilder->weld_check_button(u"hscroll"_ustr)) + , m_xHScrollImg(m_xBuilder->weld_widget(u"lockhscroll"_ustr)) + , m_xVScrollCB(m_xBuilder->weld_check_button(u"vscroll"_ustr)) + , m_xVScrollImg(m_xBuilder->weld_widget(u"lockvscroll"_ustr)) + , m_xTblRegCB(m_xBuilder->weld_check_button(u"tblreg"_ustr)) + , m_xTblRegImg(m_xBuilder->weld_widget(u"locktblreg"_ustr)) + , m_xOutlineCB(m_xBuilder->weld_check_button(u"outline"_ustr)) + , m_xOutlineImg(m_xBuilder->weld_widget(u"lockoutline"_ustr)) + , m_xSummaryCB(m_xBuilder->weld_check_button(u"cbSummary"_ustr)) + , m_xSummaryImg(m_xBuilder->weld_widget(u"lockcbSummary"_ustr)) + , m_xThemedCursorRB(m_xBuilder->weld_radio_button(u"rbThemedCursor"_ustr)) + , m_xSystemCursorRB(m_xBuilder->weld_radio_button(u"rbSystemCursor"_ustr)) + , m_xCursorImg(m_xBuilder->weld_widget(u"lockCursor"_ustr)) { SetExchangeSupport(); Link<weld::ComboBox&,void> aSelObjHdl(LINK( this, ScTpContentOptions, SelLbObjHdl ) ); @@ -129,8 +129,8 @@ std::unique_ptr<SfxTabPage> ScTpContentOptions::Create( weld::Container* pPage, OUString ScTpContentOptions::GetAllStrings() { OUString sAllStrings; - OUString labels[] = { "label4", "label5", "label3", "label1", "grid_label", - "lbCursor", "label2", "objgrf_label", "diagram_label", "draw_label" }; + OUString labels[] = { u"label4"_ustr, u"label5"_ustr, u"label3"_ustr, u"label1"_ustr, u"grid_label"_ustr, + u"lbCursor"_ustr, u"label2"_ustr, u"objgrf_label"_ustr, u"diagram_label"_ustr, u"draw_label"_ustr }; for (const auto& label : labels) { @@ -139,9 +139,9 @@ OUString ScTpContentOptions::GetAllStrings() } OUString checkButton[] - = { "formula", "nil", "annot", "formulamark", "value", "anchor", - "rangefind", "rowcolheader", "hscroll", "vscroll", "tblreg", "outline", - "cbSummary", "synczoom", "break", "guideline" }; + = { u"formula"_ustr, u"nil"_ustr, u"annot"_ustr, u"formulamark"_ustr, u"value"_ustr, u"anchor"_ustr, + u"rangefind"_ustr, u"rowcolheader"_ustr, u"hscroll"_ustr, u"vscroll"_ustr, u"tblreg"_ustr, u"outline"_ustr, + u"cbSummary"_ustr, u"synczoom"_ustr, u"break"_ustr, u"guideline"_ustr }; for (const auto& check : checkButton) { @@ -455,35 +455,35 @@ IMPL_LINK( ScTpContentOptions, GridHdl, weld::ComboBox&, rLb, void ) } ScTpLayoutOptions::ScTpLayoutOptions(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rArgSet) - : SfxTabPage(pPage, pController, "modules/scalc/ui/scgeneralpage.ui", "ScGeneralPage", &rArgSet) + : SfxTabPage(pPage, pController, u"modules/scalc/ui/scgeneralpage.ui"_ustr, u"ScGeneralPage"_ustr, &rArgSet) , pDoc(nullptr) - , m_xUnitLB(m_xBuilder->weld_combo_box("unitlb")) - , m_xUnitImg(m_xBuilder->weld_widget("lockunitlb")) - , m_xTabMF(m_xBuilder->weld_metric_spin_button("tabmf", FieldUnit::CM)) - , m_xTabImg(m_xBuilder->weld_widget("locktabmf")) - , m_xAlwaysRB(m_xBuilder->weld_radio_button("alwaysrb")) - , m_xRequestRB(m_xBuilder->weld_radio_button("requestrb")) - , m_xNeverRB(m_xBuilder->weld_radio_button("neverrb")) - , m_xUpdateLinksImg(m_xBuilder->weld_widget("lockupdatelinks")) - , m_xAlignCB(m_xBuilder->weld_check_button("aligncb")) - , m_xAlignImg(m_xBuilder->weld_widget("lockaligncb")) - , m_xAlignLB(m_xBuilder->weld_combo_box("alignlb")) - , m_xEditModeCB(m_xBuilder->weld_check_button("editmodecb")) - , m_xEditModeImg(m_xBuilder->weld_widget("lockeditmodecb")) - , m_xFormatCB(m_xBuilder->weld_check_button("formatcb")) - , m_xFormatImg(m_xBuilder->weld_widget("lockformatcb")) - , m_xExpRefCB(m_xBuilder->weld_check_button("exprefcb")) - , m_xExpRefImg(m_xBuilder->weld_widget("lockexprefcb")) - , m_xSortRefUpdateCB(m_xBuilder->weld_check_button("sortrefupdatecb")) - , m_xSortRefUpdateImg(m_xBuilder->weld_widget("locksortrefupdatecb")) - , m_xMarkHdrCB(m_xBuilder->weld_check_button("markhdrcb")) - , m_xMarkHdrImg(m_xBuilder->weld_widget("lockmarkhdrcb")) - , m_xReplWarnCB(m_xBuilder->weld_check_button("replwarncb")) - , m_xReplWarnImg(m_xBuilder->weld_widget("lockreplwarncb")) - , m_xLegacyCellSelectionCB(m_xBuilder->weld_check_button("legacy_cell_selection_cb")) - , m_xLegacyCellSelectionImg(m_xBuilder->weld_widget("locklegacy_cell")) - , m_xEnterPasteModeCB(m_xBuilder->weld_check_button("enter_paste_mode_cb")) - , m_xEnterPasteModeImg(m_xBuilder->weld_widget("lockenter_paste")) + , m_xUnitLB(m_xBuilder->weld_combo_box(u"unitlb"_ustr)) + , m_xUnitImg(m_xBuilder->weld_widget(u"lockunitlb"_ustr)) + , m_xTabMF(m_xBuilder->weld_metric_spin_button(u"tabmf"_ustr, FieldUnit::CM)) + , m_xTabImg(m_xBuilder->weld_widget(u"locktabmf"_ustr)) + , m_xAlwaysRB(m_xBuilder->weld_radio_button(u"alwaysrb"_ustr)) + , m_xRequestRB(m_xBuilder->weld_radio_button(u"requestrb"_ustr)) + , m_xNeverRB(m_xBuilder->weld_radio_button(u"neverrb"_ustr)) + , m_xUpdateLinksImg(m_xBuilder->weld_widget(u"lockupdatelinks"_ustr)) + , m_xAlignCB(m_xBuilder->weld_check_button(u"aligncb"_ustr)) + , m_xAlignImg(m_xBuilder->weld_widget(u"lockaligncb"_ustr)) + , m_xAlignLB(m_xBuilder->weld_combo_box(u"alignlb"_ustr)) + , m_xEditModeCB(m_xBuilder->weld_check_button(u"editmodecb"_ustr)) + , m_xEditModeImg(m_xBuilder->weld_widget(u"lockeditmodecb"_ustr)) + , m_xFormatCB(m_xBuilder->weld_check_button(u"formatcb"_ustr)) + , m_xFormatImg(m_xBuilder->weld_widget(u"lockformatcb"_ustr)) + , m_xExpRefCB(m_xBuilder->weld_check_button(u"exprefcb"_ustr)) + , m_xExpRefImg(m_xBuilder->weld_widget(u"lockexprefcb"_ustr)) + , m_xSortRefUpdateCB(m_xBuilder->weld_check_button(u"sortrefupdatecb"_ustr)) + , m_xSortRefUpdateImg(m_xBuilder->weld_widget(u"locksortrefupdatecb"_ustr)) + , m_xMarkHdrCB(m_xBuilder->weld_check_button(u"markhdrcb"_ustr)) + , m_xMarkHdrImg(m_xBuilder->weld_widget(u"lockmarkhdrcb"_ustr)) + , m_xReplWarnCB(m_xBuilder->weld_check_button(u"replwarncb"_ustr)) + , m_xReplWarnImg(m_xBuilder->weld_widget(u"lockreplwarncb"_ustr)) + , m_xLegacyCellSelectionCB(m_xBuilder->weld_check_button(u"legacy_cell_selection_cb"_ustr)) + , m_xLegacyCellSelectionImg(m_xBuilder->weld_widget(u"locklegacy_cell"_ustr)) + , m_xEnterPasteModeCB(m_xBuilder->weld_check_button(u"enter_paste_mode_cb"_ustr)) + , m_xEnterPasteModeImg(m_xBuilder->weld_widget(u"lockenter_paste"_ustr)) { SetExchangeSupport(); @@ -533,7 +533,7 @@ std::unique_ptr<SfxTabPage> ScTpLayoutOptions::Create( weld::Container* pPage, w OUString ScTpLayoutOptions::GetAllStrings() { OUString sAllStrings; - OUString labels[] = { "label1", "label4", "label5", "label6", "label3" }; + OUString labels[] = { u"label1"_ustr, u"label4"_ustr, u"label5"_ustr, u"label6"_ustr, u"label3"_ustr }; for (const auto& label : labels) { @@ -541,9 +541,9 @@ OUString ScTpLayoutOptions::GetAllStrings() sAllStrings += pString->get_label() + " "; } - OUString checkButton[] = { "aligncb", "editmodecb", "enter_paste_mode_cb", - "formatcb", "exprefcb", "sortrefupdatecb", - "markhdrcb", "replwarncb", "legacy_cell_selection_cb" }; + OUString checkButton[] = { u"aligncb"_ustr, u"editmodecb"_ustr, u"enter_paste_mode_cb"_ustr, + u"formatcb"_ustr, u"exprefcb"_ustr, u"sortrefupdatecb"_ustr, + u"markhdrcb"_ustr, u"replwarncb"_ustr, u"legacy_cell_selection_cb"_ustr }; for (const auto& check : checkButton) { @@ -551,7 +551,7 @@ OUString ScTpLayoutOptions::GetAllStrings() sAllStrings += pString->get_label() + " "; } - OUString radioButton[] = { "alwaysrb", "requestrb", "neverrb" }; + OUString radioButton[] = { u"alwaysrb"_ustr, u"requestrb"_ustr, u"neverrb"_ustr }; for (const auto& radio : radioButton) { |