sw/source/ui/dbui/addresslistdialog.cxx | 56 ++++-----
sw/source/ui/dbui/createaddresslistdialog.cxx | 48 ++++----
sw/source/ui/dbui/customizeaddresslistdialog.cxx | 20 +--
sw/source/ui/dbui/customizeaddresslistdialog.hxx | 8 -
sw/source/ui/dbui/dbinsdlg.cxx | 76 ++++++------
sw/source/ui/dbui/dbtablepreviewdialog.cxx | 8 -
sw/source/ui/dbui/mailmergewizard.cxx | 10 -
sw/source/ui/dbui/mmaddressblockpage.cxx | 136 +++++++++++------------
sw/source/ui/dbui/mmdocselectpage.cxx | 22 +--
sw/source/ui/dbui/mmgreetingspage.cxx | 22 +--
sw/source/ui/dbui/mmgreetingspage.hxx | 30 ++---
sw/source/ui/dbui/mmlayoutpage.cxx | 30 ++---
sw/source/ui/dbui/mmoutputtypepage.cxx | 32 ++---
sw/source/ui/dbui/mmresultdialogs.cxx | 106 ++++++++---------
sw/source/ui/dbui/selectdbtabledialog.cxx | 19 +--
15 files changed, 312 insertions(+), 311 deletions(-)
New commits:
commit ebb1444a17d56acc93ffbb06b435065399991dd6
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Wed May 22 09:36:10 2024 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Wed May 22 16:07:27 2024 +0200
loplugin:ostr in sw/../dbui
Change-Id: I0ccf6f61781d9104c82ec0acf7f10b5be47d6dc9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167920
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/sw/source/ui/dbui/addresslistdialog.cxx
b/sw/source/ui/dbui/addresslistdialog.cxx
index 30df8ce37ce2..d4e6f40be4bc 100644
--- a/sw/source/ui/dbui/addresslistdialog.cxx
+++ b/sw/source/ui/dbui/addresslistdialog.cxx
@@ -87,13 +87,13 @@ static OUString lcl_getFlatURL(
uno::Reference<beans::XPropertySet> const & xSou
if(xSourceProperties.is())
{
OUString sDBURL;
- xSourceProperties->getPropertyValue("URL") >>= sDBURL;
+ xSourceProperties->getPropertyValue(u"URL"_ustr) >>= sDBURL;
if (sDBURL.startsWith("sdbc:flat:"))
{
uno::Sequence<OUString> aFilters;
- xSourceProperties->getPropertyValue("TableFilter") >>= aFilters;
+ xSourceProperties->getPropertyValue(u"TableFilter"_ustr) >>=
aFilters;
uno::Sequence<PropertyValue> aInfo;
- xSourceProperties->getPropertyValue("Info") >>= aInfo;
+ xSourceProperties->getPropertyValue(u"Info"_ustr) >>= aInfo;
if(aFilters.getLength() == 1 && aInfo.hasElements() )
{
OUString sExtension;
@@ -118,19 +118,19 @@ static OUString lcl_getFlatURL(
uno::Reference<beans::XPropertySet> const & xSou
}
SwAddressListDialog::SwAddressListDialog(SwMailMergeAddressBlockPage* pParent)
- : SfxDialogController(pParent->GetWizard()->getDialog(),
"modules/swriter/ui/selectaddressdialog.ui", "SelectAddressDialog")
+ : SfxDialogController(pParent->GetWizard()->getDialog(),
u"modules/swriter/ui/selectaddressdialog.ui"_ustr, u"SelectAddressDialog"_ustr)
, m_bInSelectHdl(false)
, m_pAddressPage(pParent)
- , m_xDescriptionFI(m_xBuilder->weld_label("desc"))
- , m_xConnecting(m_xBuilder->weld_label("connecting"))
- , m_xListLB(m_xBuilder->weld_tree_view("sources"))
- , m_xLoadListPB(m_xBuilder->weld_button("add"))
- , m_xRemovePB(m_xBuilder->weld_button("remove"))
- , m_xCreateListPB(m_xBuilder->weld_button("create"))
- , m_xFilterPB(m_xBuilder->weld_button("filter"))
- , m_xEditPB(m_xBuilder->weld_button("edit"))
- , m_xTablePB(m_xBuilder->weld_button("changetable"))
- , m_xOK(m_xBuilder->weld_button("ok"))
+ , m_xDescriptionFI(m_xBuilder->weld_label(u"desc"_ustr))
+ , m_xConnecting(m_xBuilder->weld_label(u"connecting"_ustr))
+ , m_xListLB(m_xBuilder->weld_tree_view(u"sources"_ustr))
+ , m_xLoadListPB(m_xBuilder->weld_button(u"add"_ustr))
+ , m_xRemovePB(m_xBuilder->weld_button(u"remove"_ustr))
+ , m_xCreateListPB(m_xBuilder->weld_button(u"create"_ustr))
+ , m_xFilterPB(m_xBuilder->weld_button(u"filter"_ustr))
+ , m_xEditPB(m_xBuilder->weld_button(u"edit"_ustr))
+ , m_xTablePB(m_xBuilder->weld_button(u"changetable"_ustr))
+ , m_xOK(m_xBuilder->weld_button(u"ok"_ustr))
, m_xIter(m_xListLB->make_iterator())
{
m_sConnecting = m_xConnecting->get_label();
@@ -245,20 +245,20 @@ IMPL_LINK_NOARG(SwAddressListDialog, FilterHdl_Impl,
weld::Button&, void)
{
uno::Reference<lang::XMultiServiceFactory>
xConnectFactory(pUserData->xConnection, UNO_QUERY_THROW);
uno::Reference<XSingleSelectQueryComposer> xComposer(
-
xConnectFactory->createInstance("com.sun.star.sdb.SingleSelectQueryComposer"),
UNO_QUERY_THROW);
+
xConnectFactory->createInstance(u"com.sun.star.sdb.SingleSelectQueryComposer"_ustr),
UNO_QUERY_THROW);
uno::Reference<XRowSet> xRowSet(
- xMgr->createInstance("com.sun.star.sdb.RowSet"), UNO_QUERY);
+ xMgr->createInstance(u"com.sun.star.sdb.RowSet"_ustr),
UNO_QUERY);
uno::Reference<XPropertySet> xRowProperties(xRowSet, UNO_QUERY);
- xRowProperties->setPropertyValue("DataSourceName",
+ xRowProperties->setPropertyValue(u"DataSourceName"_ustr,
Any(m_xListLB->get_text(nSelect, 0)));
- xRowProperties->setPropertyValue("Command", Any(sCommand));
- xRowProperties->setPropertyValue("CommandType",
Any(pUserData->nCommandType));
- xRowProperties->setPropertyValue("ActiveConnection",
Any(pUserData->xConnection.getTyped()));
+ xRowProperties->setPropertyValue(u"Command"_ustr, Any(sCommand));
+ xRowProperties->setPropertyValue(u"CommandType"_ustr,
Any(pUserData->nCommandType));
+ xRowProperties->setPropertyValue(u"ActiveConnection"_ustr,
Any(pUserData->xConnection.getTyped()));
xRowSet->execute();
OUString sQuery;
- xRowProperties->getPropertyValue("ActiveCommand")>>= sQuery;
+ xRowProperties->getPropertyValue(u"ActiveCommand"_ustr)>>= sQuery;
xComposer->setQuery(sQuery);
if(!pUserData->sFilter.isEmpty())
xComposer->setFilter(pUserData->sFilter);
@@ -351,19 +351,19 @@ IMPL_LINK_NOARG(SwAddressListDialog, CreateHdl_Impl,
weld::Button&, void)
aTempURL.removeSegment();
aTempURL.removeFinalSlash();
const OUString sDBURL("sdbc:flat:" +
aTempURL.GetMainURL(INetURLObject::DecodeMechanism::NONE));
- xDataProperties->setPropertyValue("URL", Any(sDBURL));
+ xDataProperties->setPropertyValue(u"URL"_ustr, Any(sDBURL));
//set the filter to the file name without extension
uno::Sequence<OUString> aFilters { sNewName };
- xDataProperties->setPropertyValue("TableFilter", Any(aFilters));
+ xDataProperties->setPropertyValue(u"TableFilter"_ustr, Any(aFilters));
uno::Sequence<PropertyValue> aInfo
{
- comphelper::makePropertyValue("FieldDelimiter", OUString(' ')),
- comphelper::makePropertyValue("StringDelimiter", OUString('"')),
- comphelper::makePropertyValue("Extension", aURL.getExtension()),
//"csv
- comphelper::makePropertyValue("CharSet", OUString("UTF-8"))
+ comphelper::makePropertyValue(u"FieldDelimiter"_ustr, OUString('
')),
+ comphelper::makePropertyValue(u"StringDelimiter"_ustr,
OUString('"')),
+ comphelper::makePropertyValue(u"Extension"_ustr,
aURL.getExtension()), //"csv
+ comphelper::makePropertyValue(u"CharSet"_ustr, u"UTF-8"_ustr)
};
- xDataProperties->setPropertyValue("Info", Any(aInfo));
+ xDataProperties->setPropertyValue(u"Info"_ustr, Any(aInfo));
uno::Reference<sdb::XDocumentDataSource> xDS(xNewInstance,
UNO_QUERY_THROW);
uno::Reference<frame::XStorable> xStore(xDS->getDatabaseDocument(),
UNO_QUERY_THROW);
diff --git a/sw/source/ui/dbui/createaddresslistdialog.cxx
b/sw/source/ui/dbui/createaddresslistdialog.cxx
index 1930d8c68e94..26c538c9a667 100644
--- a/sw/source/ui/dbui/createaddresslistdialog.cxx
+++ b/sw/source/ui/dbui/createaddresslistdialog.cxx
@@ -51,9 +51,9 @@ struct SwAddressFragment
weld::Container* m_pGrid;
SwAddressFragment(weld::Container* pGrid, int nLine)
- : m_xBuilder(Application::CreateBuilder(pGrid,
"modules/swriter/ui/addressfragment.ui"))
- , m_xLabel(m_xBuilder->weld_label("label"))
- , m_xEntry(m_xBuilder->weld_entry("entry"))
+ : m_xBuilder(Application::CreateBuilder(pGrid,
u"modules/swriter/ui/addressfragment.ui"_ustr))
+ , m_xLabel(m_xBuilder->weld_label(u"label"_ustr))
+ , m_xEntry(m_xBuilder->weld_entry(u"entry"_ustr))
, m_pGrid(pGrid)
{
m_xLabel->set_grid_left_attach(0);
@@ -105,8 +105,8 @@ SwAddressControl_Impl::SwAddressControl_Impl(weld::Builder&
rBuilder)
: m_pData(nullptr)
, m_nCurrentDataSet(0)
, m_bNoDataSet(true)
- , m_xScrollBar(rBuilder.weld_scrolled_window("scrollwin"))
- , m_xWindow(rBuilder.weld_container("CONTAINER"))
+ , m_xScrollBar(rBuilder.weld_scrolled_window(u"scrollwin"_ustr))
+ , m_xWindow(rBuilder.weld_container(u"CONTAINER"_ustr))
{
}
@@ -213,22 +213,22 @@ void SwAddressControl_Impl::SetCursorTo(std::size_t
nElement)
SwCreateAddressListDialog::SwCreateAddressListDialog(
weld::Window* pParent, OUString aURL, SwMailMergeConfigItem const &
rConfig)
- : SfxDialogController(pParent, "modules/swriter/ui/createaddresslist.ui",
"CreateAddressList")
+ : SfxDialogController(pParent,
u"modules/swriter/ui/createaddresslist.ui"_ustr, u"CreateAddressList"_ustr)
, m_sAddressListFilterName(SwResId(ST_FILTERNAME))
, m_sURL(std::move(aURL))
, m_pCSVData(new SwCSVData)
, m_xAddressControl(new SwAddressControl_Impl(*m_xBuilder))
- , m_xNewPB(m_xBuilder->weld_button("NEW"))
- , m_xDeletePB(m_xBuilder->weld_button("DELETE"))
- , m_xFindPB(m_xBuilder->weld_button("FIND"))
- , m_xCustomizePB(m_xBuilder->weld_button("CUSTOMIZE"))
- , m_xStartPB(m_xBuilder->weld_button("START"))
- , m_xPrevPB(m_xBuilder->weld_button("PREV"))
- , m_xSetNoED(m_xBuilder->weld_entry("SETNOED"))
- , m_xSetNoNF(m_xBuilder->weld_spin_button("SETNOSB"))
- , m_xNextPB(m_xBuilder->weld_button("NEXT"))
- , m_xEndPB(m_xBuilder->weld_button("END"))
- , m_xOK(m_xBuilder->weld_button("ok"))
+ , m_xNewPB(m_xBuilder->weld_button(u"NEW"_ustr))
+ , m_xDeletePB(m_xBuilder->weld_button(u"DELETE"_ustr))
+ , m_xFindPB(m_xBuilder->weld_button(u"FIND"_ustr))
+ , m_xCustomizePB(m_xBuilder->weld_button(u"CUSTOMIZE"_ustr))
+ , m_xStartPB(m_xBuilder->weld_button(u"START"_ustr))
+ , m_xPrevPB(m_xBuilder->weld_button(u"PREV"_ustr))
+ , m_xSetNoED(m_xBuilder->weld_entry(u"SETNOED"_ustr))
+ , m_xSetNoNF(m_xBuilder->weld_spin_button(u"SETNOSB"_ustr))
+ , m_xNextPB(m_xBuilder->weld_button(u"NEXT"_ustr))
+ , m_xEndPB(m_xBuilder->weld_button(u"END"_ustr))
+ , m_xOK(m_xBuilder->weld_button(u"ok"_ustr))
{
m_xSetNoNF->set_min(1);
@@ -423,7 +423,7 @@ IMPL_LINK_NOARG(SwCreateAddressListDialog, OkHdl_Impl,
weld::Button&, void)
FileDialogFlags::NONE,
m_xDialog.get());
aDlgHelper.SetContext(sfx2::FileDialogHelper::WriterCreateAddressList);
uno::Reference < XFilePicker3 > xFP = aDlgHelper.GetFilePicker();
- xFP->appendFilter( m_sAddressListFilterName, "*.csv" );
+ xFP->appendFilter( m_sAddressListFilterName, u"*.csv"_ustr );
xFP->setCurrentFilter( m_sAddressListFilterName ) ;
if( ERRCODE_NONE == aDlgHelper.Execute() )
@@ -552,13 +552,13 @@ void SwCreateAddressListDialog::Find(const OUString&
rSearch, sal_Int32 nColumn)
}
SwFindEntryDialog::SwFindEntryDialog(SwCreateAddressListDialog* pParent)
- : GenericDialogController(pParent->getDialog(),
"modules/swriter/ui/findentrydialog.ui", "FindEntryDialog")
+ : GenericDialogController(pParent->getDialog(),
u"modules/swriter/ui/findentrydialog.ui"_ustr, u"FindEntryDialog"_ustr)
, m_pParent(pParent)
- , m_xFindED(m_xBuilder->weld_entry("entry"))
- , m_xFindOnlyCB(m_xBuilder->weld_check_button("findin"))
- , m_xFindOnlyLB(m_xBuilder->weld_combo_box("area"))
- , m_xFindPB(m_xBuilder->weld_button("find"))
- , m_xCancel(m_xBuilder->weld_button("cancel"))
+ , m_xFindED(m_xBuilder->weld_entry(u"entry"_ustr))
+ , m_xFindOnlyCB(m_xBuilder->weld_check_button(u"findin"_ustr))
+ , m_xFindOnlyLB(m_xBuilder->weld_combo_box(u"area"_ustr))
+ , m_xFindPB(m_xBuilder->weld_button(u"find"_ustr))
+ , m_xCancel(m_xBuilder->weld_button(u"cancel"_ustr))
{
m_xFindPB->connect_clicked(LINK(this, SwFindEntryDialog, FindHdl_Impl));
m_xFindED->connect_changed(LINK(this, SwFindEntryDialog,
FindEnableHdl_Impl));
diff --git a/sw/source/ui/dbui/customizeaddresslistdialog.cxx
b/sw/source/ui/dbui/customizeaddresslistdialog.cxx
index e80e75678c79..0d19744c9174 100644
--- a/sw/source/ui/dbui/customizeaddresslistdialog.cxx
+++ b/sw/source/ui/dbui/customizeaddresslistdialog.cxx
@@ -22,15 +22,15 @@
SwCustomizeAddressListDialog::SwCustomizeAddressListDialog(
weld::Window* pParent, const SwCSVData& rOldData)
- : SfxDialogController(pParent,
"modules/swriter/ui/customizeaddrlistdialog.ui",
- "CustomizeAddrListDialog")
+ : SfxDialogController(pParent,
u"modules/swriter/ui/customizeaddrlistdialog.ui"_ustr,
+ u"CustomizeAddrListDialog"_ustr)
, m_xNewData(new SwCSVData(rOldData))
- , m_xFieldsLB(m_xBuilder->weld_tree_view("treeview"))
- , m_xAddPB(m_xBuilder->weld_button("add"))
- , m_xDeletePB(m_xBuilder->weld_button("delete"))
- , m_xRenamePB(m_xBuilder->weld_button("rename"))
- , m_xUpPB(m_xBuilder->weld_button("up"))
- , m_xDownPB(m_xBuilder->weld_button("down"))
+ , m_xFieldsLB(m_xBuilder->weld_tree_view(u"treeview"_ustr))
+ , m_xAddPB(m_xBuilder->weld_button(u"add"_ustr))
+ , m_xDeletePB(m_xBuilder->weld_button(u"delete"_ustr))
+ , m_xRenamePB(m_xBuilder->weld_button(u"rename"_ustr))
+ , m_xUpPB(m_xBuilder->weld_button(u"up"_ustr))
+ , m_xDownPB(m_xBuilder->weld_button(u"down"_ustr))
{
m_xFieldsLB->set_size_request(-1, m_xFieldsLB->get_height_rows(14));
@@ -158,8 +158,8 @@ SwAddRenameEntryDialog::SwAddRenameEntryDialog(
const std::vector< OUString >& rCSVHeader)
: SfxDialogController(pParent, rUIXMLDescription, rID)
, m_rCSVHeader(rCSVHeader)
- , m_xFieldNameED(m_xBuilder->weld_entry("entry"))
- , m_xOK(m_xBuilder->weld_button("ok"))
+ , m_xFieldNameED(m_xBuilder->weld_entry(u"entry"_ustr))
+ , m_xOK(m_xBuilder->weld_button(u"ok"_ustr))
{
m_xFieldNameED->connect_changed(LINK(this, SwAddRenameEntryDialog,
ModifyHdl_Impl));
ModifyHdl_Impl(*m_xFieldNameED);
diff --git a/sw/source/ui/dbui/customizeaddresslistdialog.hxx
b/sw/source/ui/dbui/customizeaddresslistdialog.hxx
index a683ccb8290f..a93c212915b1 100644
--- a/sw/source/ui/dbui/customizeaddresslistdialog.hxx
+++ b/sw/source/ui/dbui/customizeaddresslistdialog.hxx
@@ -70,8 +70,8 @@ class SwAddEntryDialog : public SwAddRenameEntryDialog
{
public:
SwAddEntryDialog(weld::Window* pParent, const std::vector< OUString >&
rCSVHeader)
- : SwAddRenameEntryDialog(pParent,
"modules/swriter/ui/addentrydialog.ui",
- "AddEntryDialog", rCSVHeader)
+ : SwAddRenameEntryDialog(pParent,
u"modules/swriter/ui/addentrydialog.ui"_ustr,
+ u"AddEntryDialog"_ustr, rCSVHeader)
{
}
};
@@ -80,8 +80,8 @@ class SwRenameEntryDialog : public SwAddRenameEntryDialog
{
public:
SwRenameEntryDialog(weld::Window* pParent, const std::vector< OUString >&
rCSVHeader)
- : SwAddRenameEntryDialog(pParent,
"modules/swriter/ui/renameentrydialog.ui",
- "RenameEntryDialog", rCSVHeader)
+ : SwAddRenameEntryDialog(pParent,
u"modules/swriter/ui/renameentrydialog.ui"_ustr,
+ u"RenameEntryDialog"_ustr, rCSVHeader)
{
}
};
diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx
index 647397ff0d24..ac5be46fe4cb 100644
--- a/sw/source/ui/dbui/dbinsdlg.cxx
+++ b/sw/source/ui/dbui/dbinsdlg.cxx
@@ -174,36 +174,36 @@ SwInsertDBColAutoPilot::SwInsertDBColAutoPilot( SwView&
rView,
Reference<XDataSource> const & xDataSource,
Reference<sdbcx::XColumnsSupplier> const & xColSupp,
SwDBData aData )
- : SfxDialogController(rView.GetWindow()->GetFrameWeld(),
"modules/swriter/ui/insertdbcolumnsdialog.ui", "InsertDbColumnsDialog")
- , ConfigItem("Office.Writer/InsertData/DataSet", ConfigItemMode::NONE)
+ : SfxDialogController(rView.GetWindow()->GetFrameWeld(),
u"modules/swriter/ui/insertdbcolumnsdialog.ui"_ustr,
u"InsertDbColumnsDialog"_ustr)
+ , ConfigItem(u"Office.Writer/InsertData/DataSet"_ustr,
ConfigItemMode::NONE)
, m_aDBData(std::move(aData))
, m_sNoTmpl(SwResId(SW_STR_NONE))
, m_pView(&rView)
- , m_xRbAsTable(m_xBuilder->weld_radio_button("astable"))
- , m_xRbAsField(m_xBuilder->weld_radio_button("asfields"))
- , m_xRbAsText(m_xBuilder->weld_radio_button("astext"))
- , m_xHeadFrame(m_xBuilder->weld_frame("dbframe"))
- , m_xLbTableDbColumn(m_xBuilder->weld_tree_view("tabledbcols"))
- , m_xLbTextDbColumn(m_xBuilder->weld_tree_view("tabletxtcols"))
- , m_xFormatFrame(m_xBuilder->weld_frame("formatframe"))
- , m_xRbDbFormatFromDb(m_xBuilder->weld_radio_button("fromdatabase"))
- , m_xRbDbFormatFromUsr(m_xBuilder->weld_radio_button("userdefined"))
- , m_xLbDbFormatFromUsr(new
NumFormatListBox(m_xBuilder->weld_combo_box("numformat")))
- , m_xIbDbcolToEdit(m_xBuilder->weld_button("toedit"))
- , m_xEdDbText(m_xBuilder->weld_text_view("textview"))
- , m_xFtDbParaColl(m_xBuilder->weld_label("parastylelabel"))
- , m_xLbDbParaColl(m_xBuilder->weld_combo_box("parastyle"))
- , m_xIbDbcolAllTo(m_xBuilder->weld_button("oneright"))
- , m_xIbDbcolOneTo(m_xBuilder->weld_button("allright"))
- , m_xIbDbcolOneFrom(m_xBuilder->weld_button("oneleft"))
- , m_xIbDbcolAllFrom(m_xBuilder->weld_button("allleft"))
- , m_xFtTableCol(m_xBuilder->weld_label("tablecolft"))
- , m_xLbTableCol(m_xBuilder->weld_tree_view("tablecols"))
- , m_xCbTableHeadon(m_xBuilder->weld_check_button("tableheading"))
- , m_xRbHeadlColnms(m_xBuilder->weld_radio_button("columnname"))
- , m_xRbHeadlEmpty(m_xBuilder->weld_radio_button("rowonly"))
- , m_xPbTableFormat(m_xBuilder->weld_button("tableformat"))
- , m_xPbTableAutofmt(m_xBuilder->weld_button("autoformat"))
+ , m_xRbAsTable(m_xBuilder->weld_radio_button(u"astable"_ustr))
+ , m_xRbAsField(m_xBuilder->weld_radio_button(u"asfields"_ustr))
+ , m_xRbAsText(m_xBuilder->weld_radio_button(u"astext"_ustr))
+ , m_xHeadFrame(m_xBuilder->weld_frame(u"dbframe"_ustr))
+ , m_xLbTableDbColumn(m_xBuilder->weld_tree_view(u"tabledbcols"_ustr))
+ , m_xLbTextDbColumn(m_xBuilder->weld_tree_view(u"tabletxtcols"_ustr))
+ , m_xFormatFrame(m_xBuilder->weld_frame(u"formatframe"_ustr))
+ , m_xRbDbFormatFromDb(m_xBuilder->weld_radio_button(u"fromdatabase"_ustr))
+ , m_xRbDbFormatFromUsr(m_xBuilder->weld_radio_button(u"userdefined"_ustr))
+ , m_xLbDbFormatFromUsr(new
NumFormatListBox(m_xBuilder->weld_combo_box(u"numformat"_ustr)))
+ , m_xIbDbcolToEdit(m_xBuilder->weld_button(u"toedit"_ustr))
+ , m_xEdDbText(m_xBuilder->weld_text_view(u"textview"_ustr))
+ , m_xFtDbParaColl(m_xBuilder->weld_label(u"parastylelabel"_ustr))
+ , m_xLbDbParaColl(m_xBuilder->weld_combo_box(u"parastyle"_ustr))
+ , m_xIbDbcolAllTo(m_xBuilder->weld_button(u"oneright"_ustr))
+ , m_xIbDbcolOneTo(m_xBuilder->weld_button(u"allright"_ustr))
+ , m_xIbDbcolOneFrom(m_xBuilder->weld_button(u"oneleft"_ustr))
+ , m_xIbDbcolAllFrom(m_xBuilder->weld_button(u"allleft"_ustr))
+ , m_xFtTableCol(m_xBuilder->weld_label(u"tablecolft"_ustr))
+ , m_xLbTableCol(m_xBuilder->weld_tree_view(u"tablecols"_ustr))
+ , m_xCbTableHeadon(m_xBuilder->weld_check_button(u"tableheading"_ustr))
+ , m_xRbHeadlColnms(m_xBuilder->weld_radio_button(u"columnname"_ustr))
+ , m_xRbHeadlEmpty(m_xBuilder->weld_radio_button(u"rowonly"_ustr))
+ , m_xPbTableFormat(m_xBuilder->weld_button(u"tableformat"_ustr))
+ , m_xPbTableAutofmt(m_xBuilder->weld_button(u"autoformat"_ustr))
{
m_xEdDbText->set_size_request(m_xEdDbText->get_approximate_digit_width() *
40, -1);
m_xLbDbParaColl->make_sorted();
@@ -222,7 +222,7 @@ SwInsertDBColAutoPilot::SwInsertDBColAutoPilot( SwView&
rView,
Reference< util::XNumberFormats > xNumberFormats;
if(xSourceProps.is())
{
- Any aFormats =
xSourceProps->getPropertyValue("NumberFormatsSupplier");
+ Any aFormats =
xSourceProps->getPropertyValue(u"NumberFormatsSupplier"_ustr);
if(aFormats.hasValue())
{
Reference< util::XNumberFormatsSupplier> xSuppl;
@@ -241,7 +241,7 @@ SwInsertDBColAutoPilot::SwInsertDBColAutoPilot( SwView&
rView,
Any aCol = xCols->getByName(rColName);
Reference <XPropertySet> xCol;
aCol >>= xCol;
- Any aType = xCol->getPropertyValue("Type");
+ Any aType = xCol->getPropertyValue(u"Type"_ustr);
sal_Int32 eDataType = 0;
aType >>= eDataType;
switch(eDataType)
@@ -262,7 +262,7 @@ SwInsertDBColAutoPilot::SwInsertDBColAutoPilot( SwView&
rView,
case DataType::TIMESTAMP:
{
pNew->bHasFormat = true;
- Any aFormat = xCol->getPropertyValue("FormatKey");
+ Any aFormat = xCol->getPropertyValue(u"FormatKey"_ustr);
if(aFormat.hasValue())
{
sal_Int32 nFormat = 0;
@@ -272,8 +272,8 @@ SwInsertDBColAutoPilot::SwInsertDBColAutoPilot( SwView&
rView,
try
{
Reference<XPropertySet> xNumProps =
xNumberFormats->getByKey( nFormat );
- Any aFormatVal =
xNumProps->getPropertyValue("FormatString");
- Any aLocale =
xNumProps->getPropertyValue("Locale");
+ Any aFormatVal =
xNumProps->getPropertyValue(u"FormatString"_ustr);
+ Any aLocale =
xNumProps->getPropertyValue(u"Locale"_ustr);
OUString sFormat;
aFormatVal >>= sFormat;
lang::Locale aLoc;
@@ -795,7 +795,7 @@ IMPL_LINK(SwInsertDBColAutoPilot, TVSelectHdl,
weld::TreeView&, rBox, void)
// to know later on, what ListBox was the "active", a Flag
// is remembered in the 1st entry
if (&rBox == m_xLbTableCol.get())
- m_xLbTableCol->set_id(0, "tablecols");
+ m_xLbTableCol->set_id(0, u"tablecols"_ustr);
else
m_xLbTableCol->set_id(0, OUString());
}
@@ -1067,7 +1067,7 @@ void SwInsertDBColAutoPilot::DataToDoc( const
Sequence<Any>& rSelection,
sal_Int32 eDataType = 0;
if( xColumnProps.is() )
{
- Any aType = xColumnProps->getPropertyValue("Type");
+ Any aType = xColumnProps->getPropertyValue(u"Type"_ustr);
aType >>= eDataType;
}
try
@@ -1199,7 +1199,7 @@ void SwInsertDBColAutoPilot::DataToDoc( const
Sequence<Any>& rSelection,
Reference<XPropertySet> xSourceProps(xSource, UNO_QUERY);
if(xSourceProps.is())
{
- Any aFormats =
xSourceProps->getPropertyValue("NumberFormatsSupplier");
+ Any aFormats =
xSourceProps->getPropertyValue(u"NumberFormatsSupplier"_ustr);
if(aFormats.hasValue())
{
Reference< util::XNumberFormatsSupplier> xSuppl;
@@ -1207,7 +1207,7 @@ void SwInsertDBColAutoPilot::DataToDoc( const
Sequence<Any>& rSelection,
if(xSuppl.is())
{
Reference< XPropertySet > xSettings =
xSuppl->getNumberFormatSettings();
- Any aNull = xSettings->getPropertyValue("NullDate");
+ Any aNull =
xSettings->getPropertyValue(u"NullDate"_ustr);
aNull >>= aDBFormatData.aNullDate;
if(aDBFormatData.xFormatter.is())
aDBFormatData.xFormatter->attachNumberFormatsSupplier(xSuppl);
@@ -1217,7 +1217,7 @@ void SwInsertDBColAutoPilot::DataToDoc( const
Sequence<Any>& rSelection,
aDBFormatData.aLocale = LanguageTag( rSh.GetCurLang()
).getLocale();
SwDBNextSetField aNxtDBField(
static_cast<SwDBNextSetFieldType*>(rSh.
GetFieldType( 0,
SwFieldIds::DbNextSet )),
- "1", m_aDBData );
+ u"1"_ustr, m_aDBData );
bool bSetCursor = true;
const size_t nCols = aColArr.size();
@@ -1275,7 +1275,7 @@ void SwInsertDBColAutoPilot::DataToDoc( const
Sequence<Any>& rSelection,
&nValue ) );
if( DBL_MAX != nValue )
{
- Any aType =
xColumnProps->getPropertyValue("Type");
+ Any aType =
xColumnProps->getPropertyValue(u"Type"_ustr);
sal_Int32 eDataType = 0;
aType >>= eDataType;
if( DataType::DATE == eDataType ||
DataType::TIME == eDataType ||
diff --git a/sw/source/ui/dbui/dbtablepreviewdialog.cxx
b/sw/source/ui/dbui/dbtablepreviewdialog.cxx
index ec530f9e3ce6..2dfce9d06ef7 100644
--- a/sw/source/ui/dbui/dbtablepreviewdialog.cxx
+++ b/sw/source/ui/dbui/dbtablepreviewdialog.cxx
@@ -61,9 +61,9 @@ public:
};
SwDBTablePreviewDialog::SwDBTablePreviewDialog(weld::Window* pParent,
uno::Sequence< beans::PropertyValue> const & rValues)
- : SfxDialogController(pParent, "modules/swriter/ui/tablepreviewdialog.ui",
"TablePreviewDialog")
- , m_xDescriptionFI(m_xBuilder->weld_label("description"))
- , m_xBeamerWIN(m_xBuilder->weld_container("beamer"))
+ : SfxDialogController(pParent,
u"modules/swriter/ui/tablepreviewdialog.ui"_ustr, u"TablePreviewDialog"_ustr)
+ , m_xDescriptionFI(m_xBuilder->weld_label(u"description"_ustr))
+ , m_xBeamerWIN(m_xBuilder->weld_container(u"beamer"_ustr))
{
Size aSize(m_xBeamerWIN->get_approximate_digit_width() * 80,
m_xBeamerWIN->get_text_height() * 18);
@@ -98,7 +98,7 @@ SwDBTablePreviewDialog::SwDBTablePreviewDialog(weld::Window*
pParent, uno::Seque
util::URL aURL;
aURL.Complete = ".component:DB/DataSourceBrowser";
- uno::Reference<frame::XDispatch> xD = xFrame->queryDispatch(aURL, "",
+ uno::Reference<frame::XDispatch> xD = xFrame->queryDispatch(aURL, u""_ustr,
css::frame::FrameSearchFlag::CHILDREN |
css::frame::FrameSearchFlag::CREATE);
if (xD.is())
{
diff --git a/sw/source/ui/dbui/mailmergewizard.cxx
b/sw/source/ui/dbui/mailmergewizard.cxx
index f163a19f9041..ed76c83b86c0 100644
--- a/sw/source/ui/dbui/mailmergewizard.cxx
+++ b/sw/source/ui/dbui/mailmergewizard.cxx
@@ -100,23 +100,23 @@ std::unique_ptr<BuilderPage>
SwMailMergeWizard::createPage(WizardState _nState)
so that when by default the focus is on the left side pane of
the wizard the relevant help page is displayed when hitting
the Help / F1 button */
- SetRoadmapHelpId("modules/swriter/ui/mmselectpage/MMSelectPage");
+
SetRoadmapHelpId(u"modules/swriter/ui/mmselectpage/MMSelectPage"_ustr);
break;
case MM_OUTPUTTYPETPAGE :
xRet = std::make_unique<SwMailMergeOutputTypePage>(pPageContainer,
this);
-
SetRoadmapHelpId("modules/swriter/ui/mmoutputtypepage/MMOutputTypePage");
+
SetRoadmapHelpId(u"modules/swriter/ui/mmoutputtypepage/MMOutputTypePage"_ustr);
break;
case MM_ADDRESSBLOCKPAGE :
xRet =
std::make_unique<SwMailMergeAddressBlockPage>(pPageContainer, this);
-
SetRoadmapHelpId("modules/swriter/ui/mmaddressblockpage/MMAddressBlockPage");
+
SetRoadmapHelpId(u"modules/swriter/ui/mmaddressblockpage/MMAddressBlockPage"_ustr);
break;
case MM_GREETINGSPAGE :
xRet = std::make_unique<SwMailMergeGreetingsPage>(pPageContainer,
this);
-
SetRoadmapHelpId("modules/swriter/ui/mmsalutationpage/MMSalutationPage");
+
SetRoadmapHelpId(u"modules/swriter/ui/mmsalutationpage/MMSalutationPage"_ustr);
break;
case MM_LAYOUTPAGE :
xRet = std::make_unique<SwMailMergeLayoutPage>(pPageContainer,
this);
- SetRoadmapHelpId("modules/swriter/ui/mmlayoutpage/MMLayoutPage");
+
SetRoadmapHelpId(u"modules/swriter/ui/mmlayoutpage/MMLayoutPage"_ustr);
break;
}
diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx
b/sw/source/ui/dbui/mmaddressblockpage.cxx
index 9df414eca421..fcae51d43fc7 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.cxx
+++ b/sw/source/ui/dbui/mmaddressblockpage.cxx
@@ -53,26 +53,26 @@ using namespace ::com::sun::star::sdbc;
using namespace ::com::sun::star::sdbcx;
SwMailMergeAddressBlockPage::SwMailMergeAddressBlockPage(weld::Container*
pPage, SwMailMergeWizard* pWizard)
- : vcl::OWizardPage(pPage, pWizard,
"modules/swriter/ui/mmaddressblockpage.ui", "MMAddressBlockPage")
+ : vcl::OWizardPage(pPage, pWizard,
u"modules/swriter/ui/mmaddressblockpage.ui"_ustr, u"MMAddressBlockPage"_ustr)
, m_pWizard(pWizard)
- , m_xAddressListPB(m_xBuilder->weld_button("addresslist"))
- , m_xCurrentAddressFI(m_xBuilder->weld_label("currentaddress"))
- , m_xStep2(m_xBuilder->weld_container("step2"))
- , m_xStep3(m_xBuilder->weld_container("step3"))
- , m_xStep4(m_xBuilder->weld_container("step4"))
- , m_xSettingsFI(m_xBuilder->weld_label("settingsft"))
- , m_xAddressCB(m_xBuilder->weld_check_button("address"))
- , m_xSettingsPB(m_xBuilder->weld_button("settings"))
- , m_xHideEmptyParagraphsCB(m_xBuilder->weld_check_button("hideempty"))
- , m_xAssignPB(m_xBuilder->weld_button("assign"))
- , m_xDocumentIndexFI(m_xBuilder->weld_label("documentindex"))
- , m_xPrevSetIB(m_xBuilder->weld_button("prev"))
- , m_xNextSetIB(m_xBuilder->weld_button("next"))
- , m_xDifferentlist(m_xBuilder->weld_button("differentlist"))
- , m_xSettings(new
SwAddressPreview(m_xBuilder->weld_scrolled_window("settingspreviewwin", true)))
- , m_xPreview(new
SwAddressPreview(m_xBuilder->weld_scrolled_window("addresspreviewwin", true)))
- , m_xSettingsWIN(new weld::CustomWeld(*m_xBuilder, "settingspreview",
*m_xSettings))
- , m_xPreviewWIN(new weld::CustomWeld(*m_xBuilder, "addresspreview",
*m_xPreview))
+ , m_xAddressListPB(m_xBuilder->weld_button(u"addresslist"_ustr))
+ , m_xCurrentAddressFI(m_xBuilder->weld_label(u"currentaddress"_ustr))
+ , m_xStep2(m_xBuilder->weld_container(u"step2"_ustr))
+ , m_xStep3(m_xBuilder->weld_container(u"step3"_ustr))
+ , m_xStep4(m_xBuilder->weld_container(u"step4"_ustr))
+ , m_xSettingsFI(m_xBuilder->weld_label(u"settingsft"_ustr))
+ , m_xAddressCB(m_xBuilder->weld_check_button(u"address"_ustr))
+ , m_xSettingsPB(m_xBuilder->weld_button(u"settings"_ustr))
+ ,
m_xHideEmptyParagraphsCB(m_xBuilder->weld_check_button(u"hideempty"_ustr))
+ , m_xAssignPB(m_xBuilder->weld_button(u"assign"_ustr))
+ , m_xDocumentIndexFI(m_xBuilder->weld_label(u"documentindex"_ustr))
+ , m_xPrevSetIB(m_xBuilder->weld_button(u"prev"_ustr))
+ , m_xNextSetIB(m_xBuilder->weld_button(u"next"_ustr))
+ , m_xDifferentlist(m_xBuilder->weld_button(u"differentlist"_ustr))
+ , m_xSettings(new
SwAddressPreview(m_xBuilder->weld_scrolled_window(u"settingspreviewwin"_ustr,
true)))
+ , m_xPreview(new
SwAddressPreview(m_xBuilder->weld_scrolled_window(u"addresspreviewwin"_ustr,
true)))
+ , m_xSettingsWIN(new weld::CustomWeld(*m_xBuilder,
u"settingspreview"_ustr, *m_xSettings))
+ , m_xPreviewWIN(new weld::CustomWeld(*m_xBuilder, u"addresspreview"_ustr,
*m_xPreview))
{
m_xSettingsWIN->set_size_request(m_xDifferentlist->get_approximate_digit_width()
* 40,
m_xDifferentlist->get_text_height() * 6);
@@ -314,17 +314,17 @@ IMPL_LINK(SwMailMergeAddressBlockPage,
InsertDataHdl_Impl, weld::Button&, rButto
}
SwSelectAddressBlockDialog::SwSelectAddressBlockDialog(weld::Window* pParent,
SwMailMergeConfigItem& rConfig)
- : SfxDialogController(pParent, "modules/swriter/ui/selectblockdialog.ui",
"SelectBlockDialog")
+ : SfxDialogController(pParent,
u"modules/swriter/ui/selectblockdialog.ui"_ustr, u"SelectBlockDialog"_ustr)
, m_rConfig(rConfig)
- , m_xPreview(new
SwAddressPreview(m_xBuilder->weld_scrolled_window("previewwin", true)))
- , m_xNewPB(m_xBuilder->weld_button("new"))
- , m_xCustomizePB(m_xBuilder->weld_button("edit"))
- , m_xDeletePB(m_xBuilder->weld_button("delete"))
- , m_xNeverRB(m_xBuilder->weld_radio_button("never"))
- , m_xAlwaysRB(m_xBuilder->weld_radio_button("always"))
- , m_xDependentRB(m_xBuilder->weld_radio_button("dependent"))
- , m_xCountryED(m_xBuilder->weld_entry("country"))
- , m_xPreviewWin(new weld::CustomWeld(*m_xBuilder, "preview", *m_xPreview))
+ , m_xPreview(new
SwAddressPreview(m_xBuilder->weld_scrolled_window(u"previewwin"_ustr, true)))
+ , m_xNewPB(m_xBuilder->weld_button(u"new"_ustr))
+ , m_xCustomizePB(m_xBuilder->weld_button(u"edit"_ustr))
+ , m_xDeletePB(m_xBuilder->weld_button(u"delete"_ustr))
+ , m_xNeverRB(m_xBuilder->weld_radio_button(u"never"_ustr))
+ , m_xAlwaysRB(m_xBuilder->weld_radio_button(u"always"_ustr))
+ , m_xDependentRB(m_xBuilder->weld_radio_button(u"dependent"_ustr))
+ , m_xCountryED(m_xBuilder->weld_entry(u"country"_ustr))
+ , m_xPreviewWin(new weld::CustomWeld(*m_xBuilder, u"preview"_ustr,
*m_xPreview))
{
m_xPreviewWin->set_size_request(m_xCountryED->get_approximate_digit_width() *
45,
m_xCountryED->get_text_height() * 12);
@@ -456,28 +456,28 @@ IMPL_LINK(SwCustomizeAddressBlockDialog, TextFilterHdl,
OUString&, rTest, bool)
SwCustomizeAddressBlockDialog::SwCustomizeAddressBlockDialog(
weld::Widget* pParent, SwMailMergeConfigItem& rConfig, DialogType
eType)
- : SfxDialogController(pParent, "modules/swriter/ui/addressblockdialog.ui",
- "AddressBlockDialog")
- , m_aTextFilter("<>")
+ : SfxDialogController(pParent,
u"modules/swriter/ui/addressblockdialog.ui"_ustr,
+ u"AddressBlockDialog"_ustr)
+ , m_aTextFilter(u"<>"_ustr)
, m_rConfigItem(rConfig)
, m_eType(eType)
, m_aSelectionChangedIdle("SwCustomizeAddressBlockDialog
m_aSelectionChangedIdle")
- , m_xAddressElementsFT(m_xBuilder->weld_label("addressesft"))
- , m_xAddressElementsLB(m_xBuilder->weld_tree_view("addresses"))
- , m_xInsertFieldIB(m_xBuilder->weld_button("toaddr"))
- , m_xRemoveFieldIB(m_xBuilder->weld_button("fromaddr"))
- , m_xDragFT(m_xBuilder->weld_label("addressdestft"))
- , m_xUpIB(m_xBuilder->weld_button("up"))
- , m_xLeftIB(m_xBuilder->weld_button("left"))
- , m_xRightIB(m_xBuilder->weld_button("right"))
- , m_xDownIB(m_xBuilder->weld_button("down"))
- , m_xFieldFT(m_xBuilder->weld_label("customft"))
- , m_xFieldCB(m_xBuilder->weld_combo_box("custom"))
- , m_xOK(m_xBuilder->weld_button("ok"))
- , m_xPreview(new
SwAddressPreview(m_xBuilder->weld_scrolled_window("previewwin", true)))
- , m_xPreviewWIN(new weld::CustomWeld(*m_xBuilder, "addrpreview",
*m_xPreview))
+ , m_xAddressElementsFT(m_xBuilder->weld_label(u"addressesft"_ustr))
+ , m_xAddressElementsLB(m_xBuilder->weld_tree_view(u"addresses"_ustr))
+ , m_xInsertFieldIB(m_xBuilder->weld_button(u"toaddr"_ustr))
+ , m_xRemoveFieldIB(m_xBuilder->weld_button(u"fromaddr"_ustr))
+ , m_xDragFT(m_xBuilder->weld_label(u"addressdestft"_ustr))
+ , m_xUpIB(m_xBuilder->weld_button(u"up"_ustr))
+ , m_xLeftIB(m_xBuilder->weld_button(u"left"_ustr))
+ , m_xRightIB(m_xBuilder->weld_button(u"right"_ustr))
+ , m_xDownIB(m_xBuilder->weld_button(u"down"_ustr))
+ , m_xFieldFT(m_xBuilder->weld_label(u"customft"_ustr))
+ , m_xFieldCB(m_xBuilder->weld_combo_box(u"custom"_ustr))
+ , m_xOK(m_xBuilder->weld_button(u"ok"_ustr))
+ , m_xPreview(new
SwAddressPreview(m_xBuilder->weld_scrolled_window(u"previewwin"_ustr, true)))
+ , m_xPreviewWIN(new weld::CustomWeld(*m_xBuilder, u"addrpreview"_ustr,
*m_xPreview))
, m_xDragED(new AddressMultiLineEdit(this))
- , m_xDragWIN(new weld::CustomWeld(*m_xBuilder, "addressdest", *m_xDragED))
+ , m_xDragWIN(new weld::CustomWeld(*m_xBuilder, u"addressdest"_ustr,
*m_xDragED))
{
m_aSelectionChangedIdle.SetInvokeHandler( LINK( this,
SwCustomizeAddressBlockDialog, SelectionChangedIdleHdl ) );
@@ -498,7 +498,7 @@
SwCustomizeAddressBlockDialog::SwCustomizeAddressBlockDialog(
m_aSalutations.push_back(SwResId(aID));
for (auto const& aID : RA_PUNCTUATION)
m_aPunctuations.push_back(SwResId(aID));
- m_xDragED->SetText(" ");
+ m_xDragED->SetText(u" "_ustr);
m_xDialog->set_title(SwResId(eType == GREETING_MALE ? ST_TITLE_MALE :
ST_TITLE_FEMALE));
m_xAddressElementsFT->set_label(SwResId(ST_SALUTATIONELEMENTS));
m_xInsertFieldIB->set_tooltip_text(SwResId(ST_INSERTSALUTATIONFIELD));
@@ -509,7 +509,7 @@
SwCustomizeAddressBlockDialog::SwCustomizeAddressBlockDialog(
{
if (eType == ADDRESSBLOCK_EDIT)
m_xDialog->set_title(SwResId(ST_TITLE_EDIT));
- m_xDragED->SetText("
");
+ m_xDragED->SetText(u"
"_ustr);
/* Set custom HIDs for swriter/01/mm_newaddblo.xhp */
m_xAddressElementsLB->set_help_id( HID_MM_ADDBLOCK_ELEMENTS );
m_xInsertFieldIB->set_help_id( HID_MM_ADDBLOCK_INSERT );
@@ -777,10 +777,10 @@ struct SwAssignFragment
std::unique_ptr<weld::Label> m_xPreview;
SwAssignFragment(weld::Container* pGrid, int nLine)
- : m_xBuilder(Application::CreateBuilder(pGrid,
"modules/swriter/ui/assignfragment.ui"))
- , m_xLabel(m_xBuilder->weld_label("label"))
- , m_xComboBox(m_xBuilder->weld_combo_box("combobox"))
- , m_xPreview(m_xBuilder->weld_label("preview"))
+ : m_xBuilder(Application::CreateBuilder(pGrid,
u"modules/swriter/ui/assignfragment.ui"_ustr))
+ , m_xLabel(m_xBuilder->weld_label(u"label"_ustr))
+ , m_xComboBox(m_xBuilder->weld_combo_box(u"combobox"_ustr))
+ , m_xPreview(m_xBuilder->weld_label(u"preview"_ustr))
{
m_xLabel->set_grid_left_attach(0);
m_xLabel->set_grid_top_attach(nLine);
@@ -970,20 +970,20 @@ SwAssignFieldsDialog::SwAssignFieldsDialog(
weld::Window* pParent, SwMailMergeConfigItem& rConfigItem,
OUString aPreview,
bool bIsAddressBlock)
- : SfxDialogController(pParent, "modules/swriter/ui/assignfieldsdialog.ui",
"AssignFieldsDialog")
+ : SfxDialogController(pParent,
u"modules/swriter/ui/assignfieldsdialog.ui"_ustr, u"AssignFieldsDialog"_ustr)
, m_sNone(SwResId(SW_STR_NONE))
, m_rPreviewString(std::move(aPreview))
, m_rConfigItem(rConfigItem)
- , m_xPreview(new
SwAddressPreview(m_xBuilder->weld_scrolled_window("previewwin", true)))
- , m_xMatchingFI(m_xBuilder->weld_label("MATCHING_LABEL"))
- , m_xAddressTitle(m_xBuilder->weld_label("addresselem"))
- , m_xMatchTitle(m_xBuilder->weld_label("matchelem"))
- , m_xPreviewTitle(m_xBuilder->weld_label("previewelem"))
- , m_xPreviewFI(m_xBuilder->weld_label("PREVIEW_LABEL"))
- , m_xOK(m_xBuilder->weld_button("ok"))
- , m_xPreviewWin(new weld::CustomWeld(*m_xBuilder, "PREVIEW", *m_xPreview))
- , m_xFieldsControl(new
SwAssignFieldsControl(m_xBuilder->weld_scrolled_window("scroll"),
-
m_xBuilder->weld_container("FIELDS")))
+ , m_xPreview(new
SwAddressPreview(m_xBuilder->weld_scrolled_window(u"previewwin"_ustr, true)))
+ , m_xMatchingFI(m_xBuilder->weld_label(u"MATCHING_LABEL"_ustr))
+ , m_xAddressTitle(m_xBuilder->weld_label(u"addresselem"_ustr))
+ , m_xMatchTitle(m_xBuilder->weld_label(u"matchelem"_ustr))
+ , m_xPreviewTitle(m_xBuilder->weld_label(u"previewelem"_ustr))
+ , m_xPreviewFI(m_xBuilder->weld_label(u"PREVIEW_LABEL"_ustr))
+ , m_xOK(m_xBuilder->weld_button(u"ok"_ustr))
+ , m_xPreviewWin(new weld::CustomWeld(*m_xBuilder, u"PREVIEW"_ustr,
*m_xPreview))
+ , m_xFieldsControl(new
SwAssignFieldsControl(m_xBuilder->weld_scrolled_window(u"scroll"_ustr),
+
m_xBuilder->weld_container(u"FIELDS"_ustr)))
{
m_xPreviewWin->set_size_request(m_xMatchingFI->get_approximate_digit_width() *
45,
m_xMatchingFI->get_text_height() * 5);
@@ -1139,7 +1139,7 @@ void AddressMultiLineEdit::SetText( const OUString& rStr )
if (!sPara.isEmpty() && !sPara.endsWith(" "))
{
ESelection aPaM(nPara, sPara.getLength(), nPara,
sPara.getLength());
- m_xEditEngine->QuickInsertText(" ", aPaM);
+ m_xEditEngine->QuickInsertText(u" "_ustr, aPaM);
}
for(;;)
{
@@ -1153,7 +1153,7 @@ void AddressMultiLineEdit::SetText( const OUString& rStr )
SfxItemSet aSet(m_xEditEngine->GetEmptyItemSet());
// make each one different, so they are not collapsed together
// as one attribute
- aProtectAttr.GetGrabBag()["Index"] <<= nSequence++;
+ aProtectAttr.GetGrabBag()[u"Index"_ustr] <<= nSequence++;
aSet.Put(aProtectAttr);
m_xEditEngine->QuickSetAttribs(aSet, ESelection(nPara, nStart,
nPara, nEnd + 1));
}
@@ -1168,7 +1168,7 @@ void AddressMultiLineEdit::SetText( const OUString& rStr )
{
int nPara = nParaCount ? nParaCount - 1 : 0;
ESelection aPaM(nPara, nLastLen, nPara, nLastLen);
- m_xEditEngine->QuickInsertText("
", aPaM);
+ m_xEditEngine->QuickInsertText(u"
"_ustr, aPaM);
}
}
@@ -1300,7 +1300,7 @@ void AddressMultiLineEdit::MoveCurrentItem(MoveItemFlags
nMove)
auto nInsPara = nPara - 1;
auto nInsPos = m_xEditEngine->GetTextLen( nPara - 1 );
ESelection aTemp(nInsPara, nInsPos, nInsPara, nInsPos);
- m_xEditEngine->QuickInsertText("
", aTemp);
+ m_xEditEngine->QuickInsertText(u"
"_ustr, aTemp);
}
InsertNewEntryAtPosition( sCurrentItem, nPara, nIndex );
diff --git a/sw/source/ui/dbui/mmdocselectpage.cxx
b/sw/source/ui/dbui/mmdocselectpage.cxx
index 2cd6ce67274d..b07890d4b337 100644
--- a/sw/source/ui/dbui/mmdocselectpage.cxx
+++ b/sw/source/ui/dbui/mmdocselectpage.cxx
@@ -37,18 +37,18 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
SwMailMergeDocSelectPage::SwMailMergeDocSelectPage(weld::Container* pPage,
SwMailMergeWizard* pWizard)
- : vcl::OWizardPage(pPage, pWizard, "modules/swriter/ui/mmselectpage.ui",
"MMSelectPage")
+ : vcl::OWizardPage(pPage, pWizard,
u"modules/swriter/ui/mmselectpage.ui"_ustr, u"MMSelectPage"_ustr)
, m_pWizard(pWizard)
- , m_xCurrentDocRB(m_xBuilder->weld_radio_button("currentdoc"))
- , m_xNewDocRB(m_xBuilder->weld_radio_button("newdoc"))
- , m_xLoadDocRB(m_xBuilder->weld_radio_button("loaddoc"))
- , m_xLoadTemplateRB(m_xBuilder->weld_radio_button("template"))
- , m_xRecentDocRB(m_xBuilder->weld_radio_button("recentdoc"))
- , m_xBrowseDocPB(m_xBuilder->weld_button("browsedoc"))
- , m_xBrowseTemplatePB(m_xBuilder->weld_button("browsetemplate"))
- , m_xRecentDocLB(m_xBuilder->weld_combo_box("recentdoclb"))
- , m_xDataSourceWarningFT(m_xBuilder->weld_label("datasourcewarning"))
- , m_xExchangeDatabasePB(m_xBuilder->weld_button("exchangedatabase"))
+ , m_xCurrentDocRB(m_xBuilder->weld_radio_button(u"currentdoc"_ustr))
+ , m_xNewDocRB(m_xBuilder->weld_radio_button(u"newdoc"_ustr))
+ , m_xLoadDocRB(m_xBuilder->weld_radio_button(u"loaddoc"_ustr))
+ , m_xLoadTemplateRB(m_xBuilder->weld_radio_button(u"template"_ustr))
+ , m_xRecentDocRB(m_xBuilder->weld_radio_button(u"recentdoc"_ustr))
+ , m_xBrowseDocPB(m_xBuilder->weld_button(u"browsedoc"_ustr))
+ , m_xBrowseTemplatePB(m_xBuilder->weld_button(u"browsetemplate"_ustr))
+ , m_xRecentDocLB(m_xBuilder->weld_combo_box(u"recentdoclb"_ustr))
+ , m_xDataSourceWarningFT(m_xBuilder->weld_label(u"datasourcewarning"_ustr))
+ , m_xExchangeDatabasePB(m_xBuilder->weld_button(u"exchangedatabase"_ustr))
{
m_xDataSourceWarningFT->set_label_type(weld::LabelType::Warning);
m_xCurrentDocRB->set_active(true);
diff --git a/sw/source/ui/dbui/mmgreetingspage.cxx
b/sw/source/ui/dbui/mmgreetingspage.cxx
index a7184e1c9f9c..5fb6ed5a0648 100644
--- a/sw/source/ui/dbui/mmgreetingspage.cxx
+++ b/sw/source/ui/dbui/mmgreetingspage.cxx
@@ -196,15 +196,15 @@ void SwGreetingsHandler::Contains(bool bContainsGreeting)
}
SwMailMergeGreetingsPage::SwMailMergeGreetingsPage(weld::Container* pPage,
SwMailMergeWizard* pWizard)
- : vcl::OWizardPage(pPage, pWizard,
"modules/swriter/ui/mmsalutationpage.ui", "MMSalutationPage")
+ : vcl::OWizardPage(pPage, pWizard,
u"modules/swriter/ui/mmsalutationpage.ui"_ustr, u"MMSalutationPage"_ustr)
, SwGreetingsHandler(pWizard->GetConfigItem(), *m_xBuilder)
- , m_xPreview(new
SwAddressPreview(m_xBuilder->weld_scrolled_window("previewwin", true)))
- , m_xPreviewFI(m_xBuilder->weld_label("previewft"))
- , m_xAssignPB(m_xBuilder->weld_button("assign"))
- , m_xDocumentIndexFI(m_xBuilder->weld_label("documentindex"))
- , m_xPrevSetIB(m_xBuilder->weld_button("prev"))
- , m_xNextSetIB(m_xBuilder->weld_button("next"))
- , m_xPreviewWIN(new weld::CustomWeld(*m_xBuilder, "preview", *m_xPreview))
+ , m_xPreview(new
SwAddressPreview(m_xBuilder->weld_scrolled_window(u"previewwin"_ustr, true)))
+ , m_xPreviewFI(m_xBuilder->weld_label(u"previewft"_ustr))
+ , m_xAssignPB(m_xBuilder->weld_button(u"assign"_ustr))
+ , m_xDocumentIndexFI(m_xBuilder->weld_label(u"documentindex"_ustr))
+ , m_xPrevSetIB(m_xBuilder->weld_button(u"prev"_ustr))
+ , m_xNextSetIB(m_xBuilder->weld_button(u"next"_ustr))
+ , m_xPreviewWIN(new weld::CustomWeld(*m_xBuilder, u"preview"_ustr,
*m_xPreview))
{
m_pWizard = pWizard;
@@ -338,10 +338,10 @@ IMPL_LINK(SwMailMergeGreetingsPage, InsertDataHdl_Impl,
weld::Button&, rButton,
}
SwMailBodyDialog::SwMailBodyDialog(weld::Window* pParent)
- : SfxDialogController(pParent, "modules/swriter/ui/mmmailbody.ui",
"MailBodyDialog")
+ : SfxDialogController(pParent, u"modules/swriter/ui/mmmailbody.ui"_ustr,
u"MailBodyDialog"_ustr)
, SwGreetingsHandler(*GetActiveView()->GetMailMergeConfigItem(),
*m_xBuilder)
- , m_xBodyMLE(m_xBuilder->weld_text_view("bodymle"))
- , m_xOK(m_xBuilder->weld_button("ok"))
+ , m_xBodyMLE(m_xBuilder->weld_text_view(u"bodymle"_ustr))
+ , m_xOK(m_xBuilder->weld_button(u"ok"_ustr))
{
m_bIsTabPage = false;
m_xBodyMLE->set_size_request(m_xBodyMLE->get_approximate_digit_width() *
45,
diff --git a/sw/source/ui/dbui/mmgreetingspage.hxx
b/sw/source/ui/dbui/mmgreetingspage.hxx
index cce99a0ffbe5..7d266870b13b 100644
--- a/sw/source/ui/dbui/mmgreetingspage.hxx
+++ b/sw/source/ui/dbui/mmgreetingspage.hxx
@@ -56,21 +56,21 @@ protected:
: m_pWizard(nullptr)
, m_rConfigItem(rConfigItem)
, m_bIsTabPage(false)
- , m_xGreetingLineCB(rBuilder.weld_check_button("greeting"))
- , m_xPersonalizedCB(rBuilder.weld_check_button("personalized"))
- , m_xFemaleFT(rBuilder.weld_label("femaleft"))
- , m_xFemaleLB(rBuilder.weld_combo_box("female"))
- , m_xFemalePB(rBuilder.weld_button("newfemale"))
- , m_xMaleFT(rBuilder.weld_label("maleft"))
- , m_xMaleLB(rBuilder.weld_combo_box("male"))
- , m_xMalePB(rBuilder.weld_button("newmale"))
- , m_xFemaleFI(rBuilder.weld_label("femalefi"))
- , m_xFemaleColumnFT(rBuilder.weld_label("femalecolft"))
- , m_xFemaleColumnLB(rBuilder.weld_combo_box("femalecol"))
- , m_xFemaleFieldFT(rBuilder.weld_label("femalefieldft"))
- , m_xFemaleFieldCB(rBuilder.weld_combo_box("femalefield"))
- , m_xNeutralFT(rBuilder.weld_label("generalft"))
- , m_xNeutralCB(rBuilder.weld_combo_box("general"))
+ , m_xGreetingLineCB(rBuilder.weld_check_button(u"greeting"_ustr))
+ , m_xPersonalizedCB(rBuilder.weld_check_button(u"personalized"_ustr))
+ , m_xFemaleFT(rBuilder.weld_label(u"femaleft"_ustr))
+ , m_xFemaleLB(rBuilder.weld_combo_box(u"female"_ustr))
+ , m_xFemalePB(rBuilder.weld_button(u"newfemale"_ustr))
+ , m_xMaleFT(rBuilder.weld_label(u"maleft"_ustr))
+ , m_xMaleLB(rBuilder.weld_combo_box(u"male"_ustr))
+ , m_xMalePB(rBuilder.weld_button(u"newmale"_ustr))
+ , m_xFemaleFI(rBuilder.weld_label(u"femalefi"_ustr))
+ , m_xFemaleColumnFT(rBuilder.weld_label(u"femalecolft"_ustr))
+ , m_xFemaleColumnLB(rBuilder.weld_combo_box(u"femalecol"_ustr))
+ , m_xFemaleFieldFT(rBuilder.weld_label(u"femalefieldft"_ustr))
+ , m_xFemaleFieldCB(rBuilder.weld_combo_box(u"femalefield"_ustr))
+ , m_xNeutralFT(rBuilder.weld_label(u"generalft"_ustr))
+ , m_xNeutralCB(rBuilder.weld_combo_box(u"general"_ustr))
{
}
diff --git a/sw/source/ui/dbui/mmlayoutpage.cxx
b/sw/source/ui/dbui/mmlayoutpage.cxx
index 95d7879ebdf7..c780424c34f7 100644
--- a/sw/source/ui/dbui/mmlayoutpage.cxx
+++ b/sw/source/ui/dbui/mmlayoutpage.cxx
@@ -68,24 +68,24 @@ constexpr tools::Long DEFAULT_ADDRESS_WIDTH =
o3tl::toTwips(75, o3tl::Length::mm
constexpr tools::Long DEFAULT_ADDRESS_HEIGHT = o3tl::toTwips(35,
o3tl::Length::mm); // 3,5cm
SwMailMergeLayoutPage::SwMailMergeLayoutPage(weld::Container* pPage,
SwMailMergeWizard* pWizard)
- : vcl::OWizardPage(pPage, pWizard, "modules/swriter/ui/mmlayoutpage.ui",
"MMLayoutPage")
+ : vcl::OWizardPage(pPage, pWizard,
u"modules/swriter/ui/mmlayoutpage.ui"_ustr, u"MMLayoutPage"_ustr)
, m_pExampleWrtShell(nullptr)
, m_pAddressBlockFormat(nullptr)
, m_bIsGreetingInserted(false)
, m_pWizard(pWizard)
- , m_xPosition(m_xBuilder->weld_container("addresspos"))
- , m_xAlignToBodyCB(m_xBuilder->weld_check_button("align"))
- , m_xLeftFT(m_xBuilder->weld_label("leftft"))
- , m_xLeftMF(m_xBuilder->weld_metric_spin_button("left", FieldUnit::CM))
- , m_xTopMF(m_xBuilder->weld_metric_spin_button("top", FieldUnit::CM))
- , m_xGreetingLine(m_xBuilder->weld_container("greetingspos"))
- , m_xUpPB(m_xBuilder->weld_button("up"))
- , m_xDownPB(m_xBuilder->weld_button("down"))
- , m_xZoomLB(m_xBuilder->weld_combo_box("zoom"))
+ , m_xPosition(m_xBuilder->weld_container(u"addresspos"_ustr))
+ , m_xAlignToBodyCB(m_xBuilder->weld_check_button(u"align"_ustr))
+ , m_xLeftFT(m_xBuilder->weld_label(u"leftft"_ustr))
+ , m_xLeftMF(m_xBuilder->weld_metric_spin_button(u"left"_ustr,
FieldUnit::CM))
+ , m_xTopMF(m_xBuilder->weld_metric_spin_button(u"top"_ustr, FieldUnit::CM))
+ , m_xGreetingLine(m_xBuilder->weld_container(u"greetingspos"_ustr))
+ , m_xUpPB(m_xBuilder->weld_button(u"up"_ustr))
+ , m_xDownPB(m_xBuilder->weld_button(u"down"_ustr))
+ , m_xZoomLB(m_xBuilder->weld_combo_box(u"zoom"_ustr))
{
std::shared_ptr<const SfxFilter> pSfxFlt =
SwDocShell::Factory().GetFilterContainer()->
- GetFilter4FilterName("writer8", SfxFilterFlags::EXPORT);
+ GetFilter4FilterName(u"writer8"_ustr, SfxFilterFlags::EXPORT);
//save the current document into a temporary file
{
@@ -101,8 +101,8 @@
SwMailMergeLayoutPage::SwMailMergeLayoutPage(weld::Container* pPage, SwMailMerge
// Don't save embedded data set! It would steal it from current document.
uno::Sequence< beans::PropertyValue > aValues =
{
- comphelper::makePropertyValue("FilterName", pSfxFlt->GetFilterName()),
- comphelper::makePropertyValue("NoEmbDataSet", true)
+ comphelper::makePropertyValue(u"FilterName"_ustr,
pSfxFlt->GetFilterName()),
+ comphelper::makePropertyValue(u"NoEmbDataSet"_ustr, true)
};
uno::Reference< frame::XStorable > xStore(
pView->GetDocShell()->GetModel(), uno::UNO_QUERY);
@@ -110,7 +110,7 @@
SwMailMergeLayoutPage::SwMailMergeLayoutPage(weld::Container* pPage, SwMailMerge
Link<SwOneExampleFrame&,void> aLink(LINK(this, SwMailMergeLayoutPage,
PreviewLoadedHdl_Impl));
m_xExampleFrame.reset(new SwOneExampleFrame(EX_SHOW_DEFAULT_PAGE, &aLink,
&m_sExampleURL));
- m_xExampleContainerWIN.reset(new weld::CustomWeld(*m_xBuilder, "example",
*m_xExampleFrame));
+ m_xExampleContainerWIN.reset(new weld::CustomWeld(*m_xBuilder,
u"example"_ustr, *m_xExampleFrame));
Size aSize =
m_xExampleFrame->GetDrawingArea()->get_ref_device().LogicToPixel(
Size(124, 159), MapMode(MapUnit::MapAppFont));
@@ -348,7 +348,7 @@ SwFrameFormat* SwMailMergeLayoutPage::InsertAddressFrame(
}
else
{
- SwInsertField_Data
aData(SwFieldTypesEnum::HiddenParagraph, 0, "", "", 0, &rShell );
+ SwInsertField_Data
aData(SwFieldTypesEnum::HiddenParagraph, 0, u""_ustr, u""_ustr, 0, &rShell );
aFieldMgr.InsertField( aData );
}
}
diff --git a/sw/source/ui/dbui/mmoutputtypepage.cxx
b/sw/source/ui/dbui/mmoutputtypepage.cxx
index 0110c0e5d0f8..33033f0a94ce 100644
--- a/sw/source/ui/dbui/mmoutputtypepage.cxx
+++ b/sw/source/ui/dbui/mmoutputtypepage.cxx
@@ -40,12 +40,12 @@
using namespace ::com::sun::star;
SwMailMergeOutputTypePage::SwMailMergeOutputTypePage(weld::Container* pPage,
SwMailMergeWizard* pWizard)
- : vcl::OWizardPage(pPage, pWizard,
"modules/swriter/ui/mmoutputtypepage.ui", "MMOutputTypePage")
+ : vcl::OWizardPage(pPage, pWizard,
u"modules/swriter/ui/mmoutputtypepage.ui"_ustr, u"MMOutputTypePage"_ustr)
, m_pWizard(pWizard)
- , m_xLetterRB(m_xBuilder->weld_radio_button("letter"))
- , m_xMailRB(m_xBuilder->weld_radio_button("email"))
- , m_xLetterHint(m_xBuilder->weld_label("letterft"))
- , m_xMailHint(m_xBuilder->weld_label("emailft"))
+ , m_xLetterRB(m_xBuilder->weld_radio_button(u"letter"_ustr))
+ , m_xMailRB(m_xBuilder->weld_radio_button(u"email"_ustr))
+ , m_xLetterHint(m_xBuilder->weld_label(u"letterft"_ustr))
+ , m_xMailHint(m_xBuilder->weld_label(u"emailft"_ustr))
{
Link<weld::Toggleable&,void> aLink = LINK(this, SwMailMergeOutputTypePage,
TypeHdl_Impl);
m_xLetterRB->connect_toggled(aLink);
@@ -175,7 +175,7 @@ void SwMailDispatcherListener_Impl::DeleteAttachments(
uno::Reference< mail::XMa
{
uno::Reference< beans::XPropertySet > xTransferableProperties(
rAttachment.Data, uno::UNO_QUERY_THROW);
OUString sURL;
- xTransferableProperties->getPropertyValue("URL") >>= sURL;
+ xTransferableProperties->getPropertyValue(u"URL"_ustr) >>= sURL;
if(!sURL.isEmpty())
SWUnoHelper::UCB_DeleteFile( sURL );
}
@@ -192,8 +192,8 @@ class SwSendWarningBox_Impl : public
weld::MessageDialogController
std::unique_ptr<weld::TextView> m_xDetailED;
public:
SwSendWarningBox_Impl(weld::Window* pParent, const OUString& rDetails)
- : MessageDialogController(pParent,
"modules/swriter/ui/warnemaildialog.ui", "WarnEmailDialog", "grid")
- , m_xDetailED(m_xBuilder->weld_text_view("errors"))
+ : MessageDialogController(pParent,
u"modules/swriter/ui/warnemaildialog.ui"_ustr, u"WarnEmailDialog"_ustr,
u"grid"_ustr)
+ , m_xDetailED(m_xBuilder->weld_text_view(u"errors"_ustr))
{
m_xDetailED->set_size_request(80 *
m_xDetailED->get_approximate_digit_width(),
8 * m_xDetailED->get_text_height());
@@ -204,7 +204,7 @@ public:
}
SwSendMailDialog::SwSendMailDialog(weld::Window *pParent,
SwMailMergeConfigItem& rConfigItem)
- : GenericDialogController(pParent, "modules/swriter/ui/mmsendmails.ui",
"SendMailsDialog")
+ : GenericDialogController(pParent,
u"modules/swriter/ui/mmsendmails.ui"_ustr, u"SendMailsDialog"_ustr)
, m_sContinue(SwResId( ST_CONTINUE ))
, m_sClose(SwResId(ST_CLOSE_DIALOG))
, m_sSendingTo( SwResId(ST_SENDINGTO ))
@@ -218,13 +218,13 @@ SwSendMailDialog::SwSendMailDialog(weld::Window *pParent,
SwMailMergeConfigItem&
, m_nExpectedCount(0)
, m_nProcessedCount(0)
, m_nErrorCount(0)
- , m_xTransferStatus(m_xBuilder->weld_label("transferstatus"))
- , m_xPaused(m_xBuilder->weld_label("paused"))
- , m_xProgressBar(m_xBuilder->weld_progress_bar("progress"))
- , m_xErrorStatus(m_xBuilder->weld_label("errorstatus"))
- , m_xStatus(m_xBuilder->weld_tree_view("container"))
- , m_xStop(m_xBuilder->weld_button("stop"))
- , m_xCancel(m_xBuilder->weld_button("cancel"))
+ , m_xTransferStatus(m_xBuilder->weld_label(u"transferstatus"_ustr))
+ , m_xPaused(m_xBuilder->weld_label(u"paused"_ustr))
+ , m_xProgressBar(m_xBuilder->weld_progress_bar(u"progress"_ustr))
+ , m_xErrorStatus(m_xBuilder->weld_label(u"errorstatus"_ustr))
+ , m_xStatus(m_xBuilder->weld_tree_view(u"container"_ustr))
+ , m_xStop(m_xBuilder->weld_button(u"stop"_ustr))
+ , m_xCancel(m_xBuilder->weld_button(u"cancel"_ustr))
{
m_sStop = m_xStop->get_label();
m_sTransferStatus = m_xTransferStatus->get_label();
diff --git a/sw/source/ui/dbui/mmresultdialogs.cxx
b/sw/source/ui/dbui/mmresultdialogs.cxx
index 669cf695c359..e36306678c8f 100644
--- a/sw/source/ui/dbui/mmresultdialogs.cxx
+++ b/sw/source/ui/dbui/mmresultdialogs.cxx
@@ -190,8 +190,8 @@ public:
}
SwSaveWarningBox_Impl::SwSaveWarningBox_Impl(weld::Window* pParent, const
OUString& rFileName)
- : SwMessageAndEditDialog(pParent, "AlreadyExistsDialog",
- "modules/swriter/ui/alreadyexistsdialog.ui")
+ : SwMessageAndEditDialog(pParent, u"AlreadyExistsDialog"_ustr,
+ u"modules/swriter/ui/alreadyexistsdialog.ui"_ustr)
{
m_xEdit->set_text(rFileName);
m_xEdit->connect_changed(LINK(this, SwSaveWarningBox_Impl, ModifyHdl));
@@ -231,9 +231,9 @@ class SwCopyToDialog : public SfxDialogController
public:
explicit SwCopyToDialog(weld::Window* pParent)
- : SfxDialogController(pParent, "modules/swriter/ui/ccdialog.ui",
"CCDialog")
- , m_xCCED(m_xBuilder->weld_entry("cc"))
- , m_xBCCED(m_xBuilder->weld_entry("bcc"))
+ : SfxDialogController(pParent, u"modules/swriter/ui/ccdialog.ui"_ustr,
u"CCDialog"_ustr)
+ , m_xCCED(m_xBuilder->weld_entry(u"cc"_ustr))
+ , m_xBCCED(m_xBuilder->weld_entry(u"bcc"_ustr))
{
}
@@ -247,15 +247,15 @@ public:
}
SwMMResultSaveDialog::SwMMResultSaveDialog(weld::Window* pParent)
- : SfxDialogController(pParent, "modules/swriter/ui/mmresultsavedialog.ui",
"MMResultSaveDialog")
+ : SfxDialogController(pParent,
u"modules/swriter/ui/mmresultsavedialog.ui"_ustr, u"MMResultSaveDialog"_ustr)
, m_bCancelSaving(false)
- , m_xSaveAsOneRB(m_xBuilder->weld_radio_button("singlerb"))
- , m_xSaveIndividualRB(m_xBuilder->weld_radio_button("individualrb"))
- , m_xFromRB(m_xBuilder->weld_check_button("fromrb"))
- , m_xFromNF(m_xBuilder->weld_spin_button("from"))
- , m_xToFT(m_xBuilder->weld_label("toft"))
- , m_xToNF(m_xBuilder->weld_spin_button("to"))
- , m_xOKButton(m_xBuilder->weld_button("ok"))
+ , m_xSaveAsOneRB(m_xBuilder->weld_radio_button(u"singlerb"_ustr))
+ , m_xSaveIndividualRB(m_xBuilder->weld_radio_button(u"individualrb"_ustr))
+ , m_xFromRB(m_xBuilder->weld_check_button(u"fromrb"_ustr))
+ , m_xFromNF(m_xBuilder->weld_spin_button(u"from"_ustr))
+ , m_xToFT(m_xBuilder->weld_label(u"toft"_ustr))
+ , m_xToNF(m_xBuilder->weld_spin_button(u"to"_ustr))
+ , m_xOKButton(m_xBuilder->weld_button(u"ok"_ustr))
{
Link<weld::Toggleable&,void> aLink = LINK(this, SwMMResultSaveDialog,
DocumentSelectionHdl_Impl);
m_xSaveAsOneRB->connect_toggled(aLink);
@@ -281,15 +281,15 @@ SwMMResultSaveDialog::~SwMMResultSaveDialog()
}
SwMMResultPrintDialog::SwMMResultPrintDialog(weld::Window* pParent)
- : SfxDialogController(pParent,
"modules/swriter/ui/mmresultprintdialog.ui", "MMResultPrintDialog")
- , m_xPrinterLB(m_xBuilder->weld_combo_box("printers"))
- , m_xPrinterSettingsPB(m_xBuilder->weld_button("printersettings"))
- , m_xPrintAllRB(m_xBuilder->weld_radio_button("printallrb"))
- , m_xFromRB(m_xBuilder->weld_radio_button("fromrb"))
- , m_xFromNF(m_xBuilder->weld_spin_button("from"))
- , m_xToFT(m_xBuilder->weld_label("toft"))
- , m_xToNF(m_xBuilder->weld_spin_button("to"))
- , m_xOKButton(m_xBuilder->weld_button("ok"))
+ : SfxDialogController(pParent,
u"modules/swriter/ui/mmresultprintdialog.ui"_ustr, u"MMResultPrintDialog"_ustr)
+ , m_xPrinterLB(m_xBuilder->weld_combo_box(u"printers"_ustr))
+ , m_xPrinterSettingsPB(m_xBuilder->weld_button(u"printersettings"_ustr))
+ , m_xPrintAllRB(m_xBuilder->weld_radio_button(u"printallrb"_ustr))
+ , m_xFromRB(m_xBuilder->weld_radio_button(u"fromrb"_ustr))
+ , m_xFromNF(m_xBuilder->weld_spin_button(u"from"_ustr))
+ , m_xToFT(m_xBuilder->weld_label(u"toft"_ustr))
+ , m_xToNF(m_xBuilder->weld_spin_button(u"to"_ustr))
+ , m_xOKButton(m_xBuilder->weld_button(u"ok"_ustr))
{
m_xPrinterLB->make_sorted();
@@ -312,24 +312,24 @@ SwMMResultPrintDialog::~SwMMResultPrintDialog()
}
SwMMResultEmailDialog::SwMMResultEmailDialog(weld::Window* pParent)
- : SfxDialogController(pParent,
"modules/swriter/ui/mmresultemaildialog.ui", "MMResultEmailDialog")
+ : SfxDialogController(pParent,
u"modules/swriter/ui/mmresultemaildialog.ui"_ustr, u"MMResultEmailDialog"_ustr)
, m_sConfigureMail(SwResId(ST_CONFIGUREMAIL))
- , m_xMailToLB(m_xBuilder->weld_combo_box("mailto"))
- , m_xCopyToPB(m_xBuilder->weld_button("copyto"))
- , m_xSubjectED(m_xBuilder->weld_entry("subject"))
- , m_xSendAsLB(m_xBuilder->weld_combo_box("sendas"))
- , m_xSendAsPB(m_xBuilder->weld_button("sendassettings"))
- , m_xAttachmentGroup(m_xBuilder->weld_widget("attachgroup"))
- , m_xAttachmentED(m_xBuilder->weld_entry("attach"))
- , m_xPasswordFT(m_xBuilder->weld_label("passwordft"))
- , m_xPasswordLB(m_xBuilder->weld_combo_box("password"))
- , m_xPasswordCB(m_xBuilder->weld_check_button("passwordcb"))
- , m_xSendAllRB(m_xBuilder->weld_radio_button("sendallrb"))
- , m_xFromRB(m_xBuilder->weld_radio_button("fromrb"))
- , m_xFromNF(m_xBuilder->weld_spin_button("from"))
- , m_xToFT(m_xBuilder->weld_label("toft"))
- , m_xToNF(m_xBuilder->weld_spin_button("to"))
- , m_xOKButton(m_xBuilder->weld_button("ok"))
+ , m_xMailToLB(m_xBuilder->weld_combo_box(u"mailto"_ustr))
+ , m_xCopyToPB(m_xBuilder->weld_button(u"copyto"_ustr))
+ , m_xSubjectED(m_xBuilder->weld_entry(u"subject"_ustr))
+ , m_xSendAsLB(m_xBuilder->weld_combo_box(u"sendas"_ustr))
+ , m_xSendAsPB(m_xBuilder->weld_button(u"sendassettings"_ustr))
+ , m_xAttachmentGroup(m_xBuilder->weld_widget(u"attachgroup"_ustr))
+ , m_xAttachmentED(m_xBuilder->weld_entry(u"attach"_ustr))
+ , m_xPasswordFT(m_xBuilder->weld_label(u"passwordft"_ustr))
+ , m_xPasswordLB(m_xBuilder->weld_combo_box(u"password"_ustr))
+ , m_xPasswordCB(m_xBuilder->weld_check_button(u"passwordcb"_ustr))
+ , m_xSendAllRB(m_xBuilder->weld_radio_button(u"sendallrb"_ustr))
+ , m_xFromRB(m_xBuilder->weld_radio_button(u"fromrb"_ustr))
+ , m_xFromNF(m_xBuilder->weld_spin_button(u"from"_ustr))
+ , m_xToFT(m_xBuilder->weld_label(u"toft"_ustr))
+ , m_xToNF(m_xBuilder->weld_spin_button(u"to"_ustr))
+ , m_xOKButton(m_xBuilder->weld_button(u"ok"_ustr))
{
m_xCopyToPB->connect_clicked(LINK(this, SwMMResultEmailDialog,
CopyToHdl_Impl));
m_xSendAsPB->connect_clicked(LINK(this, SwMMResultEmailDialog,
SendAsHdl_Impl));
@@ -587,7 +587,7 @@ IMPL_LINK_NOARG(SwMMResultSaveDialog, SaveOutputHdl_Impl,
weld::Button&, void)
if (m_xSaveAsOneRB->get_active())
{
- uno::Sequence< beans::PropertyValue > aValues {
comphelper::makePropertyValue("FilterName", sFilter) };
+ uno::Sequence< beans::PropertyValue > aValues {
comphelper::makePropertyValue(u"FilterName"_ustr, sFilter) };
uno::Reference< frame::XStorable > xStore(
pTargetView->GetDocShell()->GetModel(), uno::UNO_QUERY);
ErrCode nErrorCode = ERRCODE_NONE;
@@ -690,8 +690,8 @@ IMPL_LINK_NOARG(SwMMResultSaveDialog, SaveOutputHdl_Impl,
weld::Button&, void)
uno::Reference<beans::XPropertySet> const xRetSet(
pTempView->GetDocShell()->GetBaseModel(),
uno::UNO_QUERY_THROW);
uno::Sequence<beans::PropertyValue> aInteropGrabBag;
- xThisSet->getPropertyValue("InteropGrabBag") >>= aInteropGrabBag;
- xRetSet->setPropertyValue("InteropGrabBag",
uno::Any(aInteropGrabBag));
+ xThisSet->getPropertyValue(u"InteropGrabBag"_ustr) >>=
aInteropGrabBag;
+ xRetSet->setPropertyValue(u"InteropGrabBag"_ustr,
uno::Any(aInteropGrabBag));
pTargetView->GetWrtShell().PastePages(
pTempView->GetWrtShell(),
documentStartPageNumber(xConfigItem.get(), nDoc, false),
@@ -835,8 +835,8 @@ IMPL_LINK_NOARG(SwMMResultPrintDialog, PrintHdl_Impl,
weld::Button&, void)
SfxObjectShell* pObjSh = pTargetView->GetViewFrame().GetObjectShell();
SfxGetpApp()->NotifyEvent(SfxEventHint(SfxEventHintId::SwMailMerge,
SwDocShell::GetEventName(STR_SW_EVENT_MAIL_MERGE), pObjSh));
- uno::Sequence aProps{ comphelper::makePropertyValue("MonitorVisible",
true),
- comphelper::makePropertyValue("Pages", sPages) };
+ uno::Sequence aProps{
comphelper::makePropertyValue(u"MonitorVisible"_ustr, true),
+ comphelper::makePropertyValue(u"Pages"_ustr, sPages)
};
pTargetView->ExecPrint( aProps, false, true );
SfxGetpApp()->NotifyEvent(SfxEventHint(SfxEventHintId::SwMailMergeEnd,
SwDocShell::GetEventName(STR_SW_EVENT_MAIL_MERGE_END), pObjSh));
@@ -973,14 +973,14 @@ IMPL_LINK_NOARG(SwMMResultEmailDialog,
SendDocumentsHdl_Impl, weld::Button&, voi
//Make sure we don't pick e.g. the flat xml filter
//for this format
pSfxFlt = pFilterContainer->GetFilter4FilterName(
- "writer8",
+ u"writer8"_ustr,
SfxFilterFlags::EXPORT);
}
break;
case MM_DOCTYPE_PDF:
{
pSfxFlt = pFilterContainer->GetFilter4FilterName(
- "writer_pdf_Export",
+ u"writer_pdf_Export"_ustr,
SfxFilterFlags::EXPORT);
}
break;
@@ -1013,7 +1013,7 @@ IMPL_LINK_NOARG(SwMMResultEmailDialog,
SendDocumentsHdl_Impl, weld::Button&, voi
{
bAsBody = true;
pSfxFlt = pFilterContainer->GetFilter4FilterName(
- "Text (encoded)", SfxFilterFlags::EXPORT);
+ u"Text (encoded)"_ustr, SfxFilterFlags::EXPORT);
}
break;
}
@@ -1029,10 +1029,10 @@ IMPL_LINK_NOARG(SwMMResultEmailDialog,
SendDocumentsHdl_Impl, weld::Button&, voi
if (m_xSubjectED->get_text().isEmpty())
{
- std::unique_ptr<SwSendQueryBox_Impl> xQuery(new
SwSendQueryBox_Impl(m_xDialog.get(), "SubjectDialog",
-
"modules/swriter/ui/subjectdialog.ui"));
+ std::unique_ptr<SwSendQueryBox_Impl> xQuery(new
SwSendQueryBox_Impl(m_xDialog.get(), u"SubjectDialog"_ustr,
+
u"modules/swriter/ui/subjectdialog.ui"_ustr));
xQuery->SetIsEmptyTextAllowed(true);
- xQuery->SetValue("");
+ xQuery->SetValue(u""_ustr);
if(RET_OK == xQuery->run())
{
if (!xQuery->GetValue().isEmpty())
@@ -1043,8 +1043,8 @@ IMPL_LINK_NOARG(SwMMResultEmailDialog,
SendDocumentsHdl_Impl, weld::Button&, voi
}
if(!bAsBody && m_xAttachmentED->get_text().isEmpty())
{
- std::unique_ptr<SwSendQueryBox_Impl> xQuery(new
SwSendQueryBox_Impl(m_xDialog.get(), "AttachNameDialog",
-
"modules/swriter/ui/attachnamedialog.ui"));
+ std::unique_ptr<SwSendQueryBox_Impl> xQuery(new
SwSendQueryBox_Impl(m_xDialog.get(), u"AttachNameDialog"_ustr,
+
u"modules/swriter/ui/attachnamedialog.ui"_ustr));
xQuery->SetIsEmptyTextAllowed(false);
if (RET_OK == xQuery->run())
{
@@ -1103,7 +1103,7 @@ IMPL_LINK_NOARG(SwMMResultEmailDialog,
SendDocumentsHdl_Impl, weld::Button&, voi
FILTER_XML,
SwDocShell::Factory().GetFilterContainer() );
- uno::Sequence< beans::PropertyValue > aValues {
comphelper::makePropertyValue("FilterName", pTargetSfxFlt->GetFilterName()) };
+ uno::Sequence< beans::PropertyValue > aValues {
comphelper::makePropertyValue(u"FilterName"_ustr,
pTargetSfxFlt->GetFilterName()) };
uno::Reference< frame::XStorable > xStore(
pTargetView->GetDocShell()->GetModel(), uno::UNO_QUERY);
xStore->storeToURL( sTargetTempURL, aValues );
diff --git a/sw/source/ui/dbui/selectdbtabledialog.cxx
b/sw/source/ui/dbui/selectdbtabledialog.cxx
index be5faf3adada..e67718e46997 100644
--- a/sw/source/ui/dbui/selectdbtabledialog.cxx
+++ b/sw/source/ui/dbui/selectdbtabledialog.cxx
@@ -43,10 +43,11 @@ using namespace ::com::sun::star::beans;
SwSelectDBTableDialog::SwSelectDBTableDialog(weld::Window* pParent,
uno::Reference<sdbc::XConnection>
xConnection)
- : SfxDialogController(pParent, "modules/swriter/ui/selecttabledialog.ui",
"SelectTableDialog")
+ : SfxDialogController(pParent,
u"modules/swriter/ui/selecttabledialog.ui"_ustr,
+ u"SelectTableDialog"_ustr)
, m_xConnection(std::move(xConnection))
- , m_xTable(m_xBuilder->weld_tree_view("table"))
- , m_xPreviewPB(m_xBuilder->weld_button("preview"))
+ , m_xTable(m_xBuilder->weld_tree_view(u"table"_ustr))
+ , m_xPreviewPB(m_xBuilder->weld_button(u"preview"_ustr))
{
m_xTable->set_size_request(m_xTable->get_approximate_digit_width() * 60,
m_xTable->get_height_rows(6));
@@ -102,15 +103,15 @@ IMPL_LINK_NOARG(SwSelectDBTableDialog, PreviewHdl,
weld::Button&, void)
{
Reference<XDataSource> xSource(xChild->getParent(), UNO_QUERY);
Reference<XPropertySet> xPrSet(xSource, UNO_QUERY);
- xPrSet->getPropertyValue("Name") >>= sDataSourceName;
+ xPrSet->getPropertyValue(u"Name"_ustr) >>= sDataSourceName;
}
OSL_ENSURE(!sDataSourceName.isEmpty(), "no data source found");
Sequence<PropertyValue> aProperties{
- comphelper::makePropertyValue("DataSourceName", sDataSourceName),
- comphelper::makePropertyValue("Command", sTableOrQuery),
- comphelper::makePropertyValue("CommandType", nCommandType),
- comphelper::makePropertyValue("ShowTreeView", false),
- comphelper::makePropertyValue("ShowTreeViewButton", false)
+ comphelper::makePropertyValue(u"DataSourceName"_ustr, sDataSourceName),
+ comphelper::makePropertyValue(u"Command"_ustr, sTableOrQuery),
+ comphelper::makePropertyValue(u"CommandType"_ustr, nCommandType),
+ comphelper::makePropertyValue(u"ShowTreeView"_ustr, false),
+ comphelper::makePropertyValue(u"ShowTreeViewButton"_ustr, false)
};
SwDBTablePreviewDialog aDlg(m_xDialog.get(), aProperties);
