diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2024-06-03 09:11:36 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2024-06-03 12:07:20 +0200 |
commit | 83d0b6bd8da7495bc962b83a6638e2aaab90a5ae (patch) | |
tree | 32692c09f4c57bef78c39695d90be9d6132d0d1a | |
parent | 24b06580577425681e22472ee68ab00e9c509a83 (diff) |
loplugin:ostr in sc
Change-Id: I72438d38c75a7facb9bd5f9cfb7be1213ac3d141
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168356
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
53 files changed, 660 insertions, 656 deletions
diff --git a/sc/inc/SolverSettings.hxx b/sc/inc/SolverSettings.hxx index 9d9b96ef975f..7f328ed89eed 100644 --- a/sc/inc/SolverSettings.hxx +++ b/sc/inc/SolverSettings.hxx @@ -248,39 +248,41 @@ private: // NonNegative: for MS compatibility, use 1 for selected and 2 for not selected typedef std::vector<std::variant<OUString, SolverParameter>> TParamInfo; std::map<OUString, TParamInfo> SolverParamNames - = { { "Integer", { SP_INTEGER, "solver_int", "bool" } }, - { "NonNegative", { SP_NON_NEGATIVE, "solver_neg", "bool" } }, - { "EpsilonLevel", { SP_EPSILON_LEVEL, "solver_eps", "int" } }, - { "LimitBBDepth", { SP_LIMIT_BBDEPTH, "solver_bbd", "bool" } }, - { "Timeout", { SP_TIMEOUT, "solver_tim", "int" } }, - { "Algorithm", { SP_ALGORITHM, "solver_alg", "int" } }, + = { { u"Integer"_ustr, { SP_INTEGER, "solver_int", "bool" } }, + { u"NonNegative"_ustr, { SP_NON_NEGATIVE, "solver_neg", "bool" } }, + { u"EpsilonLevel"_ustr, { SP_EPSILON_LEVEL, "solver_eps", "int" } }, + { u"LimitBBDepth"_ustr, { SP_LIMIT_BBDEPTH, "solver_bbd", "bool" } }, + { u"Timeout"_ustr, { SP_TIMEOUT, "solver_tim", "int" } }, + { u"Algorithm"_ustr, { SP_ALGORITHM, "solver_alg", "int" } }, // SCO and DEPS - { "AssumeNonNegative", { SP_NON_NEGATIVE, "solver_neg", "bool" } }, - { "SwarmSize", { SP_SWARM_SIZE, "solver_ssz", "int" } }, - { "LearningCycles", { SP_LEARNING_CYCLES, "solver_lcy", "int" } }, - { "GuessVariableRange", { SP_GUESS_VARIABLE_RANGE, "solver_gvr", "bool" } }, - { "VariableRangeThreshold", { SP_VARIABLE_RANGE_THRESHOLD, "solver_vrt", "double" } }, - { "UseACRComparator", { SP_ACR_COMPARATOR, "solver_acr", "bool" } }, - { "UseRandomStartingPoint", { SP_RND_STARTING_POINT, "solver_rsp", "bool" } }, - { "UseStrongerPRNG", { SP_STRONGER_PRNG, "solver_prng", "bool" } }, - { "StagnationLimit", { SP_STAGNATION_LIMIT, "solver_slim", "int" } }, - { "Tolerance", { SP_STAGNATION_TOLERANCE, "solver_stol", "double" } }, - { "EnhancedSolverStatus", { SP_ENHANCED_STATUS, "solver_enst", "bool" } }, + { u"AssumeNonNegative"_ustr, { SP_NON_NEGATIVE, "solver_neg", "bool" } }, + { u"SwarmSize"_ustr, { SP_SWARM_SIZE, "solver_ssz", "int" } }, + { u"LearningCycles"_ustr, { SP_LEARNING_CYCLES, "solver_lcy", "int" } }, + { u"GuessVariableRange"_ustr, { SP_GUESS_VARIABLE_RANGE, "solver_gvr", "bool" } }, + { u"VariableRangeThreshold"_ustr, + { SP_VARIABLE_RANGE_THRESHOLD, "solver_vrt", "double" } }, + { u"UseACRComparator"_ustr, { SP_ACR_COMPARATOR, "solver_acr", "bool" } }, + { u"UseRandomStartingPoint"_ustr, { SP_RND_STARTING_POINT, "solver_rsp", "bool" } }, + { u"UseStrongerPRNG"_ustr, { SP_STRONGER_PRNG, "solver_prng", "bool" } }, + { u"StagnationLimit"_ustr, { SP_STAGNATION_LIMIT, "solver_slim", "int" } }, + { u"Tolerance"_ustr, { SP_STAGNATION_TOLERANCE, "solver_stol", "double" } }, + { u"EnhancedSolverStatus"_ustr, { SP_ENHANCED_STATUS, "solver_enst", "bool" } }, // DEPS only - { "AgentSwitchRate", { SP_AGENT_SWITCH_RATE, "solver_asr", "double" } }, - { "DEFactorMin", { SP_SCALING_MIN, "solver_smin", "double" } }, - { "DEFactorMax", { SP_SCALING_MAX, "solver_smax", "double" } }, - { "DECR", { SP_CROSSOVER_PROB, "solver_crpb", "double" } }, - { "PSC1", { SP_COGNITIVE_CONST, "solver_cog", "double" } }, - { "PSC2", { SP_SOCIAL_CONST, "solver_soc", "double" } }, - { "PSWeight", { SP_CONSTRICTION_COEFF, "solver_ccoeff", "double" } }, - { "PSCL", { SP_MUTATION_PROB, "solver_mtpb", "double" } }, + { u"AgentSwitchRate"_ustr, { SP_AGENT_SWITCH_RATE, "solver_asr", "double" } }, + { u"DEFactorMin"_ustr, { SP_SCALING_MIN, "solver_smin", "double" } }, + { u"DEFactorMax"_ustr, { SP_SCALING_MAX, "solver_smax", "double" } }, + { u"DECR"_ustr, { SP_CROSSOVER_PROB, "solver_crpb", "double" } }, + { u"PSC1"_ustr, { SP_COGNITIVE_CONST, "solver_cog", "double" } }, + { u"PSC2"_ustr, { SP_SOCIAL_CONST, "solver_soc", "double" } }, + { u"PSWeight"_ustr, { SP_CONSTRICTION_COEFF, "solver_ccoeff", "double" } }, + { u"PSCL"_ustr, { SP_MUTATION_PROB, "solver_mtpb", "double" } }, // SCO only - { "LibrarySize", { SP_LIBRARY_SIZE, "solver_lbsz", "int" } } }; + { u"LibrarySize"_ustr, { SP_LIBRARY_SIZE, "solver_lbsz", "int" } } }; // Stores the roots used for named ranges of constraint parts // Items here must be in the same order as in ConstraintPart enum - std::vector<OUString> m_aConstraintParts{ "solver_lhs", "solver_rel", "solver_rhs" }; + std::vector<OUString> m_aConstraintParts{ u"solver_lhs"_ustr, u"solver_rel"_ustr, + u"solver_rhs"_ustr }; public: /* A SolverSettings object is linked to the ScTable where solver parameters diff --git a/sc/inc/appluno.hxx b/sc/inc/appluno.hxx index c1dcc4b5fb82..b05afb09617b 100644 --- a/sc/inc/appluno.hxx +++ b/sc/inc/appluno.hxx @@ -68,82 +68,82 @@ public: // XGlobalSheetSettings virtual sal_Bool SAL_CALL getMoveSelection() override - { return getPropertyBool("MoveSelection"); } + { return getPropertyBool(u"MoveSelection"_ustr); } virtual void SAL_CALL setMoveSelection(sal_Bool p1) override - { setProperty("MoveSelection", static_cast<bool>(p1)); } + { setProperty(u"MoveSelection"_ustr, static_cast<bool>(p1)); } virtual sal_Int16 SAL_CALL getMoveDirection() override - { return getPropertyInt16("MoveDirection"); } + { return getPropertyInt16(u"MoveDirection"_ustr); } virtual void SAL_CALL setMoveDirection(sal_Int16 p1) override - { setProperty("MoveDirection", p1); } + { setProperty(u"MoveDirection"_ustr, p1); } virtual sal_Bool SAL_CALL getEnterEdit() override - { return getPropertyBool("EnterEdit"); } + { return getPropertyBool(u"EnterEdit"_ustr); } virtual void SAL_CALL setEnterEdit(sal_Bool p1) override - { setProperty("EnterEdit", static_cast<bool>(p1)); } + { setProperty(u"EnterEdit"_ustr, static_cast<bool>(p1)); } virtual sal_Bool SAL_CALL getExtendFormat() override - { return getPropertyBool("ExtendFormat"); } + { return getPropertyBool(u"ExtendFormat"_ustr); } virtual void SAL_CALL setExtendFormat(sal_Bool p1) override - { setProperty("ExtendFormat", static_cast<bool>(p1)); } + { setProperty(u"ExtendFormat"_ustr, static_cast<bool>(p1)); } virtual sal_Bool SAL_CALL getRangeFinder() override - { return getPropertyBool("RangeFinder"); } + { return getPropertyBool(u"RangeFinder"_ustr); } virtual void SAL_CALL setRangeFinder(sal_Bool p1) override - { setProperty("RangeFinder", static_cast<bool>(p1)); } + { setProperty(u"RangeFinder"_ustr, static_cast<bool>(p1)); } virtual sal_Bool SAL_CALL getExpandReferences() override - { return getPropertyBool("ExpandReferences"); } + { return getPropertyBool(u"ExpandReferences"_ustr); } virtual void SAL_CALL setExpandReferences(sal_Bool p1) override - { setProperty("ExpandReferences", static_cast<bool>(p1)); } + { setProperty(u"ExpandReferences"_ustr, static_cast<bool>(p1)); } virtual sal_Bool SAL_CALL getMarkHeader() override - { return getPropertyBool("MarkHeader"); } + { return getPropertyBool(u"MarkHeader"_ustr); } virtual void SAL_CALL setMarkHeader(sal_Bool p1) override - { setProperty("MarkHeader", static_cast<bool>(p1)); } + { setProperty(u"MarkHeader"_ustr, static_cast<bool>(p1)); } virtual sal_Bool SAL_CALL getUseTabCol() override - { return getPropertyBool("UseTabCol"); } + { return getPropertyBool(u"UseTabCol"_ustr); } virtual void SAL_CALL setUseTabCol(sal_Bool p1) override - { setProperty("UseTabCol", static_cast<bool>(p1)); } + { setProperty(u"UseTabCol"_ustr, static_cast<bool>(p1)); } virtual sal_Int16 SAL_CALL getMetric() override - { return getPropertyInt16("Metric"); } + { return getPropertyInt16(u"Metric"_ustr); } virtual void SAL_CALL setMetric(sal_Int16 p1) override - { setProperty("Metric", p1); } + { setProperty(u"Metric"_ustr, p1); } virtual sal_Int16 SAL_CALL getScale() override - { return getPropertyInt16("Scale"); } + { return getPropertyInt16(u"Scale"_ustr); } virtual void SAL_CALL setScale(sal_Int16 p1) override - { setProperty("Scale", p1); } + { setProperty(u"Scale"_ustr, p1); } virtual sal_Bool SAL_CALL getDoAutoComplete() override - { return getPropertyBool("DoAutoComplete"); } + { return getPropertyBool(u"DoAutoComplete"_ustr); } virtual void SAL_CALL setDoAutoComplete(sal_Bool p1) override - { setProperty("DoAutoComplete", static_cast<bool>(p1)); } + { setProperty(u"DoAutoComplete"_ustr, static_cast<bool>(p1)); } virtual sal_Int16 SAL_CALL getStatusBarFunction() override - { return getPropertyInt16("StatusBarFunction"); } + { return getPropertyInt16(u"StatusBarFunction"_ustr); } virtual void SAL_CALL setStatusBarFunction(sal_Int16 p1) override - { setProperty("StatusBarFunction", p1); } + { setProperty(u"StatusBarFunction"_ustr, p1); } virtual css::uno::Sequence<OUString> SAL_CALL getUserLists() override { - css::uno::Any any = getPropertyValue("UserLists"); + css::uno::Any any = getPropertyValue(u"UserLists"_ustr); css::uno::Sequence<OUString> b; any >>= b; return b; } virtual void SAL_CALL setUserLists(const css::uno::Sequence<OUString>& p1) override - { setPropertyValue( "UserLists", css::uno::Any(p1) ); } + { setPropertyValue( u"UserLists"_ustr, css::uno::Any(p1) ); } virtual sal_Int16 SAL_CALL getLinkUpdateMode() override - { return getPropertyInt16("LinkUpdateMode"); } + { return getPropertyInt16(u"LinkUpdateMode"_ustr); } virtual void SAL_CALL setLinkUpdateMode(sal_Int16 p1) override - { setProperty("LinkUpdateMode", p1); } + { setProperty(u"LinkUpdateMode"_ustr, p1); } virtual sal_Bool SAL_CALL getPrintAllSheets() override - { return getPropertyBool("PrintAllSheets"); } + { return getPropertyBool(u"PrintAllSheets"_ustr); } virtual void SAL_CALL setPrintAllSheets(sal_Bool p1) override - { setProperty("PrintAllSheets", static_cast<bool>(p1)); } + { setProperty(u"PrintAllSheets"_ustr, static_cast<bool>(p1)); } virtual sal_Bool SAL_CALL getPrintEmptyPages() override - { return getPropertyBool("PrintEmptyPages"); } + { return getPropertyBool(u"PrintEmptyPages"_ustr); } virtual void SAL_CALL setPrintEmptyPages(sal_Bool p1) override - { setProperty("PrintEmptyPages", static_cast<bool>(p1)); } + { setProperty(u"PrintEmptyPages"_ustr, static_cast<bool>(p1)); } virtual sal_Bool SAL_CALL getUsePrinterMetrics() override - { return getPropertyBool("UsePrinterMetrics"); } + { return getPropertyBool(u"UsePrinterMetrics"_ustr); } virtual void SAL_CALL setUsePrinterMetrics(sal_Bool p1) override - { setProperty("UsePrinterMetrics", static_cast<bool>(p1)); } + { setProperty(u"UsePrinterMetrics"_ustr, static_cast<bool>(p1)); } virtual sal_Bool SAL_CALL getReplaceCellsWarning() override - { return getPropertyBool("ReplaceCellsWarning"); } + { return getPropertyBool(u"ReplaceCellsWarning"_ustr); } virtual void SAL_CALL setReplaceCellsWarning(sal_Bool p1) override - { setProperty("ReplaceCellsWarning", static_cast<bool>(p1)); } + { setProperty(u"ReplaceCellsWarning"_ustr, static_cast<bool>(p1)); } // XPropertySet virtual css::uno::Reference< css::beans::XPropertySetInfo > diff --git a/sc/source/ui/app/drwtrans.cxx b/sc/source/ui/app/drwtrans.cxx index d66b32aba4bc..c6dd8a773f8d 100644 --- a/sc/source/ui/app/drwtrans.cxx +++ b/sc/source/ui/app/drwtrans.cxx @@ -129,7 +129,7 @@ ScDrawTransferObj::ScDrawTransferObj( std::unique_ptr<SdrModel> pClipModel, ScDo uno::Reference< beans::XPropertySet > xPropSet( xControlModel, uno::UNO_QUERY ); uno::Reference< beans::XPropertySetInfo > xInfo = xPropSet->getPropertySetInfo(); - OUString sPropButtonType( "ButtonType" ); + OUString sPropButtonType( u"ButtonType"_ustr ); if(xInfo->hasPropertyByName( sPropButtonType )) { @@ -138,7 +138,7 @@ ScDrawTransferObj::ScDrawTransferObj( std::unique_ptr<SdrModel> pClipModel, ScDo if ( (aAny >>= eTmp) && eTmp == form::FormButtonType_URL ) { // URL - OUString sPropTargetURL( "TargetURL" ); + OUString sPropTargetURL( u"TargetURL"_ustr ); if(xInfo->hasPropertyByName( sPropTargetURL )) { aAny = xPropSet->getPropertyValue( sPropTargetURL ); @@ -161,7 +161,7 @@ ScDrawTransferObj::ScDrawTransferObj( std::unique_ptr<SdrModel> pClipModel, ScDo // Label OUString aLabel; - OUString sPropLabel( "Label" ); + OUString sPropLabel( u"Label"_ustr ); if(xInfo->hasPropertyByName( sPropLabel )) { aAny = xPropSet->getPropertyValue( sPropLabel ); @@ -489,7 +489,7 @@ bool ScDrawTransferObj::WriteObject( SvStream& rOStm, void* pUserObject, sal_uIn try { uno::Sequence < beans::PropertyValue > aSeq; - OUString aDummyName("Dummy"); + OUString aDummyName(u"Dummy"_ustr); xPers->storeToEntry( xWorkStore, aDummyName, aSeq, aSeq ); if ( xWorkStore->isStreamElement( aDummyName ) ) { diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx index 85ecd8fe4cea..93f2c3d92c2b 100644 --- a/sc/source/ui/app/inputhdl.cxx +++ b/sc/source/ui/app/inputhdl.cxx @@ -366,7 +366,7 @@ void ScInputHandler::InitRangeFinder( const OUString& rFormula ) ScDocument& rDoc = pDocSh->GetDocument(); const sal_Unicode cSheetSep = rDoc.GetSheetSeparator(); - OUString aDelimiters = ScEditUtil::ModifyDelimiters(" !~%\"\t\n"); + OUString aDelimiters = ScEditUtil::ModifyDelimiters(u" !~%\"\t\n"_ustr); // delimiters (in addition to ScEditUtil): only characters that are // allowed in formulas next to references and the quotation mark (so // string constants can be skipped) @@ -1854,7 +1854,7 @@ void ScTabViewShell::SendFormulabarUpdate::Send() (*pData)["text"_ostr] = m_aText; (*pData)["selection"_ostr] = m_aSelection; OUString sWindowId = OUString::number(m_nShellId) + "formulabar"; - jsdialog::SendAction(sWindowId, "sc_input_window", std::move(pData)); + jsdialog::SendAction(sWindowId, u"sc_input_window"_ustr, std::move(pData)); } // Calculate selection and display as tip help @@ -3767,12 +3767,12 @@ void ScInputHandler::ClearText() if (pTableView) { - pTableView->getEditEngine().SetText( "" ); + pTableView->getEditEngine().SetText( u""_ustr ); pTableView->SetSelection( ESelection(0,0, 0,0) ); } if (pTopView) { - pTopView->getEditEngine().SetText( "" ); + pTopView->getEditEngine().SetText( u""_ustr ); pTopView->SetSelection( ESelection(0,0, 0,0) ); } @@ -4186,12 +4186,12 @@ void ScInputHandler::InputCommand( const CommandEvent& rCEvt ) { if (pTableView) { - pTableView->getEditEngine().SetText( "" ); + pTableView->getEditEngine().SetText( u""_ustr ); pTableView->SetSelection( ESelection(0,0, 0,0) ); } if (pTopView) { - pTopView->getEditEngine().SetText( "" ); + pTopView->getEditEngine().SetText( u""_ustr ); pTopView->SetSelection( ESelection(0,0, 0,0) ); } } diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx index e447045e4b51..8e07cc79bf78 100644 --- a/sc/source/ui/app/inputwin.cxx +++ b/sc/source/ui/app/inputwin.cxx @@ -414,7 +414,7 @@ void ScInputWindow::StartFormula() nEndPos = nLen; break; default: - mxTextWindow->SetTextString("=", true); + mxTextWindow->SetTextString(u"="_ustr, true); break; } } @@ -859,11 +859,11 @@ void ScInputWindow::AutoSum( bool& bRangeFinder, bool& bSubTotal, OpCode eCode ) } ScInputBarGroup::ScInputBarGroup(vcl::Window* pParent, ScTabViewShell* pViewSh) - : InterimItemWindow(pParent, "modules/scalc/ui/inputbar.ui", "InputBar", true, reinterpret_cast<sal_uInt64>(pViewSh)) - , mxBackground(m_xBuilder->weld_container("background")) + : InterimItemWindow(pParent, u"modules/scalc/ui/inputbar.ui"_ustr, u"InputBar"_ustr, true, reinterpret_cast<sal_uInt64>(pViewSh)) + , mxBackground(m_xBuilder->weld_container(u"background"_ustr)) , mxTextWndGroup(new ScTextWndGroup(*this, pViewSh)) - , mxButtonUp(m_xBuilder->weld_button("up")) - , mxButtonDown(m_xBuilder->weld_button("down")) + , mxButtonUp(m_xBuilder->weld_button(u"up"_ustr)) + , mxButtonDown(m_xBuilder->weld_button(u"down"_ustr)) { InitControlBase(m_xContainer.get()); @@ -1073,8 +1073,8 @@ IMPL_LINK_NOARG(ScInputWindow, DropdownClickHdl, ToolBox *, void) { tools::Rectangle aRect(GetItemRect(SID_INPUT_SUM)); weld::Window* pPopupParent = weld::GetPopupParent(*this, aRect); - std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(pPopupParent, "modules/scalc/ui/autosum.ui")); - std::unique_ptr<weld::Menu> xPopMenu(xBuilder->weld_menu("menu")); + std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(pPopupParent, u"modules/scalc/ui/autosum.ui"_ustr)); + std::unique_ptr<weld::Menu> xPopMenu(xBuilder->weld_menu(u"menu"_ustr)); MenuHdl(xPopMenu->popup_at_rect(pPopupParent, aRect)); } } @@ -1128,7 +1128,7 @@ void ScInputBarGroup::TriggerToolboxLayout() if ( xPropSet.is() ) { - css::uno::Any aValue = xPropSet->getPropertyValue("LayoutManager"); + css::uno::Any aValue = xPropSet->getPropertyValue(u"LayoutManager"_ustr); aValue >>= xLayoutManager; } @@ -1165,15 +1165,15 @@ constexpr tools::Long gnBorderHeight = INPUTLINE_INSET_MARGIN + 1; ScTextWndGroup::ScTextWndGroup(ScInputBarGroup& rParent, ScTabViewShell* pViewSh) : mxTextWnd(new ScTextWnd(*this, pViewSh)) - , mxScrollWin(rParent.GetBuilder().weld_scrolled_window("scrolledwindow", true)) - , mxTextWndWin(new weld::CustomWeld(rParent.GetBuilder(), "sc_input_window", *mxTextWnd)) + , mxScrollWin(rParent.GetBuilder().weld_scrolled_window(u"scrolledwindow"_ustr, true)) + , mxTextWndWin(new weld::CustomWeld(rParent.GetBuilder(), u"sc_input_window"_ustr, *mxTextWnd)) , mrParent(rParent) { mxScrollWin->connect_vadjustment_changed(LINK(this, ScTextWndGroup, Impl_ScrollHdl)); if (ScTabViewShell* pActiveViewShell = comphelper::LibreOfficeKit::isActive() ? dynamic_cast<ScTabViewShell*>(SfxViewShell::Current()) : nullptr) { - pActiveViewShell->LOKSendFormulabarUpdate(nullptr, "", ESelection()); + pActiveViewShell->LOKSendFormulabarUpdate(nullptr, u""_ustr, ESelection()); } } @@ -1792,7 +1792,7 @@ bool ScTextWnd::Command( const CommandEvent& rCEvt ) if (IsMouseCaptured()) ReleaseMouse(); UpdateFocus(); - pViewFrm->GetDispatcher()->ExecutePopup("formulabar", &mrGroupBar.GetVclParent(), &aPos); + pViewFrm->GetDispatcher()->ExecutePopup(u"formulabar"_ustr, &mrGroupBar.GetVclParent(), &aPos); } } else if ( nCommand == CommandEventId::Wheel ) @@ -2251,8 +2251,8 @@ void ScTextWnd::TextGrabFocus() // Position window ScPosWnd::ScPosWnd(vcl::Window* pParent) - : InterimItemWindow(pParent, "modules/scalc/ui/posbox.ui", "PosBox") - , m_xWidget(m_xBuilder->weld_combo_box("pos_window")) + : InterimItemWindow(pParent, u"modules/scalc/ui/posbox.ui"_ustr, u"PosBox"_ustr) + , m_xWidget(m_xBuilder->weld_combo_box(u"pos_window"_ustr)) , m_nAsyncGetFocusId(nullptr) , nTipVisible(nullptr) , bFormulaMode(false) @@ -2340,7 +2340,7 @@ void ScPosWnd::FillRangeNames() ScDocument& rDoc = pDocShell->GetDocument(); m_xWidget->append_text(ScResId(STR_MANAGE_NAMES)); - m_xWidget->append_separator("separator"); + m_xWidget->append_separator(u"separator"_ustr); ScRange aDummy; std::set<OUString> aSet; diff --git a/sc/source/ui/app/msgpool.cxx b/sc/source/ui/app/msgpool.cxx index 88d720077b64..4675dc285ea0 100644 --- a/sc/source/ui/app/msgpool.cxx +++ b/sc/source/ui/app/msgpool.cxx @@ -55,7 +55,7 @@ static ItemInfoPackage& getItemInfoPackageScMessage() } ScMessagePool::ScMessagePool() -: SfxItemPool("ScMessagePool"), +: SfxItemPool(u"ScMessagePool"_ustr), pDocPool(new ScDocumentPool) { registerItemInfoPackage(getItemInfoPackageScMessage()); diff --git a/sc/source/ui/app/scdll.cxx b/sc/source/ui/app/scdll.cxx index f2fbe8d74c81..8d8cc74a31b1 100644 --- a/sc/source/ui/app/scdll.cxx +++ b/sc/source/ui/app/scdll.cxx @@ -106,7 +106,7 @@ void ScDLL::Init() ScModule* pMod = pUniqueModule.get(); SfxApplication::SetModule(SfxToolsModule::Calc, std::move(pUniqueModule)); - ScDocShell::Factory().SetDocumentServiceName( "com.sun.star.sheet.SpreadsheetDocument" ); + ScDocShell::Factory().SetDocumentServiceName( u"com.sun.star.sheet.SpreadsheetDocument"_ustr ); // Not until the ResManager is initialized // The AppOptions must be initialized not until after ScGlobal::Init diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx index b06e3385cea1..16ce1d3278a5 100644 --- a/sc/source/ui/app/scmod.cxx +++ b/sc/source/ui/app/scmod.cxx @@ -129,7 +129,7 @@ ScModule::ScModule( SfxObjectFactory* pFact ) : m_bIsInSharedDocSaving( false ) { // The ResManager (DLL data) is not yet initialized in the ctor! - SetName("StarCalc"); // for Basic + SetName(u"StarCalc"_ustr); // for Basic ResetDragObject(); @@ -364,10 +364,10 @@ void ScModule::Execute( SfxRequest& rReq ) switch ( nSlot ) { case SID_CHOOSE_DESIGN: - SfxApplication::CallAppBasic( "Template.Samples.ShowStyles" ); + SfxApplication::CallAppBasic( u"Template.Samples.ShowStyles"_ustr ); break; case SID_EURO_CONVERTER: - SfxApplication::CallAppBasic( "Euro.ConvertRun.Main" ); + SfxApplication::CallAppBasic( u"Euro.ConvertRun.Main"_ustr ); break; case SID_AUTOSPELL_CHECK: { diff --git a/sc/source/ui/app/seltrans.cxx b/sc/source/ui/app/seltrans.cxx index 3c0345e9466b..208b87528b31 100644 --- a/sc/source/ui/app/seltrans.cxx +++ b/sc/source/ui/app/seltrans.cxx @@ -53,7 +53,7 @@ static bool lcl_IsURLButton( SdrObject* pObject ) uno::Reference< beans::XPropertySet > xPropSet( xControlModel, uno::UNO_QUERY ); uno::Reference< beans::XPropertySetInfo > xInfo = xPropSet->getPropertySetInfo(); - OUString sPropButtonType( "ButtonType" ); + OUString sPropButtonType( u"ButtonType"_ustr ); if(xInfo->hasPropertyByName( sPropButtonType )) { uno::Any aAny = xPropSet->getPropertyValue( sPropButtonType ); diff --git a/sc/source/ui/attrdlg/attrdlg.cxx b/sc/source/ui/attrdlg/attrdlg.cxx index c0653ad4f1d0..ef6fecddd0b2 100644 --- a/sc/source/ui/attrdlg/attrdlg.cxx +++ b/sc/source/ui/attrdlg/attrdlg.cxx @@ -32,32 +32,32 @@ #include <osl/diagnose.h> ScAttrDlg::ScAttrDlg(weld::Window* pParent, const SfxItemSet* pCellAttrs) - : SfxTabDialogController(pParent, "modules/scalc/ui/formatcellsdialog.ui", - "FormatCellsDialog", pCellAttrs) + : SfxTabDialogController(pParent, u"modules/scalc/ui/formatcellsdialog.ui"_ustr, + u"FormatCellsDialog"_ustr, pCellAttrs) { SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create(); OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_NUMBERFORMAT ), "GetTabPageCreatorFunc fail!"); - AddTabPage( "numbers", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_NUMBERFORMAT ), nullptr ); + AddTabPage( u"numbers"_ustr, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_NUMBERFORMAT ), nullptr ); OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_NAME ), "GetTabPageCreatorFunc fail!"); - AddTabPage( "font", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_NAME ), nullptr ); + AddTabPage( u"font"_ustr, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_NAME ), nullptr ); OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_EFFECTS ), "GetTabPageCreatorFunc fail!"); - AddTabPage( "fonteffects", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_EFFECTS ), nullptr ); + AddTabPage( u"fonteffects"_ustr, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_EFFECTS ), nullptr ); OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_ALIGNMENT ), "GetTabPageCreatorFunc fail!"); - AddTabPage( "alignment", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_ALIGNMENT ), nullptr ); + AddTabPage( u"alignment"_ustr, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_ALIGNMENT ), nullptr ); if (SvtCJKOptions::IsAsianTypographyEnabled()) { OSL_ENSURE(pFact->GetTabPageCreatorFunc(RID_SVXPAGE_PARA_ASIAN), "GetTabPageCreatorFunc fail!"); - AddTabPage( "asiantypography", pFact->GetTabPageCreatorFunc(RID_SVXPAGE_PARA_ASIAN), nullptr ); + AddTabPage( u"asiantypography"_ustr, pFact->GetTabPageCreatorFunc(RID_SVXPAGE_PARA_ASIAN), nullptr ); } else - RemoveTabPage( "asiantypography" ); + RemoveTabPage( u"asiantypography"_ustr ); OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), "GetTabPageCreatorFunc fail!"); - AddTabPage( "borders", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), nullptr ); + AddTabPage( u"borders"_ustr, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), nullptr ); OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BKG ), "GetTabPageCreatorFunc fail!"); - AddTabPage( "background", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BKG ), nullptr ); - AddTabPage( "cellprotection" , ScTabPageProtection::Create, nullptr ); + AddTabPage( u"background"_ustr, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BKG ), nullptr ); + AddTabPage( u"cellprotection"_ustr , ScTabPageProtection::Create, nullptr ); } ScAttrDlg::~ScAttrDlg() diff --git a/sc/source/ui/attrdlg/scuiexp.cxx b/sc/source/ui/attrdlg/scuiexp.cxx index 1179050037b2..3da9d2ed7b42 100644 --- a/sc/source/ui/attrdlg/scuiexp.cxx +++ b/sc/source/ui/attrdlg/scuiexp.cxx @@ -33,7 +33,7 @@ public: // css::lang::XServiceInfo: virtual OUString SAL_CALL getImplementationName() override { - return "com.sun.star.sheet.comp.CreateDialogFactoryService"; + return u"com.sun.star.sheet.comp.CreateDialogFactoryService"_ustr; } virtual sal_Bool SAL_CALL supportsService(const OUString& serviceName) override { @@ -41,7 +41,7 @@ public: } virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override { - return { "com.sun.star.sheet.CreateDialogFactoryService" }; + return { u"com.sun.star.sheet.CreateDialogFactoryService"_ustr }; } // XUnoTunnel diff --git a/sc/source/ui/attrdlg/tabpages.cxx b/sc/source/ui/attrdlg/tabpages.cxx index 708fc4c630d6..34931979499a 100644 --- a/sc/source/ui/attrdlg/tabpages.cxx +++ b/sc/source/ui/attrdlg/tabpages.cxx @@ -31,11 +31,11 @@ const WhichRangesContainer ScTabPageProtection::pProtectionRanges( // Zellschutz-Tabpage: ScTabPageProtection::ScTabPageProtection(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rCoreAttrs) - : SfxTabPage(pPage, pController, "modules/scalc/ui/cellprotectionpage.ui", "CellProtectionPage", &rCoreAttrs) - , m_xBtnHideCell(m_xBuilder->weld_check_button("checkHideAll")) - , m_xBtnProtect(m_xBuilder->weld_check_button("checkProtected")) - , m_xBtnHideFormula(m_xBuilder->weld_check_button("checkHideFormula")) - , m_xBtnHidePrint(m_xBuilder->weld_check_button("checkHidePrinting")) + : SfxTabPage(pPage, pController, u"modules/scalc/ui/cellprotectionpage.ui"_ustr, u"CellProtectionPage"_ustr, &rCoreAttrs) + , m_xBtnHideCell(m_xBuilder->weld_check_button(u"checkHideAll"_ustr)) + , m_xBtnProtect(m_xBuilder->weld_check_button(u"checkProtected"_ustr)) + , m_xBtnHideFormula(m_xBuilder->weld_check_button(u"checkHideFormula"_ustr)) + , m_xBtnHidePrint(m_xBuilder->weld_check_button(u"checkHidePrinting"_ustr)) { // This Page need ExchangeSupport SetExchangeSupport(); diff --git a/sc/source/ui/cctrl/cbnumberformat.cxx b/sc/source/ui/cctrl/cbnumberformat.cxx index 760d6a7f9ca1..e340f3bf63f4 100644 --- a/sc/source/ui/cctrl/cbnumberformat.cxx +++ b/sc/source/ui/cctrl/cbnumberformat.cxx @@ -28,9 +28,9 @@ #include <sc.hrc> ScNumberFormat::ScNumberFormat(vcl::Window* pParent) - : InterimItemWindow(pParent, "modules/scalc/ui/numberbox.ui", "NumberBox", true, + : InterimItemWindow(pParent, u"modules/scalc/ui/numberbox.ui"_ustr, u"NumberBox"_ustr, true, reinterpret_cast<sal_uInt64>(SfxViewShell::Current())) - , m_xWidget(m_xBuilder->weld_combo_box("numbertype")) + , m_xWidget(m_xBuilder->weld_combo_box(u"numbertype"_ustr)) { m_xWidget->append_text(ScResId(STR_GENERAL)); m_xWidget->append_text(ScResId(STR_NUMBER)); diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx index 45202de94fb4..792bd3aebd99 100644 --- a/sc/source/ui/cctrl/checklistmenu.cxx +++ b/sc/source/ui/cctrl/checklistmenu.cxx @@ -545,26 +545,26 @@ constexpr int nColorListVisibleRows = 9; ScCheckListMenuControl::ScCheckListMenuControl(weld::Widget* pParent, ScViewData& rViewData, bool bHasDates, int nWidth, bool bIsMultiField) - : mxBuilder(Application::CreateBuilder(pParent, "modules/scalc/ui/filterdropdown.ui")) - , mxPopover(mxBuilder->weld_popover("FilterDropDown")) - , mxContainer(mxBuilder->weld_container("container")) - , mxMenu(mxBuilder->weld_tree_view("menu")) + : mxBuilder(Application::CreateBuilder(pParent, u"modules/scalc/ui/filterdropdown.ui"_ustr)) + , mxPopover(mxBuilder->weld_popover(u"FilterDropDown"_ustr)) + , mxContainer(mxBuilder->weld_container(u"container"_ustr)) + , mxMenu(mxBuilder->weld_tree_view(u"menu"_ustr)) , mxScratchIter(mxMenu->make_iterator()) - , mxNonMenu(mxBuilder->weld_widget("nonmenu")) - , mxFieldsComboLabel(mxBuilder->weld_label("select_field_label")) - , mxFieldsCombo(mxBuilder->weld_combo_box("multi_field_combo")) - , mxEdSearch(mxBuilder->weld_entry("search_edit")) - , mxBox(mxBuilder->weld_widget("box")) - , mxListChecks(mxBuilder->weld_tree_view("check_list_box")) - , mxTreeChecks(mxBuilder->weld_tree_view("check_tree_box")) - , mxChkToggleAll(mxBuilder->weld_check_button("toggle_all")) - , mxChkLockChecked(mxBuilder->weld_check_button("lock_checked")) - , mxBtnSelectSingle(mxBuilder->weld_button("select_current")) - , mxBtnUnselectSingle(mxBuilder->weld_button("unselect_current")) - , mxButtonBox(mxBuilder->weld_box("buttonbox")) - , mxBtnOk(mxBuilder->weld_button("ok")) - , mxBtnCancel(mxBuilder->weld_button("cancel")) - , mxContextMenu(mxBuilder->weld_menu("contextmenu")) + , mxNonMenu(mxBuilder->weld_widget(u"nonmenu"_ustr)) + , mxFieldsComboLabel(mxBuilder->weld_label(u"select_field_label"_ustr)) + , mxFieldsCombo(mxBuilder->weld_combo_box(u"multi_field_combo"_ustr)) + , mxEdSearch(mxBuilder->weld_entry(u"search_edit"_ustr)) + , mxBox(mxBuilder->weld_widget(u"box"_ustr)) + , mxListChecks(mxBuilder->weld_tree_view(u"check_list_box"_ustr)) + , mxTreeChecks(mxBuilder->weld_tree_view(u"check_tree_box"_ustr)) + , mxChkToggleAll(mxBuilder->weld_check_button(u"toggle_all"_ustr)) + , mxChkLockChecked(mxBuilder->weld_check_button(u"lock_checked"_ustr)) + , mxBtnSelectSingle(mxBuilder->weld_button(u"select_current"_ustr)) + , mxBtnUnselectSingle(mxBuilder->weld_button(u"unselect_current"_ustr)) + , mxButtonBox(mxBuilder->weld_box(u"buttonbox"_ustr)) + , mxBtnOk(mxBuilder->weld_button(u"ok"_ustr)) + , mxBtnCancel(mxBuilder->weld_button(u"cancel"_ustr)) + , mxContextMenu(mxBuilder->weld_menu(u"contextmenu"_ustr)) , mxDropDown(mxMenu->create_virtual_device()) , mnCheckWidthReq(-1) , mnWndWidth(0) @@ -763,8 +763,8 @@ IMPL_LINK(ScCheckListMenuControl, CommandHdl, const CommandEvent&, rCEvt, bool) if (rCEvt.GetCommand() != CommandEventId::ContextMenu) return false; - mxContextMenu->set_sensitive("less", mnCheckListVisibleRows > 4); - mxContextMenu->set_sensitive("more", mnCheckListVisibleRows < 42); + mxContextMenu->set_sensitive(u"less"_ustr, mnCheckListVisibleRows > 4); + mxContextMenu->set_sensitive(u"more"_ustr, mnCheckListVisibleRows < 42); OUString sCommand = mxContextMenu->popup_at_rect(mpChecks, tools::Rectangle(rCEvt.GetMousePosPixel(), Size(1,1))); if (sCommand.isEmpty()) @@ -1721,12 +1721,12 @@ int ScCheckListMenuControl::IncreaseWindowWidthToFitText(int nMaxTextWidth) } ScListSubMenuControl::ScListSubMenuControl(weld::Widget* pParent, ScCheckListMenuControl& rParentControl, bool bColorMenu) - : mxBuilder(Application::CreateBuilder(pParent, "modules/scalc/ui/filtersubdropdown.ui")) - , mxPopover(mxBuilder->weld_popover("FilterSubDropDown")) - , mxContainer(mxBuilder->weld_container("container")) - , mxMenu(mxBuilder->weld_tree_view("menu")) - , mxBackColorMenu(mxBuilder->weld_tree_view("background")) - , mxTextColorMenu(mxBuilder->weld_tree_view("textcolor")) + : mxBuilder(Application::CreateBuilder(pParent, u"modules/scalc/ui/filtersubdropdown.ui"_ustr)) + , mxPopover(mxBuilder->weld_popover(u"FilterSubDropDown"_ustr)) + , mxContainer(mxBuilder->weld_container(u"container"_ustr)) + , mxMenu(mxBuilder->weld_tree_view(u"menu"_ustr)) + , mxBackColorMenu(mxBuilder->weld_tree_view(u"background"_ustr)) + , mxTextColorMenu(mxBuilder->weld_tree_view(u"textcolor"_ustr)) , mxScratchIter(mxMenu->make_iterator()) , mrParentControl(rParentControl) , mnBackColorMenuPrefHeight(-1) diff --git a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx index 31eb73b0a8e5..4d84615b5265 100644 --- a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx +++ b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx @@ -181,11 +181,11 @@ tools::Long ScZoomSlider::Zoom2Offset( sal_uInt16 nCurrentZoom ) const ScZoomSliderWnd::ScZoomSliderWnd( vcl::Window* pParent, const css::uno::Reference< css::frame::XDispatchProvider >& rDispatchProvider, sal_uInt16 nCurrentZoom ): - InterimItemWindow(pParent, "modules/scalc/ui/zoombox.ui", "ZoomBox"), + InterimItemWindow(pParent, u"modules/scalc/ui/zoombox.ui"_ustr, u"ZoomBox"_ustr), mxWidget(new ScZoomSlider(rDispatchProvider, nCurrentZoom)), - mxPercentage(m_xBuilder->weld_label("current_zoom")), - mxLabel(m_xBuilder->weld_label("zoom_label")), - mxWeld(new weld::CustomWeld(*m_xBuilder, "zoom", *mxWidget)) + mxPercentage(m_xBuilder->weld_label(u"current_zoom"_ustr)), + mxLabel(m_xBuilder->weld_label(u"zoom_label"_ustr)), + mxWeld(new weld::CustomWeld(*m_xBuilder, u"zoom"_ustr, *mxWidget)) { Size aLogicalSize( 115, 40 ); Size aSliderSize = LogicToPixel(aLogicalSize, MapMode(MapUnit::Map10thMM)); @@ -274,9 +274,9 @@ bool ScZoomSlider::MouseButtonDown( const MouseEvent& rMEvt ) css::uno::Any a; aZoomSliderItem.QueryValue( a ); - css::uno::Sequence aArgs{ comphelper::makePropertyValue("ScalingFactor", a) }; + css::uno::Sequence aArgs{ comphelper::makePropertyValue(u"ScalingFactor"_ustr, a) }; - SfxToolBoxControl::Dispatch( m_xDispatchProvider, ".uno:ScalingFactor", aArgs ); + SfxToolBoxControl::Dispatch( m_xDispatchProvider, u".uno:ScalingFactor"_ustr, aArgs ); mbOmitPaint = false; @@ -309,9 +309,9 @@ bool ScZoomSlider::MouseMove( const MouseEvent& rMEvt ) css::uno::Any a; aZoomSliderItem.QueryValue( a ); - css::uno::Sequence aArgs{ comphelper::makePropertyValue("ScalingFactor", a) }; + css::uno::Sequence aArgs{ comphelper::makePropertyValue(u"ScalingFactor"_ustr, a) }; - SfxToolBoxControl::Dispatch( m_xDispatchProvider, ".uno:ScalingFactor", aArgs ); + SfxToolBoxControl::Dispatch( m_xDispatchProvider, u".uno:ScalingFactor"_ustr, aArgs ); mbOmitPaint = false; } diff --git a/sc/source/ui/condformat/colorformat.cxx b/sc/source/ui/condformat/colorformat.cxx index d97f53fe680c..7257fca2b469 100644 --- a/sc/source/ui/condformat/colorformat.cxx +++ b/sc/source/ui/condformat/colorformat.cxx @@ -69,24 +69,24 @@ void SetValue( const ScDocument* pDoc, const ScColorScaleEntry* pEntry, weld::En } ScDataBarSettingsDlg::ScDataBarSettingsDlg(weld::Window* pParent, const ScDataBarFormatData& rData, ScDocument* pDoc, const ScAddress& rPos) - : GenericDialogController(pParent, "modules/scalc/ui/databaroptions.ui", "DataBarOptions") + : GenericDialogController(pParent, u"modules/scalc/ui/databaroptions.ui"_ustr, u"DataBarOptions"_ustr) , mpNumberFormatter(pDoc->GetFormatTable()) , mpDoc(pDoc) , maPos(rPos) - , mxBtnOk(m_xBuilder->weld_button("ok")) - , mxLbPos(new ColorListBox(m_xBuilder->weld_menu_button("positive_colour"), [this]{ return m_xDialog.get(); })) - , mxLbNeg(new ColorListBox(m_xBuilder->weld_menu_button("negative_colour"), [this]{ return m_xDialog.get(); })) - , mxLbAxisCol(new ColorListBox(m_xBuilder->weld_menu_button("axis_colour"), [this]{ return m_xDialog.get(); })) - , mxLbFillType(m_xBuilder->weld_combo_box("fill_type")) - , mxLbTypeMin(m_xBuilder->weld_combo_box("min")) - , mxLbTypeMax(m_xBuilder->weld_combo_box("max")) - , mxLbAxisPos(m_xBuilder->weld_combo_box("axis_pos")) - , mxEdMin(m_xBuilder->weld_entry("min_value")) - , mxEdMax(m_xBuilder->weld_entry("max_value")) - , mxLenMin(m_xBuilder->weld_entry("min_length")) - , mxLenMax(m_xBuilder->weld_entry("max_length")) - , mxCbOnlyBar(m_xBuilder->weld_check_button("only_bar")) - , mxStrSameValueFT(m_xBuilder->weld_label("str_same_value")) + , mxBtnOk(m_xBuilder->weld_button(u"ok"_ustr)) + , mxLbPos(new ColorListBox(m_xBuilder->weld_menu_button(u"positive_colour"_ustr), [this]{ return m_xDialog.get(); })) + , mxLbNeg(new ColorListBox(m_xBuilder->weld_menu_button(u"negative_colour"_ustr), [this]{ return m_xDialog.get(); })) + , mxLbAxisCol(new ColorListBox(m_xBuilder->weld_menu_button(u"axis_colour"_ustr), [this]{ return m_xDialog.get(); })) + , mxLbFillType(m_xBuilder->weld_combo_box(u"fill_type"_ustr)) + , mxLbTypeMin(m_xBuilder->weld_combo_box(u"min"_ustr)) + , mxLbTypeMax(m_xBuilder->weld_combo_box(u"max"_ustr)) + , mxLbAxisPos(m_xBuilder->weld_combo_box(u"axis_pos"_ustr)) + , mxEdMin(m_xBuilder->weld_entry(u"min_value"_ustr)) + , mxEdMax(m_xBuilder->weld_entry(u"max_value"_ustr)) + , mxLenMin(m_xBuilder->weld_entry(u"min_length"_ustr)) + , mxLenMax(m_xBuilder->weld_entry(u"max_length"_ustr)) + , mxCbOnlyBar(m_xBuilder->weld_check_button(u"only_bar"_ustr)) + , mxStrSameValueFT(m_xBuilder->weld_label(u"str_same_value"_ustr)) { maStrWarnSameValue = mxStrSameValueFT->get_label(); diff --git a/sc/source/ui/condformat/condformatdlg.cxx b/sc/source/ui/condformat/condformatdlg.cxx index cef7de276439..8c608597cab0 100644 --- a/sc/source/ui/condformat/condformatdlg.cxx +++ b/sc/source/ui/condformat/condformatdlg.cxx @@ -424,24 +424,24 @@ ScCondFormatDlg::ScCondFormatDlg(SfxBindings* pB, SfxChildWindow* pCW, weld::Window* pParent, ScViewData* pViewData, const std::shared_ptr<ScCondFormatDlgData>& rItem) : ScAnyRefDlgController(pB, pCW, pParent, - isLOKMobilePhone()?OUString("modules/scalc/ui/conditionalformatdialogmobile.ui"):OUString("modules/scalc/ui/conditionalformatdialog.ui"), - "ConditionalFormatDialog") + isLOKMobilePhone()?u"modules/scalc/ui/conditionalformatdialogmobile.ui"_ustr:u"modules/scalc/ui/conditionalformatdialog.ui"_ustr, + u"ConditionalFormatDialog"_ustr) , mpViewData(pViewData) // previous version based on SfxPoolItem used SfxPoolItem::Clone here, so make a copy // using copy constructor , mpDlgItem(std::make_shared<ScCondFormatDlgData>(*rItem)) , mpLastEdit(nullptr) - , mxBtnOk(m_xBuilder->weld_button("ok")) - , mxBtnAdd(m_xBuilder->weld_button("add")) - , mxBtnRemove(m_xBuilder->weld_button("delete")) - , mxBtnUp(m_xBuilder->weld_button("up")) - , mxBtnDown(m_xBuilder->weld_button("down")) - , mxBtnCancel(m_xBuilder->weld_button("cancel")) - , mxFtRange(m_xBuilder->weld_label("ftassign")) - , mxEdRange(new formula::RefEdit(m_xBuilder->weld_entry("edassign"))) - , mxRbRange(new formula::RefButton(m_xBuilder->weld_button("rbassign"))) - , mxCondFormList(new ScCondFormatList(this, m_xBuilder->weld_scrolled_window("listwindow"), - m_xBuilder->weld_container("list"))) + , mxBtnOk(m_xBuilder->weld_button(u"ok"_ustr)) + , mxBtnAdd(m_xBuilder->weld_button(u"add"_ustr)) + , mxBtnRemove(m_xBuilder->weld_button(u"delete"_ustr)) + , mxBtnUp(m_xBuilder->weld_button(u"up"_ustr)) + , mxBtnDown(m_xBuilder->weld_button(u"down"_ustr)) + , mxBtnCancel(m_xBuilder->weld_button(u"cancel"_ustr)) + , mxFtRange(m_xBuilder->weld_label(u"ftassign"_ustr)) + , mxEdRange(new formula::RefEdit(m_xBuilder->weld_entry(u"edassign"_ustr))) + , mxRbRange(new formula::RefButton(m_xBuilder->weld_button(u"rbassign"_ustr))) + , mxCondFormList(new ScCondFormatList(this, m_xBuilder->weld_scrolled_window(u"listwindow"_ustr), + m_xBuilder->weld_container(u"list"_ustr))) { mxEdRange->SetReferences(this, mxFtRange.get()); mxRbRange->SetReferences(this, mxEdRange.get()); diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx b/sc/source/ui/condformat/condformatdlgentry.cxx index 01d13c821981..f08d23bd977b 100644 --- a/sc/source/ui/condformat/condformatdlgentry.cxx +++ b/sc/source/ui/condformat/condformatdlgentry.cxx @@ -52,14 +52,14 @@ static bool isLOKMobilePhone() ScCondFrmtEntry::ScCondFrmtEntry(ScCondFormatList* pParent, ScDocument* pDoc, const ScAddress& rPos) : mpParent(pParent) - , mxBuilder(Application::CreateBuilder(pParent->GetContainer(), isLOKMobilePhone()?OUString("modules/scalc/ui/conditionalentrymobile.ui"):OUString("modules/scalc/ui/conditionalentry.ui"))) - , mxBorder(mxBuilder->weld_widget("border")) - , mxGrid(mxBuilder->weld_container("grid")) - , mxFtCondNr(mxBuilder->weld_label("number")) - , mxFtCondition(mxBuilder->weld_label("condition")) + , mxBuilder(Application::CreateBuilder(pParent->GetContainer(), isLOKMobilePhone()?u"modules/scalc/ui/conditionalentrymobile.ui"_ustr:u"modules/scalc/ui/conditionalentry.ui"_ustr)) + , mxBorder(mxBuilder->weld_widget(u"border"_ustr)) + , mxGrid(mxBuilder->weld_container(u"grid"_ustr)) + , mxFtCondNr(mxBuilder->weld_label(u"number"_ustr)) + , mxFtCondition(mxBuilder->weld_label(u"condition"_ustr)) , mbActive(false) , maStrCondition(ScResId(SCSTR_CONDITION)) - , mxLbType(mxBuilder->weld_combo_box("type")) + , mxLbType(mxBuilder->weld_combo_box(u"type"_ustr)) , mpDoc(pDoc) , maPos(rPos) { @@ -158,14 +158,14 @@ const ScConditionMode ScConditionFrmtEntry::mpEntryToCond[ScConditionFrmtEntry:: ScConditionFrmtEntry::ScConditionFrmtEntry(ScCondFormatList* pParent, ScDocument* pDoc, ScCondFormatDlg* pDialogParent, const ScAddress& rPos, const ScCondFormatEntry* pFormatEntry) : ScCondFrmtEntry(pParent, pDoc, rPos) - , mxLbCondType(mxBuilder->weld_combo_box("typeis")) - , mxEdVal1(new formula::RefEdit(mxBuilder->weld_entry("val1"))) - , mxEdVal2(new formula::RefEdit(mxBuilder->weld_entry("val2"))) - , mxFtVal(mxBuilder->weld_label("valueft")) - , mxFtStyle(mxBuilder->weld_label("styleft")) - , mxLbStyle(mxBuilder->weld_combo_box("style")) - , mxWdPreviewWin(mxBuilder->weld_widget("previewwin")) - , mxWdPreview(new weld::CustomWeld(*mxBuilder, "preview", maWdPreview)) + , mxLbCondType(mxBuilder->weld_combo_box(u"typeis"_ustr)) + , mxEdVal1(new formula::RefEdit(mxBuilder->weld_entry(u"val1"_ustr))) + , mxEdVal2(new formula::RefEdit(mxBuilder->weld_entry(u"val2"_ustr))) + , mxFtVal(mxBuilder->weld_label(u"valueft"_ustr)) + , mxFtStyle(mxBuilder->weld_label(u"styleft"_ustr)) + , mxLbStyle(mxBuilder->weld_combo_box(u"style"_ustr)) + , mxWdPreviewWin(mxBuilder->weld_widget(u"previewwin"_ustr)) + , mxWdPreview(new weld::CustomWeld(*mxBuilder, u"preview"_ustr, maWdPreview)) , mbIsInStyleCreate(false) { mxLbCondType->set_size_request(CommonWidgetWidth, -1); @@ -296,7 +296,7 @@ IMPL_LINK(ScConditionFrmtEntry, OnEdChanged, formula::RefEdit&, rRefEdit, void) } rEdit.set_message_type(weld::EntryMessageType::Normal); - mxFtVal->set_label(""); + mxFtVal->set_label(u""_ustr); } void ScConditionFrmtEntry::Select() @@ -513,11 +513,11 @@ IMPL_LINK_NOARG(ScConditionFrmtEntry, StyleSelectHdl, weld::ComboBox&, void) ScFormulaFrmtEntry::ScFormulaFrmtEntry(ScCondFormatList* pParent, ScDocument* pDoc, ScCondFormatDlg* pDialogParent, const ScAddress& rPos, const ScCondFormatEntry* pFormat) : ScCondFrmtEntry(pParent, pDoc, rPos) - , mxFtStyle(mxBuilder->weld_label("styleft")) - , mxLbStyle(mxBuilder->weld_combo_box("style")) - , mxWdPreviewWin(mxBuilder->weld_widget("previewwin")) - , mxWdPreview(new weld::CustomWeld(*mxBuilder, "preview", maWdPreview)) - , mxEdFormula(new formula::RefEdit(mxBuilder->weld_entry("formula"))) + , mxFtStyle(mxBuilder->weld_label(u"styleft"_ustr)) + , mxLbStyle(mxBuilder->weld_combo_box(u"style"_ustr)) + , mxWdPreviewWin(mxBuilder->weld_widget(u"previewwin"_ustr)) + , mxWdPreview(new weld::CustomWeld(*mxBuilder, u"preview"_ustr, maWdPreview)) + , mxEdFormula(new formula::RefEdit(mxBuilder->weld_entry(u"formula"_ustr))) { mxLbType->set_size_request(CommonWidgetWidth, -1); mxWdPreview->set_size_request(-1, mxLbStyle->get_preferred_size().Height()); @@ -739,15 +739,15 @@ ScColorScaleEntry* createColorScaleEntry( const weld::ComboBox& rType, const Col ScColorScale2FrmtEntry::ScColorScale2FrmtEntry(ScCondFormatList* pParent, ScDocument* pDoc, const ScAddress& rPos, const ScColorScaleFormat* pFormat) : ScCondFrmtEntry(pParent, pDoc, rPos) - , mxLbColorFormat(mxBuilder->weld_combo_box("colorformat")) - , mxLbEntryTypeMin(mxBuilder->weld_combo_box("colscalemin")) - , mxLbEntryTypeMax(mxBuilder->weld_combo_box("colscalemax")) - , mxEdMin(mxBuilder->weld_entry("edcolscalemin")) - , mxEdMax(mxBuilder->weld_entry("edcolscalemax")) - , mxLbColMin(new ColorListBox(mxBuilder->weld_menu_button("lbcolmin"), [this]{ return mpParent->GetFrameWeld(); })) - , mxLbColMax(new ColorListBox(mxBuilder->weld_menu_button("lbcolmax"), [this]{ return mpParent->GetFrameWeld(); })) - , mxFtMin(mxBuilder->weld_label("Label_minimum")) - , mxFtMax(mxBuilder->weld_label("Label_maximum")) + , mxLbColorFormat(mxBuilder->weld_combo_box(u"colorformat"_ustr)) + , mxLbEntryTypeMin(mxBuilder->weld_combo_box(u"colscalemin"_ustr)) + , mxLbEntryTypeMax(mxBuilder->weld_combo_box(u"colscalemax"_ustr)) + , mxEdMin(mxBuilder->weld_entry(u"edcolscalemin"_ustr)) + , mxEdMax(mxBuilder->weld_entry(u"edcolscalemax"_ustr)) + , mxLbColMin(new ColorListBox(mxBuilder->weld_menu_button(u"lbcolmin"_ustr), [this]{ return mpParent->GetFrameWeld(); })) + , mxLbColMax(new ColorListBox(mxBuilder->weld_menu_button(u"lbcolmax"_ustr), [this]{ return mpParent->GetFrameWeld(); })) + , mxFtMin(mxBuilder->weld_label(u"Label_minimum"_ustr)) + , mxFtMax(mxBuilder->weld_label(u"Label_maximum"_ustr)) { mxLbColorFormat->set_size_request(CommonWidgetWidth, -1); mxLbEntryTypeMin->set_size_request(CommonWidgetWidth, -1); @@ -874,18 +874,18 @@ IMPL_LINK( ScColorScale2FrmtEntry, EntryTypeHdl, weld::ComboBox&, rBox, void ) ScColorScale3FrmtEntry::ScColorScale3FrmtEntry(ScCondFormatList* pParent, ScDocument* pDoc, const ScAddress& rPos, const ScColorScaleFormat* pFormat) : ScCondFrmtEntry(pParent, pDoc, rPos) - , mxLbColorFormat(mxBuilder->weld_combo_box("colorformat")) - , mxLbEntryTypeMin(mxBuilder->weld_combo_box("colscalemin")) - , mxLbEntryTypeMiddle(mxBuilder->weld_combo_box("colscalemiddle")) - , mxLbEntryTypeMax(mxBuilder->weld_combo_box("colscalemax")) - , mxEdMin(mxBuilder->weld_entry("edcolscalemin")) - , mxEdMiddle(mxBuilder->weld_entry("edcolscalemiddle")) - , mxEdMax(mxBuilder->weld_entry("edcolscalemax")) - , mxLbColMin(new ColorListBox(mxBuilder->weld_menu_button("lbcolmin"), [this]{ return mpParent->GetFrameWeld(); })) - , mxLbColMiddle(new ColorListBox(mxBuilder->weld_menu_button("lbcolmiddle"), [this]{ return mpParent->GetFrameWeld(); })) - , mxLbColMax(new ColorListBox(mxBuilder->weld_menu_button("lbcolmax"), [this]{ return mpParent->GetFrameWeld(); })) - , mxFtMin(mxBuilder->weld_label("Label_minimum")) - , mxFtMax(mxBuilder->weld_label("Label_maximum")) + , mxLbColorFormat(mxBuilder->weld_combo_box(u"colorformat"_ustr)) + , mxLbEntryTypeMin(mxBuilder->weld_combo_box(u"colscalemin"_ustr)) + , mxLbEntryTypeMiddle(mxBuilder->weld_combo_box(u"colscalemiddle"_ustr)) + , mxLbEntryTypeMax(mxBuilder->weld_combo_box(u"colscalemax"_ustr)) + , mxEdMin(mxBuilder->weld_entry(u"edcolscalemin"_ustr)) + , mxEdMiddle(mxBuilder->weld_entry(u"edcolscalemiddle"_ustr)) + , mxEdMax(mxBuilder->weld_entry(u"edcolscalemax"_ustr)) + , mxLbColMin(new ColorListBox(mxBuilder->weld_menu_button(u"lbcolmin"_ustr), [this]{ return mpParent->GetFrameWeld(); })) + , mxLbColMiddle(new ColorListBox(mxBuilder->weld_menu_button(u"lbcolmiddle"_ustr), [this]{ return mpParent->GetFrameWeld(); })) + , mxLbColMax(new ColorListBox(mxBuilder->weld_menu_button(u"lbcolmax"_ustr), [this]{ return mpParent->GetFrameWeld(); })) + , mxFtMin(mxBuilder->weld_label(u"Label_minimum"_ustr)) + , mxFtMax(mxBuilder->weld_label(u"Label_maximum"_ustr)) { mxLbColorFormat->set_size_request(CommonWidgetWidth, -1); mxLbEntryTypeMin->set_size_request(CommonWidgetWidth, -1); @@ -1087,14 +1087,14 @@ void SetDataBarEntryTypes( const ScColorScaleEntry& rEntry, weld::ComboBox& rLbT ScDataBarFrmtEntry::ScDataBarFrmtEntry(ScCondFormatList* pParent, ScDocument* pDoc, const ScAddress& rPos, const ScDataBarFormat* pFormat) : ScCondFrmtEntry(pParent, pDoc, rPos) - , mxLbColorFormat(mxBuilder->weld_combo_box("colorformat")) - , mxLbDataBarMinType(mxBuilder->weld_combo_box("colscalemin")) - , mxLbDataBarMaxType(mxBuilder->weld_combo_box("colscalemax")) - , mxEdDataBarMin(mxBuilder->weld_entry("edcolscalemin")) - , mxEdDataBarMax(mxBuilder->weld_entry("edcolscalemax")) - , mxBtOptions(mxBuilder->weld_button("options")) - , mxFtMin(mxBuilder->weld_label("Label_minimum")) - , mxFtMax(mxBuilder->weld_label("Label_maximum")) + , mxLbColorFormat(mxBuilder->weld_combo_box(u"colorformat"_ustr)) + , mxLbDataBarMinType(mxBuilder->weld_combo_box(u"colscalemin"_ustr)) + , mxLbDataBarMaxType(mxBuilder->weld_combo_box(u"colscalemax"_ustr)) + , mxEdDataBarMin(mxBuilder->weld_entry(u"edcolscalemin"_ustr)) + , mxEdDataBarMax(mxBuilder->weld_entry(u"edcolscalemax"_ustr)) + , mxBtOptions(mxBuilder->weld_button(u"options"_ustr)) + , mxFtMin(mxBuilder->weld_label(u"Label_minimum"_ustr)) + , mxFtMax(mxBuilder->weld_label(u"Label_maximum"_ustr)) { mxLbColorFormat->set_size_request(CommonWidgetWidth, -1); mxLbDataBarMinType->set_size_request(CommonWidgetWidth, -1); @@ -1227,11 +1227,11 @@ IMPL_LINK_NOARG( ScDataBarFrmtEntry, OptionBtnHdl, weld::Button&, void ) ScDateFrmtEntry::ScDateFrmtEntry(ScCondFormatList* pParent, ScDocument* pDoc, const ScCondDateFormatEntry* pFormat) : ScCondFrmtEntry(pParent, pDoc, ScAddress()) - , mxLbDateEntry(mxBuilder->weld_combo_box("datetype")) - , mxFtStyle(mxBuilder->weld_label("styleft")) - , mxLbStyle(mxBuilder->weld_combo_box("style")) - , mxWdPreviewWin(mxBuilder->weld_widget("previewwin")) - , mxWdPreview(new weld::CustomWeld(*mxBuilder, "preview", maWdPreview)) + , mxLbDateEntry(mxBuilder->weld_combo_box(u"datetype"_ustr)) + , mxFtStyle(mxBuilder->weld_label(u"styleft"_ustr)) + , mxLbStyle(mxBuilder->weld_combo_box(u"style"_ustr)) + , mxWdPreviewWin(mxBuilder->weld_widget(u"previewwin"_ustr)) + , mxWdPreview(new weld::CustomWeld(*mxBuilder, u"preview"_ustr, maWdPreview)) , mbIsInStyleCreate(false) { mxLbDateEntry->set_size_request(CommonWidgetWidth, -1); @@ -1347,12 +1347,12 @@ public: }; ScIconSetFrmtDataEntry::ScIconSetFrmtDataEntry(weld::Container* pParent, ScIconSetType eType, const ScDocument* pDoc, sal_Int32 i, const ScColorScaleEntry* pEntry) - : mxBuilder(Application::CreateBuilder(pParent, "modules/scalc/ui/conditionaliconset.ui")) - , mxGrid(mxBuilder->weld_container("ConditionalIconSet")) - , mxImgIcon(mxBuilder->weld_image("icon")) - , mxEdEntry(mxBuilder->weld_entry("entry")) - , mxLbEntryType(mxBuilder->weld_combo_box("listbox")) - , mxConditionMode(mxBuilder->weld_combo_box("conditionMode")) + : mxBuilder(Application::CreateBuilder(pParent, u"modules/scalc/ui/conditionaliconset.ui"_ustr)) + , mxGrid(mxBuilder->weld_container(u"ConditionalIconSet"_ustr)) + , mxImgIcon(mxBuilder->weld_image(u"icon"_ustr)) + , mxEdEntry(mxBuilder->weld_entry(u"entry"_ustr)) + , mxLbEntryType(mxBuilder->weld_combo_box(u"listbox"_ustr)) + , mxConditionMode(mxBuilder->weld_combo_box(u"conditionMode"_ustr)) , mpContainer(pParent) { mxImgIcon->set_from_icon_name(ScIconSetFormat::getIconName(eType, i)); @@ -1436,9 +1436,9 @@ ScColorScaleEntry* ScIconSetFrmtDataEntry::CreateEntry(ScDocument& rDoc, const S ScIconSetFrmtEntry::ScIconSetFrmtEntry(ScCondFormatList* pParent, ScDocument* pDoc, const ScAddress& rPos, const ScIconSetFormat* pFormat) : ScCondFrmtEntry(pParent, pDoc, rPos) - , mxLbColorFormat(mxBuilder->weld_combo_box("colorformat")) - , mxLbIconSetType(mxBuilder->weld_combo_box("iconsettype")) - , mxIconParent(mxBuilder->weld_container("iconparent")) + , mxLbColorFormat(mxBuilder->weld_combo_box(u"colorformat"_ustr)) + , mxLbIconSetType(mxBuilder->weld_combo_box(u"iconsettype"_ustr)) + , mxIconParent(mxBuilder->weld_container(u"iconparent"_ustr)) { mxLbColorFormat->set_size_request(CommonWidgetWidth, -1); mxLbIconSetType->set_size_request(CommonWidgetWidth, -1); diff --git a/sc/source/ui/condformat/condformateasydlg.cxx b/sc/source/ui/condformat/condformateasydlg.cxx index 89cfdeb79c3d..a7a3d6907306 100644 --- a/sc/source/ui/condformat/condformateasydlg.cxx +++ b/sc/source/ui/condformat/condformateasydlg.cxx @@ -45,18 +45,19 @@ ConditionalFormatEasyDialog::ConditionalFormatEasyDialog(SfxBindings* pBindings, weld::Window* pParent, ScViewData* pViewData) : ScAnyRefDlgController(pBindings, pChildWindow, pParent, - "modules/scalc/ui/conditionaleasydialog.ui", "CondFormatEasyDlg") + u"modules/scalc/ui/conditionaleasydialog.ui"_ustr, + u"CondFormatEasyDlg"_ustr) , mpViewData(pViewData) , mpDocument(&mpViewData->GetDocument()) - , mxNumberEntry(m_xBuilder->weld_entry("entryNumber")) - , mxNumberEntry2(m_xBuilder->weld_entry("entryNumber2")) - , mxAllInputs(m_xBuilder->weld_container("allInputs")) - , mxRangeEntry(new formula::RefEdit(m_xBuilder->weld_entry("entryRange"))) - , mxButtonRangeEdit(new formula::RefButton(m_xBuilder->weld_button("rbassign"))) - , mxStyles(m_xBuilder->weld_combo_box("themeCombo")) - , mxDescription(m_xBuilder->weld_label("description")) - , mxButtonOk(m_xBuilder->weld_button("ok")) - , mxButtonCancel(m_xBuilder->weld_button("cancel")) + , mxNumberEntry(m_xBuilder->weld_entry(u"entryNumber"_ustr)) + , mxNumberEntry2(m_xBuilder->weld_entry(u"entryNumber2"_ustr)) + , mxAllInputs(m_xBuilder->weld_container(u"allInputs"_ustr)) + , mxRangeEntry(new formula::RefEdit(m_xBuilder->weld_entry(u"entryRange"_ustr))) + , mxButtonRangeEdit(new formula::RefButton(m_xBuilder->weld_button(u"rbassign"_ustr))) + , mxStyles(m_xBuilder->weld_combo_box(u"themeCombo"_ustr)) + , mxDescription(m_xBuilder->weld_label(u"description"_ustr)) + , mxButtonOk(m_xBuilder->weld_button(u"ok"_ustr)) + , mxButtonCancel(m_xBuilder->weld_button(u"cancel"_ustr)) { mxButtonRangeEdit->SetReferences(this, mxRangeEntry.get()); const ScConditionMode* pCurrentMode @@ -230,11 +231,11 @@ IMPL_LINK(ConditionalFormatEasyDialog, ButtonPressed, weld::Button&, rButton, vo OUString sExpression1 = (mxNumberEntry->get_visible() == true && mxAllInputs->get_visible() == true ? mxNumberEntry->get_text() - : ""); + : u""_ustr); OUString sExpression2 = (mxNumberEntry2->get_visible() == true && mxAllInputs->get_visible() == true ? mxNumberEntry2->get_text() - : ""); + : u""_ustr); switch (meMode) { diff --git a/sc/source/ui/condformat/condformathelper.cxx b/sc/source/ui/condformat/condformathelper.cxx index 6d1f1b1b3a27..86feddad8e6d 100644 --- a/sc/source/ui/condformat/condformathelper.cxx +++ b/sc/source/ui/condformat/condformathelper.cxx @@ -46,17 +46,17 @@ OUString getExpression(sal_Int32 nIndex) switch(nIndex) { case 0: - return "="; + return u"="_ustr; case 1: - return "<"; + return u"<"_ustr; case 2: - return ">"; + return u">"_ustr; case 3: - return "<="; + return u"<="_ustr; case 4: - return ">="; + return u">="_ustr; case 5: - return "!="; + return u"!="_ustr; case 6: return ScResId(STR_COND_BETWEEN); case 7: diff --git a/sc/source/ui/condformat/condformatmgr.cxx b/sc/source/ui/condformat/condformatmgr.cxx index 31e16ab8c08c..5a445c2abde0 100644 --- a/sc/source/ui/condformat/condformatmgr.cxx +++ b/sc/source/ui/condformat/condformatmgr.cxx @@ -86,13 +86,13 @@ void ScCondFormatManagerWindow::setColSizes() } ScCondFormatManagerDlg::ScCondFormatManagerDlg(weld::Window* pParent, ScDocument& rDoc, const ScConditionalFormatList* pFormatList) - : GenericDialogController(pParent, "modules/scalc/ui/condformatmanager.ui", "CondFormatManager") + : GenericDialogController(pParent, u"modules/scalc/ui/condformatmanager.ui"_ustr, u"CondFormatManager"_ustr) , m_bModified(false) , m_xFormatList( pFormatList ? new ScConditionalFormatList(*pFormatList) : nullptr) - , m_xBtnAdd(m_xBuilder->weld_button("add")) - , m_xBtnRemove(m_xBuilder->weld_button("remove")) - , m_xBtnEdit(m_xBuilder->weld_button("edit")) - , m_xTreeView(m_xBuilder->weld_tree_view("CONTAINER")) + , m_xBtnAdd(m_xBuilder->weld_button(u"add"_ustr)) + , m_xBtnRemove(m_xBuilder->weld_button(u"remove"_ustr)) + , m_xBtnEdit(m_xBuilder->weld_button(u"edit"_ustr)) + , m_xTreeView(m_xBuilder->weld_tree_view(u"CONTAINER"_ustr)) , m_xCtrlManager(new ScCondFormatManagerWindow(*m_xTreeView, rDoc, m_xFormatList.get())) { m_xBtnRemove->connect_clicked(LINK(this, ScCondFormatManagerDlg, RemoveBtnHdl)); @@ -100,7 +100,7 @@ ScCondFormatManagerDlg::ScCondFormatManagerDlg(weld::Window* pParent, ScDocument m_xBtnAdd->connect_clicked(LINK(this, ScCondFormatManagerDlg, AddBtnHdl)); m_xTreeView->connect_row_activated(LINK(this, ScCondFormatManagerDlg, EditBtnHdl)); - SvtViewOptions aDlgOpt(EViewType::Dialog, "CondFormatDialog"); + SvtViewOptions aDlgOpt(EViewType::Dialog, u"CondFormatDialog"_ustr); if (aDlgOpt.Exists()) m_xDialog->set_window_state(aDlgOpt.GetWindowState()); @@ -110,7 +110,7 @@ ScCondFormatManagerDlg::ScCondFormatManagerDlg(weld::Window* pParent, ScDocument ScCondFormatManagerDlg::~ScCondFormatManagerDlg() { // tdf#101285 - Remember position of dialog - SvtViewOptions aDlgOpt(EViewType::Dialog, "CondFormatDialog"); + SvtViewOptions aDlgOpt(EViewType::Dialog, u"CondFormatDialog"_ustr); aDlgOpt.SetWindowState(m_xDialog->get_window_state(vcl::WindowDataMask::Pos)); } diff --git a/sc/source/ui/dataprovider/datatransformation.cxx b/sc/source/ui/dataprovider/datatransformation.cxx index 9fa4c483a4b3..decb4a7c9a9a 100644 --- a/sc/source/ui/dataprovider/datatransformation.cxx +++ b/sc/source/ui/dataprovider/datatransformation.cxx @@ -817,7 +817,7 @@ void DateTimeTransformation::Transform(ScDocument& rDoc) const double nVal = rDoc.GetValue(rCol, nRow, 0); const Color* pColor = nullptr; OUString aResult; - pFormatter->GetPreviewStringGuess("MMMM", nVal, aResult, &pColor, eLanguage); + pFormatter->GetPreviewStringGuess(u"MMMM"_ustr, nVal, aResult, &pColor, eLanguage); rDoc.SetString(rCol, nRow, 0, aResult); } } diff --git a/sc/source/ui/dialogs/SparklineDataRangeDialog.cxx b/sc/source/ui/dialogs/SparklineDataRangeDialog.cxx index 0e91051db44c..607f5624072b 100644 --- a/sc/source/ui/dialogs/SparklineDataRangeDialog.cxx +++ b/sc/source/ui/dialogs/SparklineDataRangeDialog.cxx @@ -19,16 +19,16 @@ SparklineDataRangeDialog::SparklineDataRangeDialog(SfxBindings* pBindings, weld::Window* pWindow, ScViewData& rViewData) : ScAnyRefDlgController(pBindings, pChildWindow, pWindow, u"modules/scalc/ui/sparklinedatarangedialog.ui"_ustr, - "SparklineDataRangeDialog") + u"SparklineDataRangeDialog"_ustr) , mrViewData(rViewData) , mrDocument(rViewData.GetDocument()) , mpActiveEdit(nullptr) , mbDialogLostFocus(false) - , mxButtonOk(m_xBuilder->weld_button("ok")) - , mxButtonCancel(m_xBuilder->weld_button("cancel")) - , mxDataRangeLabel(m_xBuilder->weld_label("cell-range-label")) - , mxDataRangeEdit(new formula::RefEdit(m_xBuilder->weld_entry("cell-range-edit"))) - , mxDataRangeButton(new formula::RefButton(m_xBuilder->weld_button("cell-range-button"))) + , mxButtonOk(m_xBuilder->weld_button(u"ok"_ustr)) + , mxButtonCancel(m_xBuilder->weld_button(u"cancel"_ustr)) + , mxDataRangeLabel(m_xBuilder->weld_label(u"cell-range-label"_ustr)) + , mxDataRangeEdit(new formula::RefEdit(m_xBuilder->weld_entry(u"cell-range-edit"_ustr))) + , mxDataRangeButton(new formula::RefButton(m_xBuilder->weld_button(u"cell-range-button"_ustr))) { mxDataRangeEdit->SetReferences(this, mxDataRangeLabel.get()); diff --git a/sc/source/ui/dialogs/SparklineDialog.cxx b/sc/source/ui/dialogs/SparklineDialog.cxx index ff56e629e684..ad092b6659e2 100644 --- a/sc/source/ui/dialogs/SparklineDialog.cxx +++ b/sc/source/ui/dialogs/SparklineDialog.cxx @@ -23,50 +23,50 @@ namespace sc SparklineDialog::SparklineDialog(SfxBindings* pBindings, SfxChildWindow* pChildWindow, weld::Window* pWindow, ScViewData& rViewData) : ScAnyRefDlgController(pBindings, pChildWindow, pWindow, - u"modules/scalc/ui/sparklinedialog.ui"_ustr, "SparklineDialog") + u"modules/scalc/ui/sparklinedialog.ui"_ustr, u"SparklineDialog"_ustr) , mrViewData(rViewData) , mrDocument(rViewData.GetDocument()) , mpActiveEdit(nullptr) , mbDialogLostFocus(false) - , mxButtonOk(m_xBuilder->weld_button("ok")) - , mxButtonCancel(m_xBuilder->weld_button("cancel")) - , mxFrameData(m_xBuilder->weld_frame("frmData")) - , mxInputRangeLabel(m_xBuilder->weld_label("lbInputRange")) - , mxInputRangeEdit(new formula::RefEdit(m_xBuilder->weld_entry("edInputRange"))) - , mxInputRangeButton(new formula::RefButton(m_xBuilder->weld_button("btnInputRange"))) - , mxOutputRangeLabel(m_xBuilder->weld_label("lbOutputRange")) - , mxOutputRangeEdit(new formula::RefEdit(m_xBuilder->weld_entry("edOutputRange"))) - , mxOutputRangeButton(new formula::RefButton(m_xBuilder->weld_button("btnOutputRange"))) - , mxColorSeries(new ColorListBox(m_xBuilder->weld_menu_button("colSeries"), + , mxButtonOk(m_xBuilder->weld_button(u"ok"_ustr)) + , mxButtonCancel(m_xBuilder->weld_button(u"cancel"_ustr)) + , mxFrameData(m_xBuilder->weld_frame(u"frmData"_ustr)) + , mxInputRangeLabel(m_xBuilder->weld_label(u"lbInputRange"_ustr)) + , mxInputRangeEdit(new formula::RefEdit(m_xBuilder->weld_entry(u"edInputRange"_ustr))) + , mxInputRangeButton(new formula::RefButton(m_xBuilder->weld_button(u"btnInputRange"_ustr))) + , mxOutputRangeLabel(m_xBuilder->weld_label(u"lbOutputRange"_ustr)) + , mxOutputRangeEdit(new formula::RefEdit(m_xBuilder->weld_entry(u"edOutputRange"_ustr))) + , mxOutputRangeButton(new formula::RefButton(m_xBuilder->weld_button(u"btnOutputRange"_ustr))) + , mxColorSeries(new ColorListBox(m_xBuilder->weld_menu_button(u"colSeries"_ustr), [pWindow] { return pWindow; })) - , mxColorNegative(new ColorListBox(m_xBuilder->weld_menu_button("colNegative"), + , mxColorNegative(new ColorListBox(m_xBuilder->weld_menu_button(u"colNegative"_ustr), [pWindow] { return pWindow; })) - , mxColorMarker(new ColorListBox(m_xBuilder->weld_menu_button("colMarker"), + , mxColorMarker(new ColorListBox(m_xBuilder->weld_menu_button(u"colMarker"_ustr), [pWindow] { return pWindow; })) - , mxColorHigh( - new ColorListBox(m_xBuilder->weld_menu_button("colHigh"), [pWindow] { return pWindow; })) - , mxColorLow( - new ColorListBox(m_xBuilder->weld_menu_button("colLow"), [pWindow] { return pWindow; })) - , mxColorFirst( - new ColorListBox(m_xBuilder->weld_menu_button("colFirst"), [pWindow] { return pWindow; })) - , mxColorLast( - new ColorListBox(m_xBuilder->weld_menu_button("colLast"), [pWindow] { return pWindow; })) - , mxCheckButtonNegative(m_xBuilder->weld_check_button("cbNegative")) - , mxCheckButtonMarker(m_xBuilder->weld_check_button("cbMarker")) - , mxCheckButtonHigh(m_xBuilder->weld_check_button("cbHigh")) - , mxCheckButtonLow(m_xBuilder->weld_check_button("cbLow")) - , mxCheckButtonFirst(m_xBuilder->weld_check_button("cbFirst")) - , mxCheckButtonLast(m_xBuilder->weld_check_button("cbLast")) - , mxSpinLineWidth(m_xBuilder->weld_spin_button("seLineWidth")) - , mxType(m_xBuilder->weld_combo_box("cbType")) - , mxCheckDisplayXAxis(m_xBuilder->weld_check_button("cbDisplayXAxis")) - , mxCheckDisplayHidden(m_xBuilder->weld_check_button("cbHidden")) - , mxCheckRightToLeft(m_xBuilder->weld_check_button("cbRTL")) - , mxDisplayEmptyGap(m_xBuilder->weld_combo_box("cbEmptyCells")) - , mxComboMinAxisType(m_xBuilder->weld_combo_box("cbMinAxisType")) - , mxComboMaxAxisType(m_xBuilder->weld_combo_box("cbMaxAxisType")) - , mxSpinCustomMin(m_xBuilder->weld_formatted_spin_button("seMinAxis")) - , mxSpinCustomMax(m_xBuilder->weld_formatted_spin_button("seMaxAxis")) + , mxColorHigh(new ColorListBox(m_xBuilder->weld_menu_button(u"colHigh"_ustr), + [pWindow] { return pWindow; })) + , mxColorLow(new ColorListBox(m_xBuilder->weld_menu_button(u"colLow"_ustr), + [pWindow] { return pWindow; })) + , mxColorFirst(new ColorListBox(m_xBuilder->weld_menu_button(u"colFirst"_ustr), + [pWindow] { return pWindow; })) + , mxColorLast(new ColorListBox(m_xBuilder->weld_menu_button(u"colLast"_ustr), + [pWindow] { return pWindow; })) + , mxCheckButtonNegative(m_xBuilder->weld_check_button(u"cbNegative"_ustr)) + , mxCheckButtonMarker(m_xBuilder->weld_check_button(u"cbMarker"_ustr)) + , mxCheckButtonHigh(m_xBuilder->weld_check_button(u"cbHigh"_ustr)) + , mxCheckButtonLow(m_xBuilder->weld_check_button(u"cbLow"_ustr)) + , mxCheckButtonFirst(m_xBuilder->weld_check_button(u"cbFirst"_ustr)) + , mxCheckButtonLast(m_xBuilder->weld_check_button(u"cbLast"_ustr)) + , mxSpinLineWidth(m_xBuilder->weld_spin_button(u"seLineWidth"_ustr)) + , mxType(m_xBuilder->weld_combo_box(u"cbType"_ustr)) + , mxCheckDisplayXAxis(m_xBuilder->weld_check_button(u"cbDisplayXAxis"_ustr)) + , mxCheckDisplayHidden(m_xBuilder->weld_check_button(u"cbHidden"_ustr)) + , mxCheckRightToLeft(m_xBuilder->weld_check_button(u"cbRTL"_ustr)) + , mxDisplayEmptyGap(m_xBuilder->weld_combo_box(u"cbEmptyCells"_ustr)) + , mxComboMinAxisType(m_xBuilder->weld_combo_box(u"cbMinAxisType"_ustr)) + , mxComboMaxAxisType(m_xBuilder->weld_combo_box(u"cbMaxAxisType"_ustr)) + , mxSpinCustomMin(m_xBuilder->weld_formatted_spin_button(u"seMinAxis"_ustr)) + , mxSpinCustomMax(m_xBuilder->weld_formatted_spin_button(u"seMaxAxis"_ustr)) , mbEditMode(false) { mxInputRangeEdit->SetReferences(this, mxInputRangeLabel.get()); diff --git a/sc/source/ui/dialogs/searchresults.cxx b/sc/source/ui/dialogs/searchresults.cxx index 31444dbb3f39..4650ce711797 100644 --- a/sc/source/ui/dialogs/searchresults.cxx +++ b/sc/source/ui/dialogs/searchresults.cxx @@ -23,14 +23,14 @@ namespace sc { SearchResultsDlg::SearchResultsDlg(SfxBindings* _pBindings, weld::Window* pParent) - : SfxDialogController(pParent, "modules/scalc/ui/searchresults.ui", "SearchResultsDialog") + : SfxDialogController(pParent, u"modules/scalc/ui/searchresults.ui"_ustr, u"SearchResultsDialog"_ustr) , aSkipped(ScResId(SCSTR_SKIPPED)) , mpBindings(_pBindings) , mpDoc(nullptr) , mbSorted(false) - , mxList(m_xBuilder->weld_tree_view("results")) - , mxSearchResults(m_xBuilder->weld_label("lbSearchResults")) - , mxShowDialog(m_xBuilder->weld_check_button("cbShow")) + , mxList(m_xBuilder->weld_tree_view(u"results"_ustr)) + , mxSearchResults(m_xBuilder->weld_label(u"lbSearchResults"_ustr)) + , mxShowDialog(m_xBuilder->weld_check_button(u"cbShow"_ustr)) { mxList->set_size_request(mxList->get_approximate_digit_width() * 50, mxList->get_height_rows(15)); mxShowDialog->connect_toggled(LINK(this, SearchResultsDlg, OnShowToggled)); diff --git a/sc/source/ui/formdlg/dwfunctr.cxx b/sc/source/ui/formdlg/dwfunctr.cxx index 344b13b395c9..355a820f4f87 100644 --- a/sc/source/ui/formdlg/dwfunctr.cxx +++ b/sc/source/ui/formdlg/dwfunctr.cxx @@ -46,13 +46,13 @@ #************************************************************************/ ScFunctionWin::ScFunctionWin(weld::Widget* pParent) - : PanelLayout(pParent, "FunctionPanel", "modules/scalc/ui/functionpanel.ui") - , xCatBox(m_xBuilder->weld_combo_box("category")) - , xFuncList(m_xBuilder->weld_tree_view("funclist")) - , xInsertButton(m_xBuilder->weld_button("insert")) - , xFiFuncDesc(m_xBuilder->weld_text_view("funcdesc")) - , m_xSearchString(m_xBuilder->weld_entry("search")) - , xConfigListener(new comphelper::ConfigurationListener("/org.openoffice.Office.Calc/Formula/Syntax")) + : PanelLayout(pParent, u"FunctionPanel"_ustr, u"modules/scalc/ui/functionpanel.ui"_ustr) + , xCatBox(m_xBuilder->weld_combo_box(u"category"_ustr)) + , xFuncList(m_xBuilder->weld_tree_view(u"funclist"_ustr)) + , xInsertButton(m_xBuilder->weld_button(u"insert"_ustr)) + , xFiFuncDesc(m_xBuilder->weld_text_view(u"funcdesc"_ustr)) + , m_xSearchString(m_xBuilder->weld_entry(u"search"_ustr)) + , xConfigListener(new comphelper::ConfigurationListener(u"/org.openoffice.Office.Calc/Formula/Syntax"_ustr)) , xConfigChange(std::make_unique<EnglishFunctionNameChange>(xConfigListener, this)) , pFuncDesc(nullptr) { @@ -127,7 +127,7 @@ void ScFunctionWin::InitLRUList() sal_Int32 nSelPos = xCatBox->get_active(); if (nSelPos == 0) - UpdateFunctionList(""); + UpdateFunctionList(u""_ustr); } /************************************************************************* @@ -443,8 +443,8 @@ IMPL_LINK(ScFunctionWin, KeyInputHdl, const KeyEvent&, rEvent, bool) break; case KEY_ESCAPE: { - m_xSearchString->set_text(""); - UpdateFunctionList(""); + m_xSearchString->set_text(u""_ustr); + UpdateFunctionList(u""_ustr); bHandled = true; } break; @@ -483,9 +483,9 @@ IMPL_LINK(ScFunctionWin, KeyInputHdl, const KeyEvent&, rEvent, bool) IMPL_LINK_NOARG(ScFunctionWin, SelComboHdl, weld::ComboBox&, void) { - UpdateFunctionList(""); + UpdateFunctionList(u""_ustr); SetDescription(); - m_xSearchString->set_text(""); + m_xSearchString->set_text(u""_ustr); m_xSearchString->grab_focus(); } @@ -523,7 +523,7 @@ void EnglishFunctionNameChange::setProperty(const css::uno::Any &rProperty) { ConfigurationListenerProperty::setProperty(rProperty); m_pFunctionWin->InitLRUList(); - m_pFunctionWin->UpdateFunctionList(""); + m_pFunctionWin->UpdateFunctionList(u""_ustr); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/formdlg/formula.cxx b/sc/source/ui/formdlg/formula.cxx index c75091bde20c..e92de5aca844 100644 --- a/sc/source/ui/formdlg/formula.cxx +++ b/sc/source/ui/formdlg/formula.cxx @@ -661,7 +661,7 @@ OUString ScFormulaDlg::getCurrentFormula() const ScFormEditData* pData = m_pViewShell->GetFormEditData(); if (pData && pData->GetInputHandler()) return pData->GetInputHandler()->GetFormString(); - return ""; + return u""_ustr; } formula::IFunctionManager* ScFormulaDlg::getFunctionManager() { diff --git a/sc/source/ui/inc/corodlg.hxx b/sc/source/ui/inc/corodlg.hxx index 68e5fd0f1fd7..9b28f06987cf 100644 --- a/sc/source/ui/inc/corodlg.hxx +++ b/sc/source/ui/inc/corodlg.hxx @@ -25,10 +25,10 @@ class ScColRowLabelDlg : public weld::GenericDialogController { public: ScColRowLabelDlg(weld::Window* pParent, bool bCol, bool bRow) - : GenericDialogController(pParent, "modules/scalc/ui/changesourcedialog.ui", - "ChangeSourceDialog") - , m_xBtnRow(m_xBuilder->weld_check_button("row")) - , m_xBtnCol(m_xBuilder->weld_check_button("col")) + : GenericDialogController(pParent, u"modules/scalc/ui/changesourcedialog.ui"_ustr, + u"ChangeSourceDialog"_ustr) + , m_xBtnRow(m_xBuilder->weld_check_button(u"row"_ustr)) + , m_xBtnCol(m_xBuilder->weld_check_button(u"col"_ustr)) { m_xBtnCol->set_active(bCol); m_xBtnRow->set_active(bRow); diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx index 0b82b85ea3e9..5b3ace8e1535 100644 --- a/sc/source/ui/inc/docsh.hxx +++ b/sc/source/ui/inc/docsh.hxx @@ -511,7 +511,7 @@ namespace HelperNotifyChanges } inline void Notify(ScModelObj &rModelObj, const ScRangeList &rChangeRanges, - const OUString &rType = OUString("cell-change"), + const OUString &rType = u"cell-change"_ustr, const css::uno::Sequence< css::beans::PropertyValue >& rProperties = css::uno::Sequence< css::beans::PropertyValue >()) { @@ -519,7 +519,7 @@ namespace HelperNotifyChanges } inline void NotifyIfChangesListeners(const ScDocShell &rDocShell, const ScRange &rRange, - const OUString &rType = OUString("cell-change")) + const OUString &rType = u"cell-change"_ustr) { ScModelObj* pModelObj = rDocShell.GetModel(); ScRangeList aChangeRanges(rRange); @@ -529,7 +529,7 @@ namespace HelperNotifyChanges else if (pModelObj) // possibly need to invalidate getCellArea results { Notify(*pModelObj, aChangeRanges, isDataAreaInvalidateType(rType) - ? OUString("data-area-invalidate") : OUString("data-area-extend")); + ? u"data-area-invalidate"_ustr : u"data-area-extend"_ustr); } } }; diff --git a/sc/source/ui/inc/dwfunctr.hxx b/sc/source/ui/inc/dwfunctr.hxx index faf68ecd4198..fb93643539bc 100644 --- a/sc/source/ui/inc/dwfunctr.hxx +++ b/sc/source/ui/inc/dwfunctr.hxx @@ -33,7 +33,7 @@ protected: virtual void setProperty(const css::uno::Any &rProperty) override; public: EnglishFunctionNameChange(const rtl::Reference<comphelper::ConfigurationListener> &rListener, ScFunctionWin* pFunctionWin) - : ConfigurationListenerProperty(rListener, "EnglishFunctionName") + : ConfigurationListenerProperty(rListener, u"EnglishFunctionName"_ustr) , m_pFunctionWin(pFunctionWin) { } diff --git a/sc/source/ui/namedlg/namedefdlg.cxx b/sc/source/ui/namedlg/namedefdlg.cxx index 8a2e1eb6ea5d..7e29d16e7b3f 100644 --- a/sc/source/ui/namedlg/namedefdlg.cxx +++ b/sc/source/ui/namedlg/namedefdlg.cxx @@ -27,7 +27,7 @@ ScNameDefDlg::ScNameDefDlg( SfxBindings* pB, SfxChildWindow* pCW, weld::Window* pParent, const ScViewData& rViewData, std::map<OUString, ScRangeName*>&& aRangeMap, const ScAddress& aCursorPos, const bool bUndo ) - : ScAnyRefDlgController( pB, pCW, pParent, "modules/scalc/ui/definename.ui", "DefineNameDialog") + : ScAnyRefDlgController( pB, pCW, pParent, u"modules/scalc/ui/definename.ui"_ustr, u"DefineNameDialog"_ustr) , mbUndo( bUndo ) , mrDoc(rViewData.GetDocument()) , mpDocShell ( rViewData.GetDocShell() ) diff --git a/sc/source/ui/namedlg/namedlg.cxx b/sc/source/ui/namedlg/namedlg.cxx index f0d0107c891d..ebfaf6a122fe 100644 --- a/sc/source/ui/namedlg/namedlg.cxx +++ b/sc/source/ui/namedlg/namedlg.cxx @@ -44,8 +44,8 @@ ScNameDlg::ScNameDlg( SfxBindings* pB, SfxChildWindow* pCW, weld::Window* pParen ScViewData& rViewData, const ScAddress& aCursorPos, std::map<OUString, ScRangeName> *const pRangeMap) - : ScAnyRefDlgController(pB, pCW, pParent, "modules/scalc/ui/managenamesdialog.ui", - "ManageNamesDialog") + : ScAnyRefDlgController(pB, pCW, pParent, u"modules/scalc/ui/managenamesdialog.ui"_ustr, + u"ManageNamesDialog"_ustr) , maGlobalNameStr(ScResId(STR_GLOBAL_SCOPE)) , maErrInvalidNameStr(ScResId(STR_ERR_NAME_INVALID)) @@ -102,7 +102,7 @@ void ScNameDlg::Init() { //init UI - std::unique_ptr<weld::TreeView> xTreeView(m_xBuilder->weld_tree_view("names")); + std::unique_ptr<weld::TreeView> xTreeView(m_xBuilder->weld_tree_view(u"names"_ustr)); xTreeView->set_size_request(xTreeView->get_approximate_digit_width() * 75, xTreeView->get_height_rows(10)); m_xRangeManagerTable.reset(new ScRangeManagerTable(std::move(xTreeView), m_RangeMap, maCursorPos)); diff --git a/sc/source/ui/namedlg/namepast.cxx b/sc/source/ui/namedlg/namepast.cxx index 1d144f3fdf5c..b31a4fbd0995 100644 --- a/sc/source/ui/namedlg/namepast.cxx +++ b/sc/source/ui/namedlg/namepast.cxx @@ -29,10 +29,11 @@ #include <compiler.hxx> ScNamePasteDlg::ScNamePasteDlg(weld::Window* pParent, ScDocShell* pShell) - : GenericDialogController(pParent, "modules/scalc/ui/insertname.ui", "InsertNameDialog") - , m_xBtnPasteAll(m_xBuilder->weld_button("pasteall")) - , m_xBtnPaste(m_xBuilder->weld_button("paste")) - , m_xBtnClose(m_xBuilder->weld_button("close")) + : GenericDialogController(pParent, u"modules/scalc/ui/insertname.ui"_ustr, + u"InsertNameDialog"_ustr) + , m_xBtnPasteAll(m_xBuilder->weld_button(u"pasteall"_ustr)) + , m_xBtnPaste(m_xBuilder->weld_button(u"paste"_ustr)) + , m_xBtnClose(m_xBuilder->weld_button(u"close"_ustr)) { ScDocument& rDoc = pShell->GetDocument(); m_aSheetSep = OUString(rDoc.GetSheetSeparator()); @@ -47,7 +48,7 @@ ScNamePasteDlg::ScNamePasteDlg(weld::Window* pParent, ScDocShell* pShell) if (ScViewData* pViewData = ScDocShell::GetViewData()) aPos = ScAddress(pViewData->GetCurX(), pViewData->GetCurY(), pViewData->GetTabNo()); - std::unique_ptr<weld::TreeView> xTreeView(m_xBuilder->weld_tree_view("ctrl")); + std::unique_ptr<weld::TreeView> xTreeView(m_xBuilder->weld_tree_view(u"ctrl"_ustr)); xTreeView->set_size_request(xTreeView->get_approximate_digit_width() * 75, xTreeView->get_height_rows(10)); m_xTable.reset(new ScRangeManagerTable(std::move(xTreeView), m_RangeMap, aPos)); diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx index b1e8841b359c..0ae1b45de7ee 100644 --- a/sc/source/ui/navipi/content.cxx +++ b/sc/source/ui/navipi/content.cxx @@ -564,25 +564,25 @@ IMPL_LINK(ScContentTree, CommandHdl, const CommandEvent&, rCEvt, bool) case CommandEventId::ContextMenu: { // drag-and-drop mode - std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(m_xTreeView.get(), "modules/scalc/ui/dropmenu.ui")); - std::unique_ptr<weld::Menu> xPop(xBuilder->weld_menu("contextmenu")); - std::unique_ptr<weld::Menu> xDropMenu(xBuilder->weld_menu("dragmodesubmenu")); + std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(m_xTreeView.get(), u"modules/scalc/ui/dropmenu.ui"_ustr)); + std::unique_ptr<weld::Menu> xPop(xBuilder->weld_menu(u"contextmenu"_ustr)); + std::unique_ptr<weld::Menu> xDropMenu(xBuilder->weld_menu(u"dragmodesubmenu"_ustr)); switch (pParentWindow->GetDropMode()) { case 0: - xDropMenu->set_active("hyperlink", true); + xDropMenu->set_active(u"hyperlink"_ustr, true); break; case 1: - xDropMenu->set_active("link", true); + xDropMenu->set_active(u"link"_ustr, true); break; case 2: - xDropMenu->set_active("copy", true); + xDropMenu->set_active(u"copy"_ustr, true); break; } // displayed document - std::unique_ptr<weld::Menu> xDocMenu(xBuilder->weld_menu("displaymenu")); + std::unique_ptr<weld::Menu> xDocMenu(xBuilder->weld_menu(u"displaymenu"_ustr)); sal_uInt16 i=0; OUString sActive; OUString sId; @@ -618,8 +618,8 @@ IMPL_LINK(ScContentTree, CommandHdl, const CommandEvent&, rCEvt, bool) // Edit/Delete Comments are only visible for comments if (nType != ScContentId::NOTE) { - xPop->set_visible("edit", false); - xPop->set_visible("delete", false); + xPop->set_visible(u"edit"_ustr, false); + xPop->set_visible(u"delete"_ustr, false); } OUString sIdent = xPop->popup_at_rect(m_xTreeView.get(), tools::Rectangle(rCEvt.GetMousePosPixel(), Size(1, 1))); diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx index a58491f58dd1..1710937db9d9 100644 --- a/sc/source/ui/navipi/navipi.cxx +++ b/sc/source/ui/navipi/navipi.cxx @@ -214,7 +214,7 @@ IMPL_LINK(ScNavigatorDlg, ToolBoxSelectHdl, const OUString&, rSelId, void) UpdateButtons(); } else if (rSelId == "dragmode") - m_xTbxCmd2->set_menu_item_active("dragmode", !m_xTbxCmd2->get_menu_item_active("dragmode")); + m_xTbxCmd2->set_menu_item_active(u"dragmode"_ustr, !m_xTbxCmd2->get_menu_item_active(u"dragmode"_ustr)); else { if (rSelId == "datarange") @@ -244,13 +244,13 @@ IMPL_LINK(ScNavigatorDlg, ToolBoxDropdownClickHdl, const OUString&, rCommand, vo switch (GetDropMode()) { case 0: - m_xDragModeMenu->set_active("hyperlink", true); + m_xDragModeMenu->set_active(u"hyperlink"_ustr, true); break; case 1: - m_xDragModeMenu->set_active("link", true); + m_xDragModeMenu->set_active(u"link"_ustr, true); break; case 2: - m_xDragModeMenu->set_active("copy", true); + m_xDragModeMenu->set_active(u"copy"_ustr, true); break; } } @@ -268,20 +268,20 @@ IMPL_LINK(ScNavigatorDlg, MenuSelectHdl, const OUString&, rIdent, void) void ScNavigatorDlg::UpdateButtons() { NavListMode eMode = eListMode; - m_xTbxCmd2->set_item_active("scenarios", eMode == NAV_LMODE_SCENARIOS); - m_xTbxCmd1->set_item_active("contents", eMode != NAV_LMODE_NONE); + m_xTbxCmd2->set_item_active(u"scenarios"_ustr, eMode == NAV_LMODE_SCENARIOS); + m_xTbxCmd1->set_item_active(u"contents"_ustr, eMode != NAV_LMODE_NONE); // the toggle button: if (eMode == NAV_LMODE_SCENARIOS || eMode == NAV_LMODE_NONE) { - m_xTbxCmd2->set_item_sensitive("toggle", false); - m_xTbxCmd2->set_item_active("toggle", false); + m_xTbxCmd2->set_item_sensitive(u"toggle"_ustr, false); + m_xTbxCmd2->set_item_active(u"toggle"_ustr, false); } else { - m_xTbxCmd2->set_item_sensitive("toggle", true); + m_xTbxCmd2->set_item_sensitive(u"toggle"_ustr, true); bool bRootSet = m_xLbEntries->GetRootType() != ScContentId::ROOT; - m_xTbxCmd2->set_item_active("toggle", bRootSet); + m_xTbxCmd2->set_item_active(u"toggle"_ustr, bRootSet); } OUString sImageId; @@ -297,7 +297,7 @@ void ScNavigatorDlg::UpdateButtons() sImageId = RID_BMP_DROP_COPY; break; } - m_xTbxCmd2->set_item_icon_name("dragmode", sImageId); + m_xTbxCmd2->set_item_icon_name(u"dragmode"_ustr, sImageId); } ScNavigatorSettings::ScNavigatorSettings() @@ -335,18 +335,18 @@ ScNavigatorWin::ScNavigatorWin(SfxBindings* _pBindings, SfxChildWindow* _pMgr, } ScNavigatorDlg::ScNavigatorDlg(SfxBindings* pB, weld::Widget* pParent, SfxNavigator* pNavigatorDlg) - : PanelLayout(pParent, "NavigatorPanel", "modules/scalc/ui/navigatorpanel.ui") + : PanelLayout(pParent, u"NavigatorPanel"_ustr, u"modules/scalc/ui/navigatorpanel.ui"_ustr) , rBindings(*pB) - , m_xEdCol(m_xBuilder->weld_spin_button("column")) - , m_xEdRow(m_xBuilder->weld_spin_button("row")) - , m_xTbxCmd1(m_xBuilder->weld_toolbar("toolbox1")) - , m_xTbxCmd2(m_xBuilder->weld_toolbar("toolbox2")) - , m_xLbEntries(new ScContentTree(m_xBuilder->weld_tree_view("contentbox"), this)) - , m_xScenarioBox(m_xBuilder->weld_widget("scenariobox")) + , m_xEdCol(m_xBuilder->weld_spin_button(u"column"_ustr)) + , m_xEdRow(m_xBuilder->weld_spin_button(u"row"_ustr)) + , m_xTbxCmd1(m_xBuilder->weld_toolbar(u"toolbox1"_ustr)) + , m_xTbxCmd2(m_xBuilder->weld_toolbar(u"toolbox2"_ustr)) + , m_xLbEntries(new ScContentTree(m_xBuilder->weld_tree_view(u"contentbox"_ustr), this)) + , m_xScenarioBox(m_xBuilder->weld_widget(u"scenariobox"_ustr)) , m_xWndScenarios(new ScScenarioWindow(*m_xBuilder, ScResId(SCSTR_QHLP_SCEN_LISTBOX), ScResId(SCSTR_QHLP_SCEN_COMMENT))) - , m_xLbDocuments(m_xBuilder->weld_combo_box("documents")) - , m_xDragModeMenu(m_xBuilder->weld_menu("dragmodemenu")) + , m_xLbDocuments(m_xBuilder->weld_combo_box(u"documents"_ustr)) + , m_xDragModeMenu(m_xBuilder->weld_menu(u"dragmodemenu"_ustr)) , m_xNavigatorDlg(pNavigatorDlg) , aContentIdle("ScNavigatorDlg aContentIdle") , aStrActiveWin(ScResId(SCSTR_ACTIVEWIN)) @@ -371,7 +371,7 @@ ScNavigatorDlg::ScNavigatorDlg(SfxBindings* pB, weld::Widget* pParent, SfxNaviga m_xTbxCmd1->connect_clicked(LINK(this, ScNavigatorDlg, ToolBoxSelectHdl)); m_xTbxCmd2->connect_clicked(LINK(this, ScNavigatorDlg, ToolBoxSelectHdl)); - m_xTbxCmd2->set_item_menu("dragmode", m_xDragModeMenu.get()); + m_xTbxCmd2->set_item_menu(u"dragmode"_ustr, m_xDragModeMenu.get()); m_xDragModeMenu->connect_activate(LINK(this, ScNavigatorDlg, MenuSelectHdl)); m_xTbxCmd2->connect_menu_toggled(LINK(this, ScNavigatorDlg, ToolBoxDropdownClickHdl)); @@ -418,14 +418,14 @@ ScNavigatorDlg::ScNavigatorDlg(SfxBindings* pB, weld::Widget* pParent, SfxNaviga // if scenario was active, switch on NavListMode eNavMode = static_cast<NavListMode>(rCfg.GetListMode()); if (eNavMode == NAV_LMODE_SCENARIOS) - m_xTbxCmd2->set_item_active("scenarios", true); + m_xTbxCmd2->set_item_active(u"scenarios"_ustr, true); else eNavMode = NAV_LMODE_AREAS; SetListMode(eNavMode); if(comphelper::LibreOfficeKit::isActive()) { - m_xBuilder->weld_container("gridbuttons")->hide(); + m_xBuilder->weld_container(u"gridbuttons"_ustr)->hide(); m_xLbDocuments->hide(); } } @@ -453,7 +453,7 @@ void ScNavigatorDlg::UpdateInitShow() // When the navigator is displayed in the sidebar, or is otherwise // docked, it has the whole deck to fill. Therefore hide the button that // hides all controls below the top two rows of buttons. - m_xTbxCmd1->set_item_visible("contents", ParentIsFloatingWindow(m_xNavigatorDlg)); + m_xTbxCmd1->set_item_visible(u"contents"_ustr, ParentIsFloatingWindow(m_xNavigatorDlg)); } void ScNavigatorWin::StateChanged(StateChangedType nStateChange) diff --git a/sc/source/ui/navipi/scenwnd.cxx b/sc/source/ui/navipi/scenwnd.cxx index 22ee5148fc7b..0b6b6b46bf88 100644 --- a/sc/source/ui/navipi/scenwnd.cxx +++ b/sc/source/ui/navipi/scenwnd.cxx @@ -126,8 +126,8 @@ IMPL_LINK(ScScenarioWindow, ContextMenuHdl, const CommandEvent&, rCEvt, bool) { if (!pEntry->mbProtected) { - std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(m_xLbScenario.get(), "modules/scalc/ui/scenariomenu.ui")); - std::unique_ptr<weld::Menu> xPopup(xBuilder->weld_menu("menu")); + std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(m_xLbScenario.get(), u"modules/scalc/ui/scenariomenu.ui"_ustr)); + std::unique_ptr<weld::Menu> xPopup(xBuilder->weld_menu(u"menu"_ustr)); OUString sIdent(xPopup->popup_at_rect(m_xLbScenario.get(), tools::Rectangle(rCEvt.GetMousePosPixel(), Size(1,1)))); if (sIdent == "delete") DeleteScenario(); @@ -186,8 +186,8 @@ void ScScenarioWindow::DeleteScenario() ScScenarioWindow::ScScenarioWindow(weld::Builder& rBuilder, const OUString& aQH_List, const OUString& aQH_Comment) - : m_xLbScenario(rBuilder.weld_tree_view("scenariolist")) - , m_xEdComment(rBuilder.weld_text_view("scenariotext")) + : m_xLbScenario(rBuilder.weld_tree_view(u"scenariolist"_ustr)) + , m_xEdComment(rBuilder.weld_text_view(u"scenariotext"_ustr)) { m_xLbScenario->set_help_id(HID_SC_SCENWIN_TOP); m_xEdComment->set_help_id(HID_SC_SCENWIN_BOTTOM); diff --git a/sc/source/ui/pagedlg/areasdlg.cxx b/sc/source/ui/pagedlg/areasdlg.cxx index 2e5b9f844a0e..27f9d114d1b9 100644 --- a/sc/source/ui/pagedlg/areasdlg.cxx +++ b/sc/source/ui/pagedlg/areasdlg.cxx @@ -95,25 +95,25 @@ static void printAddressFlags(ScRefFlags nFlag) ScPrintAreasDlg::ScPrintAreasDlg(SfxBindings* pB, SfxChildWindow* pCW, weld::Window* pParent) - : ScAnyRefDlgController(pB, pCW, pParent, "modules/scalc/ui/printareasdialog.ui", "PrintAreasDialog") + : ScAnyRefDlgController(pB, pCW, pParent, u"modules/scalc/ui/printareasdialog.ui"_ustr, u"PrintAreasDialog"_ustr) , bDlgLostFocus(false) , pDoc(nullptr) , pViewData(nullptr) , nCurTab(0) - , m_xLbPrintArea(m_xBuilder->weld_combo_box("lbprintarea")) - , m_xEdPrintArea(new formula::RefEdit(m_xBuilder->weld_entry("edprintarea"))) - , m_xRbPrintArea(new formula::RefButton(m_xBuilder->weld_button("rbprintarea"))) - , m_xLbRepeatRow(m_xBuilder->weld_combo_box("lbrepeatrow")) - , m_xEdRepeatRow(new formula::RefEdit(m_xBuilder->weld_entry("edrepeatrow"))) - , m_xRbRepeatRow(new formula::RefButton(m_xBuilder->weld_button("rbrepeatrow"))) - , m_xLbRepeatCol(m_xBuilder->weld_combo_box("lbrepeatcol")) - , m_xEdRepeatCol(new formula::RefEdit(m_xBuilder->weld_entry("edrepeatcol"))) - , m_xRbRepeatCol(new formula::RefButton(m_xBuilder->weld_button("rbrepeatcol"))) - , m_xBtnOk(m_xBuilder->weld_button("ok")) - , m_xBtnCancel(m_xBuilder->weld_button("cancel")) - , m_xPrintFrame(m_xBuilder->weld_frame("printframe")) - , m_xRowFrame(m_xBuilder->weld_frame("rowframe")) - , m_xColFrame(m_xBuilder->weld_frame("colframe")) + , m_xLbPrintArea(m_xBuilder->weld_combo_box(u"lbprintarea"_ustr)) + , m_xEdPrintArea(new formula::RefEdit(m_xBuilder->weld_entry(u"edprintarea"_ustr))) + , m_xRbPrintArea(new formula::RefButton(m_xBuilder->weld_button(u"rbprintarea"_ustr))) + , m_xLbRepeatRow(m_xBuilder->weld_combo_box(u"lbrepeatrow"_ustr)) + , m_xEdRepeatRow(new formula::RefEdit(m_xBuilder->weld_entry(u"edrepeatrow"_ustr))) + , m_xRbRepeatRow(new formula::RefButton(m_xBuilder->weld_button(u"rbrepeatrow"_ustr))) + , m_xLbRepeatCol(m_xBuilder->weld_combo_box(u"lbrepeatcol"_ustr)) + , m_xEdRepeatCol(new formula::RefEdit(m_xBuilder->weld_entry(u"edrepeatcol"_ustr))) + , m_xRbRepeatCol(new formula::RefButton(m_xBuilder->weld_button(u"rbrepeatcol"_ustr))) + , m_xBtnOk(m_xBuilder->weld_button(u"ok"_ustr)) + , m_xBtnCancel(m_xBuilder->weld_button(u"cancel"_ustr)) + , m_xPrintFrame(m_xBuilder->weld_frame(u"printframe"_ustr)) + , m_xRowFrame(m_xBuilder->weld_frame(u"rowframe"_ustr)) + , m_xColFrame(m_xBuilder->weld_frame(u"colframe"_ustr)) , m_xPrintFrameFT(m_xPrintFrame->weld_label_widget()) , m_xRowFrameFT(m_xRowFrame->weld_label_widget()) , m_xColFrameFT(m_xColFrame->weld_label_widget()) @@ -449,9 +449,9 @@ IMPL_LINK(ScPrintAreasDlg, Impl_BtnHdl, weld::Button&, rBtn, void) { if ( Impl_CheckRefStrings() ) { - SfxStringItem aPrintArea( SID_CHANGE_PRINTAREA, "" ); - SfxStringItem aRepeatRow( FN_PARAM_2, "" ); - SfxStringItem aRepeatCol( FN_PARAM_3, "" ); + SfxStringItem aPrintArea( SID_CHANGE_PRINTAREA, u""_ustr ); + SfxStringItem aRepeatRow( FN_PARAM_2, u""_ustr ); + SfxStringItem aRepeatCol( FN_PARAM_3, u""_ustr ); // Printing area changed? diff --git a/sc/source/ui/pagedlg/hfedtdlg.cxx b/sc/source/ui/pagedlg/hfedtdlg.cxx index de77c9e7cb09..de8879f5652a 100644 --- a/sc/source/ui/pagedlg/hfedtdlg.cxx +++ b/sc/source/ui/pagedlg/hfedtdlg.cxx @@ -49,11 +49,11 @@ ScHFEditHeaderDlg::ScHFEditHeaderDlg( const SfxItemSet& rCoreSet, std::u16string_view rPageStyle) : ScHFEditDlg( pParent, rCoreSet, rPageStyle, - "modules/scalc/ui/headerdialog.ui", "HeaderDialog") + u"modules/scalc/ui/headerdialog.ui"_ustr, u"HeaderDialog"_ustr) { - AddTabPage("headerfirst", ScFirstHeaderEditPage::Create, nullptr); - AddTabPage("headerright", ScRightHeaderEditPage::Create, nullptr); - AddTabPage("headerleft", ScLeftHeaderEditPage::Create, nullptr); + AddTabPage(u"headerfirst"_ustr, ScFirstHeaderEditPage::Create, nullptr); + AddTabPage(u"headerright"_ustr, ScRightHeaderEditPage::Create, nullptr); + AddTabPage(u"headerleft"_ustr, ScLeftHeaderEditPage::Create, nullptr); } ScHFEditFooterDlg::ScHFEditFooterDlg( @@ -61,11 +61,11 @@ ScHFEditFooterDlg::ScHFEditFooterDlg( const SfxItemSet& rCoreSet, std::u16string_view rPageStyle) : ScHFEditDlg( pParent, rCoreSet, rPageStyle, - "modules/scalc/ui/footerdialog.ui", "FooterDialog" ) + u"modules/scalc/ui/footerdialog.ui"_ustr, u"FooterDialog"_ustr ) { - AddTabPage("footerfirst", ScFirstFooterEditPage::Create, nullptr); - AddTabPage("footerright", ScRightFooterEditPage::Create, nullptr); - AddTabPage("footerleft", ScLeftFooterEditPage::Create, nullptr); + AddTabPage(u"footerfirst"_ustr, ScFirstFooterEditPage::Create, nullptr); + AddTabPage(u"footerright"_ustr, ScRightFooterEditPage::Create, nullptr); + AddTabPage(u"footerleft"_ustr, ScLeftFooterEditPage::Create, nullptr); } ScHFEditSharedFirstHeaderDlg::ScHFEditSharedFirstHeaderDlg( @@ -73,10 +73,10 @@ ScHFEditSharedFirstHeaderDlg::ScHFEditSharedFirstHeaderDlg( const SfxItemSet& rCoreSet, std::u16string_view rPageStyle) : ScHFEditDlg( pParent, rCoreSet, rPageStyle, - "modules/scalc/ui/sharedfirstheaderdialog.ui", "SharedFirstHeaderDialog" ) + u"modules/scalc/ui/sharedfirstheaderdialog.ui"_ustr, u"SharedFirstHeaderDialog"_ustr ) { - AddTabPage("headerright", ScRightHeaderEditPage::Create, nullptr); - AddTabPage("headerleft", ScLeftHeaderEditPage::Create, nullptr); + AddTabPage(u"headerright"_ustr, ScRightHeaderEditPage::Create, nullptr); + AddTabPage(u"headerleft"_ustr, ScLeftHeaderEditPage::Create, nullptr); } ScHFEditSharedFirstFooterDlg::ScHFEditSharedFirstFooterDlg( @@ -84,10 +84,10 @@ ScHFEditSharedFirstFooterDlg::ScHFEditSharedFirstFooterDlg( const SfxItemSet& rCoreSet, std::u16string_view rPageStyle) : ScHFEditDlg( pParent, rCoreSet, rPageStyle, - "modules/scalc/ui/sharedfirstfooterdialog.ui", "SharedFirstFooterDialog" ) + u"modules/scalc/ui/sharedfirstfooterdialog.ui"_ustr, u"SharedFirstFooterDialog"_ustr ) { - AddTabPage("footerright", ScRightFooterEditPage::Create, nullptr); - AddTabPage("footerleft", ScLeftFooterEditPage::Create, nullptr); + AddTabPage(u"footerright"_ustr, ScRightFooterEditPage::Create, nullptr); + AddTabPage(u"footerleft"_ustr, ScLeftFooterEditPage::Create, nullptr); } ScHFEditSharedLeftHeaderDlg::ScHFEditSharedLeftHeaderDlg( @@ -95,10 +95,10 @@ ScHFEditSharedLeftHeaderDlg::ScHFEditSharedLeftHeaderDlg( const SfxItemSet& rCoreSet, std::u16string_view rPageStyle) : ScHFEditDlg( pParent, rCoreSet, rPageStyle, - "modules/scalc/ui/sharedleftheaderdialog.ui", "SharedLeftHeaderDialog" ) + u"modules/scalc/ui/sharedleftheaderdialog.ui"_ustr, u"SharedLeftHeaderDialog"_ustr ) { - AddTabPage("headerfirst", ScFirstHeaderEditPage::Create, nullptr); - AddTabPage("headerright", ScRightHeaderEditPage::Create, nullptr); + AddTabPage(u"headerfirst"_ustr, ScFirstHeaderEditPage::Create, nullptr); + AddTabPage(u"headerright"_ustr, ScRightHeaderEditPage::Create, nullptr); } ScHFEditSharedLeftFooterDlg::ScHFEditSharedLeftFooterDlg( @@ -106,10 +106,10 @@ ScHFEditSharedLeftFooterDlg::ScHFEditSharedLeftFooterDlg( const SfxItemSet& rCoreSet, std::u16string_view rPageStyle) : ScHFEditDlg( pParent, rCoreSet, rPageStyle, - "modules/scalc/ui/sharedleftfooterdialog.ui", "SharedLeftFooterDialog" ) + u"modules/scalc/ui/sharedleftfooterdialog.ui"_ustr, u"SharedLeftFooterDialog"_ustr ) { - AddTabPage("footerfirst", ScFirstFooterEditPage::Create, nullptr); - AddTabPage("footerright", ScRightFooterEditPage::Create, nullptr); + AddTabPage(u"footerfirst"_ustr, ScFirstFooterEditPage::Create, nullptr); + AddTabPage(u"footerright"_ustr, ScRightFooterEditPage::Create, nullptr); } ScHFEditFirstHeaderDlg::ScHFEditFirstHeaderDlg( @@ -117,9 +117,9 @@ ScHFEditFirstHeaderDlg::ScHFEditFirstHeaderDlg( const SfxItemSet& rCoreSet, std::u16string_view rPageStyle) : ScHFEditDlg( pParent, rCoreSet, rPageStyle, - "modules/scalc/ui/firstheaderdialog.ui", "FirstHeaderDialog" ) + u"modules/scalc/ui/firstheaderdialog.ui"_ustr, u"FirstHeaderDialog"_ustr ) { - AddTabPage("headerfirst", ScFirstHeaderEditPage::Create, nullptr); + AddTabPage(u"headerfirst"_ustr, ScFirstHeaderEditPage::Create, nullptr); } ScHFEditLeftHeaderDlg::ScHFEditLeftHeaderDlg( @@ -127,9 +127,9 @@ ScHFEditLeftHeaderDlg::ScHFEditLeftHeaderDlg( const SfxItemSet& rCoreSet, std::u16string_view rPageStyle) : ScHFEditDlg( pParent, rCoreSet, rPageStyle, - "modules/scalc/ui/leftheaderdialog.ui", "LeftHeaderDialog" ) + u"modules/scalc/ui/leftheaderdialog.ui"_ustr, u"LeftHeaderDialog"_ustr ) { - AddTabPage("headerleft", ScLeftHeaderEditPage::Create, nullptr); + AddTabPage(u"headerleft"_ustr, ScLeftHeaderEditPage::Create, nullptr); } ScHFEditRightHeaderDlg::ScHFEditRightHeaderDlg( @@ -137,9 +137,9 @@ ScHFEditRightHeaderDlg::ScHFEditRightHeaderDlg( const SfxItemSet& rCoreSet, std::u16string_view rPageStyle) : ScHFEditDlg( pParent, rCoreSet, rPageStyle, - "modules/scalc/ui/rightheaderdialog.ui", "RightHeaderDialog" ) + u"modules/scalc/ui/rightheaderdialog.ui"_ustr, u"RightHeaderDialog"_ustr ) { - AddTabPage("headerright", ScRightHeaderEditPage::Create, nullptr); + AddTabPage(u"headerright"_ustr, ScRightHeaderEditPage::Create, nullptr); } ScHFEditFirstFooterDlg::ScHFEditFirstFooterDlg( @@ -147,9 +147,9 @@ ScHFEditFirstFooterDlg::ScHFEditFirstFooterDlg( const SfxItemSet& rCoreSet, std::u16string_view rPageStyle) : ScHFEditDlg( pParent, rCoreSet, rPageStyle, - "modules/scalc/ui/firstfooterdialog.ui", "FirstFooterDialog" ) + u"modules/scalc/ui/firstfooterdialog.ui"_ustr, u"FirstFooterDialog"_ustr ) { - AddTabPage("footerfirst", ScFirstFooterEditPage::Create, nullptr); + AddTabPage(u"footerfirst"_ustr, ScFirstFooterEditPage::Create, nullptr); } ScHFEditLeftFooterDlg::ScHFEditLeftFooterDlg( @@ -157,9 +157,9 @@ ScHFEditLeftFooterDlg::ScHFEditLeftFooterDlg( const SfxItemSet& rCoreSet, std::u16string_view rPageStyle) : ScHFEditDlg( pParent, rCoreSet, rPageStyle, - "modules/scalc/ui/leftfooterdialog.ui", "LeftFooterDialog" ) + u"modules/scalc/ui/leftfooterdialog.ui"_ustr, u"LeftFooterDialog"_ustr ) { - AddTabPage("footerleft", ScLeftFooterEditPage::Create, nullptr); + AddTabPage(u"footerleft"_ustr, ScLeftFooterEditPage::Create, nullptr); } ScHFEditRightFooterDlg::ScHFEditRightFooterDlg( @@ -167,9 +167,9 @@ ScHFEditRightFooterDlg::ScHFEditRightFooterDlg( const SfxItemSet& rCoreSet, std::u16string_view rPageStyle) : ScHFEditDlg( pParent, rCoreSet, rPageStyle, - "modules/scalc/ui/rightfooterdialog.ui", "RightFooterDialog" ) + u"modules/scalc/ui/rightfooterdialog.ui"_ustr, u"RightFooterDialog"_ustr ) { - AddTabPage("footerright", ScRightFooterEditPage::Create, nullptr); + AddTabPage(u"footerright"_ustr, ScRightFooterEditPage::Create, nullptr); } ScHFEditSharedHeaderDlg::ScHFEditSharedHeaderDlg( @@ -177,13 +177,13 @@ ScHFEditSharedHeaderDlg::ScHFEditSharedHeaderDlg( const SfxItemSet& rCoreSet, std::u16string_view rPageStyle) : ScHFEditDlg( pParent, rCoreSet, rPageStyle, - "modules/scalc/ui/sharedheaderdialog.ui", "SharedHeaderDialog" ) + u"modules/scalc/ui/sharedheaderdialog.ui"_ustr, u"SharedHeaderDialog"_ustr ) { - AddTabPage("headerfirst", ScFirstHeaderEditPage::Create, nullptr); - AddTabPage("header", ScRightHeaderEditPage::Create, nullptr); - AddTabPage("footerfirst", ScFirstFooterEditPage::Create, nullptr); - AddTabPage("footerright", ScRightFooterEditPage::Create, nullptr); - AddTabPage("footerleft", ScLeftFooterEditPage::Create, nullptr); + AddTabPage(u"headerfirst"_ustr, ScFirstHeaderEditPage::Create, nullptr); + AddTabPage(u"header"_ustr, ScRightHeaderEditPage::Create, nullptr); + AddTabPage(u"footerfirst"_ustr, ScFirstFooterEditPage::Create, nullptr); + AddTabPage(u"footerright"_ustr, ScRightFooterEditPage::Create, nullptr); + AddTabPage(u"footerleft"_ustr, ScLeftFooterEditPage::Create, nullptr); } ScHFEditSharedFooterDlg::ScHFEditSharedFooterDlg( @@ -191,13 +191,13 @@ ScHFEditSharedFooterDlg::ScHFEditSharedFooterDlg( const SfxItemSet& rCoreSet, std::u16string_view rPageStyle) : ScHFEditDlg( pParent, rCoreSet, rPageStyle, - "modules/scalc/ui/sharedfooterdialog.ui", "SharedFooterDialog" ) + u"modules/scalc/ui/sharedfooterdialog.ui"_ustr, u"SharedFooterDialog"_ustr ) { - AddTabPage("headerfirst", ScFirstFooterEditPage::Create, nullptr); - AddTabPage("headerright", ScRightHeaderEditPage::Create, nullptr); - AddTabPage("headerleft", ScLeftHeaderEditPage::Create, nullptr); - AddTabPage("footerfirst", ScFirstFooterEditPage::Create, nullptr); - AddTabPage("footer", ScRightFooterEditPage::Create, nullptr); + AddTabPage(u"headerfirst"_ustr, ScFirstFooterEditPage::Create, nullptr); + AddTabPage(u"headerright"_ustr, ScRightHeaderEditPage::Create, nullptr); + AddTabPage(u"headerleft"_ustr, ScLeftHeaderEditPage::Create, nullptr); + AddTabPage(u"footerfirst"_ustr, ScFirstFooterEditPage::Create, nullptr); + AddTabPage(u"footer"_ustr, ScRightFooterEditPage::Create, nullptr); } ScHFEditAllDlg::ScHFEditAllDlg( @@ -205,14 +205,14 @@ ScHFEditAllDlg::ScHFEditAllDlg( const SfxItemSet& rCoreSet, std::u16string_view rPageStyle) : ScHFEditDlg( pParent, rCoreSet, rPageStyle, - "modules/scalc/ui/allheaderfooterdialog.ui", "AllHeaderFooterDialog" ) + u"modules/scalc/ui/allheaderfooterdialog.ui"_ustr, u"AllHeaderFooterDialog"_ustr ) { - AddTabPage("headerfirst", ScFirstHeaderEditPage::Create, nullptr); - AddTabPage("headerright", ScRightHeaderEditPage::Create, nullptr); - AddTabPage("headerleft", ScLeftHeaderEditPage::Create, nullptr); - AddTabPage("footerfirst", ScFirstFooterEditPage::Create, nullptr); - AddTabPage("footerright", ScRightFooterEditPage::Create, nullptr); - AddTabPage("footerleft", ScLeftFooterEditPage::Create, nullptr); + AddTabPage(u"headerfirst"_ustr, ScFirstHeaderEditPage::Create, nullptr); + AddTabPage(u"headerright"_ustr, ScRightHeaderEditPage::Create, nullptr); + AddTabPage(u"headerleft"_ustr, ScLeftHeaderEditPage::Create, nullptr); + AddTabPage(u"footerfirst"_ustr, ScFirstFooterEditPage::Create, nullptr); + AddTabPage(u"footerright"_ustr, ScRightFooterEditPage::Create, nullptr); + AddTabPage(u"footerleft"_ustr, ScLeftFooterEditPage::Create, nullptr); } ScHFEditActiveDlg::ScHFEditActiveDlg( @@ -220,7 +220,7 @@ ScHFEditActiveDlg::ScHFEditActiveDlg( const SfxItemSet& rCoreSet, std::u16string_view rPageStyle) : ScHFEditDlg( pParent, rCoreSet, rPageStyle, - "modules/scalc/ui/headerfooterdialog.ui", "HeaderFooterDialog" ) + u"modules/scalc/ui/headerfooterdialog.ui"_ustr, u"HeaderFooterDialog"_ustr ) { const SvxPageItem& rPageItem = rCoreSet.Get( @@ -230,8 +230,8 @@ ScHFEditActiveDlg::ScHFEditActiveDlg( if ( bRightPage ) { - AddTabPage("header", ScRightHeaderEditPage::Create, nullptr); - AddTabPage("footer", ScRightFooterEditPage::Create, nullptr); + AddTabPage(u"header"_ustr, ScRightHeaderEditPage::Create, nullptr); + AddTabPage(u"footer"_ustr, ScRightFooterEditPage::Create, nullptr); } else { @@ -240,16 +240,16 @@ ScHFEditActiveDlg::ScHFEditActiveDlg( bool bShareHeader = rCoreSet.Get(ATTR_PAGE_HEADERSET).GetItemSet(). Get(ATTR_PAGE_SHARED).GetValue(); if ( bShareHeader ) - AddTabPage("header", ScRightHeaderEditPage::Create, nullptr); + AddTabPage(u"header"_ustr, ScRightHeaderEditPage::Create, nullptr); else - AddTabPage("header", ScLeftHeaderEditPage::Create, nullptr); + AddTabPage(u"header"_ustr, ScLeftHeaderEditPage::Create, nullptr); bool bShareFooter = rCoreSet.Get(ATTR_PAGE_FOOTERSET).GetItemSet(). Get(ATTR_PAGE_SHARED).GetValue(); if ( bShareFooter ) - AddTabPage("footer", ScRightFooterEditPage::Create, nullptr); + AddTabPage(u"footer"_ustr, ScRightFooterEditPage::Create, nullptr); else - AddTabPage("footer", ScLeftFooterEditPage::Create, nullptr); + AddTabPage(u"footer"_ustr, ScLeftFooterEditPage::Create, nullptr); } } diff --git a/sc/source/ui/pagedlg/scuitphfedit.cxx b/sc/source/ui/pagedlg/scuitphfedit.cxx index e087370f84cd..ecc7b1c0986e 100644 --- a/sc/source/ui/pagedlg/scuitphfedit.cxx +++ b/sc/source/ui/pagedlg/scuitphfedit.cxx @@ -42,35 +42,35 @@ ScHFEditPage::ScHFEditPage(weld::Container* pPage, weld::DialogController* pCont const SfxItemSet& rCoreAttrs, TypedWhichId<ScPageHFItem> nWhichId, bool bHeader) - : SfxTabPage(pPage, pController, "modules/scalc/ui/headerfootercontent.ui", "HeaderFooterContent", &rCoreAttrs) + : SfxTabPage(pPage, pController, u"modules/scalc/ui/headerfootercontent.ui"_ustr, u"HeaderFooterContent"_ustr, &rCoreAttrs) , nWhich( nWhichId ) , m_bDropDownActive(false) , m_nTimeToggled(-1) , m_xFtDefinedHF(m_xBuilder->weld_label(!bHeader ? "labelFT_F_DEFINED" : "labelFT_H_DEFINED")) - , m_xLbDefined(m_xBuilder->weld_combo_box("comboLB_DEFINED")) + , m_xLbDefined(m_xBuilder->weld_combo_box(u"comboLB_DEFINED"_ustr)) , m_xFtCustomHF(m_xBuilder->weld_label(!bHeader ? "labelFT_F_CUSTOM" : "labelFT_H_CUSTOM")) - , m_xBtnText(m_xBuilder->weld_button("buttonBTN_TEXT")) - , m_xBtnFile(m_xBuilder->weld_menu_button("buttonBTN_FILE")) - , m_xBtnTable(m_xBuilder->weld_button("buttonBTN_TABLE")) - , m_xBtnPage(m_xBuilder->weld_button("buttonBTN_PAGE")) - , m_xBtnLastPage(m_xBuilder->weld_button("buttonBTN_PAGES")) - , m_xBtnDate(m_xBuilder->weld_button("buttonBTN_DATE")) - , m_xBtnTime(m_xBuilder->weld_button("buttonBTN_TIME")) - , m_xFtConfidential(m_xBuilder->weld_label("labelSTR_HF_CONFIDENTIAL")) - , m_xFtPage(m_xBuilder->weld_label("labelSTR_PAGE")) - , m_xFtOfQuestion(m_xBuilder->weld_label("labelSTR_HF_OF_QUESTION")) - , m_xFtOf(m_xBuilder->weld_label("labelSTR_HF_OF")) - , m_xFtNone(m_xBuilder->weld_label("labelSTR_HF_NONE_IN_BRACKETS")) - , m_xFtCreatedBy(m_xBuilder->weld_label("labelSTR_HF_CREATED_BY")) - , m_xFtCustomized(m_xBuilder->weld_label("labelSTR_HF_CUSTOMIZED")) - , m_xLeft(m_xBuilder->weld_widget("labelFT_LEFT")) - , m_xRight(m_xBuilder->weld_widget("labelFT_RIGHT")) + , m_xBtnText(m_xBuilder->weld_button(u"buttonBTN_TEXT"_ustr)) + , m_xBtnFile(m_xBuilder->weld_menu_button(u"buttonBTN_FILE"_ustr)) + , m_xBtnTable(m_xBuilder->weld_button(u"buttonBTN_TABLE"_ustr)) + , m_xBtnPage(m_xBuilder->weld_button(u"buttonBTN_PAGE"_ustr)) + , m_xBtnLastPage(m_xBuilder->weld_button(u"buttonBTN_PAGES"_ustr)) + , m_xBtnDate(m_xBuilder->weld_button(u"buttonBTN_DATE"_ustr)) + , m_xBtnTime(m_xBuilder->weld_button(u"buttonBTN_TIME"_ustr)) + , m_xFtConfidential(m_xBuilder->weld_label(u"labelSTR_HF_CONFIDENTIAL"_ustr)) + , m_xFtPage(m_xBuilder->weld_label(u"labelSTR_PAGE"_ustr)) + , m_xFtOfQuestion(m_xBuilder->weld_label(u"labelSTR_HF_OF_QUESTION"_ustr)) + , m_xFtOf(m_xBuilder->weld_label(u"labelSTR_HF_OF"_ustr)) + , m_xFtNone(m_xBuilder->weld_label(u"labelSTR_HF_NONE_IN_BRACKETS"_ustr)) + , m_xFtCreatedBy(m_xBuilder->weld_label(u"labelSTR_HF_CREATED_BY"_ustr)) + , m_xFtCustomized(m_xBuilder->weld_label(u"labelSTR_HF_CUSTOMIZED"_ustr)) + , m_xLeft(m_xBuilder->weld_widget(u"labelFT_LEFT"_ustr)) + , m_xRight(m_xBuilder->weld_widget(u"labelFT_RIGHT"_ustr)) , m_xWndLeft(new ScEditWindow(Left, pController->getDialog())) , m_xWndCenter(new ScEditWindow(Center, pController->getDialog())) , m_xWndRight(new ScEditWindow(Right, pController->getDialog())) - , m_xWndLeftWnd(new weld::CustomWeld(*m_xBuilder, "textviewWND_LEFT", *m_xWndLeft)) - , m_xWndCenterWnd(new weld::CustomWeld(*m_xBuilder, "textviewWND_CENTER", *m_xWndCenter)) - , m_xWndRightWnd(new weld::CustomWeld(*m_xBuilder, "textviewWND_RIGHT", *m_xWndRight)) + , m_xWndLeftWnd(new weld::CustomWeld(*m_xBuilder, u"textviewWND_LEFT"_ustr, *m_xWndLeft)) + , m_xWndCenterWnd(new weld::CustomWeld(*m_xBuilder, u"textviewWND_CENTER"_ustr, *m_xWndCenter)) + , m_xWndRightWnd(new weld::CustomWeld(*m_xBuilder, u"textviewWND_RIGHT"_ustr, *m_xWndRight)) , m_pEditFocus(nullptr) { // tdf#114695 override natural size with a small value @@ -607,7 +607,7 @@ void ScHFEditPage::ProcessDefinedListSel(ScHFEntryId eSel, bool bTravelling) m_xWndCenter->GetEditEngine()->QuickInsertField(SvxFieldItem(SvxPageField(), EE_FEATURE_FIELD), ESelection(aSel.nEndPara, aSel.nEndPos, aSel.nEndPara, aSel.nEndPos)); ++aSel.nEndPos; - OUString aCommaSpace(", "); + OUString aCommaSpace(u", "_ustr); m_xWndCenter->GetEditEngine()->QuickInsertText(aCommaSpace,ESelection(aSel.nEndPara, aSel.nEndPos, aSel.nEndPara, aSel.nEndPos)); aSel.nEndPos = aSel.nEndPos + aCommaSpace.getLength(); m_xWndCenter->GetEditEngine()->QuickInsertField( SvxFieldItem(SvxTableField(), EE_FEATURE_FIELD), ESelection(aSel.nEndPara, aSel.nEndPos, aSel.nEndPara, aSel.nEndPos)); @@ -627,7 +627,7 @@ void ScHFEditPage::ProcessDefinedListSel(ScHFEntryId eSel, bool bTravelling) aSel.nEndPos = aPageEntry.getLength(); m_xWndCenter->GetEditEngine()->QuickInsertField(SvxFieldItem(SvxPageField(), EE_FEATURE_FIELD), ESelection(aSel.nEndPara, aSel.nEndPos, aSel.nEndPara, aSel.nEndPos)); ++aSel.nEndPos; - OUString aCommaSpace(", "); + OUString aCommaSpace(u", "_ustr); m_xWndCenter->GetEditEngine()->QuickInsertText(aCommaSpace,ESelection(aSel.nEndPara, aSel.nEndPos, aSel.nEndPara, aSel.nEndPos)); aSel.nEndPos = aSel.nEndPos + aCommaSpace.getLength(); m_xWndCenter->GetEditEngine()->QuickInsertField( SvxFieldItem(SvxFileField(), EE_FEATURE_FIELD), ESelection(aSel.nEndPara, aSel.nEndPos, aSel.nEndPara, aSel.nEndPos)); diff --git a/sc/source/ui/pagedlg/tphf.cxx b/sc/source/ui/pagedlg/tphf.cxx index cdf4802af3e9..dfd8868e3397 100644 --- a/sc/source/ui/pagedlg/tphf.cxx +++ b/sc/source/ui/pagedlg/tphf.cxx @@ -45,7 +45,7 @@ ScHFPage::ScHFPage(weld::Container* pPage, weld::DialogController* pController, , aDataSet(*rSet.GetPool(), svl::Items<ATTR_PAGE, ATTR_PAGE, ATTR_PAGE_HEADERLEFT, ATTR_PAGE_FOOTERFIRST>) , nPageUsage(SvxPageUsage::All) , pStyleDlg(nullptr) - , m_xBtnEdit(m_xBuilder->weld_button("buttonEdit")) + , m_xBtnEdit(m_xBuilder->weld_button(u"buttonEdit"_ustr)) { SetExchangeSupport(); diff --git a/sc/source/ui/pagedlg/tptable.cxx b/sc/source/ui/pagedlg/tptable.cxx index 131d2bceb4b1..6d482e949cf5 100644 --- a/sc/source/ui/pagedlg/tptable.cxx +++ b/sc/source/ui/pagedlg/tptable.cxx @@ -83,32 +83,32 @@ bool WAS_DEFAULT(sal_uInt16 w, SfxItemSet const & s) #define SC_TPTABLE_SCALE_TO_PAGES 2 ScTablePage::ScTablePage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rCoreAttrs) - : SfxTabPage(pPage, pController, "modules/scalc/ui/sheetprintpage.ui", "SheetPrintPage", &rCoreAttrs) + : SfxTabPage(pPage, pController, u"modules/scalc/ui/sheetprintpage.ui"_ustr, u"SheetPrintPage"_ustr, &rCoreAttrs) , m_nOrigScalePageWidth(0) , m_nOrigScalePageHeight(0) - , m_xBtnTopDown(m_xBuilder->weld_radio_button("radioBTN_TOPDOWN")) - , m_xBtnLeftRight(m_xBuilder->weld_radio_button("radioBTN_LEFTRIGHT")) - , m_xBmpPageDir(m_xBuilder->weld_image("imageBMP_PAGEDIR")) - , m_xBtnPageNo(m_xBuilder->weld_check_button("checkBTN_PAGENO")) - , m_xEdPageNo(m_xBuilder->weld_spin_button("spinED_PAGENO")) - , m_xBtnHeaders(m_xBuilder->weld_check_button("checkBTN_HEADER")) - , m_xBtnGrid(m_xBuilder->weld_check_button("checkBTN_GRID")) - , m_xBtnNotes(m_xBuilder->weld_check_button("checkBTN_NOTES")) - , m_xBtnObjects(m_xBuilder->weld_check_button("checkBTN_OBJECTS")) - , m_xBtnCharts(m_xBuilder->weld_check_button("checkBTN_CHARTS")) - , m_xBtnDrawings(m_xBuilder->weld_check_button("checkBTN_DRAWINGS")) - , m_xBtnFormulas(m_xBuilder->weld_check_button("checkBTN_FORMULAS")) - , m_xBtnNullVals(m_xBuilder->weld_check_button("checkBTN_NULLVALS")) - , m_xLbScaleMode(m_xBuilder->weld_combo_box("comboLB_SCALEMODE")) - , m_xBxScaleAll(m_xBuilder->weld_widget("boxSCALEALL")) - , m_xEdScaleAll(m_xBuilder->weld_metric_spin_button("spinED_SCALEALL", FieldUnit::PERCENT)) - , m_xGrHeightWidth(m_xBuilder->weld_widget("gridWH")) - , m_xEdScalePageWidth(m_xBuilder->weld_spin_button("spinED_SCALEPAGEWIDTH")) - , m_xCbScalePageWidth(m_xBuilder->weld_check_button("labelWP")) - , m_xEdScalePageHeight(m_xBuilder->weld_spin_button("spinED_SCALEPAGEHEIGHT")) - , m_xCbScalePageHeight(m_xBuilder->weld_check_button("labelHP")) - , m_xBxScalePageNum(m_xBuilder->weld_widget("boxNP")) - , m_xEdScalePageNum(m_xBuilder->weld_spin_button("spinED_SCALEPAGENUM")) + , m_xBtnTopDown(m_xBuilder->weld_radio_button(u"radioBTN_TOPDOWN"_ustr)) + , m_xBtnLeftRight(m_xBuilder->weld_radio_button(u"radioBTN_LEFTRIGHT"_ustr)) + , m_xBmpPageDir(m_xBuilder->weld_image(u"imageBMP_PAGEDIR"_ustr)) + , m_xBtnPageNo(m_xBuilder->weld_check_button(u"checkBTN_PAGENO"_ustr)) + , m_xEdPageNo(m_xBuilder->weld_spin_button(u"spinED_PAGENO"_ustr)) + , m_xBtnHeaders(m_xBuilder->weld_check_button(u"checkBTN_HEADER"_ustr)) + , m_xBtnGrid(m_xBuilder->weld_check_button(u"checkBTN_GRID"_ustr)) + , m_xBtnNotes(m_xBuilder->weld_check_button(u"checkBTN_NOTES"_ustr)) + , m_xBtnObjects(m_xBuilder->weld_check_button(u"checkBTN_OBJECTS"_ustr)) + , m_xBtnCharts(m_xBuilder->weld_check_button(u"checkBTN_CHARTS"_ustr)) + , m_xBtnDrawings(m_xBuilder->weld_check_button(u"checkBTN_DRAWINGS"_ustr)) + , m_xBtnFormulas(m_xBuilder->weld_check_button(u"checkBTN_FORMULAS"_ustr)) + , m_xBtnNullVals(m_xBuilder->weld_check_button(u"checkBTN_NULLVALS"_ustr)) + , m_xLbScaleMode(m_xBuilder->weld_combo_box(u"comboLB_SCALEMODE"_ustr)) + , m_xBxScaleAll(m_xBuilder->weld_widget(u"boxSCALEALL"_ustr)) + , m_xEdScaleAll(m_xBuilder->weld_metric_spin_button(u"spinED_SCALEALL"_ustr, FieldUnit::PERCENT)) + , m_xGrHeightWidth(m_xBuilder->weld_widget(u"gridWH"_ustr)) + , m_xEdScalePageWidth(m_xBuilder->weld_spin_button(u"spinED_SCALEPAGEWIDTH"_ustr)) + , m_xCbScalePageWidth(m_xBuilder->weld_check_button(u"labelWP"_ustr)) + , m_xEdScalePageHeight(m_xBuilder->weld_spin_button(u"spinED_SCALEPAGEHEIGHT"_ustr)) + , m_xCbScalePageHeight(m_xBuilder->weld_check_button(u"labelHP"_ustr)) + , m_xBxScalePageNum(m_xBuilder->weld_widget(u"boxNP"_ustr)) + , m_xEdScalePageNum(m_xBuilder->weld_spin_button(u"spinED_SCALEPAGENUM"_ustr)) { SetExchangeSupport(); diff --git a/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx b/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx index 369e262c8088..6f4885988205 100644 --- a/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx +++ b/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx @@ -41,25 +41,25 @@ AlignmentPropertyPanel::AlignmentPropertyPanel( weld::Widget* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame, SfxBindings* pBindings) - : PanelLayout(pParent, "AlignmentPropertyPanel", "modules/scalc/ui/sidebaralignment.ui") - , mxFTLeftIndent(m_xBuilder->weld_label("leftindentlabel")) - , mxMFLeftIndent(m_xBuilder->weld_metric_spin_button("leftindent", FieldUnit::POINT)) - , mxCBXWrapText(m_xBuilder->weld_check_button("wraptext")) - , mxCBXMergeCell(m_xBuilder->weld_check_button("mergecells")) - , mxFtRotate(m_xBuilder->weld_label("orientationlabel")) - , mxMtrAngle(m_xBuilder->weld_metric_spin_button("orientationdegrees", FieldUnit::DEGREE)) - , mxRefEdgeBottom(m_xBuilder->weld_toggle_button("bottom")) - , mxRefEdgeTop(m_xBuilder->weld_toggle_button("top")) - , mxRefEdgeStd(m_xBuilder->weld_toggle_button("standard")) - , mxCBStacked(m_xBuilder->weld_check_button("stacked")) - , mxTextOrientBox(m_xBuilder->weld_widget("textorientbox")) - , mxHorizontalAlign(m_xBuilder->weld_toolbar("horizontalalignment")) + : PanelLayout(pParent, u"AlignmentPropertyPanel"_ustr, u"modules/scalc/ui/sidebaralignment.ui"_ustr) + , mxFTLeftIndent(m_xBuilder->weld_label(u"leftindentlabel"_ustr)) + , mxMFLeftIndent(m_xBuilder->weld_metric_spin_button(u"leftindent"_ustr, FieldUnit::POINT)) + , mxCBXWrapText(m_xBuilder->weld_check_button(u"wraptext"_ustr)) + , mxCBXMergeCell(m_xBuilder->weld_check_button(u"mergecells"_ustr)) + , mxFtRotate(m_xBuilder->weld_label(u"orientationlabel"_ustr)) + , mxMtrAngle(m_xBuilder->weld_metric_spin_button(u"orientationdegrees"_ustr, FieldUnit::DEGREE)) + , mxRefEdgeBottom(m_xBuilder->weld_toggle_button(u"bottom"_ustr)) + , mxRefEdgeTop(m_xBuilder->weld_toggle_button(u"top"_ustr)) + , mxRefEdgeStd(m_xBuilder->weld_toggle_button(u"standard"_ustr)) + , mxCBStacked(m_xBuilder->weld_check_button(u"stacked"_ustr)) + , mxTextOrientBox(m_xBuilder->weld_widget(u"textorientbox"_ustr)) + , mxHorizontalAlign(m_xBuilder->weld_toolbar(u"horizontalalignment"_ustr)) , mxHorizontalAlignDispatch(new ToolbarUnoDispatcher(*mxHorizontalAlign, *m_xBuilder, rxFrame)) - , mxVertAlign(m_xBuilder->weld_toolbar("verticalalignment")) + , mxVertAlign(m_xBuilder->weld_toolbar(u"verticalalignment"_ustr)) , mxVertAlignDispatch(new ToolbarUnoDispatcher(*mxVertAlign, *m_xBuilder, rxFrame)) - , mxWriteDirection(m_xBuilder->weld_toolbar("writedirection")) + , mxWriteDirection(m_xBuilder->weld_toolbar(u"writedirection"_ustr)) , mxWriteDirectionDispatch(new ToolbarUnoDispatcher(*mxWriteDirection, *m_xBuilder, rxFrame)) - , mxIndentButtons(m_xBuilder->weld_toolbar("indentbuttons")) + , mxIndentButtons(m_xBuilder->weld_toolbar(u"indentbuttons"_ustr)) , mxIndentButtonsDispatch(new ToolbarUnoDispatcher(*mxIndentButtons, *m_xBuilder, rxFrame)) , maAlignHorControl(SID_H_ALIGNCELL, *pBindings, *this) , maLeftIndentControl(SID_ATTR_ALIGN_INDENT, *pBindings, *this) @@ -197,11 +197,11 @@ std::unique_ptr<PanelLayout> AlignmentPropertyPanel::Create ( SfxBindings* pBindings) { if (pParent == nullptr) - throw lang::IllegalArgumentException("no parent Window given to AlignmentPropertyPanel::Create", nullptr, 0); + throw lang::IllegalArgumentException(u"no parent Window given to AlignmentPropertyPanel::Create"_ustr, nullptr, 0); if ( ! rxFrame.is()) - throw lang::IllegalArgumentException("no XFrame given to AlignmentPropertyPanel::Create", nullptr, 1); + throw lang::IllegalArgumentException(u"no XFrame given to AlignmentPropertyPanel::Create"_ustr, nullptr, 1); if (pBindings == nullptr) - throw lang::IllegalArgumentException("no SfxBindings given to AlignmentPropertyPanel::Create", nullptr, 2); + throw lang::IllegalArgumentException(u"no SfxBindings given to AlignmentPropertyPanel::Create"_ustr, nullptr, 2); return std::make_unique<AlignmentPropertyPanel>(pParent, rxFrame, pBindings); } diff --git a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx index 4f7e83a46d18..e1b57ded2d89 100644 --- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx +++ b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx @@ -47,13 +47,13 @@ CellAppearancePropertyPanel::CellAppearancePropertyPanel( weld::Widget* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame, SfxBindings* pBindings) -: PanelLayout(pParent, "CellAppearancePropertyPanel", "modules/scalc/ui/sidebarcellappearance.ui"), +: PanelLayout(pParent, u"CellAppearancePropertyPanel"_ustr, u"modules/scalc/ui/sidebarcellappearance.ui"_ustr), - mxTBCellBorder(m_xBuilder->weld_toolbar("cellbordertype")), - mxTBCellBackground(m_xBuilder->weld_toolbar("cellbackgroundcolor")), + mxTBCellBorder(m_xBuilder->weld_toolbar(u"cellbordertype"_ustr)), + mxTBCellBackground(m_xBuilder->weld_toolbar(u"cellbackgroundcolor"_ustr)), mxBackColorDispatch(new ToolbarUnoDispatcher(*mxTBCellBackground, *m_xBuilder, rxFrame)), - mxTBLineStyle(m_xBuilder->weld_toolbar("borderlinestyle")), - mxTBLineColor(m_xBuilder->weld_toolbar("borderlinecolor")), + mxTBLineStyle(m_xBuilder->weld_toolbar(u"borderlinestyle"_ustr)), + mxTBLineColor(m_xBuilder->weld_toolbar(u"borderlinecolor"_ustr)), mxLineColorDispatch(new ToolbarUnoDispatcher(*mxTBLineColor, *m_xBuilder, rxFrame)), mbCellBorderPopoverCreated(false), @@ -182,11 +182,11 @@ std::unique_ptr<PanelLayout> CellAppearancePropertyPanel::Create ( SfxBindings* pBindings) { if (pParent == nullptr) - throw lang::IllegalArgumentException("no parent Window given to CellAppearancePropertyPanel::Create", nullptr, 0); + throw lang::IllegalArgumentException(u"no parent Window given to CellAppearancePropertyPanel::Create"_ustr, nullptr, 0); if ( ! rxFrame.is()) - throw lang::IllegalArgumentException("no XFrame given to CellAppearancePropertyPanel::Create", nullptr, 1); + throw lang::IllegalArgumentException(u"no XFrame given to CellAppearancePropertyPanel::Create"_ustr, nullptr, 1); if (pBindings == nullptr) - throw lang::IllegalArgumentException("no SfxBindings given to CellAppearancePropertyPanel::Create", nullptr, 2); + throw lang::IllegalArgumentException(u"no SfxBindings given to CellAppearancePropertyPanel::Create"_ustr, nullptr, 2); return std::make_unique<CellAppearancePropertyPanel>(pParent, rxFrame, pBindings); } diff --git a/sc/source/ui/sidebar/CellBorderStyleControl.cxx b/sc/source/ui/sidebar/CellBorderStyleControl.cxx index e3b9e6a0232e..b6ec90b18e54 100644 --- a/sc/source/ui/sidebar/CellBorderStyleControl.cxx +++ b/sc/source/ui/sidebar/CellBorderStyleControl.cxx @@ -40,13 +40,13 @@ namespace sc::sidebar { #define FRM_VALID_ALL 0xff CellBorderStylePopup::CellBorderStylePopup(weld::Toolbar* pParent, const OUString& rId, SfxDispatcher* pDispatcher) - : WeldToolbarPopup(nullptr, pParent, "modules/scalc/ui/floatingborderstyle.ui", "FloatingBorderStyle") + : WeldToolbarPopup(nullptr, pParent, u"modules/scalc/ui/floatingborderstyle.ui"_ustr, u"FloatingBorderStyle"_ustr) , maToolButton(pParent, rId) , mpDispatcher(pDispatcher) - , mxTBBorder1(m_xBuilder->weld_toolbar("border1")) - , mxTBBorder2(m_xBuilder->weld_toolbar("border2")) - , mxTBBorder3(m_xBuilder->weld_toolbar("border3")) - , mxTBBorder4(m_xBuilder->weld_toolbar("border4")) + , mxTBBorder1(m_xBuilder->weld_toolbar(u"border1"_ustr)) + , mxTBBorder2(m_xBuilder->weld_toolbar(u"border2"_ustr)) + , mxTBBorder3(m_xBuilder->weld_toolbar(u"border3"_ustr)) + , mxTBBorder4(m_xBuilder->weld_toolbar(u"border4"_ustr)) { Initialize(); } diff --git a/sc/source/ui/sidebar/CellLineStyleControl.cxx b/sc/source/ui/sidebar/CellLineStyleControl.cxx index e9ea1ad34e66..b763c6a4f6db 100644 --- a/sc/source/ui/sidebar/CellLineStyleControl.cxx +++ b/sc/source/ui/sidebar/CellLineStyleControl.cxx @@ -34,12 +34,12 @@ namespace sc::sidebar { CellLineStylePopup::CellLineStylePopup(weld::Toolbar* pParent, const OUString& rId, SfxDispatcher* pDispatcher) - : WeldToolbarPopup(nullptr, pParent, "modules/scalc/ui/floatinglinestyle.ui", "FloatingLineStyle") + : WeldToolbarPopup(nullptr, pParent, u"modules/scalc/ui/floatinglinestyle.ui"_ustr, u"FloatingLineStyle"_ustr) , maToolButton(pParent, rId) , mpDispatcher(pDispatcher) , mxCellLineStyleValueSet(new sc::sidebar::CellLineStyleValueSet) - , mxCellLineStyleValueSetWin(new weld::CustomWeld(*m_xBuilder, "linestylevalueset", *mxCellLineStyleValueSet)) - , mxPushButtonMoreOptions(m_xBuilder->weld_button("more")) + , mxCellLineStyleValueSetWin(new weld::CustomWeld(*m_xBuilder, u"linestylevalueset"_ustr, *mxCellLineStyleValueSet)) + , mxPushButtonMoreOptions(m_xBuilder->weld_button(u"more"_ustr)) { Initialize(); } diff --git a/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx b/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx index c604d41b06fb..c62ddfd4b0df 100644 --- a/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx +++ b/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx @@ -37,19 +37,19 @@ NumberFormatPropertyPanel::NumberFormatPropertyPanel( weld::Widget* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame, SfxBindings* pBindings) - : PanelLayout(pParent,"NumberFormatPropertyPanel", "modules/scalc/ui/sidebarnumberformat.ui") - , mxLbCategory(m_xBuilder->weld_combo_box("numberformatcombobox")) - , mxTBCategory(m_xBuilder->weld_toolbar("numberformat")) + : PanelLayout(pParent,u"NumberFormatPropertyPanel"_ustr, u"modules/scalc/ui/sidebarnumberformat.ui"_ustr) + , mxLbCategory(m_xBuilder->weld_combo_box(u"numberformatcombobox"_ustr)) + , mxTBCategory(m_xBuilder->weld_toolbar(u"numberformat"_ustr)) , mxCategoryDispatch(new ToolbarUnoDispatcher(*mxTBCategory, *m_xBuilder, rxFrame)) - , mxFtDecimals(m_xBuilder->weld_label("decimalplaceslabel")) - , mxEdDecimals(m_xBuilder->weld_spin_button("decimalplaces")) - , mxFtDenominator(m_xBuilder->weld_label("denominatorplaceslabel")) - , mxEdDenominator(m_xBuilder->weld_spin_button("denominatorplaces")) - , mxFtLeadZeroes(m_xBuilder->weld_label("leadingzeroeslabel")) - , mxEdLeadZeroes(m_xBuilder->weld_spin_button("leadingzeroes")) - , mxBtnNegRed(m_xBuilder->weld_check_button("negativenumbersred")) - , mxBtnThousand(m_xBuilder->weld_check_button("thousandseparator")) - , mxBtnEngineering(m_xBuilder->weld_check_button("engineeringnotation")) + , mxFtDecimals(m_xBuilder->weld_label(u"decimalplaceslabel"_ustr)) + , mxEdDecimals(m_xBuilder->weld_spin_button(u"decimalplaces"_ustr)) + , mxFtDenominator(m_xBuilder->weld_label(u"denominatorplaceslabel"_ustr)) + , mxEdDenominator(m_xBuilder->weld_spin_button(u"denominatorplaces"_ustr)) + , mxFtLeadZeroes(m_xBuilder->weld_label(u"leadingzeroeslabel"_ustr)) + , mxEdLeadZeroes(m_xBuilder->weld_spin_button(u"leadingzeroes"_ustr)) + , mxBtnNegRed(m_xBuilder->weld_check_button(u"negativenumbersred"_ustr)) + , mxBtnThousand(m_xBuilder->weld_check_button(u"thousandseparator"_ustr)) + , mxBtnEngineering(m_xBuilder->weld_check_button(u"engineeringnotation"_ustr)) , maNumFormatControl(SID_NUMBER_TYPE_FORMAT, *pBindings, *this) , maFormatControl(SID_NUMBER_FORMAT, *pBindings, *this) , mnCategorySelected(0) @@ -113,7 +113,7 @@ IMPL_LINK_NOARG( NumberFormatPropertyPanel, NumFormatValueClickHdl, weld::Toggle IMPL_LINK_NOARG( NumberFormatPropertyPanel, NumFormatValueHdl, weld::SpinButton&, void ) { OUString aFormat; - OUString sBreak = ","; + OUString sBreak = u","_ustr; bool bThousand = ( mxBtnThousand->get_visible() && mxBtnThousand->get_sensitive() && mxBtnThousand->get_active() ) || ( mxBtnEngineering->get_visible() && mxBtnEngineering->get_sensitive() && mxBtnEngineering->get_active() ); bool bNegRed = mxBtnNegRed->get_sensitive() && mxBtnNegRed->get_active(); @@ -151,11 +151,11 @@ std::unique_ptr<PanelLayout> NumberFormatPropertyPanel::Create ( SfxBindings* pBindings) { if (pParent == nullptr) - throw lang::IllegalArgumentException("no parent Window given to NumberFormatPropertyPanel::Create", nullptr, 0); + throw lang::IllegalArgumentException(u"no parent Window given to NumberFormatPropertyPanel::Create"_ustr, nullptr, 0); if ( ! rxFrame.is()) - throw lang::IllegalArgumentException("no XFrame given to NumberFormatPropertyPanel::Create", nullptr, 1); + throw lang::IllegalArgumentException(u"no XFrame given to NumberFormatPropertyPanel::Create"_ustr, nullptr, 1); if (pBindings == nullptr) - throw lang::IllegalArgumentException("no SfxBindings given to NumberFormatPropertyPanel::Create", nullptr, 2); + throw lang::IllegalArgumentException(u"no SfxBindings given to NumberFormatPropertyPanel::Create"_ustr, nullptr, 2); return std::make_unique<NumberFormatPropertyPanel>(pParent, rxFrame, pBindings); } @@ -271,7 +271,7 @@ void NumberFormatPropertyPanel::NotifyItemUpdate( mxBtnEngineering->set_active(bThousand); mxBtnNegRed->set_active(bNegRed); if ( mxLbCategory->get_active() == 0 ) - mxEdDecimals->set_text(""); // tdf#44399 + mxEdDecimals->set_text(u""_ustr); // tdf#44399 else if ( mxEdDecimals->get_visible() ) mxEdDecimals->set_value(nPrecision); else if ( mxEdDenominator->get_visible() ) diff --git a/sc/source/ui/sidebar/ScPanelFactory.cxx b/sc/source/ui/sidebar/ScPanelFactory.cxx index bbcff315c289..833f2187df90 100644 --- a/sc/source/ui/sidebar/ScPanelFactory.cxx +++ b/sc/source/ui/sidebar/ScPanelFactory.cxx @@ -54,9 +54,9 @@ Reference<ui::XUIElement> SAL_CALL ScPanelFactory::createUIElement ( try { const ::comphelper::NamedValueCollection aArguments (rArguments); - Reference<frame::XFrame> xFrame (aArguments.getOrDefault("Frame", Reference<frame::XFrame>())); - Reference<awt::XWindow> xParentWindow (aArguments.getOrDefault("ParentWindow", Reference<awt::XWindow>())); - const sal_uInt64 nBindingsValue (aArguments.getOrDefault("SfxBindings", sal_uInt64(0))); + Reference<frame::XFrame> xFrame (aArguments.getOrDefault(u"Frame"_ustr, Reference<frame::XFrame>())); + Reference<awt::XWindow> xParentWindow (aArguments.getOrDefault(u"ParentWindow"_ustr, Reference<awt::XWindow>())); + const sal_uInt64 nBindingsValue (aArguments.getOrDefault(u"SfxBindings"_ustr, sal_uInt64(0))); SfxBindings* pBindings = reinterpret_cast<SfxBindings*>(nBindingsValue); weld::Widget* pParent(nullptr); @@ -65,15 +65,15 @@ Reference<ui::XUIElement> SAL_CALL ScPanelFactory::createUIElement ( if (!pParent) throw RuntimeException( - "PanelFactory::createUIElement called without ParentWindow", + u"PanelFactory::createUIElement called without ParentWindow"_ustr, nullptr); if ( ! xFrame.is()) throw RuntimeException( - "PanelFactory::createUIElement called without Frame", + u"PanelFactory::createUIElement called without Frame"_ustr, nullptr); if (pBindings == nullptr) throw RuntimeException( - "PanelFactory::createUIElement called without SfxBindings", + u"PanelFactory::createUIElement called without SfxBindings"_ustr, nullptr); sal_Int32 nMinimumSize = -1; @@ -110,7 +110,7 @@ Reference<ui::XUIElement> SAL_CALL ScPanelFactory::createUIElement ( { css::uno::Any anyEx = cppu::getCaughtException(); throw lang::WrappedTargetRuntimeException( - "ScPanelFactory::createUIElement exception", + u"ScPanelFactory::createUIElement exception"_ustr, nullptr, anyEx); } @@ -119,7 +119,7 @@ Reference<ui::XUIElement> SAL_CALL ScPanelFactory::createUIElement ( OUString ScPanelFactory::getImplementationName() { - return "org.apache.openoffice.comp.sc.sidebar.ScPanelFactory"; + return u"org.apache.openoffice.comp.sc.sidebar.ScPanelFactory"_ustr; } sal_Bool ScPanelFactory::supportsService(OUString const & ServiceName) @@ -129,7 +129,7 @@ sal_Bool ScPanelFactory::supportsService(OUString const & ServiceName) css::uno::Sequence<OUString> ScPanelFactory::getSupportedServiceNames() { - return { "com.sun.star.ui.UIElementFactory" }; + return { u"com.sun.star.ui.UIElementFactory"_ustr }; } } // end of namespace sc::sidebar diff --git a/sc/source/ui/styleui/styledlg.cxx b/sc/source/ui/styleui/styledlg.cxx index c54b496ea635..0d3332ef6fe4 100644 --- a/sc/source/ui/styleui/styledlg.cxx +++ b/sc/source/ui/styleui/styledlg.cxx @@ -44,39 +44,39 @@ ScStyleDlg::ScStyleDlg(weld::Window* pParent, bool bPage) : SfxStyleDialogController(pParent, bPage ? - OUString("modules/scalc/ui/pagetemplatedialog.ui") : - OUString("modules/scalc/ui/paratemplatedialog.ui"), + u"modules/scalc/ui/pagetemplatedialog.ui"_ustr : + u"modules/scalc/ui/paratemplatedialog.ui"_ustr, bPage ? - OUString("PageTemplateDialog") : - OUString("ParaTemplateDialog"), + u"PageTemplateDialog"_ustr : + u"ParaTemplateDialog"_ustr, rStyleBase ) , m_bPage(bPage) { SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create(); if (m_bPage) // page styles { - AddTabPage("page", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_PAGE ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_PAGE ) ); - AddTabPage("borders", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BORDER ) ); - AddTabPage("background", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BKG ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BKG ) ); - AddTabPage("header", &ScHeaderPage::Create, &ScHeaderPage::GetRanges ); - AddTabPage("footer", &ScFooterPage::Create, &ScFooterPage::GetRanges ); - AddTabPage("sheet", &ScTablePage::Create, &ScTablePage::GetRanges ); + AddTabPage(u"page"_ustr, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_PAGE ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_PAGE ) ); + AddTabPage(u"borders"_ustr, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BORDER ) ); + AddTabPage(u"background"_ustr, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BKG ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BKG ) ); + AddTabPage(u"header"_ustr, &ScHeaderPage::Create, &ScHeaderPage::GetRanges ); + AddTabPage(u"footer"_ustr, &ScFooterPage::Create, &ScFooterPage::GetRanges ); + AddTabPage(u"sheet"_ustr, &ScTablePage::Create, &ScTablePage::GetRanges ); } else // cell format styles { - AddTabPage("numbers", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_NUMBERFORMAT ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_NUMBERFORMAT )); - AddTabPage("font", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_NAME ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_NAME )); - AddTabPage("fonteffects", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_EFFECTS ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_EFFECTS )); - AddTabPage("alignment", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_ALIGNMENT ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_ALIGNMENT )); + AddTabPage(u"numbers"_ustr, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_NUMBERFORMAT ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_NUMBERFORMAT )); + AddTabPage(u"font"_ustr, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_NAME ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_NAME )); + AddTabPage(u"fonteffects"_ustr, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_EFFECTS ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_EFFECTS )); + AddTabPage(u"alignment"_ustr, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_ALIGNMENT ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_ALIGNMENT )); if ( SvtCJKOptions::IsAsianTypographyEnabled() ) { - AddTabPage("asiantypo", pFact->GetTabPageCreatorFunc(RID_SVXPAGE_PARA_ASIAN), pFact->GetTabPageRangesFunc(RID_SVXPAGE_PARA_ASIAN)); + AddTabPage(u"asiantypo"_ustr, pFact->GetTabPageCreatorFunc(RID_SVXPAGE_PARA_ASIAN), pFact->GetTabPageRangesFunc(RID_SVXPAGE_PARA_ASIAN)); } else - RemoveTabPage("asiantypo"); - AddTabPage("borders", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BORDER )); - AddTabPage("background", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BKG ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BKG )); - AddTabPage("protection", &ScTabPageProtection::Create, &ScTabPageProtection::GetRanges); + RemoveTabPage(u"asiantypo"_ustr); + AddTabPage(u"borders"_ustr, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BORDER )); + AddTabPage(u"background"_ustr, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BKG ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BKG )); + AddTabPage(u"protection"_ustr, &ScTabPageProtection::Create, &ScTabPageProtection::GetRanges); } } @@ -140,26 +140,26 @@ void ScStyleDlg::RefreshInputSet() } ScDrawStyleDlg::ScDrawStyleDlg(weld::Window* pParent, SfxStyleSheetBase& rStyleBase, SdrView* pView) - : SfxStyleDialogController(pParent, "modules/scalc/ui/drawtemplatedialog.ui", "DrawTemplateDialog", rStyleBase) + : SfxStyleDialogController(pParent, u"modules/scalc/ui/drawtemplatedialog.ui"_ustr, u"DrawTemplateDialog"_ustr, rStyleBase) , mpView(pView) { - AddTabPage("line", RID_SVXPAGE_LINE); - AddTabPage("area", RID_SVXPAGE_AREA); - AddTabPage("shadowing", RID_SVXPAGE_SHADOW); - AddTabPage("transparency", RID_SVXPAGE_TRANSPARENCE); - AddTabPage("font", RID_SVXPAGE_CHAR_NAME); - AddTabPage("fonteffect", RID_SVXPAGE_CHAR_EFFECTS); - AddTabPage("background", RID_SVXPAGE_BKG); - AddTabPage("indents", RID_SVXPAGE_STD_PARAGRAPH); - AddTabPage("text", RID_SVXPAGE_TEXTATTR); - AddTabPage("animation", RID_SVXPAGE_TEXTANIMATION); - AddTabPage("dimensioning", RID_SVXPAGE_MEASURE); - AddTabPage("alignment", RID_SVXPAGE_ALIGN_PARAGRAPH); - AddTabPage("tabs", RID_SVXPAGE_TABULATOR); + AddTabPage(u"line"_ustr, RID_SVXPAGE_LINE); + AddTabPage(u"area"_ustr, RID_SVXPAGE_AREA); + AddTabPage(u"shadowing"_ustr, RID_SVXPAGE_SHADOW); + AddTabPage(u"transparency"_ustr, RID_SVXPAGE_TRANSPARENCE); + AddTabPage(u"font"_ustr, RID_SVXPAGE_CHAR_NAME); + AddTabPage(u"fonteffect"_ustr, RID_SVXPAGE_CHAR_EFFECTS); + AddTabPage(u"background"_ustr, RID_SVXPAGE_BKG); + AddTabPage(u"indents"_ustr, RID_SVXPAGE_STD_PARAGRAPH); + AddTabPage(u"text"_ustr, RID_SVXPAGE_TEXTATTR); + AddTabPage(u"animation"_ustr, RID_SVXPAGE_TEXTANIMATION); + AddTabPage(u"dimensioning"_ustr, RID_SVXPAGE_MEASURE); + AddTabPage(u"alignment"_ustr, RID_SVXPAGE_ALIGN_PARAGRAPH); + AddTabPage(u"tabs"_ustr, RID_SVXPAGE_TABULATOR); if (SvtCJKOptions::IsAsianTypographyEnabled()) - AddTabPage("asiantypo", RID_SVXPAGE_PARA_ASIAN); + AddTabPage(u"asiantypo"_ustr, RID_SVXPAGE_PARA_ASIAN); else - RemoveTabPage("asiantypo"); + RemoveTabPage(u"asiantypo"_ustr); } void ScDrawStyleDlg::PageCreated(const OUString& rPageId, SfxTabPage& rTabPage) diff --git a/sc/source/ui/uitest/uiobject.cxx b/sc/source/ui/uitest/uiobject.cxx index 41209f0945a9..134d5c256e37 100644 --- a/sc/source/ui/uitest/uiobject.cxx +++ b/sc/source/ui/uitest/uiobject.cxx @@ -64,21 +64,21 @@ StringMap ScGridWinUIObject::get_state() { StringMap aMap = WindowUIObject::get_state(); - aMap["SelectedTable"] = OUString::number(mxGridWindow->getViewData().GetTabNo()); - aMap["CurrentColumn"] = OUString::number(mxGridWindow->getViewData().GetCurX()); - aMap["CurrentRow"] = OUString::number(mxGridWindow->getViewData().GetCurY()); + aMap[u"SelectedTable"_ustr] = OUString::number(mxGridWindow->getViewData().GetTabNo()); + aMap[u"CurrentColumn"_ustr] = OUString::number(mxGridWindow->getViewData().GetCurX()); + aMap[u"CurrentRow"_ustr] = OUString::number(mxGridWindow->getViewData().GetCurY()); ScSplitPos eAlign = mxGridWindow->getViewData().GetActivePart(); ScHSplitPos eAlignX = WhichH(eAlign); ScVSplitPos eAlignY = WhichV(eAlign); - aMap["TopVisibleRow"] = OUString::number(mxGridWindow->getViewData().GetPosY(eAlignY)); - aMap["TopVisibleColumn"] = OUString::number(mxGridWindow->getViewData().GetPosX(eAlignX)); + aMap[u"TopVisibleRow"_ustr] = OUString::number(mxGridWindow->getViewData().GetPosY(eAlignY)); + aMap[u"TopVisibleColumn"_ustr] = OUString::number(mxGridWindow->getViewData().GetPosX(eAlignX)); ScRangeList aMarkedArea = mxGridWindow->getViewData().GetMarkData().GetMarkedRanges(); OUString aMarkedAreaString; ScRangeStringConverter::GetStringFromRangeList(aMarkedAreaString, &aMarkedArea, &mxGridWindow->getViewData().GetDocument(), formula::FormulaGrammar::CONV_OOO); - aMap["MarkedArea"] = aMarkedAreaString; + aMap[u"MarkedArea"_ustr] = aMarkedAreaString; ScDocument& rDoc = mxGridWindow->getViewData().GetDocument(); ScAddress aPos( mxGridWindow->getViewData().GetCurX() , mxGridWindow->getViewData().GetCurY() , mxGridWindow->getViewData().GetTabNo() ); @@ -86,21 +86,21 @@ StringMap ScGridWinUIObject::get_state() { ScPostIt* pNote = rDoc.GetNote(aPos); assert(pNote); - aMap["CurrentCellCommentText"] = pNote->GetText(); + aMap[u"CurrentCellCommentText"_ustr] = pNote->GetText(); } SCCOL nCol; SCROW nRow; - aMap["CurrentTableHasData"] = OUString::boolean( rDoc.GetDataStart( mxGridWindow->getViewData().GetTabNo(), nCol, nRow ) ); + aMap[u"CurrentTableHasData"_ustr] = OUString::boolean( rDoc.GetDataStart( mxGridWindow->getViewData().GetTabNo(), nCol, nRow ) ); nCol = mxGridWindow->getViewData().GetCurX(); nRow = 0; - aMap["CurrentColumnHasData"] = OUString::boolean( rDoc.GetPrintAreaVer( mxGridWindow->getViewData().GetTabNo(), nCol, nCol, nRow, true ) ); + aMap[u"CurrentColumnHasData"_ustr] = OUString::boolean( rDoc.GetPrintAreaVer( mxGridWindow->getViewData().GetTabNo(), nCol, nCol, nRow, true ) ); nRow = mxGridWindow->getViewData().GetCurY(); nCol = 0; - aMap["CurrentRowHasData"] = OUString::boolean( rDoc.GetPrintAreaHor( mxGridWindow->getViewData().GetTabNo(), nRow, nRow, nCol ) ); + aMap[u"CurrentRowHasData"_ustr] = OUString::boolean( rDoc.GetPrintAreaHor( mxGridWindow->getViewData().GetTabNo(), nRow, nRow, nCol ) ); ScAppOptions aOpt = SC_MOD()->GetAppOptions(); - aMap["Zoom"] = OUString::number( aOpt.GetZoom() ); + aMap[u"Zoom"_ustr] = OUString::number( aOpt.GetZoom() ); return aMap; } @@ -142,34 +142,34 @@ void ScGridWinUIObject::execute(const OUString& rAction, if (rAction == "SELECT") { bool bExtend = false; - if (rParameters.find("EXTEND") != rParameters.end()) + if (rParameters.find(u"EXTEND"_ustr) != rParameters.end()) { - auto itr = rParameters.find("EXTEND"); + auto itr = rParameters.find(u"EXTEND"_ustr); if (itr->second.equalsIgnoreAsciiCase("true") || itr->second == "1") bExtend = true; } - if (rParameters.find("CELL") != rParameters.end()) + if (rParameters.find(u"CELL"_ustr) != rParameters.end()) { - auto itr = rParameters.find("CELL"); + auto itr = rParameters.find(u"CELL"_ustr); const OUString& rStr = itr->second; ScAddress aAddr = get_address_from_string(mxGridWindow->getViewData().GetDocument(), rStr); ScDBFunc* pFunc = getDBFunc(); pFunc->MarkRange(ScRange(aAddr), true, bExtend); mxGridWindow->CursorChanged(); } - else if (rParameters.find("RANGE") != rParameters.end()) + else if (rParameters.find(u"RANGE"_ustr) != rParameters.end()) { - auto itr = rParameters.find("RANGE"); + auto itr = rParameters.find(u"RANGE"_ustr); const OUString rStr = itr->second; ScRange aRange = get_range_from_string(mxGridWindow->getViewData().GetDocument(), rStr); ScDBFunc* pFunc = getDBFunc(); pFunc->MarkRange(aRange, true, bExtend); mxGridWindow->CursorChanged(); } - else if (rParameters.find("TABLE") != rParameters.end()) + else if (rParameters.find(u"TABLE"_ustr) != rParameters.end()) { - auto itr = rParameters.find("TABLE"); + auto itr = rParameters.find(u"TABLE"_ustr); const OUString rStr = itr->second; sal_Int32 nTab = rStr.toUInt32(); ScTabView* pTabView = mxGridWindow->getViewData().GetView(); @@ -184,9 +184,9 @@ void ScGridWinUIObject::execute(const OUString& rAction, } } } - else if (rParameters.find("OBJECT") != rParameters.end()) + else if (rParameters.find(u"OBJECT"_ustr) != rParameters.end()) { - auto itr = rParameters.find("OBJECT"); + auto itr = rParameters.find(u"OBJECT"_ustr); const OUString rStr = itr->second; ScDrawView* pDrawView = getDrawView(); @@ -199,7 +199,7 @@ void ScGridWinUIObject::execute(const OUString& rAction, } else if (rAction == "DESELECT") { - if (rParameters.find("OBJECT") != rParameters.end()) + if (rParameters.find(u"OBJECT"_ustr) != rParameters.end()) { ScDrawView* pDrawView = getDrawView(); pDrawView->UnmarkAll(); @@ -232,16 +232,16 @@ void ScGridWinUIObject::execute(const OUString& rAction, } else if (rAction == "LAUNCH") { - if ( rParameters.find("AUTOFILTER") != rParameters.end()) + if ( rParameters.find(u"AUTOFILTER"_ustr) != rParameters.end()) { - auto itrCol = rParameters.find("COL"); + auto itrCol = rParameters.find(u"COL"_ustr); if (itrCol == rParameters.end()) { SAL_WARN("sc.uitest", "missing COL parameter"); return; } - auto itrRow = rParameters.find("ROW"); + auto itrRow = rParameters.find(u"ROW"_ustr); if (itrRow == rParameters.end()) { SAL_WARN("sc.uitest", "missing ROW parameter"); @@ -251,16 +251,16 @@ void ScGridWinUIObject::execute(const OUString& rAction, SCCOL nCol = itrCol->second.toUInt32(); mxGridWindow->LaunchAutoFilterMenu(nCol, nRow); } - else if ( rParameters.find("PIVOTTABLE") != rParameters.end()) + else if ( rParameters.find(u"PIVOTTABLE"_ustr) != rParameters.end()) { - auto itrCol = rParameters.find("COL"); + auto itrCol = rParameters.find(u"COL"_ustr); if (itrCol == rParameters.end()) { SAL_WARN("sc.uitest", "missing COL parameter"); return; } - auto itrRow = rParameters.find("ROW"); + auto itrRow = rParameters.find(u"ROW"_ustr); if (itrRow == rParameters.end()) { SAL_WARN("sc.uitest", "missing ROW parameter"); @@ -270,16 +270,16 @@ void ScGridWinUIObject::execute(const OUString& rAction, SCCOL nCol = itrCol->second.toUInt32(); mxGridWindow->LaunchDPFieldMenu(nCol, nRow); } - else if ( rParameters.find("SELECTMENU") != rParameters.end()) + else if ( rParameters.find(u"SELECTMENU"_ustr) != rParameters.end()) { - auto itrCol = rParameters.find("COL"); + auto itrCol = rParameters.find(u"COL"_ustr); if (itrCol == rParameters.end()) { SAL_WARN("sc.uitest", "missing COL parameter"); return; } - auto itrRow = rParameters.find("ROW"); + auto itrRow = rParameters.find(u"ROW"_ustr); if (itrRow == rParameters.end()) { SAL_WARN("sc.uitest", "missing ROW parameter"); @@ -292,21 +292,21 @@ void ScGridWinUIObject::execute(const OUString& rAction, } else if (rAction == "COMMENT") { - if ( rParameters.find("OPEN") != rParameters.end() ) + if ( rParameters.find(u"OPEN"_ustr) != rParameters.end() ) { ScViewFunc* pViewFunc = getViewFunc(); pViewFunc->EditNote(); } - else if ( rParameters.find("CLOSE") != rParameters.end() ) + else if ( rParameters.find(u"CLOSE"_ustr) != rParameters.end() ) { FuDraw* pDraw = dynamic_cast<FuDraw*>(getViewFunc()->GetDrawFuncPtr()); assert(pDraw); ScViewData& rViewData = mxGridWindow->getViewData(); rViewData.GetDispatcher().Execute( pDraw->GetSlotID() , SfxCallMode::SLOT | SfxCallMode::RECORD ); } - else if ( rParameters.find("SETTEXT") != rParameters.end() ) + else if ( rParameters.find(u"SETTEXT"_ustr) != rParameters.end() ) { - auto itr = rParameters.find("SETTEXT"); + auto itr = rParameters.find(u"SETTEXT"_ustr); const OUString rStr = itr->second; ScDocument& rDoc = mxGridWindow->getViewData().GetDocument(); ScAddress aPos( mxGridWindow->getViewData().GetCurX() , mxGridWindow->getViewData().GetCurY() , mxGridWindow->getViewData().GetTabNo() ); @@ -319,7 +319,7 @@ void ScGridWinUIObject::execute(const OUString& rAction, assert(pViewFrm && "ScGridWinUIObject::execute: no viewframe"); pViewFrm->ShowChildWindow(SID_SIDEBAR); - auto itr = rParameters.find("PANEL"); + auto itr = rParameters.find(u"PANEL"_ustr); if (itr != rParameters.end()) { OUString aVal = itr->second; @@ -328,9 +328,9 @@ void ScGridWinUIObject::execute(const OUString& rAction, } else if (rAction == "SET") { - if (rParameters.find("ZOOM") != rParameters.end()) + if (rParameters.find(u"ZOOM"_ustr) != rParameters.end()) { - auto itr = rParameters.find("ZOOM"); + auto itr = rParameters.find(u"ZOOM"_ustr); OUString aVal = itr->second; sal_Int32 nVal = aVal.toInt32(); ScTabViewShell* pViewShell = getViewShell(); @@ -414,7 +414,7 @@ std::unique_ptr<UIObject> ScGridWinUIObject::create(vcl::Window* pWindow) OUString ScGridWinUIObject::get_name() const { - return "ScGridWinUIObject"; + return u"ScGridWinUIObject"_ustr; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/undo/undoblk3.cxx b/sc/source/ui/undo/undoblk3.cxx index 40d38a4ec1ed..c9747ad6de4b 100644 --- a/sc/source/ui/undo/undoblk3.cxx +++ b/sc/source/ui/undo/undoblk3.cxx @@ -180,7 +180,7 @@ void ScUndoDeleteContents::Undo() DoChange( true ); EndUndo(); - HelperNotifyChanges::NotifyIfChangesListeners(*pDocShell, aRange, "undo"); + HelperNotifyChanges::NotifyIfChangesListeners(*pDocShell, aRange, u"undo"_ustr); } void ScUndoDeleteContents::Redo() @@ -189,7 +189,7 @@ void ScUndoDeleteContents::Redo() DoChange( false ); EndRedo(); - HelperNotifyChanges::NotifyIfChangesListeners(*pDocShell, aRange, "redo"); + HelperNotifyChanges::NotifyIfChangesListeners(*pDocShell, aRange, u"redo"_ustr); } void ScUndoDeleteContents::Repeat(SfxRepeatTarget& rTarget) diff --git a/sc/source/ui/undo/undocell.cxx b/sc/source/ui/undo/undocell.cxx index ffda24d286e3..c7c085d1fe15 100644 --- a/sc/source/ui/undo/undocell.cxx +++ b/sc/source/ui/undo/undocell.cxx @@ -47,7 +47,7 @@ namespace HelperNotifyChanges { static void NotifyIfChangesListeners(const ScDocShell& rDocShell, const ScAddress &rPos, - const ScUndoEnterData::ValuesType &rOldValues, const OUString& rType = OUString("cell-change")) + const ScUndoEnterData::ValuesType &rOldValues, const OUString& rType = u"cell-change"_ustr) { ScModelObj* pModelObj = rDocShell.GetModel(); if (pModelObj) @@ -64,7 +64,7 @@ namespace HelperNotifyChanges if (pModelObj) // possibly need to invalidate getCellArea results { Notify(*pModelObj, aChangeRanges, isDataAreaInvalidateType(rType) - ? OUString("data-area-invalidate") : OUString("data-area-extend")); + ? u"data-area-invalidate"_ustr : u"data-area-extend"_ustr); } } } @@ -261,7 +261,7 @@ void ScUndoEnterData::Undo() DoChange(); EndUndo(); - HelperNotifyChanges::NotifyIfChangesListeners(*pDocShell, maPos, maOldValues, "undo"); + HelperNotifyChanges::NotifyIfChangesListeners(*pDocShell, maPos, maOldValues, u"undo"_ustr); } void ScUndoEnterData::Redo() @@ -290,7 +290,7 @@ void ScUndoEnterData::Redo() DoChange(); EndRedo(); - HelperNotifyChanges::NotifyIfChangesListeners(*pDocShell, maPos, maOldValues, "redo"); + HelperNotifyChanges::NotifyIfChangesListeners(*pDocShell, maPos, maOldValues, u"redo"_ustr); } void ScUndoEnterData::Repeat(SfxRepeatTarget& rTarget) diff --git a/sc/source/ui/undo/undotab.cxx b/sc/source/ui/undo/undotab.cxx index 43f647debbd9..52d1a18ff62d 100644 --- a/sc/source/ui/undo/undotab.cxx +++ b/sc/source/ui/undo/undotab.cxx @@ -1186,7 +1186,7 @@ void ScUndoRemoveLink::DoChange( bool bLink ) const if (bLink) // establish link rDoc.SetLink( pTabs[i], pModes[i], aDocName, aFltName, aOptions, pTabNames[i], nRefreshDelay ); else // remove link - rDoc.SetLink( pTabs[i], ScLinkMode::NONE, "", "", "", "", 0 ); + rDoc.SetLink( pTabs[i], ScLinkMode::NONE, u""_ustr, u""_ustr, u""_ustr, u""_ustr, 0 ); pDocShell->UpdateLinks(); } diff --git a/sc/source/ui/xmlsource/xmlsourcedlg.cxx b/sc/source/ui/xmlsource/xmlsourcedlg.cxx index e7f4bf6595f9..4740fec17143 100644 --- a/sc/source/ui/xmlsource/xmlsourcedlg.cxx +++ b/sc/source/ui/xmlsource/xmlsourcedlg.cxx @@ -64,17 +64,17 @@ OUString getXPath( ScXMLSourceDlg::ScXMLSourceDlg( SfxBindings* pB, SfxChildWindow* pCW, weld::Window* pParent, ScDocument* pDoc) - : ScAnyRefDlgController(pB, pCW, pParent, "modules/scalc/ui/xmlsourcedialog.ui", "XMLSourceDialog") + : ScAnyRefDlgController(pB, pCW, pParent, u"modules/scalc/ui/xmlsourcedialog.ui"_ustr, u"XMLSourceDialog"_ustr) , mpDoc(pDoc) , mbDlgLostFocus(false) - , mxBtnSelectSource(m_xBuilder->weld_button("selectsource")) - , mxFtSourceFile(m_xBuilder->weld_label("sourcefile")) - , mxMapGrid(m_xBuilder->weld_container("mapgrid")) - , mxLbTree(m_xBuilder->weld_tree_view("tree")) - , mxRefEdit(new formula::RefEdit(m_xBuilder->weld_entry("edit"))) - , mxRefBtn(new formula::RefButton(m_xBuilder->weld_button("ref"))) - , mxBtnOk(m_xBuilder->weld_button("ok")) - , mxBtnCancel(m_xBuilder->weld_button("cancel")) + , mxBtnSelectSource(m_xBuilder->weld_button(u"selectsource"_ustr)) + , mxFtSourceFile(m_xBuilder->weld_label(u"sourcefile"_ustr)) + , mxMapGrid(m_xBuilder->weld_container(u"mapgrid"_ustr)) + , mxLbTree(m_xBuilder->weld_tree_view(u"tree"_ustr)) + , mxRefEdit(new formula::RefEdit(m_xBuilder->weld_entry(u"edit"_ustr))) + , mxRefBtn(new formula::RefButton(m_xBuilder->weld_button(u"ref"_ustr))) + , mxBtnOk(m_xBuilder->weld_button(u"ok"_ustr)) + , mxBtnCancel(m_xBuilder->weld_button(u"cancel"_ustr)) , maCustomCompare(*mxLbTree) , maCellLinks(maCustomCompare) , maRangeLinks(maCustomCompare) |