diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2024-08-04 16:28:17 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2024-08-04 21:07:26 +0200 |
commit | f9c4fd0b981d7a0ebf76d3110955e16809dd6068 (patch) | |
tree | 83714abf30bb53f19d9f7a4c1ef1e7fa49070965 /sw/source/ui/fldui | |
parent | 5f5afe4cb08f4aa23c5f68630281098d5626ba61 (diff) |
simplify IMark hierarchy (5)
merge into IFieldmark into Fieldmark
Change-Id: Ide5c01fe49bae0be45746f6b581d72342da9c3a0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/171463
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw/source/ui/fldui')
-rw-r--r-- | sw/source/ui/fldui/DateFormFieldDialog.cxx | 4 | ||||
-rw-r--r-- | sw/source/ui/fldui/DropDownFormFieldDialog.cxx | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sw/source/ui/fldui/DateFormFieldDialog.cxx b/sw/source/ui/fldui/DateFormFieldDialog.cxx index 2b7532528de2..d7d3fd9ea7c9 100644 --- a/sw/source/ui/fldui/DateFormFieldDialog.cxx +++ b/sw/source/ui/fldui/DateFormFieldDialog.cxx @@ -47,7 +47,7 @@ void DateFormFieldDialog::Apply() // Try to find out the current date value and replace the content // with the right formatted date string - sw::mark::IFieldmark::parameter_map_t* pParameters = m_pDateField->GetParameters(); + sw::mark::Fieldmark::parameter_map_t* pParameters = m_pDateField->GetParameters(); const SvNumberformat* pFormat = m_pNumberFormatter->GetEntry(m_xFormatLB->GetFormat()); // Get date value first @@ -74,7 +74,7 @@ void DateFormFieldDialog::InitControls() if (m_pDateField == nullptr) return; - sw::mark::IFieldmark::parameter_map_t* pParameters = m_pDateField->GetParameters(); + sw::mark::Fieldmark::parameter_map_t* pParameters = m_pDateField->GetParameters(); OUString sFormatString; auto pResult = pParameters->find(ODF_FORMDATE_DATEFORMAT); diff --git a/sw/source/ui/fldui/DropDownFormFieldDialog.cxx b/sw/source/ui/fldui/DropDownFormFieldDialog.cxx index dab673c45da5..d1c875d718df 100644 --- a/sw/source/ui/fldui/DropDownFormFieldDialog.cxx +++ b/sw/source/ui/fldui/DropDownFormFieldDialog.cxx @@ -18,7 +18,7 @@ namespace sw { DropDownFormFieldDialog::DropDownFormFieldDialog(weld::Widget* pParent, - mark::IFieldmark* pDropDownField) + mark::Fieldmark* pDropDownField) : GenericDialogController(pParent, u"modules/swriter/ui/dropdownformfielddialog.ui"_ustr, u"DropDownFormFieldDialog"_ustr) , m_pDropDownField(pDropDownField) @@ -102,7 +102,7 @@ void DropDownFormFieldDialog::InitControls() { if (m_pDropDownField != nullptr) { - const mark::IFieldmark::parameter_map_t* const pParameters + const mark::Fieldmark::parameter_map_t* const pParameters = m_pDropDownField->GetParameters(); auto pListEntries = pParameters->find(ODF_FORMDROPDOWN_LISTENTRY); @@ -173,7 +173,7 @@ void DropDownFormFieldDialog::Apply() if (!(m_pDropDownField != nullptr && m_bListHasChanged)) return; - mark::IFieldmark::parameter_map_t* pParameters = m_pDropDownField->GetParameters(); + mark::Fieldmark::parameter_map_t* pParameters = m_pDropDownField->GetParameters(); css::uno::Sequence<OUString> vListEntries(m_xListItemsTreeView->n_children()); auto vListEntriesRange = asNonConstRange(vListEntries); |