simplify IMark hierarchy (4)

merge IDateFieldmark into DateFieldmark

Change-Id: Ibb77ee4e1a65f6e3edde63b98c7a67f11507ca51
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/171462
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

6 files changed, 12 insertions, 12 deletions

diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index 745997557f31..4ce101ef27e9 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -2886,7 +2886,7 @@ void DocxAttributeOutput::StartField_Impl( const SwTextNode* pNode, sal_Int32 nP
     }
     else if ( rInfos.eType == ww::eFORMDATE )
     {
-        const sw::mark::IDateFieldmark& rFieldmark = dynamic_cast<const sw::mark::IDateFieldmark&>(*rInfos.pFieldmark);
+        const sw::mark::DateFieldmark& rFieldmark = dynamic_cast<const sw::mark::DateFieldmark&>(*rInfos.pFieldmark);
         FieldMarkParamsHelper params(rFieldmark);
 
         OUString sFullDate;
diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/dialog/swdlgfact.cxx
index 1c042afd38f0..3207919b917d 100644
--- a/sw/source/ui/dialog/swdlgfact.cxx
+++ b/sw/source/ui/dialog/swdlgfact.cxx
@@ -1149,7 +1149,7 @@ VclPtr<AbstractDropDownFormFieldDialog> SwAbstractDialogFactory_Impl::CreateDrop
     return VclPtr<AbstractDropDownFormFieldDialog_Impl>::Create(std::make_unique<sw::DropDownFormFieldDialog>(pParent, pDropDownField));
 }
 
-VclPtr<AbstractDateFormFieldDialog> SwAbstractDialogFactory_Impl::CreateDateFormFieldDialog(weld::Widget *pParent, sw::mark::IDateFieldmark* pDateField, SwDoc& rDoc)
+VclPtr<AbstractDateFormFieldDialog> SwAbstractDialogFactory_Impl::CreateDateFormFieldDialog(weld::Widget *pParent, sw::mark::DateFieldmark* pDateField, SwDoc& rDoc)
 {
     return VclPtr<AbstractDateFormFieldDialog_Impl>::Create(std::make_unique<sw::DateFormFieldDialog>(pParent, pDateField, rDoc));
 }
diff --git a/sw/source/ui/dialog/swdlgfact.hxx b/sw/source/ui/dialog/swdlgfact.hxx
index 902c7ea22b48..ca2d24d067a5 100644
--- a/sw/source/ui/dialog/swdlgfact.hxx
+++ b/sw/source/ui/dialog/swdlgfact.hxx
@@ -806,7 +806,7 @@ public:
     virtual VclPtr<AbstractDropDownFieldDialog> CreateDropDownFieldDialog(weld::Widget* pParent, SwWrtShell &rSh,
         SwField* pField, bool bPrevButton, bool bNextButton) override;
     virtual VclPtr<AbstractDropDownFormFieldDialog> CreateDropDownFormFieldDialog(weld::Widget* pParent, sw::mark::IFieldmark* pDropDownField) override;
