diff options
Diffstat (limited to 'cui/source/dialogs')
46 files changed, 700 insertions, 694 deletions
diff --git a/cui/source/dialogs/AdditionsDialog.cxx b/cui/source/dialogs/AdditionsDialog.cxx index a0d2061e531c..61bee50455b3 100644 --- a/cui/source/dialogs/AdditionsDialog.cxx +++ b/cui/source/dialogs/AdditionsDialog.cxx @@ -202,8 +202,8 @@ bool getPreviewFile(const AdditionInfo& aAdditionInfo, OUString& sPreviewFile) = ucb::SimpleFileAccess::create(comphelper::getProcessComponentContext()); // copy the images to the user's additions folder - OUString userFolder = "${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER - "/" SAL_CONFIGFILE("bootstrap") "::UserInstallation}"; + OUString userFolder = u"${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER + "/" SAL_CONFIGFILE("bootstrap") "::UserInstallation}"_ustr; rtl::Bootstrap::expandMacros(userFolder); userFolder += "/user/additions/" + aAdditionInfo.sExtensionID + "/"; @@ -425,17 +425,17 @@ void SearchAndParseThread::execute() } AdditionsDialog::AdditionsDialog(weld::Window* pParent, const OUString& sAdditionsTag) - : GenericDialogController(pParent, "cui/ui/additionsdialog.ui", "AdditionsDialog") + : GenericDialogController(pParent, u"cui/ui/additionsdialog.ui"_ustr, u"AdditionsDialog"_ustr) , m_aSearchDataTimer("AdditionsDialog SearchDataTimer") - , m_xEntrySearch(m_xBuilder->weld_entry("entrySearch")) - , m_xButtonClose(m_xBuilder->weld_button("buttonClose")) - , m_xContentWindow(m_xBuilder->weld_scrolled_window("contentWindow")) - , m_xContentGrid(m_xBuilder->weld_container("contentGrid")) - , m_xLabelProgress(m_xBuilder->weld_label("labelProgress")) - , m_xGearBtn(m_xBuilder->weld_menu_button("buttonGear")) + , m_xEntrySearch(m_xBuilder->weld_entry(u"entrySearch"_ustr)) + , m_xButtonClose(m_xBuilder->weld_button(u"buttonClose"_ustr)) + , m_xContentWindow(m_xBuilder->weld_scrolled_window(u"contentWindow"_ustr)) + , m_xContentGrid(m_xBuilder->weld_container(u"contentGrid"_ustr)) + , m_xLabelProgress(m_xBuilder->weld_label(u"labelProgress"_ustr)) + , m_xGearBtn(m_xBuilder->weld_menu_button(u"buttonGear"_ustr)) { m_xGearBtn->connect_selected(LINK(this, AdditionsDialog, GearHdl)); - m_xGearBtn->set_item_active("gear_sort_voting", true); + m_xGearBtn->set_item_active(u"gear_sort_voting"_ustr, true); m_aSearchDataTimer.SetInvokeHandler(LINK(this, AdditionsDialog, ImplUpdateDataHdl)); m_aSearchDataTimer.SetTimeout(EDIT_UPDATEDATA_TIMEOUT); @@ -451,7 +451,7 @@ AdditionsDialog::AdditionsDialog(weld::Window* pParent, const OUString& sAdditio OUString titlePrefix = CuiResId(RID_CUISTR_ADDITIONS_DIALOG_TITLE_PREFIX); if (!m_sTag.isEmpty()) { // tdf#142564 localize extension category names - OUString sDialogTitle = ""; + OUString sDialogTitle = u""_ustr; if (sAdditionsTag == "Templates") { sDialogTitle = CuiResId(RID_CUISTR_ADDITIONS_TEMPLATES); @@ -597,27 +597,27 @@ bool AdditionsDialog::sortByDownload(const AdditionInfo& a, const AdditionInfo& AdditionsItem::AdditionsItem(weld::Widget* pParent, AdditionsDialog* pParentDialog, const AdditionInfo& additionInfo) - : m_xBuilder(Application::CreateBuilder(pParent, "cui/ui/additionsfragment.ui")) - , m_xContainer(m_xBuilder->weld_widget("additionsEntry")) - , m_xImageScreenshot(m_xBuilder->weld_image("imageScreenshot")) - , m_xButtonInstall(m_xBuilder->weld_button("buttonInstall")) - , m_xLinkButtonWebsite(m_xBuilder->weld_link_button("btnWebsite")) - , m_xLabelName(m_xBuilder->weld_label("lbName")) - , m_xLabelAuthor(m_xBuilder->weld_label("labelAuthor")) - , m_xLabelDescription(m_xBuilder->weld_label("labelDescription")) - , m_xLabelLicense(m_xBuilder->weld_label("lbLicenseText")) - , m_xLabelVersion(m_xBuilder->weld_label("lbVersionText")) - , m_xLinkButtonComments(m_xBuilder->weld_link_button("linkButtonComments")) - , m_xImageVoting1(m_xBuilder->weld_image("imageVoting1")) - , m_xImageVoting2(m_xBuilder->weld_image("imageVoting2")) - , m_xImageVoting3(m_xBuilder->weld_image("imageVoting3")) - , m_xImageVoting4(m_xBuilder->weld_image("imageVoting4")) - , m_xImageVoting5(m_xBuilder->weld_image("imageVoting5")) - , m_xLabelDownloadNumber(m_xBuilder->weld_label("labelDownloadNumber")) - , m_xButtonShowMore(m_xBuilder->weld_button("buttonShowMore")) + : m_xBuilder(Application::CreateBuilder(pParent, u"cui/ui/additionsfragment.ui"_ustr)) + , m_xContainer(m_xBuilder->weld_widget(u"additionsEntry"_ustr)) + , m_xImageScreenshot(m_xBuilder->weld_image(u"imageScreenshot"_ustr)) + , m_xButtonInstall(m_xBuilder->weld_button(u"buttonInstall"_ustr)) + , m_xLinkButtonWebsite(m_xBuilder->weld_link_button(u"btnWebsite"_ustr)) + , m_xLabelName(m_xBuilder->weld_label(u"lbName"_ustr)) + , m_xLabelAuthor(m_xBuilder->weld_label(u"labelAuthor"_ustr)) + , m_xLabelDescription(m_xBuilder->weld_label(u"labelDescription"_ustr)) + , m_xLabelLicense(m_xBuilder->weld_label(u"lbLicenseText"_ustr)) + , m_xLabelVersion(m_xBuilder->weld_label(u"lbVersionText"_ustr)) + , m_xLinkButtonComments(m_xBuilder->weld_link_button(u"linkButtonComments"_ustr)) + , m_xImageVoting1(m_xBuilder->weld_image(u"imageVoting1"_ustr)) + , m_xImageVoting2(m_xBuilder->weld_image(u"imageVoting2"_ustr)) + , m_xImageVoting3(m_xBuilder->weld_image(u"imageVoting3"_ustr)) + , m_xImageVoting4(m_xBuilder->weld_image(u"imageVoting4"_ustr)) + , m_xImageVoting5(m_xBuilder->weld_image(u"imageVoting5"_ustr)) + , m_xLabelDownloadNumber(m_xBuilder->weld_label(u"labelDownloadNumber"_ustr)) + , m_xButtonShowMore(m_xBuilder->weld_button(u"buttonShowMore"_ustr)) , m_pParentDialog(pParentDialog) - , m_sDownloadURL("") - , m_sExtensionID("") + , m_sDownloadURL(u""_ustr) + , m_sExtensionID(u""_ustr) { SolarMutexGuard aGuard; @@ -687,8 +687,8 @@ bool AdditionsItem::getExtensionFile(OUString& sExtensionFile) = ucb::SimpleFileAccess::create(comphelper::getProcessComponentContext()); // copy the extensions' files to the user's additions folder - OUString userFolder = "${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER - "/" SAL_CONFIGFILE("bootstrap") "::UserInstallation}"; + OUString userFolder = u"${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER + "/" SAL_CONFIGFILE("bootstrap") "::UserInstallation}"_ustr; rtl::Bootstrap::expandMacros(userFolder); userFolder += "/user/additions/" + m_sExtensionID + "/"; @@ -763,8 +763,9 @@ IMPL_LINK_NOARG(AdditionsItem, InstallHdl, weld::Button&, void) uno::Reference<task::XAbortChannel> xAbortChannel; try { - m_pParentDialog->m_xExtensionManager->addExtension( - aExtensionFile, uno::Sequence<beans::NamedValue>(), "user", xAbortChannel, pCmdEnv); + m_pParentDialog->m_xExtensionManager->addExtension(aExtensionFile, + uno::Sequence<beans::NamedValue>(), + u"user"_ustr, xAbortChannel, pCmdEnv); m_xButtonInstall->set_label(CuiResId(RID_CUISTR_ADDITIONS_INSTALLEDBUTTON)); } catch (const ucb::CommandFailedException) diff --git a/cui/source/dialogs/DiagramDialog.cxx b/cui/source/dialogs/DiagramDialog.cxx index b63d6cb6e313..a2499056210c 100644 --- a/cui/source/dialogs/DiagramDialog.cxx +++ b/cui/source/dialogs/DiagramDialog.cxx @@ -18,14 +18,14 @@ #include <svx/diagram/IDiagramHelper.hxx> DiagramDialog::DiagramDialog(weld::Window* pWindow, SdrObjGroup& rDiagram) - : GenericDialogController(pWindow, "cui/ui/diagramdialog.ui", "DiagramDialog") + : GenericDialogController(pWindow, u"cui/ui/diagramdialog.ui"_ustr, u"DiagramDialog"_ustr) , m_rDiagram(rDiagram) , m_nUndos(0) - , mpBtnCancel(m_xBuilder->weld_button("btnCancel")) - , mpBtnAdd(m_xBuilder->weld_button("btnAdd")) - , mpBtnRemove(m_xBuilder->weld_button("btnRemove")) - , mpTreeDiagram(m_xBuilder->weld_tree_view("treeDiagram")) - , mpTextAdd(m_xBuilder->weld_text_view("textAdd")) + , mpBtnCancel(m_xBuilder->weld_button(u"btnCancel"_ustr)) + , mpBtnAdd(m_xBuilder->weld_button(u"btnAdd"_ustr)) + , mpBtnRemove(m_xBuilder->weld_button(u"btnRemove"_ustr)) + , mpTreeDiagram(m_xBuilder->weld_tree_view(u"treeDiagram"_ustr)) + , mpTextAdd(m_xBuilder->weld_text_view(u"textAdd"_ustr)) { mpBtnCancel->connect_clicked(LINK(this, DiagramDialog, OnAddCancel)); mpBtnAdd->connect_clicked(LINK(this, DiagramDialog, OnAddClick)); @@ -48,7 +48,7 @@ IMPL_LINK_NOARG(DiagramDialog, OnAddCancel, weld::Button&, void) // available (?) - but it does no harm either... while (0 != m_nUndos) { - comphelper::dispatchCommand(".uno:Undo", {}); + comphelper::dispatchCommand(u".uno:Undo"_ustr, {}); m_nUndos--; } @@ -89,7 +89,7 @@ IMPL_LINK_NOARG(DiagramDialog, OnAddClick, weld::Button&, void) std::unique_ptr<weld::TreeIter> pEntry(mpTreeDiagram->make_iterator()); mpTreeDiagram->insert(nullptr, -1, &sText, &sNodeId, nullptr, nullptr, false, pEntry.get()); mpTreeDiagram->select(*pEntry); - comphelper::dispatchCommand(".uno:RegenerateDiagram", {}); + comphelper::dispatchCommand(u".uno:RegenerateDiagram"_ustr, {}); } } @@ -125,7 +125,7 @@ IMPL_LINK_NOARG(DiagramDialog, OnRemoveClick, weld::Button&, void) } mpTreeDiagram->remove(*pEntry); - comphelper::dispatchCommand(".uno:RegenerateDiagram", {}); + comphelper::dispatchCommand(u".uno:RegenerateDiagram"_ustr, {}); } } } diff --git a/cui/source/dialogs/FontFeaturesDialog.cxx b/cui/source/dialogs/FontFeaturesDialog.cxx index e9aba0a6e409..feb7f401025c 100644 --- a/cui/source/dialogs/FontFeaturesDialog.cxx +++ b/cui/source/dialogs/FontFeaturesDialog.cxx @@ -20,16 +20,17 @@ using namespace css; namespace cui { FontFeaturesDialog::FontFeaturesDialog(weld::Window* pParent, OUString aFontName) - : GenericDialogController(pParent, "cui/ui/fontfeaturesdialog.ui", "FontFeaturesDialog") + : GenericDialogController(pParent, u"cui/ui/fontfeaturesdialog.ui"_ustr, + u"FontFeaturesDialog"_ustr) , m_sFontName(std::move(aFontName)) - , m_xContentWindow(m_xBuilder->weld_scrolled_window("contentWindow")) - , m_xContentBox(m_xBuilder->weld_container("contentBox")) - , m_xContentGrid(m_xBuilder->weld_container("contentGrid")) - , m_xStylisticSetsBox(m_xBuilder->weld_container("stylisticSetsBox")) - , m_xStylisticSetsGrid(m_xBuilder->weld_container("stylisticSetsGrid")) - , m_xCharacterVariantsBox(m_xBuilder->weld_container("characterVariantsBox")) - , m_xCharacterVariantsGrid(m_xBuilder->weld_container("characterVariantsGrid")) - , m_xPreviewWindow(new weld::CustomWeld(*m_xBuilder, "preview", m_aPreviewWindow)) + , m_xContentWindow(m_xBuilder->weld_scrolled_window(u"contentWindow"_ustr)) + , m_xContentBox(m_xBuilder->weld_container(u"contentBox"_ustr)) + , m_xContentGrid(m_xBuilder->weld_container(u"contentGrid"_ustr)) + , m_xStylisticSetsBox(m_xBuilder->weld_container(u"stylisticSetsBox"_ustr)) + , m_xStylisticSetsGrid(m_xBuilder->weld_container(u"stylisticSetsGrid"_ustr)) + , m_xCharacterVariantsBox(m_xBuilder->weld_container(u"characterVariantsBox"_ustr)) + , m_xCharacterVariantsGrid(m_xBuilder->weld_container(u"characterVariantsGrid"_ustr)) + , m_xPreviewWindow(new weld::CustomWeld(*m_xBuilder, u"preview"_ustr, m_aPreviewWindow)) { initialize(); } @@ -103,7 +104,7 @@ int FontFeaturesDialog::fillGrid(std::vector<vcl::font::Feature> const& rFontFea if (rFontFeature.m_aDefinition) aDefinition = rFontFeature.m_aDefinition; if (!aDefinition) - aDefinition = { nFontFeatureCode, "" }; + aDefinition = { nFontFeatureCode, u""_ustr }; if (rFontFeature.isStylisticSet()) { diff --git a/cui/source/dialogs/GraphicTestsDialog.cxx b/cui/source/dialogs/GraphicTestsDialog.cxx index ad0c25aab1f5..49525d71bb62 100644 --- a/cui/source/dialogs/GraphicTestsDialog.cxx +++ b/cui/source/dialogs/GraphicTestsDialog.cxx @@ -25,10 +25,10 @@ GraphicTestEntry::GraphicTestEntry(weld::Container* pParent, weld::Dialog* pDialog, OUString aTestName, OUString aTestStatus, Bitmap aTestBitmap) - : m_xBuilder(Application::CreateBuilder(pParent, "cui/ui/graphictestentry.ui")) - , m_xContainer(m_xBuilder->weld_container("gptestbox")) - , m_xTestLabel(m_xBuilder->weld_label("gptestlabel")) - , m_xTestButton(m_xBuilder->weld_button("gptestbutton")) + : m_xBuilder(Application::CreateBuilder(pParent, u"cui/ui/graphictestentry.ui"_ustr)) + , m_xContainer(m_xBuilder->weld_container(u"gptestbox"_ustr)) + , m_xTestLabel(m_xBuilder->weld_label(u"gptestlabel"_ustr)) + , m_xTestButton(m_xBuilder->weld_button(u"gptestbutton"_ustr)) , m_xResultBitmap(aTestBitmap) { m_xParentDialog = pDialog; @@ -57,10 +57,10 @@ IMPL_LINK(GraphicTestEntry, HandleResultViewRequest, weld::Button&, rButton, voi } GraphicsTestsDialog::GraphicsTestsDialog(weld::Container* pParent) - : GenericDialogController(pParent, "cui/ui/graphictestdlg.ui", "GraphicTestsDialog") - , m_xResultLog(m_xBuilder->weld_text_view("gptest_txtVW")) - , m_xDownloadResults(m_xBuilder->weld_button("gptest_downld")) - , m_xContainerBox(m_xBuilder->weld_box("gptest_box")) + : GenericDialogController(pParent, u"cui/ui/graphictestdlg.ui"_ustr, u"GraphicTestsDialog"_ustr) + , m_xResultLog(m_xBuilder->weld_text_view(u"gptest_txtVW"_ustr)) + , m_xDownloadResults(m_xBuilder->weld_button(u"gptest_downld"_ustr)) + , m_xContainerBox(m_xBuilder->weld_box(u"gptest_box"_ustr)) { OUString userProfile = comphelper::BackupFileHelper::getUserProfileURL(); m_xZipFileUrl = userProfile + "/GraphicTestResults.zip"; diff --git a/cui/source/dialogs/ImageViewerDialog.cxx b/cui/source/dialogs/ImageViewerDialog.cxx index b245c8c08b60..d15960193d0f 100644 --- a/cui/source/dialogs/ImageViewerDialog.cxx +++ b/cui/source/dialogs/ImageViewerDialog.cxx @@ -11,8 +11,8 @@ #include <ImageViewerDialog.hxx> ImageViewerDialog::ImageViewerDialog(weld::Dialog* pParent, BitmapEx aBitmap, OUString atitle) - : GenericDialogController(pParent, "cui/ui/imageviewer.ui", "ImageViewerDialog") - , m_xDisplayImage(m_xBuilder->weld_image("ImgVW_mainImage")) + : GenericDialogController(pParent, u"cui/ui/imageviewer.ui"_ustr, u"ImageViewerDialog"_ustr) + , m_xDisplayImage(m_xBuilder->weld_image(u"ImgVW_mainImage"_ustr)) { m_xDialog->set_title(atitle); aBitmap.Scale(Size(300, 300), BmpScaleFlag::Fast); diff --git a/cui/source/dialogs/QrCodeGenDialog.cxx b/cui/source/dialogs/QrCodeGenDialog.cxx index d99290404629..ae712ed7a2ca 100644 --- a/cui/source/dialogs/QrCodeGenDialog.cxx +++ b/cui/source/dialogs/QrCodeGenDialog.cxx @@ -169,15 +169,15 @@ OString GenerateQRCode(std::u16string_view aQRText, tools::Long aQRECC, int aQRB QrCodeGenDialog::QrCodeGenDialog(weld::Widget* pParent, Reference<XModel> xModel, bool bEditExisting) - : GenericDialogController(pParent, "cui/ui/qrcodegen.ui", "QrCodeGenDialog") + : GenericDialogController(pParent, u"cui/ui/qrcodegen.ui"_ustr, u"QrCodeGenDialog"_ustr) , m_xModel(std::move(xModel)) - , m_xEdittext(m_xBuilder->weld_text_view("edit_text")) - , m_xECC{ m_xBuilder->weld_radio_button("button_low"), - m_xBuilder->weld_radio_button("button_medium"), - m_xBuilder->weld_radio_button("button_quartile"), - m_xBuilder->weld_radio_button("button_high") } - , m_xSpinBorder(m_xBuilder->weld_spin_button("edit_margin")) - , m_xComboType(m_xBuilder->weld_combo_box("choose_type")) + , m_xEdittext(m_xBuilder->weld_text_view(u"edit_text"_ustr)) + , m_xECC{ m_xBuilder->weld_radio_button(u"button_low"_ustr), + m_xBuilder->weld_radio_button(u"button_medium"_ustr), + m_xBuilder->weld_radio_button(u"button_quartile"_ustr), + m_xBuilder->weld_radio_button(u"button_high"_ustr) } + , m_xSpinBorder(m_xBuilder->weld_spin_button(u"edit_margin"_ustr)) + , m_xComboType(m_xBuilder->weld_combo_box(u"choose_type"_ustr)) #if ENABLE_ZXING , mpParent(pParent) #endif @@ -203,7 +203,7 @@ QrCodeGenDialog::QrCodeGenDialog(weld::Widget* pParent, Reference<XModel> xModel // Read properties from selected QR Code css::drawing::BarCode aBarCode; - xProps->getPropertyValue("BarCodeProperties") >>= aBarCode; + xProps->getPropertyValue(u"BarCodeProperties"_ustr) >>= aBarCode; m_xEdittext->set_text(aBarCode.Payload); @@ -320,7 +320,7 @@ void QrCodeGenDialog::Apply() Reference<XComponentContext> xContext(comphelper::getProcessComponentContext()); Reference<XGraphicProvider> xProvider = css::graphic::GraphicProvider::create(xContext); - Sequence<PropertyValue> aMediaProperties{ comphelper::makePropertyValue("InputStream", + Sequence<PropertyValue> aMediaProperties{ comphelper::makePropertyValue(u"InputStream"_ustr, xInputStream) }; Reference<XGraphic> xGraphic(xProvider->queryGraphic(aMediaProperties)); @@ -330,13 +330,13 @@ void QrCodeGenDialog::Apply() xShapeProps = m_xExistingShapeProperties; else xShapeProps.set(Reference<lang::XMultiServiceFactory>(m_xModel, UNO_QUERY_THROW) - ->createInstance("com.sun.star.drawing.GraphicObjectShape"), + ->createInstance(u"com.sun.star.drawing.GraphicObjectShape"_ustr), UNO_QUERY); - xShapeProps->setPropertyValue("Graphic", Any(xGraphic)); + xShapeProps->setPropertyValue(u"Graphic"_ustr, Any(xGraphic)); // Set QRCode properties - xShapeProps->setPropertyValue("BarCodeProperties", Any(aBarCode)); + xShapeProps->setPropertyValue(u"BarCodeProperties"_ustr, Any(aBarCode)); if (bIsExistingQRCode) return; @@ -349,12 +349,12 @@ void QrCodeGenDialog::Apply() xShape->setSize(aShapeSize); // Default anchoring - xShapeProps->setPropertyValue("AnchorType", Any(TextContentAnchorType_AT_PARAGRAPH)); + xShapeProps->setPropertyValue(u"AnchorType"_ustr, Any(TextContentAnchorType_AT_PARAGRAPH)); const Reference<XServiceInfo> xServiceInfo(m_xModel, UNO_QUERY_THROW); // Writer - if (xServiceInfo->supportsService("com.sun.star.text.TextDocument")) + if (xServiceInfo->supportsService(u"com.sun.star.text.TextDocument"_ustr)) { Reference<XTextContent> xTextContent(xShape, UNO_QUERY_THROW); Reference<XTextViewCursorSupplier> xViewCursorSupplier(m_xModel->getCurrentController(), @@ -368,11 +368,11 @@ void QrCodeGenDialog::Apply() } // Calc - else if (xServiceInfo->supportsService("com.sun.star.sheet.SpreadsheetDocument")) + else if (xServiceInfo->supportsService(u"com.sun.star.sheet.SpreadsheetDocument"_ustr)) { Reference<XPropertySet> xSheetCell(m_xModel->getCurrentSelection(), UNO_QUERY_THROW); awt::Point aCellPosition; - xSheetCell->getPropertyValue("Position") >>= aCellPosition; + xSheetCell->getPropertyValue(u"Position"_ustr) >>= aCellPosition; xShape->setPosition(aCellPosition); Reference<XSpreadsheetView> xView(m_xModel->getCurrentController(), UNO_QUERY_THROW); @@ -386,8 +386,8 @@ void QrCodeGenDialog::Apply() } //Impress and Draw - else if (xServiceInfo->supportsService("com.sun.star.presentation.PresentationDocument") - || xServiceInfo->supportsService("com.sun.star.drawing.DrawingDocument")) + else if (xServiceInfo->supportsService(u"com.sun.star.presentation.PresentationDocument"_ustr) + || xServiceInfo->supportsService(u"com.sun.star.drawing.DrawingDocument"_ustr)) { Reference<XDrawView> xView(m_xModel->getCurrentController(), UNO_QUERY_THROW); Reference<XDrawPage> xPage(xView->getCurrentPage(), UNO_SET_THROW); @@ -400,7 +400,7 @@ void QrCodeGenDialog::Apply() else { //Not implemented for math,base and other apps. - throw uno::RuntimeException("Not implemented"); + throw uno::RuntimeException(u"Not implemented"_ustr); } #endif } diff --git a/cui/source/dialogs/SignSignatureLineDialog.cxx b/cui/source/dialogs/SignSignatureLineDialog.cxx index d3e0bfb5b65e..183fb04c82fb 100644 --- a/cui/source/dialogs/SignSignatureLineDialog.cxx +++ b/cui/source/dialogs/SignSignatureLineDialog.cxx @@ -48,17 +48,17 @@ using namespace css::security; using namespace css::ui::dialogs; SignSignatureLineDialog::SignSignatureLineDialog(weld::Widget* pParent, Reference<XModel> xModel) - : SignatureLineDialogBase(pParent, std::move(xModel), "cui/ui/signsignatureline.ui", - "SignSignatureLineDialog") - , m_xEditName(m_xBuilder->weld_entry("edit_name")) - , m_xEditComment(m_xBuilder->weld_text_view("edit_comment")) - , m_xBtnLoadImage(m_xBuilder->weld_button("btn_load_image")) - , m_xBtnClearImage(m_xBuilder->weld_button("btn_clear_image")) - , m_xBtnChooseCertificate(m_xBuilder->weld_button("btn_select_certificate")) - , m_xBtnSign(m_xBuilder->weld_button("ok")) - , m_xLabelHint(m_xBuilder->weld_label("label_hint")) - , m_xLabelHintText(m_xBuilder->weld_label("label_hint_text")) - , m_xLabelAddComment(m_xBuilder->weld_label("label_add_comment")) + : SignatureLineDialogBase(pParent, std::move(xModel), u"cui/ui/signsignatureline.ui"_ustr, + u"SignSignatureLineDialog"_ustr) + , m_xEditName(m_xBuilder->weld_entry(u"edit_name"_ustr)) + , m_xEditComment(m_xBuilder->weld_text_view(u"edit_comment"_ustr)) + , m_xBtnLoadImage(m_xBuilder->weld_button(u"btn_load_image"_ustr)) + , m_xBtnClearImage(m_xBuilder->weld_button(u"btn_clear_image"_ustr)) + , m_xBtnChooseCertificate(m_xBuilder->weld_button(u"btn_select_certificate"_ustr)) + , m_xBtnSign(m_xBuilder->weld_button(u"ok"_ustr)) + , m_xLabelHint(m_xBuilder->weld_label(u"label_hint"_ustr)) + , m_xLabelHintText(m_xBuilder->weld_label(u"label_hint_text"_ustr)) + , m_xLabelAddComment(m_xBuilder->weld_label(u"label_add_comment"_ustr)) , m_bShowSignDate(false) { Reference<container::XIndexAccess> xIndexAccess(m_xModel->getCurrentSelection(), @@ -66,7 +66,7 @@ SignSignatureLineDialog::SignSignatureLineDialog(weld::Widget* pParent, Referenc m_xShapeProperties.set(xIndexAccess->getByIndex(0), UNO_QUERY_THROW); bool bIsSignatureLine(false); - m_xShapeProperties->getPropertyValue("IsSignatureLine") >>= bIsSignatureLine; + m_xShapeProperties->getPropertyValue(u"IsSignatureLine"_ustr) >>= bIsSignatureLine; if (!bIsSignatureLine) { SAL_WARN("cui.dialogs", "No signature line selected!"); @@ -80,17 +80,17 @@ SignSignatureLineDialog::SignSignatureLineDialog(weld::Widget* pParent, Referenc m_xEditName->connect_changed(LINK(this, SignSignatureLineDialog, entryChanged)); // Read properties from selected signature line - m_xShapeProperties->getPropertyValue("SignatureLineId") >>= m_aSignatureLineId; - m_xShapeProperties->getPropertyValue("SignatureLineSuggestedSignerName") + m_xShapeProperties->getPropertyValue(u"SignatureLineId"_ustr) >>= m_aSignatureLineId; + m_xShapeProperties->getPropertyValue(u"SignatureLineSuggestedSignerName"_ustr) >>= m_aSuggestedSignerName; - m_xShapeProperties->getPropertyValue("SignatureLineSuggestedSignerTitle") + m_xShapeProperties->getPropertyValue(u"SignatureLineSuggestedSignerTitle"_ustr) >>= m_aSuggestedSignerTitle; OUString aSigningInstructions; - m_xShapeProperties->getPropertyValue("SignatureLineSigningInstructions") + m_xShapeProperties->getPropertyValue(u"SignatureLineSigningInstructions"_ustr) >>= aSigningInstructions; - m_xShapeProperties->getPropertyValue("SignatureLineShowSignDate") >>= m_bShowSignDate; + m_xShapeProperties->getPropertyValue(u"SignatureLineShowSignDate"_ustr) >>= m_bShowSignDate; bool bCanAddComment(false); - m_xShapeProperties->getPropertyValue("SignatureLineCanAddComment") >>= bCanAddComment; + m_xShapeProperties->getPropertyValue(u"SignatureLineCanAddComment"_ustr) >>= bCanAddComment; if (aSigningInstructions.isEmpty()) { @@ -132,7 +132,7 @@ IMPL_LINK_NOARG(SignSignatureLineDialog, loadImage, weld::Button&, void) return; Reference<XGraphicProvider> xProvider = GraphicProvider::create(xContext); - Sequence<PropertyValue> aMediaProperties{ comphelper::makePropertyValue("URL", + Sequence<PropertyValue> aMediaProperties{ comphelper::makePropertyValue(u"URL"_ustr, aSelectedFiles[0]) }; m_xSignatureImage = xProvider->queryGraphic(aMediaProperties); m_sOriginalImageBtnLabel = m_xBtnLoadImage->get_label(); @@ -232,10 +232,10 @@ css::uno::Reference<css::graphic::XGraphic> SignSignatureLineDialog::getSignedGr if (!XOutBitmap::GraphicToBase64(aGraphic, aGraphicInBase64, false)) SAL_WARN("cui.dialogs", "Could not convert graphic to base64"); - OUString aImagePart = "<image y=\"825\" x=\"1300\" " + OUString aImagePart = u"<image y=\"825\" x=\"1300\" " "xlink:href=\"data:[MIMETYPE];base64,[BASE64_IMG]>\" " "preserveAspectRatio=\"xMidYMid\" height=\"1520\" " - "width=\"7600\" />"; + "width=\"7600\" />"_ustr; aImagePart = aImagePart.replaceAll( "[MIMETYPE]", GraphicMimeTypeHelper::GetMimeTypeForXGraphic(m_xSignatureImage)); aImagePart = aImagePart.replaceAll("[BASE64_IMG]", aGraphicInBase64); diff --git a/cui/source/dialogs/SignatureLineDialog.cxx b/cui/source/dialogs/SignatureLineDialog.cxx index 224dcdecd4bb..aece41a3d89d 100644 --- a/cui/source/dialogs/SignatureLineDialog.cxx +++ b/cui/source/dialogs/SignatureLineDialog.cxx @@ -42,14 +42,14 @@ using namespace css::graphic; SignatureLineDialog::SignatureLineDialog(weld::Widget* pParent, Reference<XModel> xModel, bool bEditExisting) - : SignatureLineDialogBase(pParent, std::move(xModel), "cui/ui/signatureline.ui", - "SignatureLineDialog") - , m_xEditName(m_xBuilder->weld_entry("edit_name")) - , m_xEditTitle(m_xBuilder->weld_entry("edit_title")) - , m_xEditEmail(m_xBuilder->weld_entry("edit_email")) - , m_xEditInstructions(m_xBuilder->weld_text_view("edit_instructions")) - , m_xCheckboxCanAddComments(m_xBuilder->weld_check_button("checkbox_can_add_comments")) - , m_xCheckboxShowSignDate(m_xBuilder->weld_check_button("checkbox_show_sign_date")) + : SignatureLineDialogBase(pParent, std::move(xModel), u"cui/ui/signatureline.ui"_ustr, + u"SignatureLineDialog"_ustr) + , m_xEditName(m_xBuilder->weld_entry(u"edit_name"_ustr)) + , m_xEditTitle(m_xBuilder->weld_entry(u"edit_title"_ustr)) + , m_xEditEmail(m_xBuilder->weld_entry(u"edit_email"_ustr)) + , m_xEditInstructions(m_xBuilder->weld_text_view(u"edit_instructions"_ustr)) + , m_xCheckboxCanAddComments(m_xBuilder->weld_check_button(u"checkbox_can_add_comments"_ustr)) + , m_xCheckboxShowSignDate(m_xBuilder->weld_check_button(u"checkbox_show_sign_date"_ustr)) { m_xEditInstructions->set_size_request(m_xEditInstructions->get_approximate_digit_width() * 48, m_xEditInstructions->get_text_height() * 5); @@ -67,24 +67,24 @@ SignatureLineDialog::SignatureLineDialog(weld::Widget* pParent, Reference<XModel Reference<XPropertySet> xProps(xIndexAccess->getByIndex(0), UNO_QUERY_THROW); // Read properties from selected signature line - xProps->getPropertyValue("SignatureLineId") >>= m_aSignatureLineId; + xProps->getPropertyValue(u"SignatureLineId"_ustr) >>= m_aSignatureLineId; OUString aSuggestedSignerName; - xProps->getPropertyValue("SignatureLineSuggestedSignerName") >>= aSuggestedSignerName; + xProps->getPropertyValue(u"SignatureLineSuggestedSignerName"_ustr) >>= aSuggestedSignerName; m_xEditName->set_text(aSuggestedSignerName); OUString aSuggestedSignerTitle; - xProps->getPropertyValue("SignatureLineSuggestedSignerTitle") >>= aSuggestedSignerTitle; + xProps->getPropertyValue(u"SignatureLineSuggestedSignerTitle"_ustr) >>= aSuggestedSignerTitle; m_xEditTitle->set_text(aSuggestedSignerTitle); OUString aSuggestedSignerEmail; - xProps->getPropertyValue("SignatureLineSuggestedSignerEmail") >>= aSuggestedSignerEmail; + xProps->getPropertyValue(u"SignatureLineSuggestedSignerEmail"_ustr) >>= aSuggestedSignerEmail; m_xEditEmail->set_text(aSuggestedSignerEmail); OUString aSigningInstructions; - xProps->getPropertyValue("SignatureLineSigningInstructions") >>= aSigningInstructions; + xProps->getPropertyValue(u"SignatureLineSigningInstructions"_ustr) >>= aSigningInstructions; m_xEditInstructions->set_text(aSigningInstructions); bool bCanAddComments = false; - xProps->getPropertyValue("SignatureLineCanAddComment") >>= bCanAddComments; + xProps->getPropertyValue(u"SignatureLineCanAddComment"_ustr) >>= bCanAddComments; m_xCheckboxCanAddComments->set_active(bCanAddComments); bool bShowSignDate = false; - xProps->getPropertyValue("SignatureLineShowSignDate") >>= bShowSignDate; + xProps->getPropertyValue(u"SignatureLineShowSignDate"_ustr) >>= bShowSignDate; m_xCheckboxShowSignDate->set_active(bShowSignDate); // Mark this as existing shape @@ -123,26 +123,26 @@ void SignatureLineDialog::Apply() xShapeProps = m_xExistingShapeProperties; else xShapeProps.set(Reference<lang::XMultiServiceFactory>(m_xModel, UNO_QUERY_THROW) - ->createInstance("com.sun.star.drawing.GraphicObjectShape"), + ->createInstance(u"com.sun.star.drawing.GraphicObjectShape"_ustr), UNO_QUERY); - xShapeProps->setPropertyValue("Graphic", Any(xGraphic)); - xShapeProps->setPropertyValue("SignatureLineUnsignedImage", Any(xGraphic)); + xShapeProps->setPropertyValue(u"Graphic"_ustr, Any(xGraphic)); + xShapeProps->setPropertyValue(u"SignatureLineUnsignedImage"_ustr, Any(xGraphic)); // Set signature line properties - xShapeProps->setPropertyValue("IsSignatureLine", Any(true)); - xShapeProps->setPropertyValue("SignatureLineId", Any(m_aSignatureLineId)); + xShapeProps->setPropertyValue(u"IsSignatureLine"_ustr, Any(true)); + xShapeProps->setPropertyValue(u"SignatureLineId"_ustr, Any(m_aSignatureLineId)); if (!aSignerName.isEmpty()) - xShapeProps->setPropertyValue("SignatureLineSuggestedSignerName", Any(aSignerName)); + xShapeProps->setPropertyValue(u"SignatureLineSuggestedSignerName"_ustr, Any(aSignerName)); if (!aSignerTitle.isEmpty()) - xShapeProps->setPropertyValue("SignatureLineSuggestedSignerTitle", Any(aSignerTitle)); + xShapeProps->setPropertyValue(u"SignatureLineSuggestedSignerTitle"_ustr, Any(aSignerTitle)); if (!aSignerEmail.isEmpty()) - xShapeProps->setPropertyValue("SignatureLineSuggestedSignerEmail", Any(aSignerEmail)); + xShapeProps->setPropertyValue(u"SignatureLineSuggestedSignerEmail"_ustr, Any(aSignerEmail)); if (!aSigningInstructions.isEmpty()) - xShapeProps->setPropertyValue("SignatureLineSigningInstructions", + xShapeProps->setPropertyValue(u"SignatureLineSigningInstructions"_ustr, Any(aSigningInstructions)); - xShapeProps->setPropertyValue("SignatureLineShowSignDate", Any(bShowSignDate)); - xShapeProps->setPropertyValue("SignatureLineCanAddComment", Any(bCanAddComments)); + xShapeProps->setPropertyValue(u"SignatureLineShowSignDate"_ustr, Any(bShowSignDate)); + xShapeProps->setPropertyValue(u"SignatureLineCanAddComment"_ustr, Any(bCanAddComments)); if (bIsExistingSignatureLine) return; @@ -155,7 +155,7 @@ void SignatureLineDialog::Apply() xShape->setSize(aShapeSize); // Default anchoring - xShapeProps->setPropertyValue("AnchorType", Any(TextContentAnchorType_AT_PARAGRAPH)); + xShapeProps->setPropertyValue(u"AnchorType"_ustr, Any(TextContentAnchorType_AT_PARAGRAPH)); // Writer const Reference<XTextDocument> xTextDocument(m_xModel, UNO_QUERY); @@ -179,7 +179,7 @@ void SignatureLineDialog::Apply() Reference<XPropertySet> xSheetCell(m_xModel->getCurrentSelection(), UNO_QUERY_THROW); awt::Point aCellPosition; - xSheetCell->getPropertyValue("Position") >>= aCellPosition; + xSheetCell->getPropertyValue(u"Position"_ustr) >>= aCellPosition; xShape->setPosition(aCellPosition); Reference<XSpreadsheetView> xView(m_xModel->getCurrentController(), UNO_QUERY_THROW); diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx index bc45db96e25e..a0c9819f0485 100644 --- a/cui/source/dialogs/SpellDialog.cxx +++ b/cui/source/dialogs/SpellDialog.cxx @@ -160,37 +160,37 @@ sal_uInt16 SpellUndoAction_Impl::GetId()const SpellDialog::SpellDialog(SpellDialogChildWindow* pChildWindow, weld::Window * pParent, SfxBindings* _pBindings) : SfxModelessDialogController (_pBindings, pChildWindow, - pParent, "cui/ui/spellingdialog.ui", "SpellingDialog") + pParent, u"cui/ui/spellingdialog.ui"_ustr, u"SpellingDialog"_ustr) , aDialogUndoLink(LINK (this, SpellDialog, DialogUndoHdl)) , m_pInitHdlEvent(nullptr) , bFocusLocked(true) , rParent(*pChildWindow) , pImpl( new SpellDialog_Impl ) - , m_xAltTitle(m_xBuilder->weld_label("alttitleft")) - , m_xResumeFT(m_xBuilder->weld_label("resumeft")) - , m_xNoSuggestionsFT(m_xBuilder->weld_label("nosuggestionsft")) - , m_xLanguageFT(m_xBuilder->weld_label("languageft")) - , m_xLanguageLB(new SvxLanguageBox(m_xBuilder->weld_combo_box("languagelb"))) - , m_xExplainFT(m_xBuilder->weld_label("explain")) - , m_xExplainLink(m_xBuilder->weld_link_button("explainlink")) - , m_xNotInDictFT(m_xBuilder->weld_label("notindictft")) - , m_xSentenceED(new SentenceEditWindow_Impl(m_xBuilder->weld_scrolled_window("scrolledwindow", true))) - , m_xSuggestionFT(m_xBuilder->weld_label("suggestionsft")) - , m_xSuggestionLB(m_xBuilder->weld_tree_view("suggestionslb")) - , m_xIgnorePB(m_xBuilder->weld_button("ignore")) - , m_xIgnoreAllPB(m_xBuilder->weld_button("ignoreall")) - , m_xIgnoreRulePB(m_xBuilder->weld_button("ignorerule")) - , m_xAddToDictPB(m_xBuilder->weld_button("add")) - , m_xAddToDictMB(m_xBuilder->weld_menu_button("addmb")) - , m_xChangePB(m_xBuilder->weld_button("change")) - , m_xChangeAllPB(m_xBuilder->weld_button("changeall")) - , m_xAutoCorrPB(m_xBuilder->weld_button("autocorrect")) - , m_xCheckGrammarCB(m_xBuilder->weld_check_button("checkgrammar")) - , m_xOptionsPB(m_xBuilder->weld_button("options")) - , m_xUndoPB(m_xBuilder->weld_button("undo")) - , m_xClosePB(m_xBuilder->weld_button("close")) - , m_xToolbar(m_xBuilder->weld_toolbar("toolbar")) - , m_xSentenceEDWeld(new weld::CustomWeld(*m_xBuilder, "sentence", *m_xSentenceED)) + , m_xAltTitle(m_xBuilder->weld_label(u"alttitleft"_ustr)) + , m_xResumeFT(m_xBuilder->weld_label(u"resumeft"_ustr)) + , m_xNoSuggestionsFT(m_xBuilder->weld_label(u"nosuggestionsft"_ustr)) + , m_xLanguageFT(m_xBuilder->weld_label(u"languageft"_ustr)) + , m_xLanguageLB(new SvxLanguageBox(m_xBuilder->weld_combo_box(u"languagelb"_ustr))) + , m_xExplainFT(m_xBuilder->weld_label(u"explain"_ustr)) + , m_xExplainLink(m_xBuilder->weld_link_button(u"explainlink"_ustr)) + , m_xNotInDictFT(m_xBuilder->weld_label(u"notindictft"_ustr)) + , m_xSentenceED(new SentenceEditWindow_Impl(m_xBuilder->weld_scrolled_window(u"scrolledwindow"_ustr, true))) + , m_xSuggestionFT(m_xBuilder->weld_label(u"suggestionsft"_ustr)) + , m_xSuggestionLB(m_xBuilder->weld_tree_view(u"suggestionslb"_ustr)) + , m_xIgnorePB(m_xBuilder->weld_button(u"ignore"_ustr)) + , m_xIgnoreAllPB(m_xBuilder->weld_button(u"ignoreall"_ustr)) + , m_xIgnoreRulePB(m_xBuilder->weld_button(u"ignorerule"_ustr)) + , m_xAddToDictPB(m_xBuilder->weld_button(u"add"_ustr)) + , m_xAddToDictMB(m_xBuilder->weld_menu_button(u"addmb"_ustr)) + , m_xChangePB(m_xBuilder->weld_button(u"change"_ustr)) + , m_xChangeAllPB(m_xBuilder->weld_button(u"changeall"_ustr)) + , m_xAutoCorrPB(m_xBuilder->weld_button(u"autocorrect"_ustr)) + , m_xCheckGrammarCB(m_xBuilder->weld_check_button(u"checkgrammar"_ustr)) + , m_xOptionsPB(m_xBuilder->weld_button(u"options"_ustr)) + , m_xUndoPB(m_xBuilder->weld_button(u"undo"_ustr)) + , m_xClosePB(m_xBuilder->weld_button(u"close"_ustr)) + , m_xToolbar(m_xBuilder->weld_toolbar(u"toolbar"_ustr)) + , m_xSentenceEDWeld(new weld::CustomWeld(*m_xBuilder, u"sentence"_ustr, *m_xSentenceED)) { m_xSentenceED->SetSpellDialog(this); m_xSentenceED->Init(m_xToolbar.get()); @@ -1035,7 +1035,7 @@ bool SpellDialog::GetNextSentence_Impl(std::unique_ptr<UndoChangeGroupGuard>* pG SpellErrorDescription aDesc( false, elem.xAlternatives->getWord(), elem.xAlternatives->getLocale(), elem.xAlternatives->getAlternatives(), nullptr); SfxGrabBagItem aSpellErrorDescription(EE_CHAR_GRABBAG); - aSpellErrorDescription.GetGrabBag()["SpellErrorDescription"] <<= aDesc.toSequence(); + aSpellErrorDescription.GetGrabBag()[u"SpellErrorDescription"_ustr] <<= aDesc.toSequence(); m_xSentenceED->SetAttrib(aSpellErrorDescription, nStartPosition, nEndPosition); } else if(elem.bIsGrammarError ) @@ -1064,7 +1064,7 @@ bool SpellDialog::GetNextSentence_Impl(std::unique_ptr<UndoChangeGroupGuard>* pG &sFullCommentURL ); SfxGrabBagItem aSpellErrorDescriptionItem(EE_CHAR_GRABBAG); - aSpellErrorDescriptionItem.GetGrabBag()["SpellErrorDescription"] <<= aDesc.toSequence(); + aSpellErrorDescriptionItem.GetGrabBag()[u"SpellErrorDescription"_ustr] <<= aDesc.toSequence(); m_xSentenceED->SetAttrib(aSpellErrorDescriptionItem, nStartPosition, nEndPosition); } @@ -1249,7 +1249,7 @@ namespace { css::uno::Sequence<css::uno::Any> aSequence; const auto pGrabBag = static_cast<const SfxGrabBagItem*>(rEECharAttrib.pAttr)->GetGrabBag(); - const auto iter = pGrabBag.find("SpellErrorDescription"); + const auto iter = pGrabBag.find(u"SpellErrorDescription"_ustr); assert(iter != pGrabBag.end()); iter->second >>= aSequence; rSpellErrorDescription.fromSequence(aSequence); @@ -1856,7 +1856,7 @@ int SentenceEditWindow_Impl::ChangeMarkedWord(const OUString& rNewWord, Language if (bSpellErrorDescription) { SfxGrabBagItem aSpellErrorDescriptionItem(EE_CHAR_GRABBAG); - aSpellErrorDescriptionItem.GetGrabBag()["SpellErrorDescription"] <<= aSpellErrorDescription.toSequence(); + aSpellErrorDescriptionItem.GetGrabBag()[u"SpellErrorDescription"_ustr] <<= aSpellErrorDescription.toSequence(); SetAttrib(aSpellErrorDescriptionItem, m_nErrorStart, m_nErrorEnd); } SetAttrib(SvxLanguageItem(eLanguage, EE_CHAR_LANGUAGE), m_nErrorStart, m_nErrorEnd); @@ -1914,7 +1914,7 @@ void SentenceEditWindow_Impl::SetAlternatives( const Reference< XSpellAlternativ } SpellErrorDescription aDesc( false, aWord, std::move(aLocale), aAlts, nullptr); SfxGrabBagItem aSpellErrorDescription(EE_CHAR_GRABBAG); - aSpellErrorDescription.GetGrabBag()["SpellErrorDescription"] <<= aDesc.toSequence(); + aSpellErrorDescription.GetGrabBag()[u"SpellErrorDescription"_ustr] <<= aDesc.toSequence(); SetAttrib(aSpellErrorDescription, m_nErrorStart, m_nErrorEnd); } diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx index ce82e418cf9e..353d23b16f07 100644 --- a/cui/source/dialogs/about.cxx +++ b/cui/source/dialogs/about.cxx @@ -55,22 +55,22 @@ using namespace ::com::sun::star::uno; AboutDialog::AboutDialog(weld::Window *pParent) - : GenericDialogController(pParent, "cui/ui/aboutdialog.ui", "AboutDialog"), - m_pCreditsButton(m_xBuilder->weld_link_button("btnCredits")), - m_pWebsiteButton(m_xBuilder->weld_link_button("btnWebsite")), - m_pReleaseNotesButton(m_xBuilder->weld_link_button("btnReleaseNotes")), - m_pCloseButton(m_xBuilder->weld_button("btnClose")), - m_pCopyButton(m_xBuilder->weld_button("btnCopyVersion")), - m_pBrandImage(m_xBuilder->weld_image("imBrand")), - m_pAboutImage(m_xBuilder->weld_image("imAbout")), - m_pVersionLabel(m_xBuilder->weld_label("lbVersionString")), - m_pBuildCaption(m_xBuilder->weld_label("lbBuild")), - m_pBuildLabel(m_xBuilder->weld_link_button("lbBuildString")), - m_pEnvLabel(m_xBuilder->weld_label("lbEnvString")), - m_pUILabel(m_xBuilder->weld_label("lbUIString")), - m_pLocaleLabel(m_xBuilder->weld_label("lbLocaleString")), - m_pMiscLabel(m_xBuilder->weld_label("lbMiscString")), - m_pCopyrightLabel(m_xBuilder->weld_label("lbCopyright")) { + : GenericDialogController(pParent, u"cui/ui/aboutdialog.ui"_ustr, u"AboutDialog"_ustr), + m_pCreditsButton(m_xBuilder->weld_link_button(u"btnCredits"_ustr)), + m_pWebsiteButton(m_xBuilder->weld_link_button(u"btnWebsite"_ustr)), + m_pReleaseNotesButton(m_xBuilder->weld_link_button(u"btnReleaseNotes"_ustr)), + m_pCloseButton(m_xBuilder->weld_button(u"btnClose"_ustr)), + m_pCopyButton(m_xBuilder->weld_button(u"btnCopyVersion"_ustr)), + m_pBrandImage(m_xBuilder->weld_image(u"imBrand"_ustr)), + m_pAboutImage(m_xBuilder->weld_image(u"imAbout"_ustr)), + m_pVersionLabel(m_xBuilder->weld_label(u"lbVersionString"_ustr)), + m_pBuildCaption(m_xBuilder->weld_label(u"lbBuild"_ustr)), + m_pBuildLabel(m_xBuilder->weld_link_button(u"lbBuildString"_ustr)), + m_pEnvLabel(m_xBuilder->weld_label(u"lbEnvString"_ustr)), + m_pUILabel(m_xBuilder->weld_label(u"lbUIString"_ustr)), + m_pLocaleLabel(m_xBuilder->weld_label(u"lbLocaleString"_ustr)), + m_pMiscLabel(m_xBuilder->weld_label(u"lbMiscString"_ustr)), + m_pCopyrightLabel(m_xBuilder->weld_label(u"lbCopyright"_ustr)) { // Labels m_pVersionLabel->set_label(GetVersionString()); @@ -148,7 +148,7 @@ bool AboutDialog::IsStringValidGitHash(std::u16string_view hash) { OUString AboutDialog::GetVersionString() { OUString arch; - auto const ok = rtl::Bootstrap::get("_ARCH", arch); + auto const ok = rtl::Bootstrap::get(u"_ARCH"_ustr, arch); assert(ok); (void) ok; OUString sVersion = CuiResId(TranslateId(nullptr, "%ABOUTBOXPRODUCTVERSION%ABOUTBOXPRODUCTVERSIONSUFFIX")) + " (" + arch + ")"; @@ -161,7 +161,7 @@ OUString AboutDialog::GetVersionString() { OUString AboutDialog::GetBuildString() { - OUString sBuildId(utl::Bootstrap::getBuildIdData("")); + OUString sBuildId(utl::Bootstrap::getBuildIdData(u""_ustr)); SAL_WARN_IF(sBuildId.isEmpty(), "cui.dialogs", "No BUILDID in bootstrap file"); return sBuildId; @@ -192,7 +192,7 @@ OUString AboutDialog::GetLocaleString(const bool bLocalized) { if (bLocalized) sUILocaleStr = CuiResId(RID_CUISTR_ABOUT_UILOCALE); else - sUILocaleStr = Translate::get(RID_CUISTR_ABOUT_UILOCALE, Translate::Create("cui", LanguageTag("en-US"))); + sUILocaleStr = Translate::get(RID_CUISTR_ABOUT_UILOCALE, Translate::Create("cui", LanguageTag(u"en-US"_ustr))); if (sUILocaleStr.indexOf("$LOCALE") == -1) { SAL_WARN("cui.dialogs", "translated uilocale string in translations " diff --git a/cui/source/dialogs/colorpicker.cxx b/cui/source/dialogs/colorpicker.cxx index 290025929d5a..6ca351c883d4 100644 --- a/cui/source/dialogs/colorpicker.cxx +++ b/cui/source/dialogs/colorpicker.cxx @@ -802,30 +802,30 @@ private: } ColorPickerDialog::ColorPickerDialog(weld::Window* pParent, Color nColor, sal_Int16 nDialogMode) - : SfxDialogController(pParent, "cui/ui/colorpickerdialog.ui", "ColorPicker") - , m_xColorField(new weld::CustomWeld(*m_xBuilder, "colorField", m_aColorField)) - , m_xColorSlider(new weld::CustomWeld(*m_xBuilder, "colorSlider", m_aColorSlider)) - , m_xColorPreview(new weld::CustomWeld(*m_xBuilder, "preview", m_aColorPreview)) - , m_xColorPrevious(new weld::CustomWeld(*m_xBuilder, "previous", m_aColorPrevious)) - , m_xFISliderLeft(m_xBuilder->weld_widget("leftImage")) - , m_xFISliderRight(m_xBuilder->weld_widget("rightImage")) - , m_xRBRed(m_xBuilder->weld_radio_button("redRadiobutton")) - , m_xRBGreen(m_xBuilder->weld_radio_button("greenRadiobutton")) - , m_xRBBlue(m_xBuilder->weld_radio_button("blueRadiobutton")) - , m_xRBHue(m_xBuilder->weld_radio_button("hueRadiobutton")) - , m_xRBSaturation(m_xBuilder->weld_radio_button("satRadiobutton")) - , m_xRBBrightness(m_xBuilder->weld_radio_button("brightRadiobutton")) - , m_xMFRed(m_xBuilder->weld_spin_button("redSpinbutton")) - , m_xMFGreen(m_xBuilder->weld_spin_button("greenSpinbutton")) - , m_xMFBlue(m_xBuilder->weld_spin_button("blueSpinbutton")) - , m_xEDHex(new weld::HexColorControl(m_xBuilder->weld_entry("hexEntry"))) - , m_xMFHue(m_xBuilder->weld_metric_spin_button("hueSpinbutton", FieldUnit::DEGREE)) - , m_xMFSaturation(m_xBuilder->weld_metric_spin_button("satSpinbutton", FieldUnit::PERCENT)) - , m_xMFBrightness(m_xBuilder->weld_metric_spin_button("brightSpinbutton", FieldUnit::PERCENT)) - , m_xMFCyan(m_xBuilder->weld_metric_spin_button("cyanSpinbutton", FieldUnit::PERCENT)) - , m_xMFMagenta(m_xBuilder->weld_metric_spin_button("magSpinbutton", FieldUnit::PERCENT)) - , m_xMFYellow(m_xBuilder->weld_metric_spin_button("yellowSpinbutton", FieldUnit::PERCENT)) - , m_xMFKey(m_xBuilder->weld_metric_spin_button("keySpinbutton", FieldUnit::PERCENT)) + : SfxDialogController(pParent, u"cui/ui/colorpickerdialog.ui"_ustr, u"ColorPicker"_ustr) + , m_xColorField(new weld::CustomWeld(*m_xBuilder, u"colorField"_ustr, m_aColorField)) + , m_xColorSlider(new weld::CustomWeld(*m_xBuilder, u"colorSlider"_ustr, m_aColorSlider)) + , m_xColorPreview(new weld::CustomWeld(*m_xBuilder, u"preview"_ustr, m_aColorPreview)) + , m_xColorPrevious(new weld::CustomWeld(*m_xBuilder, u"previous"_ustr, m_aColorPrevious)) + , m_xFISliderLeft(m_xBuilder->weld_widget(u"leftImage"_ustr)) + , m_xFISliderRight(m_xBuilder->weld_widget(u"rightImage"_ustr)) + , m_xRBRed(m_xBuilder->weld_radio_button(u"redRadiobutton"_ustr)) + , m_xRBGreen(m_xBuilder->weld_radio_button(u"greenRadiobutton"_ustr)) + , m_xRBBlue(m_xBuilder->weld_radio_button(u"blueRadiobutton"_ustr)) + , m_xRBHue(m_xBuilder->weld_radio_button(u"hueRadiobutton"_ustr)) + , m_xRBSaturation(m_xBuilder->weld_radio_button(u"satRadiobutton"_ustr)) + , m_xRBBrightness(m_xBuilder->weld_radio_button(u"brightRadiobutton"_ustr)) + , m_xMFRed(m_xBuilder->weld_spin_button(u"redSpinbutton"_ustr)) + , m_xMFGreen(m_xBuilder->weld_spin_button(u"greenSpinbutton"_ustr)) + , m_xMFBlue(m_xBuilder->weld_spin_button(u"blueSpinbutton"_ustr)) + , m_xEDHex(new weld::HexColorControl(m_xBuilder->weld_entry(u"hexEntry"_ustr))) + , m_xMFHue(m_xBuilder->weld_metric_spin_button(u"hueSpinbutton"_ustr, FieldUnit::DEGREE)) + , m_xMFSaturation(m_xBuilder->weld_metric_spin_button(u"satSpinbutton"_ustr, FieldUnit::PERCENT)) + , m_xMFBrightness(m_xBuilder->weld_metric_spin_button(u"brightSpinbutton"_ustr, FieldUnit::PERCENT)) + , m_xMFCyan(m_xBuilder->weld_metric_spin_button(u"cyanSpinbutton"_ustr, FieldUnit::PERCENT)) + , m_xMFMagenta(m_xBuilder->weld_metric_spin_button(u"magSpinbutton"_ustr, FieldUnit::PERCENT)) + , m_xMFYellow(m_xBuilder->weld_metric_spin_button(u"yellowSpinbutton"_ustr, FieldUnit::PERCENT)) + , m_xMFKey(m_xBuilder->weld_metric_spin_button(u"keySpinbutton"_ustr, FieldUnit::PERCENT)) , meMode( DefaultMode ) { m_aColorField.SetModifyHdl( LINK( this, ColorPickerDialog, ColorFieldControlModifydl ) ); @@ -1287,7 +1287,7 @@ void SAL_CALL ColorPicker::initialize( const Sequence< Any >& aArguments ) // XInitialization OUString SAL_CALL ColorPicker::getImplementationName( ) { - return "com.sun.star.cui.ColorPicker"; + return u"com.sun.star.cui.ColorPicker"_ustr; } sal_Bool SAL_CALL ColorPicker::supportsService( const OUString& sServiceName ) @@ -1297,8 +1297,8 @@ sal_Bool SAL_CALL ColorPicker::supportsService( const OUString& sServiceName ) Sequence< OUString > SAL_CALL ColorPicker::getSupportedServiceNames( ) { - return { "com.sun.star.ui.dialogs.ColorPicker", - "com.sun.star.ui.dialogs.AsynchronousColorPicker" }; + return { u"com.sun.star.ui.dialogs.ColorPicker"_ustr, + u"com.sun.star.ui.dialogs.AsynchronousColorPicker"_ustr }; } // XPropertyAccess diff --git a/cui/source/dialogs/cuifmsearch.cxx b/cui/source/dialogs/cuifmsearch.cxx index 0a7eb06783ab..89eee514e193 100644 --- a/cui/source/dialogs/cuifmsearch.cxx +++ b/cui/source/dialogs/cuifmsearch.cxx @@ -68,35 +68,35 @@ void FmSearchDialog::initCommon( const Reference< XResultSet >& _rxCursor ) FmSearchDialog::FmSearchDialog(weld::Window* pParent, const OUString& sInitialText, const std::vector< OUString >& _rContexts, sal_Int16 nInitialContext, const Link<FmSearchContext&,sal_uInt32>& lnkContextSupplier) - : GenericDialogController(pParent, "cui/ui/fmsearchdialog.ui", "RecordSearchDialog") + : GenericDialogController(pParent, u"cui/ui/fmsearchdialog.ui"_ustr, u"RecordSearchDialog"_ustr) , m_sCancel( GetStandardText( StandardButtonType::Cancel ) ) , m_lnkContextSupplier(lnkContextSupplier) - , m_prbSearchForText(m_xBuilder->weld_radio_button("rbSearchForText")) - , m_prbSearchForNull(m_xBuilder->weld_radio_button("rbSearchForNull")) - , m_prbSearchForNotNull(m_xBuilder->weld_radio_button("rbSearchForNotNull")) - , m_pcmbSearchText(m_xBuilder->weld_combo_box("cmbSearchText")) - , m_pftForm(m_xBuilder->weld_label("ftForm")) - , m_plbForm(m_xBuilder->weld_combo_box("lbForm")) - , m_prbAllFields(m_xBuilder->weld_radio_button("rbAllFields")) - , m_prbSingleField(m_xBuilder->weld_radio_button("rbSingleField")) - , m_plbField(m_xBuilder->weld_combo_box("lbField")) - , m_pftPosition(m_xBuilder->weld_label("ftPosition")) - , m_plbPosition(m_xBuilder->weld_combo_box("lbPosition")) - , m_pcbUseFormat(m_xBuilder->weld_check_button("cbUseFormat")) - , m_pcbCase(m_xBuilder->weld_check_button("cbCase")) - , m_pcbBackwards(m_xBuilder->weld_check_button("cbBackwards")) - , m_pcbStartOver(m_xBuilder->weld_check_button("cbStartOver")) - , m_pcbWildCard(m_xBuilder->weld_check_button("cbWildCard")) - , m_pcbRegular(m_xBuilder->weld_check_button("cbRegular")) - , m_pcbApprox(m_xBuilder->weld_check_button("cbApprox")) - , m_ppbApproxSettings(m_xBuilder->weld_button("pbApproxSettings")) - , m_pHalfFullFormsCJK(m_xBuilder->weld_check_button("HalfFullFormsCJK")) - , m_pSoundsLikeCJK(m_xBuilder->weld_check_button("SoundsLikeCJK")) - , m_pSoundsLikeCJKSettings(m_xBuilder->weld_button("SoundsLikeCJKSettings")) - , m_pftRecord(m_xBuilder->weld_label("ftRecord")) - , m_pftHint(m_xBuilder->weld_label("ftHint")) - , m_pbSearchAgain(m_xBuilder->weld_button("pbSearchAgain")) - , m_pbClose(m_xBuilder->weld_button("close")) + , m_prbSearchForText(m_xBuilder->weld_radio_button(u"rbSearchForText"_ustr)) + , m_prbSearchForNull(m_xBuilder->weld_radio_button(u"rbSearchForNull"_ustr)) + , m_prbSearchForNotNull(m_xBuilder->weld_radio_button(u"rbSearchForNotNull"_ustr)) + , m_pcmbSearchText(m_xBuilder->weld_combo_box(u"cmbSearchText"_ustr)) + , m_pftForm(m_xBuilder->weld_label(u"ftForm"_ustr)) + , m_plbForm(m_xBuilder->weld_combo_box(u"lbForm"_ustr)) + , m_prbAllFields(m_xBuilder->weld_radio_button(u"rbAllFields"_ustr)) + , m_prbSingleField(m_xBuilder->weld_radio_button(u"rbSingleField"_ustr)) + , m_plbField(m_xBuilder->weld_combo_box(u"lbField"_ustr)) + , m_pftPosition(m_xBuilder->weld_label(u"ftPosition"_ustr)) + , m_plbPosition(m_xBuilder->weld_combo_box(u"lbPosition"_ustr)) + , m_pcbUseFormat(m_xBuilder->weld_check_button(u"cbUseFormat"_ustr)) + , m_pcbCase(m_xBuilder->weld_check_button(u"cbCase"_ustr)) + , m_pcbBackwards(m_xBuilder->weld_check_button(u"cbBackwards"_ustr)) + , m_pcbStartOver(m_xBuilder->weld_check_button(u"cbStartOver"_ustr)) + , m_pcbWildCard(m_xBuilder->weld_check_button(u"cbWildCard"_ustr)) + , m_pcbRegular(m_xBuilder->weld_check_button(u"cbRegular"_ustr)) + , m_pcbApprox(m_xBuilder->weld_check_button(u"cbApprox"_ustr)) + , m_ppbApproxSettings(m_xBuilder->weld_button(u"pbApproxSettings"_ustr)) + , m_pHalfFullFormsCJK(m_xBuilder->weld_check_button(u"HalfFullFormsCJK"_ustr)) + , m_pSoundsLikeCJK(m_xBuilder->weld_check_button(u"SoundsLikeCJK"_ustr)) + , m_pSoundsLikeCJKSettings(m_xBuilder->weld_button(u"SoundsLikeCJKSettings"_ustr)) + , m_pftRecord(m_xBuilder->weld_label(u"ftRecord"_ustr)) + , m_pftHint(m_xBuilder->weld_label(u"ftHint"_ustr)) + , m_pbSearchAgain(m_xBuilder->weld_button(u"pbSearchAgain"_ustr)) + , m_pbClose(m_xBuilder->weld_button(u"close"_ustr)) { m_pcmbSearchText->set_size_request(m_pcmbSearchText->get_approximate_digit_width() * 38, -1); m_plbForm->set_size_request(m_plbForm->get_approximate_digit_width() * 38, -1); diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx index 9a1a2e26a4ed..fb2007532fc2 100644 --- a/cui/source/dialogs/cuigaldlg.cxx +++ b/cui/source/dialogs/cuigaldlg.cxx @@ -190,12 +190,12 @@ void SearchThread::ImplSearch( const INetURLObject& rStartURL, } SearchProgress::SearchProgress(weld::Window* pParent, TPGalleryThemeProperties* pTabPage, INetURLObject aStartURL) - : GenericDialogController(pParent, "cui/ui/gallerysearchprogress.ui", "GallerySearchProgress") + : GenericDialogController(pParent, u"cui/ui/gallerysearchprogress.ui"_ustr, u"GallerySearchProgress"_ustr) , startUrl_(std::move(aStartURL)) , m_pTabPage(pTabPage) - , m_xFtSearchDir(m_xBuilder->weld_label("dir")) - , m_xFtSearchType(m_xBuilder->weld_label("file")) - , m_xBtnCancel(m_xBuilder->weld_button("cancel")) + , m_xFtSearchDir(m_xBuilder->weld_label(u"dir"_ustr)) + , m_xFtSearchType(m_xBuilder->weld_label(u"file"_ustr)) + , m_xBtnCancel(m_xBuilder->weld_button(u"cancel"_ustr)) { m_xFtSearchType->set_size_request(m_xFtSearchType->get_preferred_size().Width(), -1); m_xBtnCancel->connect_clicked(LINK(this, SearchProgress, ClickCancelBtn)); @@ -291,12 +291,12 @@ void TakeThread::execute() } TakeProgress::TakeProgress(weld::Window* pParent, TPGalleryThemeProperties* pTabPage) - : GenericDialogController(pParent, "cui/ui/galleryapplyprogress.ui", - "GalleryApplyProgress") + : GenericDialogController(pParent, u"cui/ui/galleryapplyprogress.ui"_ustr, + u"GalleryApplyProgress"_ustr) , m_pParent(pParent) , m_pTabPage(pTabPage) - , m_xFtTakeFile(m_xBuilder->weld_label("file")) - , m_xBtnCancel(m_xBuilder->weld_button("cancel")) + , m_xFtTakeFile(m_xBuilder->weld_label(u"file"_ustr)) + , m_xBtnCancel(m_xBuilder->weld_button(u"cancel"_ustr)) { m_xBtnCancel->connect_clicked(LINK(this, TakeProgress, ClickCancelBtn)); } @@ -365,12 +365,12 @@ void TakeProgress::LaunchThread() } ActualizeProgress::ActualizeProgress(weld::Widget* pWindow, GalleryTheme* pThm) - : GenericDialogController(pWindow, "cui/ui/galleryupdateprogress.ui", - "GalleryUpdateProgress") + : GenericDialogController(pWindow, u"cui/ui/galleryupdateprogress.ui"_ustr, + u"GalleryUpdateProgress"_ustr) , pIdle(nullptr) , pTheme(pThm) - , m_xFtActualizeFile(m_xBuilder->weld_label("file")) - , m_xBtnCancel(m_xBuilder->weld_button("cancel")) + , m_xFtActualizeFile(m_xBuilder->weld_label(u"file"_ustr)) + , m_xBtnCancel(m_xBuilder->weld_button(u"cancel"_ustr)) { m_xBtnCancel->connect_clicked(LINK(this, ActualizeProgress, ClickCancelBtn)); } @@ -414,8 +414,8 @@ IMPL_LINK( ActualizeProgress, ActualizeHdl, const INetURLObject&, rURL, void ) } TitleDialog::TitleDialog(weld::Widget* pParent, const OUString& rOldTitle) - : GenericDialogController(pParent, "cui/ui/gallerytitledialog.ui", "GalleryTitleDialog") - , m_xEdit(m_xBuilder->weld_entry("entry")) + : GenericDialogController(pParent, u"cui/ui/gallerytitledialog.ui"_ustr, u"GalleryTitleDialog"_ustr) + , m_xEdit(m_xBuilder->weld_entry(u"entry"_ustr)) { m_xEdit->set_text(rOldTitle); m_xEdit->grab_focus(); @@ -426,12 +426,12 @@ TitleDialog::~TitleDialog() } GalleryIdDialog::GalleryIdDialog(weld::Widget* pParent, GalleryTheme* _pThm) - : GenericDialogController(pParent, "cui/ui/gallerythemeiddialog.ui", "GalleryThemeIDDialog") + : GenericDialogController(pParent, u"cui/ui/gallerythemeiddialog.ui"_ustr, u"GalleryThemeIDDialog"_ustr) , m_pThm(_pThm) - , m_xBtnOk(m_xBuilder->weld_button("ok")) - , m_xLbResName(m_xBuilder->weld_combo_box("entry")) + , m_xBtnOk(m_xBuilder->weld_button(u"ok"_ustr)) + , m_xLbResName(m_xBuilder->weld_combo_box(u"entry"_ustr)) { - m_xLbResName->append_text("!!! No Id !!!"); + m_xLbResName->append_text(u"!!! No Id !!!"_ustr); GalleryTheme::InsertAllThemes(*m_xLbResName); @@ -475,14 +475,14 @@ IMPL_LINK_NOARG(GalleryIdDialog, ClickOkHdl, weld::Button&, void) GalleryThemeProperties::GalleryThemeProperties(weld::Widget* pParent, ExchangeData* _pData, SfxItemSet const * pItemSet) - : SfxTabDialogController(pParent, "cui/ui/gallerythemedialog.ui", - "GalleryThemeDialog", pItemSet) + : SfxTabDialogController(pParent, u"cui/ui/gallerythemedialog.ui"_ustr, + u"GalleryThemeDialog"_ustr, pItemSet) , pData(_pData) { - AddTabPage("general", TPGalleryThemeGeneral::Create, nullptr); - AddTabPage("files", TPGalleryThemeProperties::Create, nullptr); + AddTabPage(u"general"_ustr, TPGalleryThemeGeneral::Create, nullptr); + AddTabPage(u"files"_ustr, TPGalleryThemeProperties::Create, nullptr); if (pData->pTheme->IsReadOnly()) - RemoveTabPage("files"); + RemoveTabPage(u"files"_ustr); OUString aText = m_xDialog->get_title().replaceFirst( "%1", pData->pTheme->GetName() ); @@ -501,14 +501,14 @@ void GalleryThemeProperties::PageCreated(const OUString& rId, SfxTabPage &rPage) } TPGalleryThemeGeneral::TPGalleryThemeGeneral(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet) - : SfxTabPage(pPage, pController, "cui/ui/gallerygeneralpage.ui", "GalleryGeneralPage", &rSet) + : SfxTabPage(pPage, pController, u"cui/ui/gallerygeneralpage.ui"_ustr, u"GalleryGeneralPage"_ustr, &rSet) , pData(nullptr) - , m_xFiMSImage(m_xBuilder->weld_image("image")) - , m_xEdtMSName(m_xBuilder->weld_entry("name")) - , m_xFtMSShowType(m_xBuilder->weld_label("type")) - , m_xFtMSShowPath(m_xBuilder->weld_label("location")) - , m_xFtMSShowContent(m_xBuilder->weld_label("contents")) - , m_xFtMSShowChangeDate(m_xBuilder->weld_label("modified")) + , m_xFiMSImage(m_xBuilder->weld_image(u"image"_ustr)) + , m_xEdtMSName(m_xBuilder->weld_entry(u"name"_ustr)) + , m_xFtMSShowType(m_xBuilder->weld_label(u"type"_ustr)) + , m_xFtMSShowPath(m_xBuilder->weld_label(u"location"_ustr)) + , m_xFtMSShowContent(m_xBuilder->weld_label(u"contents"_ustr)) + , m_xFtMSShowChangeDate(m_xBuilder->weld_label(u"modified"_ustr)) { } @@ -576,7 +576,7 @@ std::unique_ptr<SfxTabPage> TPGalleryThemeGeneral::Create(weld::Container* pPage } TPGalleryThemeProperties::TPGalleryThemeProperties(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet) - : SfxTabPage(pPage, pController, "cui/ui/galleryfilespage.ui", "GalleryFilesPage", &rSet) + : SfxTabPage(pPage, pController, u"cui/ui/galleryfilespage.ui"_ustr, u"GalleryFilesPage"_ustr, &rSet) , pData(nullptr) , aPreviewTimer("cui TPGalleryThemeProperties aPreviewTimer") , bEntriesFound(false) @@ -584,13 +584,13 @@ TPGalleryThemeProperties::TPGalleryThemeProperties(weld::Container* pPage, weld: , bTakeAll(false) , bSearchRecursive(false) , xDialogListener(new ::svt::DialogClosedListener()) - , m_xCbbFileType(m_xBuilder->weld_combo_box("filetype")) - , m_xLbxFound(m_xBuilder->weld_tree_view("files")) - , m_xBtnSearch(m_xBuilder->weld_button("findfiles")) - , m_xBtnTake(m_xBuilder->weld_button("add")) - , m_xBtnTakeAll(m_xBuilder->weld_button("addall")) - , m_xCbxPreview(m_xBuilder->weld_check_button("preview")) - , m_xWndPreview(new weld::CustomWeld(*m_xBuilder, "image", m_aWndPreview)) + , m_xCbbFileType(m_xBuilder->weld_combo_box(u"filetype"_ustr)) + , m_xLbxFound(m_xBuilder->weld_tree_view(u"files"_ustr)) + , m_xBtnSearch(m_xBuilder->weld_button(u"findfiles"_ustr)) + , m_xBtnTake(m_xBuilder->weld_button(u"add"_ustr)) + , m_xBtnTakeAll(m_xBuilder->weld_button(u"addall"_ustr)) + , m_xCbxPreview(m_xBuilder->weld_check_button(u"preview"_ustr)) + , m_xWndPreview(new weld::CustomWeld(*m_xBuilder, u"image"_ustr, m_aWndPreview)) { m_xLbxFound->set_size_request(m_xLbxFound->get_approximate_digit_width() * 35, m_xLbxFound->get_height_rows(15)); @@ -782,8 +782,8 @@ IMPL_LINK_NOARG(TPGalleryThemeProperties, SelectFileTypeHdl, weld::ComboBox&, vo { aLastFilterName = aText; - std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(GetFrameWeld(), "cui/ui/queryupdategalleryfilelistdialog.ui")); - std::unique_ptr<weld::MessageDialog> xQuery(xBuilder->weld_message_dialog("QueryUpdateFileListDialog")); + std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(GetFrameWeld(), u"cui/ui/queryupdategalleryfilelistdialog.ui"_ustr)); + std::unique_ptr<weld::MessageDialog> xQuery(xBuilder->weld_message_dialog(u"QueryUpdateFileListDialog"_ustr)); if (xQuery->run() == RET_YES) SearchFiles(); } @@ -889,9 +889,9 @@ void TPGalleryThemeProperties::DoPreview() ErrorHandler::HandleError(ERRCODE_IO_NOTEXISTSPATH, GetFrameWeld()); } #if HAVE_FEATURE_AVMEDIA - else if( ::avmedia::MediaWindow::isMediaURL( _aURL.GetMainURL( INetURLObject::DecodeMechanism::Unambiguous ), "" ) ) + else if( ::avmedia::MediaWindow::isMediaURL( _aURL.GetMainURL( INetURLObject::DecodeMechanism::Unambiguous ), u""_ustr ) ) { - xMediaPlayer = ::avmedia::MediaWindow::createPlayer( _aURL.GetMainURL( INetURLObject::DecodeMechanism::NONE ), "" ); + xMediaPlayer = ::avmedia::MediaWindow::createPlayer( _aURL.GetMainURL( INetURLObject::DecodeMechanism::NONE ), u""_ustr ); if( xMediaPlayer.is() ) xMediaPlayer->start(); } diff --git a/cui/source/dialogs/cuigrfflt.cxx b/cui/source/dialogs/cuigrfflt.cxx index 69896cd53c0d..3522fa200e05 100644 --- a/cui/source/dialogs/cuigrfflt.cxx +++ b/cui/source/dialogs/cuigrfflt.cxx @@ -129,7 +129,7 @@ GraphicFilterDialog::GraphicFilterDialog(weld::Window* pParent, : GenericDialogController(pParent, rUIXMLDescription, rID) , maTimer("cui GraphicFilterDialog maTimer") , maModifyHdl(LINK(this, GraphicFilterDialog, ImplModifyHdl)) - , mxPreview(new weld::CustomWeld(*m_xBuilder, "preview", maPreview)) + , mxPreview(new weld::CustomWeld(*m_xBuilder, u"preview"_ustr, maPreview)) { bIsBitmap = rGraphic.GetType() == GraphicType::Bitmap; @@ -157,10 +157,10 @@ IMPL_LINK_NOARG(GraphicFilterDialog, ImplModifyHdl, LinkParamNone*, void) GraphicFilterMosaic::GraphicFilterMosaic(weld::Window* pParent, const Graphic& rGraphic, sal_uInt16 nTileWidth, sal_uInt16 nTileHeight, bool bEnhanceEdges) - : GraphicFilterDialog(pParent, "cui/ui/mosaicdialog.ui", "MosaicDialog", rGraphic) - , mxMtrWidth(m_xBuilder->weld_metric_spin_button("width", FieldUnit::PIXEL)) - , mxMtrHeight(m_xBuilder->weld_metric_spin_button("height", FieldUnit::PIXEL)) - , mxCbxEdges(m_xBuilder->weld_check_button("edges")) + : GraphicFilterDialog(pParent, u"cui/ui/mosaicdialog.ui"_ustr, u"MosaicDialog"_ustr, rGraphic) + , mxMtrWidth(m_xBuilder->weld_metric_spin_button(u"width"_ustr, FieldUnit::PIXEL)) + , mxMtrHeight(m_xBuilder->weld_metric_spin_button(u"height"_ustr, FieldUnit::PIXEL)) + , mxCbxEdges(m_xBuilder->weld_check_button(u"edges"_ustr)) { mxMtrWidth->set_value(nTileWidth, FieldUnit::PIXEL); mxMtrWidth->set_max(GetGraphicSizePixel().Width(), FieldUnit::PIXEL); @@ -224,8 +224,8 @@ Graphic GraphicFilterMosaic::GetFilteredGraphic( const Graphic& rGraphic, } GraphicFilterSmooth::GraphicFilterSmooth(weld::Window* pParent, const Graphic& rGraphic, double nRadius) - : GraphicFilterDialog(pParent, "cui/ui/smoothdialog.ui", "SmoothDialog", rGraphic) - , mxMtrRadius(m_xBuilder->weld_spin_button("radius")) + : GraphicFilterDialog(pParent, u"cui/ui/smoothdialog.ui"_ustr, u"SmoothDialog"_ustr, rGraphic) + , mxMtrRadius(m_xBuilder->weld_spin_button(u"radius"_ustr)) { mxMtrRadius->set_value(nRadius * 10); mxMtrRadius->connect_value_changed(LINK(this, GraphicFilterSmooth, EditModifyHdl)); @@ -266,9 +266,9 @@ Graphic GraphicFilterSmooth::GetFilteredGraphic( const Graphic& rGraphic, double GraphicFilterSolarize::GraphicFilterSolarize(weld::Window* pParent, const Graphic& rGraphic, sal_uInt8 cGreyThreshold, bool bInvert) - : GraphicFilterDialog(pParent, "cui/ui/solarizedialog.ui", "SolarizeDialog", rGraphic) - , mxMtrThreshold(m_xBuilder->weld_metric_spin_button("value", FieldUnit::PERCENT)) - , mxCbxInvert(m_xBuilder->weld_check_button("invert")) + : GraphicFilterDialog(pParent, u"cui/ui/solarizedialog.ui"_ustr, u"SolarizeDialog"_ustr, rGraphic) + , mxMtrThreshold(m_xBuilder->weld_metric_spin_button(u"value"_ustr, FieldUnit::PERCENT)) + , mxCbxInvert(m_xBuilder->weld_check_button(u"invert"_ustr)) { mxMtrThreshold->set_value(basegfx::fround(cGreyThreshold / 2.55), FieldUnit::PERCENT); mxMtrThreshold->connect_value_changed(LINK(this, GraphicFilterSolarize, EditModifyHdl)); @@ -322,8 +322,8 @@ Graphic GraphicFilterSolarize::GetFilteredGraphic( const Graphic& rGraphic, doub GraphicFilterSepia::GraphicFilterSepia(weld::Window* pParent, const Graphic& rGraphic, sal_uInt16 nSepiaPercent) - : GraphicFilterDialog(pParent, "cui/ui/agingdialog.ui", "AgingDialog", rGraphic) - , mxMtrSepia(m_xBuilder->weld_metric_spin_button("value", FieldUnit::PERCENT)) + : GraphicFilterDialog(pParent, u"cui/ui/agingdialog.ui"_ustr, u"AgingDialog"_ustr, rGraphic) + , mxMtrSepia(m_xBuilder->weld_metric_spin_button(u"value"_ustr, FieldUnit::PERCENT)) { mxMtrSepia->set_value(nSepiaPercent, FieldUnit::PERCENT); mxMtrSepia->connect_value_changed(LINK(this, GraphicFilterSepia, EditModifyHdl)); @@ -359,8 +359,8 @@ Graphic GraphicFilterSepia::GetFilteredGraphic( const Graphic& rGraphic, double, GraphicFilterPoster::GraphicFilterPoster(weld::Window* pParent, const Graphic& rGraphic, sal_uInt16 nPosterCount) - : GraphicFilterDialog(pParent, "cui/ui/posterdialog.ui", "PosterDialog", rGraphic) - , mxNumPoster(m_xBuilder->weld_spin_button("value")) + : GraphicFilterDialog(pParent, u"cui/ui/posterdialog.ui"_ustr, u"PosterDialog"_ustr, rGraphic) + , mxNumPoster(m_xBuilder->weld_spin_button(u"value"_ustr)) { mxNumPoster->set_range(2, vcl::pixelFormatBitCount(rGraphic.GetBitmapEx().getPixelFormat())); mxNumPoster->set_value(nPosterCount); @@ -416,8 +416,8 @@ void EmbossControl::SetDrawingArea(weld::DrawingArea* pDrawingArea) GraphicFilterEmboss::GraphicFilterEmboss(weld::Window* pParent, const Graphic& rGraphic, RectPoint eLightSource) - : GraphicFilterDialog(pParent, "cui/ui/embossdialog.ui", "EmbossDialog", rGraphic) - , mxCtlLight(new weld::CustomWeld(*m_xBuilder, "lightsource", maCtlLight)) + : GraphicFilterDialog(pParent, u"cui/ui/embossdialog.ui"_ustr, u"EmbossDialog"_ustr, rGraphic) + , mxCtlLight(new weld::CustomWeld(*m_xBuilder, u"lightsource"_ustr, maCtlLight)) { maCtlLight.SetActualRP(eLightSource); maCtlLight.SetModifyHdl( GetModifyHdl() ); diff --git a/cui/source/dialogs/cuihyperdlg.cxx b/cui/source/dialogs/cuihyperdlg.cxx index 4fec600441fd..2270ab330f0b 100644 --- a/cui/source/dialogs/cuihyperdlg.cxx +++ b/cui/source/dialogs/cuihyperdlg.cxx @@ -80,22 +80,22 @@ void SvxHlinkCtrl::StateChangedAtToolBoxControl( sal_uInt16 nSID, SfxItemState e } // tdf#90496 - remember last used view in hyperlink dialog -OUString SvxHpLinkDlg::msRememberedPageId("internet"); +OUString SvxHpLinkDlg::msRememberedPageId(u"internet"_ustr); //# # //# Hyperlink - Dialog # //# # SvxHpLinkDlg::SvxHpLinkDlg(SfxBindings* pBindings, SfxChildWindow* pChild, weld::Window* pParent) - : SfxModelessDialogController(pBindings, pChild, pParent, "cui/ui/hyperlinkdialog.ui", "HyperlinkDialog") + : SfxModelessDialogController(pBindings, pChild, pParent, u"cui/ui/hyperlinkdialog.ui"_ustr, u"HyperlinkDialog"_ustr) , pSet ( nullptr ) , maCtrl ( SID_HYPERLINK_GETLINK, *pBindings, this ) , mbIsHTMLDoc ( false ) - , m_xIconCtrl(m_xBuilder->weld_notebook("tabcontrol")) - , m_xOKBtn(m_xBuilder->weld_button("ok")) - , m_xApplyBtn(m_xBuilder->weld_button("apply")) - , m_xCancelBtn(m_xBuilder->weld_button("cancel")) - , m_xHelpBtn(m_xBuilder->weld_button("help")) - , m_xResetBtn(m_xBuilder->weld_button("reset")) + , m_xIconCtrl(m_xBuilder->weld_notebook(u"tabcontrol"_ustr)) + , m_xOKBtn(m_xBuilder->weld_button(u"ok"_ustr)) + , m_xApplyBtn(m_xBuilder->weld_button(u"apply"_ustr)) + , m_xCancelBtn(m_xBuilder->weld_button(u"cancel"_ustr)) + , m_xHelpBtn(m_xBuilder->weld_button(u"help"_ustr)) + , m_xResetBtn(m_xBuilder->weld_button(u"reset"_ustr)) { m_xIconCtrl->connect_enter_page( LINK ( this, SvxHpLinkDlg, ChosePageHdl_Impl ) ); m_xIconCtrl->show(); @@ -139,12 +139,12 @@ SvxHpLinkDlg::SvxHpLinkDlg(SfxBindings* pBindings, SfxChildWindow* pChild, weld: SetInputSet (mpItemSet.get()); // insert pages - AddTabPage("internet", SvxHyperlinkInternetTp::Create); - AddTabPage("mail", SvxHyperlinkMailTp::Create); + AddTabPage(u"internet"_ustr, SvxHyperlinkInternetTp::Create); + AddTabPage(u"mail"_ustr, SvxHyperlinkMailTp::Create); if (!comphelper::LibreOfficeKit::isActive()) { - AddTabPage("document", SvxHyperlinkDocTp::Create); - AddTabPage("newdocument", SvxHyperlinkNewDocTp::Create); + AddTabPage(u"document"_ustr, SvxHyperlinkDocTp::Create); + AddTabPage(u"newdocument"_ustr, SvxHyperlinkNewDocTp::Create); } // tdf#90496 - remember last used view in hyperlink dialog @@ -236,7 +236,7 @@ IMPL_LINK_NOARG(SvxHpLinkDlg, ClickApplyHdl_Impl, weld::Button&, void) |************************************************************************/ void SvxHpLinkDlg::SetPage ( SvxHyperlinkItem const * pItem ) { - OUString sPageId("internet"); + OUString sPageId(u"internet"_ustr); OUString aStrURL(pItem->GetURL()); INetURLObject aURL(aStrURL); diff --git a/cui/source/dialogs/cuiimapwnd.cxx b/cui/source/dialogs/cuiimapwnd.cxx index d613e1a804ee..f850210018bb 100644 --- a/cui/source/dialogs/cuiimapwnd.cxx +++ b/cui/source/dialogs/cuiimapwnd.cxx @@ -28,12 +28,12 @@ URLDlg::URLDlg(weld::Widget* pWindow, const OUString& rURL, const OUString& rAlternativeText, const OUString& rDescription, const OUString& rTarget, const OUString& rName, TargetList& rTargetList) - : GenericDialogController(pWindow, "cui/ui/cuiimapdlg.ui", "IMapDialog") - , m_xEdtURL(m_xBuilder->weld_entry("urlentry")) - , m_xCbbTargets(m_xBuilder->weld_combo_box("frameCB")) - , m_xEdtName(m_xBuilder->weld_entry("nameentry")) - , m_xEdtAlternativeText(m_xBuilder->weld_entry("textentry")) - , m_xEdtDescription(m_xBuilder->weld_text_view("descTV")) + : GenericDialogController(pWindow, u"cui/ui/cuiimapdlg.ui"_ustr, u"IMapDialog"_ustr) + , m_xEdtURL(m_xBuilder->weld_entry(u"urlentry"_ustr)) + , m_xCbbTargets(m_xBuilder->weld_combo_box(u"frameCB"_ustr)) + , m_xEdtName(m_xBuilder->weld_entry(u"nameentry"_ustr)) + , m_xEdtAlternativeText(m_xBuilder->weld_entry(u"textentry"_ustr)) + , m_xEdtDescription(m_xBuilder->weld_text_view(u"descTV"_ustr)) { m_xEdtDescription->set_size_request(m_xEdtDescription->get_approximate_digit_width() * 51, m_xEdtDescription->get_height_rows(5)); @@ -47,7 +47,7 @@ URLDlg::URLDlg(weld::Widget* pWindow, const OUString& rURL, const OUString& rAlt m_xCbbTargets->append_text(a); if (rTarget.isEmpty()) - m_xCbbTargets->set_entry_text("_self"); + m_xCbbTargets->set_entry_text(u"_self"_ustr); else m_xCbbTargets->set_entry_text(rTarget); } diff --git a/cui/source/dialogs/cuitbxform.cxx b/cui/source/dialogs/cuitbxform.cxx index 55d21325d5bc..a058acc1a877 100644 --- a/cui/source/dialogs/cuitbxform.cxx +++ b/cui/source/dialogs/cuitbxform.cxx @@ -20,8 +20,9 @@ #include <cuitbxform.hxx> FmInputRecordNoDialog::FmInputRecordNoDialog(weld::Window* pParent) - : GenericDialogController(pParent, "cui/ui/recordnumberdialog.ui", "RecordNumberDialog") - , m_xRecordNo(m_xBuilder->weld_spin_button("entry")) + : GenericDialogController(pParent, u"cui/ui/recordnumberdialog.ui"_ustr, + u"RecordNumberDialog"_ustr) + , m_xRecordNo(m_xBuilder->weld_spin_button(u"entry"_ustr)) { m_xRecordNo->set_range(1, 0x7FFFFFFF); } diff --git a/cui/source/dialogs/dlgname.cxx b/cui/source/dialogs/dlgname.cxx index 09b6158fde00..8067e29bb7c7 100644 --- a/cui/source/dialogs/dlgname.cxx +++ b/cui/source/dialogs/dlgname.cxx @@ -29,10 +29,10 @@ SvxNameDialog::SvxNameDialog(weld::Window* pParent, const OUString& rName, const OUString& rDesc, const OUString& rTitle) - : GenericDialogController(pParent, "cui/ui/namedialog.ui", "NameDialog") - , m_xEdtName(m_xBuilder->weld_entry("name_entry")) - , m_xFtDescription(m_xBuilder->weld_label("description_label")) - , m_xBtnOK(m_xBuilder->weld_button("ok")) + : GenericDialogController(pParent, u"cui/ui/namedialog.ui"_ustr, u"NameDialog"_ustr) + , m_xEdtName(m_xBuilder->weld_entry(u"name_entry"_ustr)) + , m_xFtDescription(m_xBuilder->weld_label(u"description_label"_ustr)) + , m_xBtnOK(m_xBuilder->weld_button(u"ok"_ustr)) { m_xFtDescription->set_label(rDesc); m_xEdtName->set_text(rName); @@ -55,7 +55,7 @@ IMPL_LINK_NOARG(SvxNameDialog, ModifyHdl, weld::Entry&, void) // tdf#129032: feedback on reason to disabled controls m_xEdtName->set_message_type(bEnable ? weld::EntryMessageType::Normal : weld::EntryMessageType::Error); - OUString rTip = ""; + OUString rTip = u""_ustr; if (!bEnable && m_aCheckNameTooltipHdl.IsSet()) rTip = m_aCheckNameTooltipHdl.Call(*this); m_xBtnOK->set_tooltip_text(rTip); @@ -64,9 +64,9 @@ IMPL_LINK_NOARG(SvxNameDialog, ModifyHdl, weld::Entry&, void) SvxNumberDialog::SvxNumberDialog(weld::Window* pParent, const OUString& rDesc, sal_Int64 nValue, sal_Int64 nMin, sal_Int64 nMax) - : GenericDialogController(pParent, "cui/ui/numberdialog.ui", "NumberDialog") - , m_xEdtNumber(m_xBuilder->weld_spin_button("number_spinbtn")) - , m_xFtDescription(m_xBuilder->weld_label("description_label")) + : GenericDialogController(pParent, u"cui/ui/numberdialog.ui"_ustr, u"NumberDialog"_ustr) + , m_xEdtNumber(m_xBuilder->weld_spin_button(u"number_spinbtn"_ustr)) + , m_xFtDescription(m_xBuilder->weld_label(u"description_label"_ustr)) { m_xFtDescription->set_label(rDesc); m_xEdtNumber->set_min(nMin); @@ -76,9 +76,9 @@ SvxNumberDialog::SvxNumberDialog(weld::Window* pParent, const OUString& rDesc, s SvxDecimalNumberDialog::SvxDecimalNumberDialog(weld::Window* pParent, const OUString& rDesc, double fValue) - : GenericDialogController(pParent, "cui/ui/numberdialog.ui", "NumberDialog") - , m_xEdtNumber(m_xBuilder->weld_formatted_spin_button("number_spinbtn")) - , m_xFtDescription(m_xBuilder->weld_label("description_label")) + : GenericDialogController(pParent, u"cui/ui/numberdialog.ui"_ustr, u"NumberDialog"_ustr) + , m_xEdtNumber(m_xBuilder->weld_formatted_spin_button(u"number_spinbtn"_ustr)) + , m_xFtDescription(m_xBuilder->weld_label(u"description_label"_ustr)) { m_xFtDescription->set_label(rDesc); m_xEdtNumber->GetFormatter().SetValue(fValue); @@ -89,9 +89,9 @@ SvxDecimalNumberDialog::SvxDecimalNumberDialog(weld::Window* pParent, const OUSt // plus uniqueness-callback-linkHandler SvxObjectNameDialog::SvxObjectNameDialog(weld::Window* pParent, const OUString& rName) - : GenericDialogController(pParent, "cui/ui/objectnamedialog.ui", "ObjectNameDialog") - , m_xEdtName(m_xBuilder->weld_entry("object_name_entry")) - , m_xBtnOK(m_xBuilder->weld_button("ok")) + : GenericDialogController(pParent, u"cui/ui/objectnamedialog.ui"_ustr, u"ObjectNameDialog"_ustr) + , m_xEdtName(m_xBuilder->weld_entry(u"object_name_entry"_ustr)) + , m_xBtnOK(m_xBuilder->weld_button(u"ok"_ustr)) { // set name m_xEdtName->set_text(rName); @@ -116,12 +116,13 @@ IMPL_LINK_NOARG(SvxObjectNameDialog, ModifyHdl, weld::Entry&, void) SvxObjectTitleDescDialog::SvxObjectTitleDescDialog(weld::Window* pParent, const OUString& rTitle, const OUString& rDescription, bool const isDecorative) - : GenericDialogController(pParent, "cui/ui/objecttitledescdialog.ui", "ObjectTitleDescDialog") - , m_xTitleFT(m_xBuilder->weld_label("object_title_label")) - , m_xEdtTitle(m_xBuilder->weld_entry("object_title_entry")) - , m_xDescriptionFT(m_xBuilder->weld_label("desc_label")) - , m_xEdtDescription(m_xBuilder->weld_text_view("desc_entry")) - , m_xDecorativeCB(m_xBuilder->weld_check_button("decorative")) + : GenericDialogController(pParent, u"cui/ui/objecttitledescdialog.ui"_ustr, + u"ObjectTitleDescDialog"_ustr) + , m_xTitleFT(m_xBuilder->weld_label(u"object_title_label"_ustr)) + , m_xEdtTitle(m_xBuilder->weld_entry(u"object_title_entry"_ustr)) + , m_xDescriptionFT(m_xBuilder->weld_label(u"desc_label"_ustr)) + , m_xEdtDescription(m_xBuilder->weld_text_view(u"desc_entry"_ustr)) + , m_xDecorativeCB(m_xBuilder->weld_check_button(u"decorative"_ustr)) { //lock height to initial height m_xEdtDescription->set_size_request(-1, m_xEdtDescription->get_text_height() * 5); @@ -147,12 +148,12 @@ IMPL_LINK_NOARG(SvxObjectTitleDescDialog, DecorativeHdl, weld::Toggleable&, void } SvxListDialog::SvxListDialog(weld::Window* pParent) - : GenericDialogController(pParent, "cui/ui/listdialog.ui", "ListDialog") + : GenericDialogController(pParent, u"cui/ui/listdialog.ui"_ustr, u"ListDialog"_ustr) , m_aMode(ListMode::String) - , m_xList(m_xBuilder->weld_tree_view("assignlist")) - , m_xAddBtn(m_xBuilder->weld_button("addbtn")) - , m_xRemoveBtn(m_xBuilder->weld_button("removebtn")) - , m_xEditBtn(m_xBuilder->weld_button("editbtn")) + , m_xList(m_xBuilder->weld_tree_view(u"assignlist"_ustr)) + , m_xAddBtn(m_xBuilder->weld_button(u"addbtn"_ustr)) + , m_xRemoveBtn(m_xBuilder->weld_button(u"removebtn"_ustr)) + , m_xEditBtn(m_xBuilder->weld_button(u"editbtn"_ustr)) { m_xList->set_size_request(m_xList->get_approximate_digit_width() * 54, m_xList->get_height_rows(6)); @@ -169,7 +170,7 @@ SvxListDialog::~SvxListDialog() {} IMPL_LINK_NOARG(SvxListDialog, AddHdl_Impl, weld::Button&, void) { - SvxNameDialog aNameDlg(m_xDialog.get(), "", ""); + SvxNameDialog aNameDlg(m_xDialog.get(), u""_ustr, u""_ustr); if (!aNameDlg.run()) return; @@ -245,7 +246,7 @@ void SvxListDialog::EditEntry() if (m_aMode == ListMode::String) { - SvxNameDialog aNameDlg(m_xDialog.get(), sOldText, ""); + SvxNameDialog aNameDlg(m_xDialog.get(), sOldText, u""_ustr); if (!aNameDlg.run()) return; sNewText = comphelper::string::strip(aNameDlg.GetName(), ' '); @@ -258,14 +259,14 @@ void SvxListDialog::EditEntry() sal_Int64 nMax = m_aMode == ListMode::Int16 ? SAL_MAX_INT16 : m_aMode == ListMode::Int32 ? SAL_MAX_INT32 : SAL_MAX_INT64; - SvxNumberDialog aNumberDlg(m_xDialog.get(), "", sOldText.toInt64(), nMin, nMax); + SvxNumberDialog aNumberDlg(m_xDialog.get(), u""_ustr, sOldText.toInt64(), nMin, nMax); if (!aNumberDlg.run()) return; sNewText = OUString::number(aNumberDlg.GetNumber()); } else if (m_aMode == ListMode::Double) { - SvxDecimalNumberDialog aNumberDlg(m_xDialog.get(), "", sOldText.toDouble()); + SvxDecimalNumberDialog aNumberDlg(m_xDialog.get(), u""_ustr, sOldText.toDouble()); if (!aNumberDlg.run()) return; sNewText = OUString::number(aNumberDlg.GetNumber()); diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx index 537918ecb779..576055575751 100644 --- a/cui/source/dialogs/hangulhanjadlg.cxx +++ b/cui/source/dialogs/hangulhanjadlg.cxx @@ -289,9 +289,9 @@ namespace svx SuggestionDisplay::SuggestionDisplay(weld::Builder& rBuilder) : m_bDisplayListBox( true ) , m_bInSelectionUpdate( false ) - , m_xValueSet(new SuggestionSet(rBuilder.weld_scrolled_window("scrollwin", true))) - , m_xValueSetWin(new weld::CustomWeld(rBuilder, "valueset", *m_xValueSet)) - , m_xListBox(rBuilder.weld_tree_view("listbox")) + , m_xValueSet(new SuggestionSet(rBuilder.weld_scrolled_window(u"scrollwin"_ustr, true))) + , m_xValueSetWin(new weld::CustomWeld(rBuilder, u"valueset"_ustr, *m_xValueSet)) + , m_xListBox(rBuilder.weld_tree_view(u"listbox"_ustr)) { m_xValueSet->SetSelectHdl( LINK( this, SuggestionDisplay, SelectSuggestionValueSetHdl ) ); m_xListBox->connect_changed( LINK( this, SuggestionDisplay, SelectSuggestionListBoxHdl ) ); @@ -299,7 +299,7 @@ namespace svx m_xValueSet->SetLineCount( LINE_CNT ); m_xValueSet->SetStyle( m_xValueSet->GetStyle() | WB_ITEMBORDER | WB_VSCROLL ); - auto nItemWidth = 2 * m_xListBox->get_pixel_size("AU").Width(); + auto nItemWidth = 2 * m_xListBox->get_pixel_size(u"AU"_ustr).Width(); m_xValueSet->SetItemWidth( nItemWidth ); Size aSize(m_xListBox->get_approximate_digit_width() * 42, m_xListBox->get_text_height() * 5); @@ -422,31 +422,31 @@ namespace svx } HangulHanjaConversionDialog::HangulHanjaConversionDialog(weld::Widget* pParent) - : GenericDialogController(pParent, "cui/ui/hangulhanjaconversiondialog.ui", "HangulHanjaConversionDialog") + : GenericDialogController(pParent, u"cui/ui/hangulhanjaconversiondialog.ui"_ustr, u"HangulHanjaConversionDialog"_ustr) , m_bDocumentMode( true ) - , m_xFind(m_xBuilder->weld_button("find")) - , m_xIgnore(m_xBuilder->weld_button("ignore")) - , m_xIgnoreAll(m_xBuilder->weld_button("ignoreall")) - , m_xReplace(m_xBuilder->weld_button("replace")) - , m_xReplaceAll(m_xBuilder->weld_button("replaceall")) - , m_xOptions(m_xBuilder->weld_button("options")) + , m_xFind(m_xBuilder->weld_button(u"find"_ustr)) + , m_xIgnore(m_xBuilder->weld_button(u"ignore"_ustr)) + , m_xIgnoreAll(m_xBuilder->weld_button(u"ignoreall"_ustr)) + , m_xReplace(m_xBuilder->weld_button(u"replace"_ustr)) + , m_xReplaceAll(m_xBuilder->weld_button(u"replaceall"_ustr)) + , m_xOptions(m_xBuilder->weld_button(u"options"_ustr)) , m_xSuggestions(new SuggestionDisplay(*m_xBuilder)) - , m_xSimpleConversion(m_xBuilder->weld_radio_button("simpleconversion")) - , m_xHangulBracketed(m_xBuilder->weld_radio_button("hangulbracket")) - , m_xHanjaBracketed(m_xBuilder->weld_radio_button("hanjabracket")) - , m_xWordInput(m_xBuilder->weld_entry("wordinput")) - , m_xOriginalWord(m_xBuilder->weld_label("originalword")) - , m_xHanjaAbove(new RubyRadioButton(m_xBuilder->weld_radio_button("hanja_above"), - m_xBuilder->weld_image("hanja_above_img"))) - , m_xHanjaBelow(new RubyRadioButton(m_xBuilder->weld_radio_button("hanja_below"), - m_xBuilder->weld_image("hanja_below_img"))) - , m_xHangulAbove(new RubyRadioButton(m_xBuilder->weld_radio_button("hangul_above"), - m_xBuilder->weld_image("hangul_above_img"))) - , m_xHangulBelow(new RubyRadioButton(m_xBuilder->weld_radio_button("hangul_below"), - m_xBuilder->weld_image("hangul_below_img"))) - , m_xHangulOnly(m_xBuilder->weld_check_button("hangulonly")) - , m_xHanjaOnly(m_xBuilder->weld_check_button("hanjaonly")) - , m_xReplaceByChar(m_xBuilder->weld_check_button("replacebychar")) + , m_xSimpleConversion(m_xBuilder->weld_radio_button(u"simpleconversion"_ustr)) + , m_xHangulBracketed(m_xBuilder->weld_radio_button(u"hangulbracket"_ustr)) + , m_xHanjaBracketed(m_xBuilder->weld_radio_button(u"hanjabracket"_ustr)) + , m_xWordInput(m_xBuilder->weld_entry(u"wordinput"_ustr)) + , m_xOriginalWord(m_xBuilder->weld_label(u"originalword"_ustr)) + , m_xHanjaAbove(new RubyRadioButton(m_xBuilder->weld_radio_button(u"hanja_above"_ustr), + m_xBuilder->weld_image(u"hanja_above_img"_ustr))) + , m_xHanjaBelow(new RubyRadioButton(m_xBuilder->weld_radio_button(u"hanja_below"_ustr), + m_xBuilder->weld_image(u"hanja_below_img"_ustr))) + , m_xHangulAbove(new RubyRadioButton(m_xBuilder->weld_radio_button(u"hangul_above"_ustr), + m_xBuilder->weld_image(u"hangul_above_img"_ustr))) + , m_xHangulBelow(new RubyRadioButton(m_xBuilder->weld_radio_button(u"hangul_below"_ustr), + m_xBuilder->weld_image(u"hangul_below_img"_ustr))) + , m_xHangulOnly(m_xBuilder->weld_check_button(u"hangulonly"_ustr)) + , m_xHanjaOnly(m_xBuilder->weld_check_button(u"hanjaonly"_ustr)) + , m_xReplaceByChar(m_xBuilder->weld_check_button(u"replacebychar"_ustr)) { m_xSuggestions->set_size_request(m_xOriginalWord->get_approximate_digit_width() * 42, m_xOriginalWord->get_text_height() * 5); @@ -879,15 +879,15 @@ namespace svx } HangulHanjaOptionsDialog::HangulHanjaOptionsDialog(weld::Window* pParent) - : GenericDialogController(pParent, "cui/ui/hangulhanjaoptdialog.ui", "HangulHanjaOptDialog") - , m_xDictsLB(m_xBuilder->weld_tree_view("dicts")) - , m_xIgnorepostCB(m_xBuilder->weld_check_button("ignorepost")) - , m_xShowrecentlyfirstCB(m_xBuilder->weld_check_button("showrecentfirst")) - , m_xAutoreplaceuniqueCB(m_xBuilder->weld_check_button("autoreplaceunique")) - , m_xNewPB(m_xBuilder->weld_button("new")) - , m_xEditPB(m_xBuilder->weld_button("edit")) - , m_xDeletePB(m_xBuilder->weld_button("delete")) - , m_xOkPB(m_xBuilder->weld_button("ok")) + : GenericDialogController(pParent, u"cui/ui/hangulhanjaoptdialog.ui"_ustr, u"HangulHanjaOptDialog"_ustr) + , m_xDictsLB(m_xBuilder->weld_tree_view(u"dicts"_ustr)) + , m_xIgnorepostCB(m_xBuilder->weld_check_button(u"ignorepost"_ustr)) + , m_xShowrecentlyfirstCB(m_xBuilder->weld_check_button(u"showrecentfirst"_ustr)) + , m_xAutoreplaceuniqueCB(m_xBuilder->weld_check_button(u"autoreplaceunique"_ustr)) + , m_xNewPB(m_xBuilder->weld_button(u"new"_ustr)) + , m_xEditPB(m_xBuilder->weld_button(u"edit"_ustr)) + , m_xDeletePB(m_xBuilder->weld_button(u"delete"_ustr)) + , m_xOkPB(m_xBuilder->weld_button(u"ok"_ustr)) { m_xDictsLB->set_size_request(m_xDictsLB->get_approximate_digit_width() * 32, m_xDictsLB->get_height_rows(5)); @@ -951,10 +951,10 @@ namespace svx } HangulHanjaNewDictDialog::HangulHanjaNewDictDialog(weld::Window* pParent) - : GenericDialogController(pParent, "cui/ui/hangulhanjaadddialog.ui", "HangulHanjaAddDialog") + : GenericDialogController(pParent, u"cui/ui/hangulhanjaadddialog.ui"_ustr, u"HangulHanjaAddDialog"_ustr) , m_bEntered(false) - , m_xOkBtn(m_xBuilder->weld_button("ok")) - , m_xDictNameED(m_xBuilder->weld_entry("entry")) + , m_xOkBtn(m_xBuilder->weld_button(u"ok"_ustr)) + , m_xDictNameED(m_xBuilder->weld_entry(u"entry"_ustr)) { m_xOkBtn->connect_clicked( LINK( this, HangulHanjaNewDictDialog, OKHdl ) ); m_xDictNameED->connect_changed( LINK( this, HangulHanjaNewDictDialog, ModifyHdl ) ); @@ -1416,23 +1416,23 @@ namespace svx } HangulHanjaEditDictDialog::HangulHanjaEditDictDialog(weld::Window* pParent, HHDictList& _rDictList, sal_uInt32 nSelDict) - : GenericDialogController(pParent, "cui/ui/hangulhanjaeditdictdialog.ui", "HangulHanjaEditDictDialog") + : GenericDialogController(pParent, u"cui/ui/hangulhanjaeditdictdialog.ui"_ustr, u"HangulHanjaEditDictDialog"_ustr) , m_aEditHintText ( CuiResId(RID_CUISTR_EDITHINT) ) , m_rDictList ( _rDictList ) , m_nCurrentDict ( 0xFFFFFFFF ) , m_nTopPos ( 0 ) , m_bModifiedSuggestions ( false ) , m_bModifiedOriginal ( false ) - , m_xBookLB(m_xBuilder->weld_combo_box("book")) - , m_xOriginalLB(m_xBuilder->weld_combo_box("original")) - , m_xEdit1(new SuggestionEdit(m_xBuilder->weld_entry("edit1"), this)) - , m_xEdit2(new SuggestionEdit(m_xBuilder->weld_entry("edit2"), this)) - , m_xEdit3(new SuggestionEdit(m_xBuilder->weld_entry("edit3"), this)) - , m_xEdit4(new SuggestionEdit(m_xBuilder->weld_entry("edit4"), this)) - , m_xContents(m_xBuilder->weld_widget("box")) - , m_xScrollSB(m_xBuilder->weld_scrolled_window("scrollbar", true)) - , m_xNewPB(m_xBuilder->weld_button("new")) - , m_xDeletePB(m_xBuilder->weld_button("delete")) + , m_xBookLB(m_xBuilder->weld_combo_box(u"book"_ustr)) + , m_xOriginalLB(m_xBuilder->weld_combo_box(u"original"_ustr)) + , m_xEdit1(new SuggestionEdit(m_xBuilder->weld_entry(u"edit1"_ustr), this)) + , m_xEdit2(new SuggestionEdit(m_xBuilder->weld_entry(u"edit2"_ustr), this)) + , m_xEdit3(new SuggestionEdit(m_xBuilder->weld_entry(u"edit3"_ustr), this)) + , m_xEdit4(new SuggestionEdit(m_xBuilder->weld_entry(u"edit4"_ustr), this)) + , m_xContents(m_xBuilder->weld_widget(u"box"_ustr)) + , m_xScrollSB(m_xBuilder->weld_scrolled_window(u"scrollbar"_ustr, true)) + , m_xNewPB(m_xBuilder->weld_button(u"new"_ustr)) + , m_xDeletePB(m_xBuilder->weld_button(u"delete"_ustr)) { Size aSize(m_xContents->get_preferred_size()); m_xScrollSB->set_size_request(-1, aSize.Height()); diff --git a/cui/source/dialogs/hldocntp.cxx b/cui/source/dialogs/hldocntp.cxx index d58077a431f4..b09fbafe9764 100644 --- a/cui/source/dialogs/hldocntp.cxx +++ b/cui/source/dialogs/hldocntp.cxx @@ -106,12 +106,12 @@ bool SvxHyperlinkNewDocTp::ImplGetURLObject( const OUString& rPath, std::u16stri |************************************************************************/ SvxHyperlinkNewDocTp::SvxHyperlinkNewDocTp(weld::Container* pParent, SvxHpLinkDlg* pDlg, const SfxItemSet* pItemSet) - : SvxHyperlinkTabPageBase(pParent, pDlg, "cui/ui/hyperlinknewdocpage.ui", "HyperlinkNewDocPage", pItemSet) - , m_xRbtEditNow(xBuilder->weld_radio_button("editnow")) - , m_xRbtEditLater(xBuilder->weld_radio_button("editlater")) - , m_xCbbPath(new SvxHyperURLBox(xBuilder->weld_combo_box("path"))) - , m_xBtCreate(xBuilder->weld_button("create")) - , m_xLbDocTypes(xBuilder->weld_tree_view("types")) + : SvxHyperlinkTabPageBase(pParent, pDlg, u"cui/ui/hyperlinknewdocpage.ui"_ustr, u"HyperlinkNewDocPage"_ustr, pItemSet) + , m_xRbtEditNow(xBuilder->weld_radio_button(u"editnow"_ustr)) + , m_xRbtEditLater(xBuilder->weld_radio_button(u"editlater"_ustr)) + , m_xCbbPath(new SvxHyperURLBox(xBuilder->weld_combo_box(u"path"_ustr))) + , m_xBtCreate(xBuilder->weld_button(u"create"_ustr)) + , m_xLbDocTypes(xBuilder->weld_tree_view(u"types"_ustr)) { m_xCbbPath->SetSmartProtocol(INetProtocol::File); m_xLbDocTypes->set_size_request(-1, m_xLbDocTypes->get_height_rows(5)); @@ -262,8 +262,8 @@ IMPL_STATIC_LINK(SvxHyperlinkNewDocTp, DispatchDocument, void*, p, void) // create items SfxStringItem aName( SID_FILE_NAME, xExecuteInfo->aStrDocName ); - SfxStringItem aReferer( SID_REFERER, "private:user" ); - SfxStringItem aFrame( SID_TARGETNAME, "_blank"); + SfxStringItem aReferer( SID_REFERER, u"private:user"_ustr ); + SfxStringItem aFrame( SID_TARGETNAME, u"_blank"_ustr); OUString aStrFlags('S'); if (xExecuteInfo->bRbtEditLater) diff --git a/cui/source/dialogs/hldoctp.cxx b/cui/source/dialogs/hldoctp.cxx index a1c1454b69de..b414309bea0b 100644 --- a/cui/source/dialogs/hldoctp.cxx +++ b/cui/source/dialogs/hldoctp.cxx @@ -34,12 +34,12 @@ char const sHash[] = "#"; |************************************************************************/ SvxHyperlinkDocTp::SvxHyperlinkDocTp(weld::Container* pParent, SvxHpLinkDlg* pDlg, const SfxItemSet* pItemSet) - : SvxHyperlinkTabPageBase(pParent, pDlg, "cui/ui/hyperlinkdocpage.ui", "HyperlinkDocPage", pItemSet) - , m_xCbbPath(new SvxHyperURLBox(xBuilder->weld_combo_box("path"))) - , m_xBtFileopen(xBuilder->weld_button("fileopen")) - , m_xEdTarget(xBuilder->weld_entry("target")) - , m_xFtFullURL(xBuilder->weld_label("url")) - , m_xBtBrowse(xBuilder->weld_button("browse")) + : SvxHyperlinkTabPageBase(pParent, pDlg, u"cui/ui/hyperlinkdocpage.ui"_ustr, u"HyperlinkDocPage"_ustr, pItemSet) + , m_xCbbPath(new SvxHyperURLBox(xBuilder->weld_combo_box(u"path"_ustr))) + , m_xBtFileopen(xBuilder->weld_button(u"fileopen"_ustr)) + , m_xEdTarget(xBuilder->weld_entry(u"target"_ustr)) + , m_xFtFullURL(xBuilder->weld_label(u"url"_ustr)) + , m_xBtBrowse(xBuilder->weld_button(u"browse"_ustr)) , m_bMarkWndOpen(false) { m_xCbbPath->SetSmartProtocol(INetProtocol::File); @@ -217,7 +217,7 @@ IMPL_LINK_NOARG(SvxHyperlinkDocTp, ClickTargetHdl_Impl, weld::Button&, void) weld::WaitObject aWait(mpDialog->getDialog()); if ( maStrURL.equalsIgnoreAsciiCase( INET_FILE_SCHEME ) ) - mxMarkWnd->RefreshTree ( "" ); + mxMarkWnd->RefreshTree ( u""_ustr ); else mxMarkWnd->RefreshTree ( maStrURL ); } @@ -254,7 +254,7 @@ IMPL_LINK_NOARG(SvxHyperlinkDocTp, TimeoutHdl_Impl, Timer *, void) weld::WaitObject aWait(mpDialog->getDialog()); if ( maStrURL.equalsIgnoreAsciiCase( INET_FILE_SCHEME ) ) - mxMarkWnd->RefreshTree ( "" ); + mxMarkWnd->RefreshTree ( u""_ustr ); else mxMarkWnd->RefreshTree ( maStrURL ); } diff --git a/cui/source/dialogs/hlinettp.cxx b/cui/source/dialogs/hlinettp.cxx index 610cdd8aea5e..90348fe3f508 100644 --- a/cui/source/dialogs/hlinettp.cxx +++ b/cui/source/dialogs/hlinettp.cxx @@ -33,11 +33,11 @@ SvxHyperlinkInternetTp::SvxHyperlinkInternetTp(weld::Container* pParent, SvxHpLinkDlg* pDlg, const SfxItemSet* pItemSet) - : SvxHyperlinkTabPageBase(pParent, pDlg, "cui/ui/hyperlinkinternetpage.ui", "HyperlinkInternetPage", + : SvxHyperlinkTabPageBase(pParent, pDlg, u"cui/ui/hyperlinkinternetpage.ui"_ustr, u"HyperlinkInternetPage"_ustr, pItemSet) , m_bMarkWndOpen(false) - , m_xCbbTarget(new SvxHyperURLBox(xBuilder->weld_combo_box("target"))) - , m_xFtTarget(xBuilder->weld_label("target_label")) + , m_xCbbTarget(new SvxHyperURLBox(xBuilder->weld_combo_box(u"target"_ustr))) + , m_xFtTarget(xBuilder->weld_label(u"target_label"_ustr)) { // gtk_size_group_set_ignore_hidden, "Measuring the size of hidden widgets // ... they will report a size of 0 nowadays, and thus, their size will diff --git a/cui/source/dialogs/hlmailtp.cxx b/cui/source/dialogs/hlmailtp.cxx index 2d25bed91747..73904ed34258 100644 --- a/cui/source/dialogs/hlmailtp.cxx +++ b/cui/source/dialogs/hlmailtp.cxx @@ -34,10 +34,10 @@ using namespace ::com::sun::star; |* |************************************************************************/ SvxHyperlinkMailTp::SvxHyperlinkMailTp(weld::Container* pParent, SvxHpLinkDlg* pDlg, const SfxItemSet* pItemSet) - : SvxHyperlinkTabPageBase(pParent, pDlg, "cui/ui/hyperlinkmailpage.ui", "HyperlinkMailPage", pItemSet) - , m_xCbbReceiver(new SvxHyperURLBox(xBuilder->weld_combo_box("receiver"))) - , m_xBtAdrBook(xBuilder->weld_button("addressbook")) - , m_xEdSubject(xBuilder->weld_entry("subject")) + : SvxHyperlinkTabPageBase(pParent, pDlg, u"cui/ui/hyperlinkmailpage.ui"_ustr, u"HyperlinkMailPage"_ustr, pItemSet) + , m_xCbbReceiver(new SvxHyperURLBox(xBuilder->weld_combo_box(u"receiver"_ustr))) + , m_xBtAdrBook(xBuilder->weld_button(u"addressbook"_ustr)) + , m_xEdSubject(xBuilder->weld_entry(u"subject"_ustr)) { m_xCbbReceiver->SetSmartProtocol(INetProtocol::Mailto); @@ -95,7 +95,7 @@ void SvxHyperlinkMailTp::FillDlgFields(const OUString& rStrURL) } else { - m_xEdSubject->set_text(""); + m_xEdSubject->set_text(u""_ustr); } m_xCbbReceiver->set_entry_text(aStrURLc); diff --git a/cui/source/dialogs/hlmarkwn.cxx b/cui/source/dialogs/hlmarkwn.cxx index 918fc7cab3f7..0f45cfe9680a 100644 --- a/cui/source/dialogs/hlmarkwn.cxx +++ b/cui/source/dialogs/hlmarkwn.cxx @@ -66,13 +66,13 @@ struct TargetData //*** Window-Class *** // Constructor / Destructor SvxHlinkDlgMarkWnd::SvxHlinkDlgMarkWnd(weld::Window* pParentDialog, SvxHyperlinkTabPageBase *pParentPage) - : GenericDialogController(pParentDialog, "cui/ui/hyperlinkmarkdialog.ui", "HyperlinkMark") + : GenericDialogController(pParentDialog, u"cui/ui/hyperlinkmarkdialog.ui"_ustr, u"HyperlinkMark"_ustr) , mpParent(pParentPage) , mnError(LERR_NOERROR) - , mxBtApply(m_xBuilder->weld_button("ok")) - , mxBtClose(m_xBuilder->weld_button("close")) - , mxLbTree(m_xBuilder->weld_tree_view("TreeListBox")) - , mxError(m_xBuilder->weld_label("error")) + , mxBtApply(m_xBuilder->weld_button(u"ok"_ustr)) + , mxBtClose(m_xBuilder->weld_button(u"close"_ustr)) + , mxLbTree(m_xBuilder->weld_tree_view(u"TreeListBox"_ustr)) + , mxError(m_xBuilder->weld_label(u"error"_ustr)) { mxLbTree->set_size_request(mxLbTree->get_approximate_digit_width() * 25, mxLbTree->get_height_rows(12)); @@ -253,8 +253,8 @@ bool SvxHlinkDlgMarkWnd::RefreshFromDoc(const OUString& aURL) { try { - uno::Sequence< beans::PropertyValue > aArg { comphelper::makePropertyValue("Hidden", true) }; - xComp = xDesktop->loadComponentFromURL( aURL, "_blank", 0, aArg ); + uno::Sequence< beans::PropertyValue > aArg { comphelper::makePropertyValue(u"Hidden"_ustr, true) }; + xComp = xDesktop->loadComponentFromURL( aURL, u"_blank"_ustr, 0, aArg ); } catch( const io::IOException& ) { @@ -352,12 +352,12 @@ int SvxHlinkDlgMarkWnd::FillTree( const uno::Reference< container::XNameAccess > std::pair(mxLbTree->make_iterator(pParentEntry), -1)); // get the headings name to display - aAny = xTarget->getPropertyValue("ActualOutlineName"); + aAny = xTarget->getPropertyValue(u"ActualOutlineName"_ustr); OUString sActualOutlineName; aAny >>= sActualOutlineName; // get the headings outline level - aAny = xTarget->getPropertyValue("OutlineLevel"); + aAny = xTarget->getPropertyValue(u"OutlineLevel"_ustr); sal_Int32 nOutlineLevel = *o3tl::doAccess<sal_Int32>(aAny); // pop until the top of stack entry has an outline level less than diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx index 7f2230e1d87a..9ac9be2baf8b 100644 --- a/cui/source/dialogs/hltpbase.cxx +++ b/cui/source/dialogs/hltpbase.cxx @@ -107,13 +107,13 @@ SvxHyperlinkTabPageBase::SvxHyperlinkTabPageBase(weld::Container* pParent, const OUString& rID, const SfxItemSet* pItemSet) : IconChoicePage(pParent, rUIXMLDescription, rID, pItemSet) - , mxCbbFrame(xBuilder->weld_combo_box("frame")) - , mxLbForm(xBuilder->weld_combo_box("form")) - , mxEdIndication(xBuilder->weld_entry("indication")) - , mxEdText(xBuilder->weld_entry("name")) - , mxBtScript(xBuilder->weld_button("script")) - , mxFormLabel(xBuilder->weld_label("form_label")) - , mxFrameLabel(xBuilder->weld_label("frame_label")) + , mxCbbFrame(xBuilder->weld_combo_box(u"frame"_ustr)) + , mxLbForm(xBuilder->weld_combo_box(u"form"_ustr)) + , mxEdIndication(xBuilder->weld_entry(u"indication"_ustr)) + , mxEdText(xBuilder->weld_entry(u"name"_ustr)) + , mxBtScript(xBuilder->weld_button(u"script"_ustr)) + , mxFormLabel(xBuilder->weld_label(u"form_label"_ustr)) + , mxFrameLabel(xBuilder->weld_label(u"frame_label"_ustr)) , mbIsCloseDisabled( false ) , mpDialog( pDlg ) , mbStdControlsInit( false ) diff --git a/cui/source/dialogs/hyphen.cxx b/cui/source/dialogs/hyphen.cxx index c06ecab9661f..afaf415468e8 100644 --- a/cui/source/dialogs/hyphen.cxx +++ b/cui/source/dialogs/hyphen.cxx @@ -393,7 +393,7 @@ SvxHyphenWordDialog::SvxHyphenWordDialog( weld::Widget* pParent, uno::Reference< linguistic2::XHyphenator > const &xHyphen, SvxSpellWrapper* pWrapper) - : SfxDialogController(pParent, "cui/ui/hyphenate.ui", "HyphenateDialog") + : SfxDialogController(pParent, u"cui/ui/hyphenate.ui"_ustr, u"HyphenateDialog"_ustr) , m_pHyphWrapper(pWrapper) , m_aActWord(std::move(aWord)) , m_nActLanguage(nLang) @@ -401,14 +401,14 @@ SvxHyphenWordDialog::SvxHyphenWordDialog( , m_nOldPos(0) , m_nHyphenationPositionsOffset(0) , m_bBusy(false) - , m_xWordEdit(m_xBuilder->weld_entry("worded")) - , m_xLeftBtn(m_xBuilder->weld_button("left")) - , m_xRightBtn(m_xBuilder->weld_button("right")) - , m_xOkBtn(m_xBuilder->weld_button("ok")) - , m_xContBtn(m_xBuilder->weld_button("continue")) - , m_xDelBtn(m_xBuilder->weld_button("delete")) - , m_xHyphAll(m_xBuilder->weld_button("hyphall")) - , m_xCloseBtn(m_xBuilder->weld_button("close")) + , m_xWordEdit(m_xBuilder->weld_entry(u"worded"_ustr)) + , m_xLeftBtn(m_xBuilder->weld_button(u"left"_ustr)) + , m_xRightBtn(m_xBuilder->weld_button(u"right"_ustr)) + , m_xOkBtn(m_xBuilder->weld_button(u"ok"_ustr)) + , m_xContBtn(m_xBuilder->weld_button(u"continue"_ustr)) + , m_xDelBtn(m_xBuilder->weld_button(u"delete"_ustr)) + , m_xHyphAll(m_xBuilder->weld_button(u"hyphall"_ustr)) + , m_xCloseBtn(m_xBuilder->weld_button(u"close"_ustr)) { m_nWordEditWidth = m_xWordEdit->get_width_chars(); m_aLabel = m_xDialog->get_title(); diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx index e4c1c6687768..814732173598 100644 --- a/cui/source/dialogs/insdlg.cxx +++ b/cui/source/dialogs/insdlg.cxx @@ -94,7 +94,7 @@ IMPL_LINK_NOARG(SvInsertOleDlg, BrowseHdl, weld::Button&, void) // add filter try { - xFilePicker->appendFilter(CuiResId(RID_CUISTR_FILTER_ALL), "*.*"); + xFilePicker->appendFilter(CuiResId(RID_CUISTR_FILTER_ALL), u"*.*"_ustr); } catch( const IllegalArgumentException& ) { @@ -128,17 +128,17 @@ IMPL_LINK(SvInsertOleDlg, RadioHdl, weld::Toggleable&, rButton, void) SvInsertOleDlg::SvInsertOleDlg(weld::Window* pParent, const Reference<embed::XStorage>& xStorage, const SvObjectServerList* pServers) - : InsertObjectDialog_Impl( pParent, "cui/ui/insertoleobject.ui", "InsertOLEObjectDialog", xStorage) + : InsertObjectDialog_Impl( pParent, u"cui/ui/insertoleobject.ui"_ustr, u"InsertOLEObjectDialog"_ustr, xStorage) , m_pServers( pServers ) - , m_xRbNewObject(m_xBuilder->weld_radio_button("createnew")) - , m_xRbObjectFromfile(m_xBuilder->weld_radio_button("createfromfile")) - , m_xObjectTypeFrame(m_xBuilder->weld_frame("objecttypeframe")) - , m_xLbObjecttype(m_xBuilder->weld_tree_view("types")) - , m_xFileFrame(m_xBuilder->weld_frame("fileframe")) - , m_xEdFilepath(m_xBuilder->weld_entry("urled")) - , m_xBtnFilepath(m_xBuilder->weld_button("urlbtn")) - , m_xCbFilelink(m_xBuilder->weld_check_button("linktofile")) - , m_xCbAsIcon(m_xBuilder->weld_check_button("asicon")) + , m_xRbNewObject(m_xBuilder->weld_radio_button(u"createnew"_ustr)) + , m_xRbObjectFromfile(m_xBuilder->weld_radio_button(u"createfromfile"_ustr)) + , m_xObjectTypeFrame(m_xBuilder->weld_frame(u"objecttypeframe"_ustr)) + , m_xLbObjecttype(m_xBuilder->weld_tree_view(u"types"_ustr)) + , m_xFileFrame(m_xBuilder->weld_frame(u"fileframe"_ustr)) + , m_xEdFilepath(m_xBuilder->weld_entry(u"urled"_ustr)) + , m_xBtnFilepath(m_xBuilder->weld_button(u"urlbtn"_ustr)) + , m_xCbFilelink(m_xBuilder->weld_check_button(u"linktofile"_ustr)) + , m_xCbAsIcon(m_xBuilder->weld_check_button(u"asicon"_ustr)) { m_xLbObjecttype->set_size_request(m_xLbObjecttype->get_approximate_digit_width() * 32, m_xLbObjecttype->get_height_rows(6)); @@ -215,8 +215,8 @@ short SvInsertOleDlg::run() const embed::InsertedObjectInfo aNewInf = xDialogCreator->createInstanceByDialog( m_xStorage, aName, - {comphelper::makePropertyValue("StatusIndicator", xProgress), - comphelper::makePropertyValue("StatusIndicatorText", aProgressText)} ); + {comphelper::makePropertyValue(u"StatusIndicator"_ustr, xProgress), + comphelper::makePropertyValue(u"StatusIndicatorText"_ustr, aProgressText)} ); OSL_ENSURE( aNewInf.Object.is(), "The object must be created or an exception must be thrown!" ); m_xObj = aNewInf.Object; @@ -293,8 +293,8 @@ short SvInsertOleDlg::run() // create MediaDescriptor for file to create object from uno::Sequence < beans::PropertyValue > aMedium{ - comphelper::makePropertyValue("URL", aFileName), - comphelper::makePropertyValue("InteractionHandler", xInteraction) + comphelper::makePropertyValue(u"URL"_ustr, aFileName), + comphelper::makePropertyValue(u"InteractionHandler"_ustr, xInteraction) }; // create object from media descriptor @@ -374,7 +374,7 @@ uno::Reference< io::XInputStream > SvInsertOleDlg::GetIconIfIconified( OUString* SfxInsertFloatingFrameDialog::SfxInsertFloatingFrameDialog(weld::Window *pParent, const css::uno::Reference < css::embed::XStorage >& xStorage) - : InsertObjectDialog_Impl(pParent, "cui/ui/insertfloatingframe.ui", "InsertFloatingFrameDialog", + : InsertObjectDialog_Impl(pParent, u"cui/ui/insertfloatingframe.ui"_ustr, u"InsertFloatingFrameDialog"_ustr, xStorage) { Init(); @@ -382,7 +382,7 @@ SfxInsertFloatingFrameDialog::SfxInsertFloatingFrameDialog(weld::Window *pParent SfxInsertFloatingFrameDialog::SfxInsertFloatingFrameDialog(weld::Window *pParent, const uno::Reference < embed::XEmbeddedObject >& xObj) - : InsertObjectDialog_Impl(pParent, "cui/ui/insertfloatingframe.ui", "InsertFloatingFrameDialog", + : InsertObjectDialog_Impl(pParent, u"cui/ui/insertfloatingframe.ui"_ustr, u"InsertFloatingFrameDialog"_ustr, uno::Reference<embed::XStorage>()) { m_xObj = xObj; @@ -392,20 +392,20 @@ SfxInsertFloatingFrameDialog::SfxInsertFloatingFrameDialog(weld::Window *pParent void SfxInsertFloatingFrameDialog::Init() { - m_xEDName = m_xBuilder->weld_entry("edname"); - m_xEDURL = m_xBuilder->weld_entry("edurl"); - m_xBTOpen = m_xBuilder->weld_button("buttonbrowse"); - m_xRBScrollingOn = m_xBuilder->weld_radio_button("scrollbaron"); - m_xRBScrollingOff = m_xBuilder->weld_radio_button("scrollbaroff"); - m_xRBScrollingAuto = m_xBuilder->weld_radio_button("scrollbarauto"); - m_xRBFrameBorderOn = m_xBuilder->weld_radio_button("borderon"); - m_xRBFrameBorderOff = m_xBuilder->weld_radio_button("borderoff"); - m_xFTMarginWidth = m_xBuilder->weld_label("widthlabel"); - m_xNMMarginWidth = m_xBuilder->weld_spin_button("width"); - m_xCBMarginWidthDefault = m_xBuilder->weld_check_button("defaultwidth"); - m_xFTMarginHeight = m_xBuilder->weld_label("heightlabel"); - m_xNMMarginHeight = m_xBuilder->weld_spin_button("height"); - m_xCBMarginHeightDefault = m_xBuilder->weld_check_button("defaultheight"); + m_xEDName = m_xBuilder->weld_entry(u"edname"_ustr); + m_xEDURL = m_xBuilder->weld_entry(u"edurl"_ustr); + m_xBTOpen = m_xBuilder->weld_button(u"buttonbrowse"_ustr); + m_xRBScrollingOn = m_xBuilder->weld_radio_button(u"scrollbaron"_ustr); + m_xRBScrollingOff = m_xBuilder->weld_radio_button(u"scrollbaroff"_ustr); + m_xRBScrollingAuto = m_xBuilder->weld_radio_button(u"scrollbarauto"_ustr); + m_xRBFrameBorderOn = m_xBuilder->weld_radio_button(u"borderon"_ustr); + m_xRBFrameBorderOff = m_xBuilder->weld_radio_button(u"borderoff"_ustr); + m_xFTMarginWidth = m_xBuilder->weld_label(u"widthlabel"_ustr); + m_xNMMarginWidth = m_xBuilder->weld_spin_button(u"width"_ustr); + m_xCBMarginWidthDefault = m_xBuilder->weld_check_button(u"defaultwidth"_ustr); + m_xFTMarginHeight = m_xBuilder->weld_label(u"heightlabel"_ustr); + m_xNMMarginHeight = m_xBuilder->weld_spin_button(u"height"_ustr); + m_xCBMarginHeightDefault = m_xBuilder->weld_check_button(u"defaultheight"_ustr); Link<weld::Toggleable&, void> aLink(LINK(this, SfxInsertFloatingFrameDialog, CheckHdl)); m_xCBMarginWidthDefault->connect_toggled(aLink); @@ -432,15 +432,15 @@ short SfxInsertFloatingFrameDialog::run() m_xObj->changeState( embed::EmbedStates::RUNNING ); xSet.set( m_xObj->getComponent(), uno::UNO_QUERY ); OUString aStr; - uno::Any aAny = xSet->getPropertyValue( "FrameURL" ); + uno::Any aAny = xSet->getPropertyValue( u"FrameURL"_ustr ); if ( aAny >>= aStr ) m_xEDURL->set_text( aStr ); - aAny = xSet->getPropertyValue( "FrameName" ); + aAny = xSet->getPropertyValue( u"FrameName"_ustr ); if ( aAny >>= aStr ) m_xEDName->set_text(aStr); sal_Int32 nSize = SIZE_NOT_SET; - aAny = xSet->getPropertyValue( "FrameMarginWidth" ); + aAny = xSet->getPropertyValue( u"FrameMarginWidth"_ustr ); aAny >>= nSize; if ( nSize == SIZE_NOT_SET ) @@ -453,7 +453,7 @@ short SfxInsertFloatingFrameDialog::run() else m_xNMMarginWidth->set_text(OUString::number(nSize)); - aAny = xSet->getPropertyValue( "FrameMarginHeight" ); + aAny = xSet->getPropertyValue( u"FrameMarginHeight"_ustr ); aAny >>= nSize; if ( nSize == SIZE_NOT_SET ) @@ -471,11 +471,11 @@ short SfxInsertFloatingFrameDialog::run() bool bScrollAuto = false; bool bSet = false; - aAny = xSet->getPropertyValue( "FrameIsAutoScroll" ); + aAny = xSet->getPropertyValue( u"FrameIsAutoScroll"_ustr ); aAny >>= bSet; if ( !bSet ) { - aAny = xSet->getPropertyValue( "FrameIsScrollingMode" ); + aAny = xSet->getPropertyValue( u"FrameIsScrollingMode"_ustr ); aAny >>= bSet; bScrollOn = bSet; bScrollOff = !bSet; @@ -488,11 +488,11 @@ short SfxInsertFloatingFrameDialog::run() m_xRBScrollingAuto->set_sensitive(bScrollAuto); bSet = false; - aAny = xSet->getPropertyValue( "FrameIsAutoBorder" ); + aAny = xSet->getPropertyValue( u"FrameIsAutoBorder"_ustr ); aAny >>= bSet; if ( !bSet ) { - aAny = xSet->getPropertyValue( "FrameIsBorder" ); + aAny = xSet->getPropertyValue( u"FrameIsBorder"_ustr ); aAny >>= bSet; m_xRBFrameBorderOn->set_active(bSet); m_xRBFrameBorderOff->set_active(!bSet); @@ -569,17 +569,17 @@ short SfxInsertFloatingFrameDialog::run() else lMarginHeight = SIZE_NOT_SET; - xSet->setPropertyValue( "FrameURL", Any( aURL ) ); - xSet->setPropertyValue( "FrameName", Any( aName ) ); + xSet->setPropertyValue( u"FrameURL"_ustr, Any( aURL ) ); + xSet->setPropertyValue( u"FrameName"_ustr, Any( aName ) ); if ( eScroll == ScrollingMode::Auto ) - xSet->setPropertyValue( "FrameIsAutoScroll", Any( true ) ); + xSet->setPropertyValue( u"FrameIsAutoScroll"_ustr, Any( true ) ); else - xSet->setPropertyValue( "FrameIsScrollingMode", Any( eScroll == ScrollingMode::Yes ) ); + xSet->setPropertyValue( u"FrameIsScrollingMode"_ustr, Any( eScroll == ScrollingMode::Yes ) ); - xSet->setPropertyValue( "FrameIsBorder", Any( bHasBorder ) ); - xSet->setPropertyValue( "FrameMarginWidth", Any( sal_Int32( lMarginWidth ) ) ); - xSet->setPropertyValue( "FrameMarginHeight", Any( sal_Int32( lMarginHeight ) ) ); + xSet->setPropertyValue( u"FrameIsBorder"_ustr, Any( bHasBorder ) ); + xSet->setPropertyValue( u"FrameMarginWidth"_ustr, Any( sal_Int32( lMarginWidth ) ) ); + xSet->setPropertyValue( u"FrameMarginHeight"_ustr, Any( sal_Int32( lMarginHeight ) ) ); if ( bIPActive ) m_xObj->changeState( embed::EmbedStates::INPLACE_ACTIVE ); diff --git a/cui/source/dialogs/insrc.cxx b/cui/source/dialogs/insrc.cxx index 6c09c8ce4560..c26e713181f9 100644 --- a/cui/source/dialogs/insrc.cxx +++ b/cui/source/dialogs/insrc.cxx @@ -32,10 +32,10 @@ sal_uInt16 SvxInsRowColDlg::getInsertCount() const } SvxInsRowColDlg::SvxInsRowColDlg(weld::Window* pParent, bool bColumn, const OUString& rHelpId) - : GenericDialogController(pParent, "cui/ui/insertrowcolumn.ui", "InsertRowColumnDialog") - , m_xCountEdit(m_xBuilder->weld_spin_button("insert_number")) - , m_xBeforeBtn(m_xBuilder->weld_radio_button("insert_before")) - , m_xAfterBtn(m_xBuilder->weld_radio_button("insert_after")) + : GenericDialogController(pParent, u"cui/ui/insertrowcolumn.ui"_ustr, u"InsertRowColumnDialog"_ustr) + , m_xCountEdit(m_xBuilder->weld_spin_button(u"insert_number"_ustr)) + , m_xBeforeBtn(m_xBuilder->weld_radio_button(u"insert_before"_ustr)) + , m_xAfterBtn(m_xBuilder->weld_radio_button(u"insert_after"_ustr)) { m_xDialog->set_title(bColumn ? CuiResId(RID_CUISTR_COL) : CuiResId(RID_CUISTR_ROW)); diff --git a/cui/source/dialogs/linkdlg.cxx b/cui/source/dialogs/linkdlg.cxx index b31c5d74a783..e0ff180e1235 100644 --- a/cui/source/dialogs/linkdlg.cxx +++ b/cui/source/dialogs/linkdlg.cxx @@ -76,7 +76,7 @@ public: } SvBaseLinksDlg::SvBaseLinksDlg(weld::Window * pParent, LinkManager* pMgr, bool bHtmlMode) - : GenericDialogController(pParent, "cui/ui/baselinksdialog.ui", "BaseLinksDialog") + : GenericDialogController(pParent, u"cui/ui/baselinksdialog.ui"_ustr, u"BaseLinksDialog"_ustr) , aStrAutolink( CuiResId( STR_AUTOLINK ) ) , aStrManuallink( CuiResId( STR_MANUALLINK ) ) , aStrBrokenlink( CuiResId( STR_BROKENLINK ) ) @@ -85,15 +85,15 @@ SvBaseLinksDlg::SvBaseLinksDlg(weld::Window * pParent, LinkManager* pMgr, bool b , aStrWaitinglink( CuiResId( STR_WAITINGLINK ) ) , pLinkMgr( nullptr ) , aUpdateIdle("cui SvBaseLinksDlg UpdateIdle") - , m_xTbLinks(m_xBuilder->weld_tree_view("TB_LINKS")) - , m_xFtFullFileName(m_xBuilder->weld_link_button("FULL_FILE_NAME")) - , m_xFtFullSourceName(m_xBuilder->weld_label("FULL_SOURCE_NAME")) - , m_xFtFullTypeName(m_xBuilder->weld_label("FULL_TYPE_NAME")) - , m_xRbAutomatic(m_xBuilder->weld_radio_button("AUTOMATIC")) - , m_xRbManual(m_xBuilder->weld_radio_button("MANUAL")) - , m_xPbUpdateNow(m_xBuilder->weld_button("UPDATE_NOW")) - , m_xPbChangeSource(m_xBuilder->weld_button("CHANGE_SOURCE")) - , m_xPbBreakLink(m_xBuilder->weld_button("BREAK_LINK")) + , m_xTbLinks(m_xBuilder->weld_tree_view(u"TB_LINKS"_ustr)) + , m_xFtFullFileName(m_xBuilder->weld_link_button(u"FULL_FILE_NAME"_ustr)) + , m_xFtFullSourceName(m_xBuilder->weld_label(u"FULL_SOURCE_NAME"_ustr)) + , m_xFtFullTypeName(m_xBuilder->weld_label(u"FULL_TYPE_NAME"_ustr)) + , m_xRbAutomatic(m_xBuilder->weld_radio_button(u"AUTOMATIC"_ustr)) + , m_xRbManual(m_xBuilder->weld_radio_button(u"MANUAL"_ustr)) + , m_xPbUpdateNow(m_xBuilder->weld_button(u"UPDATE_NOW"_ustr)) + , m_xPbChangeSource(m_xBuilder->weld_button(u"CHANGE_SOURCE"_ustr)) + , m_xPbBreakLink(m_xBuilder->weld_button(u"BREAK_LINK"_ustr)) , m_xVirDev(VclPtr<VirtualDevice>::Create()) { // expand the point size of the desired font to the equivalent pixel size @@ -440,8 +440,8 @@ IMPL_LINK_NOARG( SvBaseLinksDlg, BreakLinkClickHdl, weld::Button&, void ) m_xPbChangeSource->set_sensitive(false); m_xPbBreakLink->set_sensitive(false); - m_xFtFullSourceName->set_label( "" ); - m_xFtFullTypeName->set_label( "" ); + m_xFtFullSourceName->set_label( u""_ustr ); + m_xFtFullTypeName->set_label( u""_ustr ); } if( pLinkMgr && pLinkMgr->GetPersist() ) pLinkMgr->GetPersist()->SetModified(); diff --git a/cui/source/dialogs/multipat.cxx b/cui/source/dialogs/multipat.cxx index e385a6ccface..383c2ee1ab0b 100644 --- a/cui/source/dialogs/multipat.cxx +++ b/cui/source/dialogs/multipat.cxx @@ -187,10 +187,10 @@ IMPL_LINK_NOARG(SvxPathSelectDialog, DelHdl_Impl, weld::Button&, void) } SvxMultiPathDialog::SvxMultiPathDialog(weld::Window* pParent) - : GenericDialogController(pParent, "cui/ui/multipathdialog.ui", "MultiPathDialog") - , m_xRadioLB(m_xBuilder->weld_tree_view("paths")) - , m_xAddBtn(m_xBuilder->weld_button("add")) - , m_xDelBtn(m_xBuilder->weld_button("delete")) + : GenericDialogController(pParent, u"cui/ui/multipathdialog.ui"_ustr, u"MultiPathDialog"_ustr) + , m_xRadioLB(m_xBuilder->weld_tree_view(u"paths"_ustr)) + , m_xAddBtn(m_xBuilder->weld_button(u"add"_ustr)) + , m_xDelBtn(m_xBuilder->weld_button(u"delete"_ustr)) { m_xRadioLB->set_size_request(m_xRadioLB->get_approximate_digit_width() * 60, m_xRadioLB->get_text_height() * 10); @@ -205,10 +205,10 @@ SvxMultiPathDialog::SvxMultiPathDialog(weld::Window* pParent) } SvxPathSelectDialog::SvxPathSelectDialog(weld::Window* pParent) - : GenericDialogController(pParent, "cui/ui/selectpathdialog.ui", "SelectPathDialog") - , m_xPathLB(m_xBuilder->weld_tree_view("paths")) - , m_xAddBtn(m_xBuilder->weld_button("add")) - , m_xDelBtn(m_xBuilder->weld_button("delete")) + : GenericDialogController(pParent, u"cui/ui/selectpathdialog.ui"_ustr, u"SelectPathDialog"_ustr) + , m_xPathLB(m_xBuilder->weld_tree_view(u"paths"_ustr)) + , m_xAddBtn(m_xBuilder->weld_button(u"add"_ustr)) + , m_xDelBtn(m_xBuilder->weld_button(u"delete"_ustr)) { m_xPathLB->set_size_request(m_xPathLB->get_approximate_digit_width() * 60, m_xPathLB->get_text_height() * 10); diff --git a/cui/source/dialogs/newtabledlg.cxx b/cui/source/dialogs/newtabledlg.cxx index 9eb50987ea9a..123cc7b7f3c4 100644 --- a/cui/source/dialogs/newtabledlg.cxx +++ b/cui/source/dialogs/newtabledlg.cxx @@ -20,9 +20,9 @@ #include <newtabledlg.hxx> SvxNewTableDialog::SvxNewTableDialog(weld::Window* pWindow) - : GenericDialogController(pWindow, "cui/ui/newtabledialog.ui", "NewTableDialog") - , mxNumColumns(m_xBuilder->weld_spin_button("columns")) - , mxNumRows(m_xBuilder->weld_spin_button("rows")) + : GenericDialogController(pWindow, u"cui/ui/newtabledialog.ui"_ustr, u"NewTableDialog"_ustr) + , mxNumColumns(m_xBuilder->weld_spin_button(u"columns"_ustr)) + , mxNumRows(m_xBuilder->weld_spin_button(u"rows"_ustr)) { } diff --git a/cui/source/dialogs/passwdomdlg.cxx b/cui/source/dialogs/passwdomdlg.cxx index a7e95a29f3b4..5e90fc88725d 100644 --- a/cui/source/dialogs/passwdomdlg.cxx +++ b/cui/source/dialogs/passwdomdlg.cxx @@ -71,15 +71,15 @@ IMPL_LINK_NOARG(PasswordToOpenModifyDialog, OkBtnClickHdl, weld::Button&, void) weld::Entry* pRepeatEdit = !bToOpenMatch? m_xReenterPasswdToOpenED.get() : m_xReenterPasswdToModifyED.get(); if (nMismatch == 1) { - pEdit->set_text( "" ); - pRepeatEdit->set_text( "" ); + pEdit->set_text( u""_ustr ); + pRepeatEdit->set_text( u""_ustr ); } else if (nMismatch == 2) { - m_xPasswdToOpenED->set_text( "" ); - m_xReenterPasswdToOpenED->set_text( "" ); - m_xPasswdToModifyED->set_text( "" ); - m_xReenterPasswdToModifyED->set_text( "" ); + m_xPasswdToOpenED->set_text( u""_ustr ); + m_xReenterPasswdToOpenED->set_text( u""_ustr ); + m_xPasswdToModifyED->set_text( u""_ustr ); + m_xReenterPasswdToModifyED->set_text( u""_ustr ); } pEdit->grab_focus(); }); @@ -140,22 +140,22 @@ IMPL_LINK(PasswordToOpenModifyDialog, ChangeHdl, weld::Entry&, rEntry, void) } PasswordToOpenModifyDialog::PasswordToOpenModifyDialog(weld::Window * pParent, sal_uInt16 nMaxPasswdLen, bool bIsPasswordToModify) - : SfxDialogController(pParent, "cui/ui/password.ui", "PasswordDialog") - , m_xPasswdToOpenED(m_xBuilder->weld_entry("newpassEntry")) - , m_xPasswdToOpenInd(m_xBuilder->weld_label("newpassIndicator")) - , m_xPasswdToOpenBar(m_xBuilder->weld_level_bar("passlevelbar")) - , m_xReenterPasswdToOpenED(m_xBuilder->weld_entry("confirmpassEntry")) - , m_xReenterPasswdToOpenInd(m_xBuilder->weld_label("confirmpassIndicator")) - , m_xOptionsExpander(m_xBuilder->weld_expander("expander")) - , m_xOk(m_xBuilder->weld_button("ok")) - , m_xOpenReadonlyCB(m_xBuilder->weld_check_button("readonly")) - , m_xPasswdToModifyFT(m_xBuilder->weld_label("label7")) - , m_xPasswdToModifyED(m_xBuilder->weld_entry("newpassroEntry")) - , m_xPasswdToModifyInd(m_xBuilder->weld_label("newpassroIndicator")) - , m_xPasswdToModifyBar(m_xBuilder->weld_level_bar("ropasslevelbar")) - , m_xReenterPasswdToModifyFT(m_xBuilder->weld_label("label8")) - , m_xReenterPasswdToModifyED(m_xBuilder->weld_entry("confirmropassEntry")) - , m_xReenterPasswdToModifyInd(m_xBuilder->weld_label("confirmropassIndicator")) + : SfxDialogController(pParent, u"cui/ui/password.ui"_ustr, u"PasswordDialog"_ustr) + , m_xPasswdToOpenED(m_xBuilder->weld_entry(u"newpassEntry"_ustr)) + , m_xPasswdToOpenInd(m_xBuilder->weld_label(u"newpassIndicator"_ustr)) + , m_xPasswdToOpenBar(m_xBuilder->weld_level_bar(u"passlevelbar"_ustr)) + , m_xReenterPasswdToOpenED(m_xBuilder->weld_entry(u"confirmpassEntry"_ustr)) + , m_xReenterPasswdToOpenInd(m_xBuilder->weld_label(u"confirmpassIndicator"_ustr)) + , m_xOptionsExpander(m_xBuilder->weld_expander(u"expander"_ustr)) + , m_xOk(m_xBuilder->weld_button(u"ok"_ustr)) + , m_xOpenReadonlyCB(m_xBuilder->weld_check_button(u"readonly"_ustr)) + , m_xPasswdToModifyFT(m_xBuilder->weld_label(u"label7"_ustr)) + , m_xPasswdToModifyED(m_xBuilder->weld_entry(u"newpassroEntry"_ustr)) + , m_xPasswdToModifyInd(m_xBuilder->weld_label(u"newpassroIndicator"_ustr)) + , m_xPasswdToModifyBar(m_xBuilder->weld_level_bar(u"ropasslevelbar"_ustr)) + , m_xReenterPasswdToModifyFT(m_xBuilder->weld_label(u"label8"_ustr)) + , m_xReenterPasswdToModifyED(m_xBuilder->weld_entry(u"confirmropassEntry"_ustr)) + , m_xReenterPasswdToModifyInd(m_xBuilder->weld_label(u"confirmropassIndicator"_ustr)) , m_aOneMismatch( CuiResId( RID_CUISTR_ONE_PASSWORD_MISMATCH ) ) , m_aTwoMismatch( CuiResId( RID_CUISTR_TWO_PASSWORDS_MISMATCH ) ) , m_aInvalidStateForOkButton( CuiResId( RID_CUISTR_INVALID_STATE_FOR_OK_BUTTON ) ) diff --git a/cui/source/dialogs/pastedlg.cxx b/cui/source/dialogs/pastedlg.cxx index 423637e9d9e9..91e91bf0dcec 100644 --- a/cui/source/dialogs/pastedlg.cxx +++ b/cui/source/dialogs/pastedlg.cxx @@ -30,10 +30,10 @@ #include <com/sun/star/beans/PropertyValue.hpp> SvPasteObjectDialog::SvPasteObjectDialog(weld::Window* pParent) - : GenericDialogController(pParent, "cui/ui/pastespecial.ui", "PasteSpecialDialog") - , m_xFtObjectSource(m_xBuilder->weld_label("source")) - , m_xLbInsertList(m_xBuilder->weld_tree_view("list")) - , m_xOKButton(m_xBuilder->weld_button("ok")) + : GenericDialogController(pParent, u"cui/ui/pastespecial.ui"_ustr, u"PasteSpecialDialog"_ustr) + , m_xFtObjectSource(m_xBuilder->weld_label(u"source"_ustr)) + , m_xLbInsertList(m_xBuilder->weld_tree_view(u"list"_ustr)) + , m_xOKButton(m_xBuilder->weld_button(u"ok"_ustr)) { m_xLbInsertList->set_size_request(m_xLbInsertList->get_approximate_digit_width() * 40, m_xLbInsertList->get_height_rows(6)); diff --git a/cui/source/dialogs/postdlg.cxx b/cui/source/dialogs/postdlg.cxx index 1bcb6b7a0156..f7c251055e18 100644 --- a/cui/source/dialogs/postdlg.cxx +++ b/cui/source/dialogs/postdlg.cxx @@ -35,16 +35,16 @@ SvxPostItDialog::SvxPostItDialog(weld::Widget* pParent, const SfxItemSet& rCoreSet, bool bPrevNext) - : SfxDialogController(pParent, "cui/ui/comment.ui", "CommentDialog") + : SfxDialogController(pParent, u"cui/ui/comment.ui"_ustr, u"CommentDialog"_ustr) , m_rSet(rCoreSet) - , m_xLastEditFT(m_xBuilder->weld_label("lastedit")) - , m_xAltTitle(m_xBuilder->weld_label("alttitle")) - , m_xEditED(m_xBuilder->weld_text_view("edit")) - , m_xInsertAuthor(m_xBuilder->weld_widget("insertauthor")) - , m_xAuthorBtn(m_xBuilder->weld_button("author")) - , m_xOKBtn(m_xBuilder->weld_button("ok")) - , m_xPrevBtn(m_xBuilder->weld_button("previous")) - , m_xNextBtn(m_xBuilder->weld_button("next")) + , m_xLastEditFT(m_xBuilder->weld_label(u"lastedit"_ustr)) + , m_xAltTitle(m_xBuilder->weld_label(u"alttitle"_ustr)) + , m_xEditED(m_xBuilder->weld_text_view(u"edit"_ustr)) + , m_xInsertAuthor(m_xBuilder->weld_widget(u"insertauthor"_ustr)) + , m_xAuthorBtn(m_xBuilder->weld_button(u"author"_ustr)) + , m_xOKBtn(m_xBuilder->weld_button(u"ok"_ustr)) + , m_xPrevBtn(m_xBuilder->weld_button(u"previous"_ustr)) + , m_xNextBtn(m_xBuilder->weld_button(u"next"_ustr)) { m_xPrevBtn->connect_clicked( LINK( this, SvxPostItDialog, PrevHdl ) ); m_xNextBtn->connect_clicked( LINK( this, SvxPostItDialog, NextHdl ) ); diff --git a/cui/source/dialogs/screenshotannotationdlg.cxx b/cui/source/dialogs/screenshotannotationdlg.cxx index fca03c02d42d..8fc2ea362b32 100644 --- a/cui/source/dialogs/screenshotannotationdlg.cxx +++ b/cui/source/dialogs/screenshotannotationdlg.cxx @@ -59,9 +59,9 @@ namespace OUString lcl_AltDescr() { - OUString aTempl("<alt id=\"%1\">" + OUString aTempl(u"<alt id=\"%1\">" " " //FIXME real dialog title or something - "</alt>"); + "</alt>"_ustr); aTempl = aTempl.replaceFirst( "%1", lcl_genRandom(u"alt_id") ); return aTempl; @@ -69,10 +69,10 @@ namespace OUString lcl_Image( std::u16string_view rScreenshotId, const Size& rSize ) { - OUString aTempl("<image id=\"%1\" src=\"media/screenshots/%2.png\"" + OUString aTempl(u"<image id=\"%1\" src=\"media/screenshots/%2.png\"" " width=\"%3cm\" height=\"%4cm\">" "%5" - "</image>"); + "</image>"_ustr); aTempl = aTempl.replaceFirst( "%1", lcl_genRandom(u"img_id") ); aTempl = aTempl.replaceFirst( "%2", rScreenshotId ); aTempl = aTempl.replaceFirst( "%3", OUString::number( rSize.Width() ) ); @@ -84,8 +84,8 @@ namespace OUString lcl_ParagraphWithImage( std::u16string_view rScreenshotId, const Size& rSize ) { - OUString aTempl( "<paragraph id=\"%1\" role=\"paragraph\">%2" - "</paragraph>" SAL_NEWLINE_STRING ); + OUString aTempl( u"<paragraph id=\"%1\" role=\"paragraph\">%2" + "</paragraph>" SAL_NEWLINE_STRING ""_ustr ); aTempl = aTempl.replaceFirst( "%1", lcl_genRandom(u"par_id") ); aTempl = aTempl.replaceFirst( "%2", lcl_Image(rScreenshotId, rSize) ); @@ -94,8 +94,8 @@ namespace OUString lcl_Bookmark( std::u16string_view rWidgetId ) { - OUString aTempl = "<!-- Bookmark for widget %1 -->" SAL_NEWLINE_STRING - "<bookmark branch=\"hid/%2\" id=\"%3\" localize=\"false\"/>" SAL_NEWLINE_STRING; + OUString aTempl = u"<!-- Bookmark for widget %1 -->" SAL_NEWLINE_STRING + "<bookmark branch=\"hid/%2\" id=\"%3\" localize=\"false\"/>" SAL_NEWLINE_STRING ""_ustr; aTempl = aTempl.replaceFirst( "%1", rWidgetId ); aTempl = aTempl.replaceFirst( "%2", rWidgetId ); aTempl = aTempl.replaceFirst( "%3", lcl_genRandom(u"bm_id") ); @@ -215,11 +215,11 @@ ScreenshotAnnotationDlg_Impl::ScreenshotAnnotationDlg_Impl( assert(0 != maParentDialogBitmap.GetSizePixel().Height()); // get needed widgets - mxPicture.reset(new weld::CustomWeld(rParentBuilder, "picture", maPicture)); + mxPicture.reset(new weld::CustomWeld(rParentBuilder, u"picture"_ustr, maPicture)); assert(mxPicture); - mxText = rParentBuilder.weld_text_view("text"); + mxText = rParentBuilder.weld_text_view(u"text"_ustr); assert(mxText); - mxSave = rParentBuilder.weld_button("save"); + mxSave = rParentBuilder.weld_button(u"save"_ustr); assert(mxSave); // set screenshot image at DrawingArea, resize, set event listener @@ -291,8 +291,8 @@ IMPL_LINK_NOARG(ScreenshotAnnotationDlg_Impl, saveButtonHandler, weld::Button&, xFilePicker->setDisplayDirectory(maLastFolderURL); } - xFilePicker->appendFilter("*.png", "*.png"); - xFilePicker->setCurrentFilter("*.png"); + xFilePicker->appendFilter(u"*.png"_ustr, u"*.png"_ustr); + xFilePicker->setCurrentFilter(u"*.png"_ustr); xFilePicker->setDefaultName(aDerivedFileName); xFilePicker->setMultiSelectionMode(false); @@ -566,7 +566,7 @@ bool Picture::MouseButtonUp(const MouseEvent&) } ScreenshotAnnotationDlg::ScreenshotAnnotationDlg(weld::Dialog& rParentDialog) - : GenericDialogController(&rParentDialog, "cui/ui/screenshotannotationdialog.ui", "ScreenshotAnnotationDialog") + : GenericDialogController(&rParentDialog, u"cui/ui/screenshotannotationdialog.ui"_ustr, u"ScreenshotAnnotationDialog"_ustr) { m_pImpl.reset(new ScreenshotAnnotationDlg_Impl(m_xDialog.get(), *m_xBuilder, rParentDialog)); } diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx index 67bb456b7d61..017f1178be8b 100644 --- a/cui/source/dialogs/scriptdlg.cxx +++ b/cui/source/dialogs/scriptdlg.cxx @@ -339,27 +339,27 @@ IMPL_LINK(SvxScriptOrgDialog, ExpandingHdl, const weld::TreeIter&, rIter, bool) // CuiInputDialog ------------------------------------------------------------ CuiInputDialog::CuiInputDialog(weld::Window * pParent, InputDialogMode nMode) - : GenericDialogController(pParent, "cui/ui/newlibdialog.ui", "NewLibDialog") - , m_xEdit(m_xBuilder->weld_entry("entry")) + : GenericDialogController(pParent, u"cui/ui/newlibdialog.ui"_ustr, u"NewLibDialog"_ustr) + , m_xEdit(m_xBuilder->weld_entry(u"entry"_ustr)) { m_xEdit->grab_focus(); - std::unique_ptr<weld::Label> xNewLibFT(m_xBuilder->weld_label("newlibft")); + std::unique_ptr<weld::Label> xNewLibFT(m_xBuilder->weld_label(u"newlibft"_ustr)); if ( nMode == InputDialogMode::NEWMACRO ) { xNewLibFT->hide(); - std::unique_ptr<weld::Label> xNewMacroFT(m_xBuilder->weld_label("newmacroft")); + std::unique_ptr<weld::Label> xNewMacroFT(m_xBuilder->weld_label(u"newmacroft"_ustr)); xNewMacroFT->show(); - std::unique_ptr<weld::Label> xAltTitle(m_xBuilder->weld_label("altmacrotitle")); + std::unique_ptr<weld::Label> xAltTitle(m_xBuilder->weld_label(u"altmacrotitle"_ustr)); m_xDialog->set_title(xAltTitle->get_label()); } else if ( nMode == InputDialogMode::RENAME ) { xNewLibFT->hide(); - std::unique_ptr<weld::Label> xRenameFT(m_xBuilder->weld_label("renameft")); + std::unique_ptr<weld::Label> xRenameFT(m_xBuilder->weld_label(u"renameft"_ustr)); xRenameFT->show(); - std::unique_ptr<weld::Label> xAltTitle(m_xBuilder->weld_label("altrenametitle")); + std::unique_ptr<weld::Label> xAltTitle(m_xBuilder->weld_label(u"altrenametitle"_ustr)); m_xDialog->set_title(xAltTitle->get_label()); } } @@ -367,7 +367,7 @@ CuiInputDialog::CuiInputDialog(weld::Window * pParent, InputDialogMode nMode) // ScriptOrgDialog ------------------------------------------------------------ SvxScriptOrgDialog::SvxScriptOrgDialog(weld::Window* pParent, OUString language) - : SfxDialogController(pParent, "cui/ui/scriptorganizer.ui", "ScriptOrganizerDialog") + : SfxDialogController(pParent, u"cui/ui/scriptorganizer.ui"_ustr, u"ScriptOrganizerDialog"_ustr) , m_pParent(pParent) , m_sLanguage(std::move(language)) , m_delErrStr(CuiResId(RID_CUISTR_DELFAILED)) @@ -381,14 +381,14 @@ SvxScriptOrgDialog::SvxScriptOrgDialog(weld::Window* pParent, OUString language) , m_renameErrTitleStr(CuiResId(RID_CUISTR_RENAMEFAILED_TITLE)) , m_sMyMacros(CuiResId(RID_CUISTR_MYMACROS)) , m_sProdMacros(CuiResId(RID_CUISTR_PRODMACROS)) - , m_xScriptsBox(m_xBuilder->weld_tree_view("scripts")) + , m_xScriptsBox(m_xBuilder->weld_tree_view(u"scripts"_ustr)) , m_xScratchIter(m_xScriptsBox->make_iterator()) - , m_xRunButton(m_xBuilder->weld_button("ok")) - , m_xCloseButton(m_xBuilder->weld_button("close")) - , m_xCreateButton(m_xBuilder->weld_button("create")) - , m_xEditButton(m_xBuilder->weld_button("edit")) - , m_xRenameButton(m_xBuilder->weld_button("rename")) - , m_xDelButton(m_xBuilder->weld_button("delete")) + , m_xRunButton(m_xBuilder->weld_button(u"ok"_ustr)) + , m_xCloseButton(m_xBuilder->weld_button(u"close"_ustr)) + , m_xCreateButton(m_xBuilder->weld_button(u"create"_ustr)) + , m_xEditButton(m_xBuilder->weld_button(u"edit"_ustr)) + , m_xRenameButton(m_xBuilder->weld_button(u"rename"_ustr)) + , m_xDelButton(m_xBuilder->weld_button(u"delete"_ustr)) { // must be a neater way to deal with the strings than as above // append the language to the dialog title @@ -465,7 +465,7 @@ void SvxScriptOrgDialog::CheckButtons( Reference< browse::XBrowseNode > const & return; } - OUString sName("Editable"); + OUString sName(u"Editable"_ustr); if ( getBoolProperty( xProps, sName ) ) { @@ -602,7 +602,7 @@ IMPL_LINK(SvxScriptOrgDialog, ButtonHdl, weld::Button&, rButton, void) mspNode.set( mspUserData->GetNode() , UNO_QUERY ); bParent = m_xScriptsBox->iter_parent(*xParentIter); } - xProp->getPropertyValue("URI") >>= tmpString; + xProp->getPropertyValue(u"URI"_ustr) >>= tmpString; const OUString scriptURL( tmpString ); if ( mspNode.is() ) @@ -650,7 +650,7 @@ IMPL_LINK(SvxScriptOrgDialog, ButtonHdl, weld::Button&, rButton, void) try { // ISSUE need code to run script here - xInv->invoke( "Editable", args, outIndex, outArgs ); + xInv->invoke( u"Editable"_ustr, args, outIndex, outArgs ); } catch( Exception const & ) { @@ -813,7 +813,7 @@ void SvxScriptOrgDialog::createEntry(const weld::TreeIter& rEntry) Sequence< sal_Int16 > outIndex; try { - Any aResult = xInv->invoke( "Creatable", args, outIndex, outArgs ); + Any aResult = xInv->invoke( u"Creatable"_ustr, args, outIndex, outArgs ); aChildNode.set(aResult, UNO_QUERY); } @@ -893,7 +893,7 @@ void SvxScriptOrgDialog::renameEntry(const weld::TreeIter& rEntry) Sequence< sal_Int16 > outIndex; try { - Any aResult = xInv->invoke( "Renamable", args, outIndex, outArgs ); + Any aResult = xInv->invoke( u"Renamable"_ustr, args, outIndex, outArgs ); aChildNode.set(aResult, UNO_QUERY); } @@ -942,7 +942,7 @@ void SvxScriptOrgDialog::deleteEntry(const weld::TreeIter& rEntry) Sequence< sal_Int16 > outIndex; try { - Any aResult = xInv->invoke( "Deletable", args, outIndex, outArgs ); + Any aResult = xInv->invoke( u"Deletable"_ustr, args, outIndex, outArgs ); aResult >>= result; // or do we just assume true if no exception ? } catch( Exception const & ) @@ -1130,7 +1130,7 @@ OUString GetErrorMessage( { OUString unformatted = CuiResId( RID_CUISTR_ERROR_AT_LINE ); - OUString unknown("UNKNOWN"); + OUString unknown(u"UNKNOWN"_ustr); OUString language = unknown; OUString script = unknown; OUString line = unknown; @@ -1169,7 +1169,7 @@ OUString GetErrorMessage( { OUString unformatted = CuiResId( RID_CUISTR_EXCEPTION_AT_LINE ); - OUString unknown("UNKNOWN"); + OUString unknown(u"UNKNOWN"_ustr); OUString language = unknown; OUString script = unknown; OUString line = unknown; @@ -1214,9 +1214,9 @@ OUString GetErrorMessage( { OUString unformatted = CuiResId( RID_CUISTR_FRAMEWORK_ERROR_RUNNING ); - OUString language("UNKNOWN"); + OUString language(u"UNKNOWN"_ustr); - OUString script("UNKNOWN"); + OUString script(u"UNKNOWN"_ustr); OUString message; diff --git a/cui/source/dialogs/sdrcelldlg.cxx b/cui/source/dialogs/sdrcelldlg.cxx index 6b10e5c688e3..dce598ec961d 100644 --- a/cui/source/dialogs/sdrcelldlg.cxx +++ b/cui/source/dialogs/sdrcelldlg.cxx @@ -29,7 +29,7 @@ #include <svx/dialogs.hrc> SvxFormatCellsDialog::SvxFormatCellsDialog(weld::Window* pParent, const SfxItemSet& rAttr, const SdrModel& rModel, bool bStyle) - : SfxTabDialogController(pParent, "cui/ui/formatcellsdialog.ui", "FormatCellsDialog", &rAttr, bStyle) + : SfxTabDialogController(pParent, u"cui/ui/formatcellsdialog.ui"_ustr, u"FormatCellsDialog"_ustr, &rAttr, bStyle) , mrOutAttrs(rAttr) , mpColorTab(rModel.GetColorList()) , mnColorTabState ( ChangeType::NONE ) @@ -38,33 +38,33 @@ SvxFormatCellsDialog::SvxFormatCellsDialog(weld::Window* pParent, const SfxItemS , mpBitmapList(rModel.GetBitmapList()) , mpPatternList(rModel.GetPatternList()) { - AddTabPage("name", RID_SVXPAGE_CHAR_NAME); - AddTabPage("effects", RID_SVXPAGE_CHAR_EFFECTS); - AddTabPage("border", RID_SVXPAGE_BORDER ); - AddTabPage("area", RID_SVXPAGE_AREA); + AddTabPage(u"name"_ustr, RID_SVXPAGE_CHAR_NAME); + AddTabPage(u"effects"_ustr, RID_SVXPAGE_CHAR_EFFECTS); + AddTabPage(u"border"_ustr, RID_SVXPAGE_BORDER ); + AddTabPage(u"area"_ustr, RID_SVXPAGE_AREA); if (bStyle) { - AddTabPage("position", RID_SVXPAGE_CHAR_POSITION); - AddTabPage("highlight", RID_SVXPAGE_BKG); - AddTabPage("indentspacing", RID_SVXPAGE_STD_PARAGRAPH); - AddTabPage("alignment", SvxParaAlignTabPage::Create, SvxParaAlignTabPage::GetSdrRanges); - RemoveTabPage("shadow"); + AddTabPage(u"position"_ustr, RID_SVXPAGE_CHAR_POSITION); + AddTabPage(u"highlight"_ustr, RID_SVXPAGE_BKG); + AddTabPage(u"indentspacing"_ustr, RID_SVXPAGE_STD_PARAGRAPH); + AddTabPage(u"alignment"_ustr, SvxParaAlignTabPage::Create, SvxParaAlignTabPage::GetSdrRanges); + RemoveTabPage(u"shadow"_ustr); } else { - RemoveTabPage("position"); - RemoveTabPage("highlight"); - RemoveTabPage("indentspacing"); - RemoveTabPage("alignment"); - AddTabPage("shadow", SvxShadowTabPage::Create, nullptr); + RemoveTabPage(u"position"_ustr); + RemoveTabPage(u"highlight"_ustr); + RemoveTabPage(u"indentspacing"_ustr); + RemoveTabPage(u"alignment"_ustr); + AddTabPage(u"shadow"_ustr, SvxShadowTabPage::Create, nullptr); RemoveStandardButton(); } if (bStyle && SvtCJKOptions::IsAsianTypographyEnabled()) - AddTabPage("asian", RID_SVXPAGE_PARA_ASIAN); + AddTabPage(u"asian"_ustr, RID_SVXPAGE_PARA_ASIAN); else - RemoveTabPage("asian"); + RemoveTabPage(u"asian"_ustr); } void SvxFormatCellsDialog::PageCreated(const OUString& rId, SfxTabPage &rPage) diff --git a/cui/source/dialogs/showcols.cxx b/cui/source/dialogs/showcols.cxx index ae468b02009a..e7f1ae746727 100644 --- a/cui/source/dialogs/showcols.cxx +++ b/cui/source/dialogs/showcols.cxx @@ -28,9 +28,9 @@ constexpr OUString CUIFM_PROP_HIDDEN = u"Hidden"_ustr; constexpr OUStringLiteral CUIFM_PROP_LABEL = u"Label"; FmShowColsDialog::FmShowColsDialog(weld::Window* pParent) - : GenericDialogController(pParent, "cui/ui/showcoldialog.ui", "ShowColDialog") - , m_xList(m_xBuilder->weld_tree_view("treeview")) - , m_xOK(m_xBuilder->weld_button("ok")) + : GenericDialogController(pParent, u"cui/ui/showcoldialog.ui"_ustr, u"ShowColDialog"_ustr) + , m_xList(m_xBuilder->weld_tree_view(u"treeview"_ustr)) + , m_xOK(m_xBuilder->weld_button(u"ok"_ustr)) { m_xList->set_size_request(m_xList->get_approximate_digit_width() * 40, m_xList->get_height_rows(8)); diff --git a/cui/source/dialogs/splitcelldlg.cxx b/cui/source/dialogs/splitcelldlg.cxx index 14146b44c373..a734b69e732a 100644 --- a/cui/source/dialogs/splitcelldlg.cxx +++ b/cui/source/dialogs/splitcelldlg.cxx @@ -20,11 +20,11 @@ #include <splitcelldlg.hxx> SvxSplitTableDlg::SvxSplitTableDlg(weld::Window *pParent, bool bIsTableVertical, tools::Long nMaxVertical, tools::Long nMaxHorizontal) - : GenericDialogController(pParent, "cui/ui/splitcellsdialog.ui", "SplitCellsDialog") - , m_xCountEdit(m_xBuilder->weld_spin_button("countnf")) - , m_xHorzBox(!bIsTableVertical ? m_xBuilder->weld_radio_button("hori") : m_xBuilder->weld_radio_button("vert")) - , m_xVertBox(!bIsTableVertical ? m_xBuilder->weld_radio_button("vert") : m_xBuilder->weld_radio_button("hori")) - , m_xPropCB(m_xBuilder->weld_check_button("prop")) + : GenericDialogController(pParent, u"cui/ui/splitcellsdialog.ui"_ustr, u"SplitCellsDialog"_ustr) + , m_xCountEdit(m_xBuilder->weld_spin_button(u"countnf"_ustr)) + , m_xHorzBox(!bIsTableVertical ? m_xBuilder->weld_radio_button(u"hori"_ustr) : m_xBuilder->weld_radio_button(u"vert"_ustr)) + , m_xVertBox(!bIsTableVertical ? m_xBuilder->weld_radio_button(u"vert"_ustr) : m_xBuilder->weld_radio_button(u"hori"_ustr)) + , m_xPropCB(m_xBuilder->weld_check_button(u"prop"_ustr)) , mnMaxVertical(nMaxVertical) , mnMaxHorizontal(nMaxHorizontal) { diff --git a/cui/source/dialogs/srchxtra.cxx b/cui/source/dialogs/srchxtra.cxx index 9364680f62b2..efa37ecb945c 100644 --- a/cui/source/dialogs/srchxtra.cxx +++ b/cui/source/dialogs/srchxtra.cxx @@ -36,23 +36,23 @@ #include <vcl/svapp.hxx> SvxSearchFormatDialog::SvxSearchFormatDialog(weld::Window* pParent, const SfxItemSet& rSet) - : SfxTabDialogController(pParent, "cui/ui/searchformatdialog.ui", "SearchFormatDialog", &rSet) + : SfxTabDialogController(pParent, u"cui/ui/searchformatdialog.ui"_ustr, u"SearchFormatDialog"_ustr, &rSet) { - AddTabPage("font", SvxCharNamePage::Create, nullptr); - AddTabPage("fonteffects", SvxCharEffectsPage::Create, nullptr); - AddTabPage("position", SvxCharPositionPage::Create, nullptr); - AddTabPage("asianlayout", SvxCharTwoLinesPage::Create, nullptr); - AddTabPage("labelTP_PARA_STD", SvxStdParagraphTabPage::Create, nullptr); - AddTabPage("labelTP_PARA_ALIGN", SvxParaAlignTabPage::Create, nullptr); - AddTabPage("labelTP_PARA_EXT", SvxExtParagraphTabPage::Create, nullptr); - AddTabPage("labelTP_PARA_ASIAN", SvxAsianTabPage::Create, nullptr ); - AddTabPage("background", SvxBkgTabPage::Create, nullptr); + AddTabPage(u"font"_ustr, SvxCharNamePage::Create, nullptr); + AddTabPage(u"fonteffects"_ustr, SvxCharEffectsPage::Create, nullptr); + AddTabPage(u"position"_ustr, SvxCharPositionPage::Create, nullptr); + AddTabPage(u"asianlayout"_ustr, SvxCharTwoLinesPage::Create, nullptr); + AddTabPage(u"labelTP_PARA_STD"_ustr, SvxStdParagraphTabPage::Create, nullptr); + AddTabPage(u"labelTP_PARA_ALIGN"_ustr, SvxParaAlignTabPage::Create, nullptr); + AddTabPage(u"labelTP_PARA_EXT"_ustr, SvxExtParagraphTabPage::Create, nullptr); + AddTabPage(u"labelTP_PARA_ASIAN"_ustr, SvxAsianTabPage::Create, nullptr ); + AddTabPage(u"background"_ustr, SvxBkgTabPage::Create, nullptr); // remove asian tabpages if necessary if ( !SvtCJKOptions::IsDoubleLinesEnabled() ) - RemoveTabPage("asianlayout"); + RemoveTabPage(u"asianlayout"_ustr); if ( !SvtCJKOptions::IsAsianTypographyEnabled() ) - RemoveTabPage("labelTP_PARA_ASIAN"); + RemoveTabPage(u"labelTP_PARA_ASIAN"_ustr); } SvxSearchFormatDialog::~SvxSearchFormatDialog() @@ -103,10 +103,10 @@ void SvxSearchFormatDialog::PageCreated(const OUString& rId, SfxTabPage& rPage) SvxSearchAttributeDialog::SvxSearchAttributeDialog(weld::Window* pParent, SearchAttrItemList& rLst, const WhichRangesContainer& pWhRanges) - : GenericDialogController(pParent, "cui/ui/searchattrdialog.ui", "SearchAttrDialog") + : GenericDialogController(pParent, u"cui/ui/searchattrdialog.ui"_ustr, u"SearchAttrDialog"_ustr) , rList(rLst) - , m_xAttrLB(m_xBuilder->weld_tree_view("treeview")) - , m_xOKBtn(m_xBuilder->weld_button("ok")) + , m_xAttrLB(m_xBuilder->weld_tree_view(u"treeview"_ustr)) + , m_xOKBtn(m_xBuilder->weld_button(u"ok"_ustr)) { m_xAttrLB->set_size_request(m_xAttrLB->get_approximate_digit_width() * 50, m_xAttrLB->get_height_rows(12)); @@ -211,11 +211,11 @@ IMPL_LINK_NOARG(SvxSearchAttributeDialog, OKHdl, weld::Button&, void) SvxSearchSimilarityDialog::SvxSearchSimilarityDialog(weld::Window* pParent, bool bRelax, sal_uInt16 nOther, sal_uInt16 nShorter, sal_uInt16 nLonger) - : GenericDialogController(pParent, "cui/ui/similaritysearchdialog.ui", "SimilaritySearchDialog") - , m_xOtherFld(m_xBuilder->weld_spin_button("otherfld")) - , m_xLongerFld(m_xBuilder->weld_spin_button("longerfld")) - , m_xShorterFld(m_xBuilder->weld_spin_button("shorterfld")) - , m_xRelaxBox(m_xBuilder->weld_check_button("relaxbox")) + : GenericDialogController(pParent, u"cui/ui/similaritysearchdialog.ui"_ustr, u"SimilaritySearchDialog"_ustr) + , m_xOtherFld(m_xBuilder->weld_spin_button(u"otherfld"_ustr)) + , m_xLongerFld(m_xBuilder->weld_spin_button(u"longerfld"_ustr)) + , m_xShorterFld(m_xBuilder->weld_spin_button(u"shorterfld"_ustr)) + , m_xRelaxBox(m_xBuilder->weld_check_button(u"relaxbox"_ustr)) { m_xOtherFld->set_value(nOther); m_xShorterFld->set_value(nShorter); diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx index f1795ddd684d..d1c284b65b82 100644 --- a/cui/source/dialogs/thesdlg.cxx +++ b/cui/source/dialogs/thesdlg.cxx @@ -237,17 +237,17 @@ SvxThesaurusDialog::SvxThesaurusDialog( uno::Reference< linguistic2::XThesaurus > const & xThes, const OUString &rWord, LanguageType nLanguage) - : SfxDialogController(pParent, "cui/ui/thesaurus.ui", "ThesaurusDialog") + : SfxDialogController(pParent, u"cui/ui/thesaurus.ui"_ustr, u"ThesaurusDialog"_ustr) , m_aModifyIdle("cui SvxThesaurusDialog LookUp Modify") , nLookUpLanguage(LANGUAGE_NONE) , m_bWordFound(false) - , m_xLeftBtn(m_xBuilder->weld_button("left")) - , m_xWordCB(m_xBuilder->weld_combo_box("wordcb")) - , m_xAlternativesCT(m_xBuilder->weld_tree_view("alternatives")) - , m_xNotFound(m_xBuilder->weld_label("notfound")) - , m_xReplaceEdit(m_xBuilder->weld_entry("replaceed")) - , m_xLangLB(m_xBuilder->weld_combo_box("langcb")) - , m_xReplaceBtn(m_xBuilder->weld_button("ok")) + , m_xLeftBtn(m_xBuilder->weld_button(u"left"_ustr)) + , m_xWordCB(m_xBuilder->weld_combo_box(u"wordcb"_ustr)) + , m_xAlternativesCT(m_xBuilder->weld_tree_view(u"alternatives"_ustr)) + , m_xNotFound(m_xBuilder->weld_label(u"notfound"_ustr)) + , m_xReplaceEdit(m_xBuilder->weld_entry(u"replaceed"_ustr)) + , m_xLangLB(m_xBuilder->weld_combo_box(u"langcb"_ustr)) + , m_xReplaceBtn(m_xBuilder->weld_button(u"ok"_ustr)) , m_nSelectFirstEvent(nullptr) { m_aModifyIdle.SetInvokeHandler( LINK( this, SvxThesaurusDialog, ModifyTimer_Hdl ) ); diff --git a/cui/source/dialogs/tipofthedaydlg.cxx b/cui/source/dialogs/tipofthedaydlg.cxx index 40bb606130f2..22b669ccae75 100644 --- a/cui/source/dialogs/tipofthedaydlg.cxx +++ b/cui/source/dialogs/tipofthedaydlg.cxx @@ -49,13 +49,14 @@ const Size ThumbSize(150, 150); TipOfTheDayDialog::TipOfTheDayDialog(weld::Window* pParent) - : GenericDialogController(pParent, "cui/ui/tipofthedaydialog.ui", "TipOfTheDayDialog") + : GenericDialogController(pParent, u"cui/ui/tipofthedaydialog.ui"_ustr, + u"TipOfTheDayDialog"_ustr) , m_xParent(pParent ? pParent->GetXWindow() : nullptr) - , m_pText(m_xBuilder->weld_label("lbText")) - , m_pShowTip(m_xBuilder->weld_check_button("cbShowTip")) - , m_pNext(m_xBuilder->weld_button("btnNext")) - , m_pLink(m_xBuilder->weld_link_button("btnLink")) - , m_pPreview(new weld::CustomWeld(*m_xBuilder, "imPreview", m_aPreview)) + , m_pText(m_xBuilder->weld_label(u"lbText"_ustr)) + , m_pShowTip(m_xBuilder->weld_check_button(u"cbShowTip"_ustr)) + , m_pNext(m_xBuilder->weld_button(u"btnNext"_ustr)) + , m_pLink(m_xBuilder->weld_link_button(u"btnLink"_ustr)) + , m_pPreview(new weld::CustomWeld(*m_xBuilder, u"imPreview"_ustr, m_aPreview)) { m_pShowTip->set_active(officecfg::Office::Common::Misc::ShowTipOfTheDay::get()); m_pNext->connect_clicked(LINK(this, TipOfTheDayDialog, OnNextClick)); @@ -218,7 +219,7 @@ void TipOfTheDayDialog::UpdateTip() m_pLink->connect_activate_link(LINK(this, TipOfTheDayDialog, OnLinkClick)); } // image - OUString aURL("$BRAND_BASE_DIR/$BRAND_SHARE_SUBDIR/tipoftheday/"); + OUString aURL(u"$BRAND_BASE_DIR/$BRAND_SHARE_SUBDIR/tipoftheday/"_ustr); rtl::Bootstrap::expandMacros(aURL); OUString aImageName = sImage; Graphic aGraphic; diff --git a/cui/source/dialogs/toolbarmodedlg.cxx b/cui/source/dialogs/toolbarmodedlg.cxx index 54918e7fdcd4..61754e614ed5 100644 --- a/cui/source/dialogs/toolbarmodedlg.cxx +++ b/cui/source/dialogs/toolbarmodedlg.cxx @@ -79,20 +79,21 @@ static OUString GetCurrentMode() } ToolbarmodeDialog::ToolbarmodeDialog(weld::Window* pParent) - : GenericDialogController(pParent, "cui/ui/toolbarmodedialog.ui", "ToolbarmodeDialog") - , m_pImage(m_xBuilder->weld_image("imImage")) - , m_pApply(m_xBuilder->weld_button("btnApply")) - , m_pApplyAll(m_xBuilder->weld_button("btnApplyAll")) - , m_pRadioButtons{ (m_xBuilder->weld_radio_button("rbButton1")), - (m_xBuilder->weld_radio_button("rbButton2")), - (m_xBuilder->weld_radio_button("rbButton3")), - (m_xBuilder->weld_radio_button("rbButton4")), - (m_xBuilder->weld_radio_button("rbButton5")), - (m_xBuilder->weld_radio_button("rbButton6")), - (m_xBuilder->weld_radio_button("rbButton7")), - (m_xBuilder->weld_radio_button("rbButton8")), - (m_xBuilder->weld_radio_button("rbButton9")) } - , m_pInfoLabel(m_xBuilder->weld_label("lbInfo")) + : GenericDialogController(pParent, u"cui/ui/toolbarmodedialog.ui"_ustr, + u"ToolbarmodeDialog"_ustr) + , m_pImage(m_xBuilder->weld_image(u"imImage"_ustr)) + , m_pApply(m_xBuilder->weld_button(u"btnApply"_ustr)) + , m_pApplyAll(m_xBuilder->weld_button(u"btnApplyAll"_ustr)) + , m_pRadioButtons{ (m_xBuilder->weld_radio_button(u"rbButton1"_ustr)), + (m_xBuilder->weld_radio_button(u"rbButton2"_ustr)), + (m_xBuilder->weld_radio_button(u"rbButton3"_ustr)), + (m_xBuilder->weld_radio_button(u"rbButton4"_ustr)), + (m_xBuilder->weld_radio_button(u"rbButton5"_ustr)), + (m_xBuilder->weld_radio_button(u"rbButton6"_ustr)), + (m_xBuilder->weld_radio_button(u"rbButton7"_ustr)), + (m_xBuilder->weld_radio_button(u"rbButton8"_ustr)), + (m_xBuilder->weld_radio_button(u"rbButton9"_ustr)) } + , m_pInfoLabel(m_xBuilder->weld_label(u"lbInfo"_ustr)) { static_assert(SAL_N_ELEMENTS(m_pRadioButtons) == std::size(TOOLBARMODES_ARRAY)); @@ -142,7 +143,7 @@ int ToolbarmodeDialog::GetActiveRadioButton() void ToolbarmodeDialog::UpdateImage(std::u16string_view sFileName) { // load image - OUString aURL("$BRAND_BASE_DIR/$BRAND_SHARE_SUBDIR/toolbarmode/"); + OUString aURL(u"$BRAND_BASE_DIR/$BRAND_SHARE_SUBDIR/toolbarmode/"_ustr); rtl::Bootstrap::expandMacros(aURL); aURL += sFileName; if (sFileName.empty() || !file_exists(aURL)) @@ -191,7 +192,7 @@ IMPL_LINK(ToolbarmodeDialog, OnApplyClick, weld::Button&, rButton, void) { const auto xContext = comphelper::getProcessComponentContext(); const utl::OConfigurationTreeRoot aAppNode( - xContext, "org.openoffice.Office.UI.ToolbarMode/Applications/", true); + xContext, u"org.openoffice.Office.UI.ToolbarMode/Applications/"_ustr, true); if (sCurrentApp != "Writer") aAppNode.setNodeValue("Writer/Active", css::uno::Any(sCmd)); if (sCurrentApp != "Calc") diff --git a/cui/source/dialogs/whatsnew.cxx b/cui/source/dialogs/whatsnew.cxx index 31ad380d8cf9..6092b7e4af50 100644 --- a/cui/source/dialogs/whatsnew.cxx +++ b/cui/source/dialogs/whatsnew.cxx @@ -22,14 +22,14 @@ constexpr tools::Long PROGRESS_DOTSIZE(24); constexpr tools::Long PROGRESS_DOTSPACING(4); WhatsNewDialog::WhatsNewDialog(weld::Window* pParent, const bool bWelcome) - : GenericDialogController(pParent, "cui/ui/whatsnewdialog.ui", "WhatsNewDialog") + : GenericDialogController(pParent, u"cui/ui/whatsnewdialog.ui"_ustr, u"WhatsNewDialog"_ustr) , m_bWelcome(bWelcome) , m_aPreview() , m_aProgress() - , m_pPrevBtn(m_xBuilder->weld_button("btnPrev")) - , m_pNextBtn(m_xBuilder->weld_button("btnNext")) - , m_pProgress(new weld::CustomWeld(*m_xBuilder, "imProgress", m_aProgress)) - , m_pImage(new weld::CustomWeld(*m_xBuilder, "imNews", m_aPreview)) + , m_pPrevBtn(m_xBuilder->weld_button(u"btnPrev"_ustr)) + , m_pNextBtn(m_xBuilder->weld_button(u"btnNext"_ustr)) + , m_pProgress(new weld::CustomWeld(*m_xBuilder, u"imProgress"_ustr, m_aProgress)) + , m_pImage(new weld::CustomWeld(*m_xBuilder, u"imNews"_ustr, m_aPreview)) { if (m_bWelcome) m_xDialog->set_title(CuiResId(STR_WELCOME)); @@ -55,7 +55,7 @@ void WhatsNewDialog::LoadImage() { auto[sText, sImage] = m_bWelcome ? WELCOME_STRINGARRAY[m_nCurrentNews] : WHATSNEW_STRINGARRAY[m_nCurrentNews]; - OUString aURL("$BRAND_BASE_DIR/$BRAND_SHARE_SUBDIR/whatsnew/"); + OUString aURL(u"$BRAND_BASE_DIR/$BRAND_SHARE_SUBDIR/whatsnew/"_ustr); rtl::Bootstrap::expandMacros(aURL); const bool bFileExists = comphelper::DirectoryHelper::fileExists(aURL + sImage); diff --git a/cui/source/dialogs/widgettestdlg.cxx b/cui/source/dialogs/widgettestdlg.cxx index 51ecef3105d0..0de81751d35d 100644 --- a/cui/source/dialogs/widgettestdlg.cxx +++ b/cui/source/dialogs/widgettestdlg.cxx @@ -11,12 +11,12 @@ #include <bitmaps.hlst> WidgetTestDialog::WidgetTestDialog(weld::Window* pParent) - : GenericDialogController(pParent, "cui/ui/widgettestdialog.ui", "WidgetTestDialog") + : GenericDialogController(pParent, u"cui/ui/widgettestdialog.ui"_ustr, u"WidgetTestDialog"_ustr) { - m_xOKButton = m_xBuilder->weld_button("ok_btn"); - m_xCancelButton = m_xBuilder->weld_button("cancel_btn"); - m_xTreeView = m_xBuilder->weld_tree_view("contenttree"); - m_xTreeView2 = m_xBuilder->weld_tree_view("contenttree2"); + m_xOKButton = m_xBuilder->weld_button(u"ok_btn"_ustr); + m_xCancelButton = m_xBuilder->weld_button(u"cancel_btn"_ustr); + m_xTreeView = m_xBuilder->weld_tree_view(u"contenttree"_ustr); + m_xTreeView2 = m_xBuilder->weld_tree_view(u"contenttree2"_ustr); m_xOKButton->connect_clicked(LINK(this, WidgetTestDialog, OkHdl)); m_xCancelButton->connect_clicked(LINK(this, WidgetTestDialog, CancelHdl)); @@ -47,7 +47,7 @@ void WidgetTestDialog::FillTreeView() m_xTreeView2->append(); m_xTreeView2->set_image(nCount, (nCount % 2 == 0) ? aImage1 : aImage2); - m_xTreeView2->set_text(nCount, "First Column", 0); + m_xTreeView2->set_text(nCount, u"First Column"_ustr, 0); m_xTreeView2->set_text( nCount, OUString::Concat("Row ") + OUString::Concat(OUString::number(nCount)), 1); m_xTreeView2->set_id(nCount, OUString::number(nCount)); diff --git a/cui/source/dialogs/zoom.cxx b/cui/source/dialogs/zoom.cxx index 7bef6a5b9860..0fe135d3c49c 100644 --- a/cui/source/dialogs/zoom.cxx +++ b/cui/source/dialogs/zoom.cxx @@ -121,22 +121,22 @@ void SvxZoomDialog::SetLimits(sal_uInt16 nMin, sal_uInt16 nMax) const SfxItemSet* SvxZoomDialog::GetOutputItemSet() const { return m_pOutSet.get(); } SvxZoomDialog::SvxZoomDialog(weld::Window* pParent, const SfxItemSet& rCoreSet) - : SfxDialogController(pParent, "cui/ui/zoomdialog.ui", "ZoomDialog") + : SfxDialogController(pParent, u"cui/ui/zoomdialog.ui"_ustr, u"ZoomDialog"_ustr) , m_rSet(rCoreSet) , m_bModified(false) - , m_xOptimalBtn(m_xBuilder->weld_radio_button("optimal")) - , m_xWholePageBtn(m_xBuilder->weld_radio_button("fitwandh")) - , m_xPageWidthBtn(m_xBuilder->weld_radio_button("fitw")) - , m_x100Btn(m_xBuilder->weld_radio_button("100pc")) - , m_xUserBtn(m_xBuilder->weld_radio_button("variable")) - , m_xUserEdit(m_xBuilder->weld_metric_spin_button("zoomsb", FieldUnit::PERCENT)) - , m_xViewFrame(m_xBuilder->weld_widget("viewframe")) - , m_xAutomaticBtn(m_xBuilder->weld_radio_button("automatic")) - , m_xSingleBtn(m_xBuilder->weld_radio_button("singlepage")) - , m_xColumnsBtn(m_xBuilder->weld_radio_button("columns")) - , m_xColumnsEdit(m_xBuilder->weld_spin_button("columnssb")) - , m_xBookModeChk(m_xBuilder->weld_check_button("bookmode")) - , m_xOKBtn(m_xBuilder->weld_button("ok")) + , m_xOptimalBtn(m_xBuilder->weld_radio_button(u"optimal"_ustr)) + , m_xWholePageBtn(m_xBuilder->weld_radio_button(u"fitwandh"_ustr)) + , m_xPageWidthBtn(m_xBuilder->weld_radio_button(u"fitw"_ustr)) + , m_x100Btn(m_xBuilder->weld_radio_button(u"100pc"_ustr)) + , m_xUserBtn(m_xBuilder->weld_radio_button(u"variable"_ustr)) + , m_xUserEdit(m_xBuilder->weld_metric_spin_button(u"zoomsb"_ustr, FieldUnit::PERCENT)) + , m_xViewFrame(m_xBuilder->weld_widget(u"viewframe"_ustr)) + , m_xAutomaticBtn(m_xBuilder->weld_radio_button(u"automatic"_ustr)) + , m_xSingleBtn(m_xBuilder->weld_radio_button(u"singlepage"_ustr)) + , m_xColumnsBtn(m_xBuilder->weld_radio_button(u"columns"_ustr)) + , m_xColumnsEdit(m_xBuilder->weld_spin_button(u"columnssb"_ustr)) + , m_xBookModeChk(m_xBuilder->weld_check_button(u"bookmode"_ustr)) + , m_xOKBtn(m_xBuilder->weld_button(u"ok"_ustr)) { Link<weld::Toggleable&, void> aLink = LINK(this, SvxZoomDialog, UserHdl); m_x100Btn->connect_toggled(aLink); |