-    virtual VclPtr<AbstractDateFormFieldDialog> CreateDateFormFieldDialog(weld::Widget* pParent, sw::mark::IDateFieldmark* pDateField, SwDoc& rDoc) override;
+    virtual VclPtr<AbstractDateFormFieldDialog> CreateDateFormFieldDialog(weld::Widget* pParent, sw::mark::DateFieldmark* pDateField, SwDoc& rDoc) override;
 
     virtual VclPtr<SfxAbstractTabDialog> CreateSwEnvDlg(weld::Window* pParent, const SfxItemSet& rSet, SwWrtShell* pWrtSh, Printer* pPrt, bool bInsert) override;
     virtual VclPtr<AbstractSwLabDlg> CreateSwLabDlg(weld::Window* pParent, const SfxItemSet& rSet,
diff --git a/sw/source/ui/fldui/DateFormFieldDialog.cxx b/sw/source/ui/fldui/DateFormFieldDialog.cxx
index 85baf0ed62f5..2b7532528de2 100644
--- a/sw/source/ui/fldui/DateFormFieldDialog.cxx
+++ b/sw/source/ui/fldui/DateFormFieldDialog.cxx
@@ -17,8 +17,8 @@
 
 namespace sw
 {
-DateFormFieldDialog::DateFormFieldDialog(weld::Widget* pParent,
-                                         sw::mark::IDateFieldmark* pDateField, SwDoc& rDoc)
+DateFormFieldDialog::DateFormFieldDialog(weld::Widget* pParent, sw::mark::DateFieldmark* pDateField,
+                                         SwDoc& rDoc)
     : GenericDialogController(pParent, u"modules/swriter/ui/dateformfielddialog.ui"_ustr,
                               u"DateFormFieldDialog"_ustr)
     , m_pDateField(pDateField)
diff --git a/sw/source/ui/vba/vbaformfield.cxx b/sw/source/ui/vba/vbaformfield.cxx
index 2efb092b8712..882773d17b2b 100644
--- a/sw/source/ui/vba/vbaformfield.cxx
+++ b/sw/source/ui/vba/vbaformfield.cxx
@@ -75,11 +75,11 @@ uno::Any SwVbaFormField::Previous()
                                                                        /*bLoop=*/false);
 
     // DateFields are a LO specialty, and do not exist natively in MS documents. Ignore if added...
-    auto pDateField = dynamic_cast<sw::mark::IDateFieldmark*>(pFieldMark);
+    auto pDateField = dynamic_cast<sw::mark::DateFieldmark*>(pFieldMark);
     while (pDateField)
     {
         pFieldMark = pMarkAccess->getFieldmarkBefore(pDateField->GetMarkPos(), /*bLoop=*/false);
-        pDateField = dynamic_cast<sw::mark::IDateFieldmark*>(pFieldMark);
+        pDateField = dynamic_cast<sw::mark::DateFieldmark*>(pFieldMark);
     }
 
     if (!pFieldMark)
@@ -103,11 +103,11 @@ uno::Any SwVbaFormField::Next()
                                                                       /*bLoop=*/false);
 
     // DateFields are a LO specialty, and do not exist natively in MS documents. Ignore if added...
-    auto pDateField = dynamic_cast<sw::mark::IDateFieldmark*>(pFieldMark);
+    auto pDateField = dynamic_cast<sw::mark::DateFieldmark*>(pFieldMark);
     while (pDateField)
     {
         pFieldMark = pMarkAccess->getFieldmarkAfter(pDateField->GetMarkPos(), /*bLoop=*/false);
-        pDateField = dynamic_cast<sw::mark::IDateFieldmark*>(pFieldMark);
+        pDateField = dynamic_cast<sw::mark::DateFieldmark*>(pFieldMark);
     }
 
     if (!pFieldMark)
diff --git a/sw/source/uibase/inc/DateFormFieldDialog.hxx b/sw/source/uibase/inc/DateFormFieldDialog.hxx
index 81a0b790831c..78c415f994b3 100644
--- a/sw/source/uibase/inc/DateFormFieldDialog.hxx
+++ b/sw/source/uibase/inc/DateFormFieldDialog.hxx
@@ -17,7 +17,7 @@ class SvNumberFormatter;
 class SwDoc;
 namespace sw::mark
 {
-class IDateFieldmark;
+class DateFieldmark;
 }
 
 /// Dialog to specify the properties of date form field
@@ -26,7 +26,7 @@ namespace sw
 class DateFormFieldDialog final : public weld::GenericDialogController
 {
 private:
-    sw::mark::IDateFieldmark* m_pDateField;
+    sw::mark::DateFieldmark* m_pDateField;
     SvNumberFormatter* m_pNumberFormatter;
 
     std::unique_ptr<SwNumFormatTreeView> m_xFormatLB;
@@ -34,7 +34,7 @@ private:
     void InitControls();
 
 public:
-    DateFormFieldDialog(weld::Widget* pParent, sw::mark::IDateFieldmark* pDateField, SwDoc& rDoc);
+    DateFormFieldDialog(weld::Widget* pParent, sw::mark::DateFieldmark* pDateField, SwDoc& rDoc);
     virtual ~DateFormFieldDialog() override;
 
     void Apply();