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>

14 files changed, 29 insertions, 29 deletions

diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/dialog/swdlgfact.cxx
index 3207919b917d..346af3291f06 100644
--- a/sw/source/ui/dialog/swdlgfact.cxx
+++ b/sw/source/ui/dialog/swdlgfact.cxx
@@ -1144,7 +1144,7 @@ VclPtr<AbstractDropDownFieldDialog> SwAbstractDialogFactory_Impl::CreateDropDown
     return VclPtr<AbstractDropDownFieldDialog_Impl>::Create(std::make_unique<sw::DropDownFieldDialog>(pParent, rSh, pField, bPrevButton, bNextButton));
 }
 
-VclPtr<AbstractDropDownFormFieldDialog> SwAbstractDialogFactory_Impl::CreateDropDownFormFieldDialog(weld::Widget *pParent, sw::mark::IFieldmark* pDropDownField)
+VclPtr<AbstractDropDownFormFieldDialog> SwAbstractDialogFactory_Impl::CreateDropDownFormFieldDialog(weld::Widget *pParent, sw::mark::Fieldmark* pDropDownField)
 {
     return VclPtr<AbstractDropDownFormFieldDialog_Impl>::Create(std::make_unique<sw::DropDownFormFieldDialog>(pParent, pDropDownField));
 }
diff --git a/sw/source/ui/dialog/swdlgfact.hxx b/sw/source/ui/dialog/swdlgfact.hxx
index ca2d24d067a5..3f4b123abc58 100644
--- a/sw/source/ui/dialog/swdlgfact.hxx
+++ b/sw/source/ui/dialog/swdlgfact.hxx
@@ -805,7 +805,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<AbstractDropDownFormFieldDialog> CreateDropDownFormFieldDialog(weld::Widget* pParent, sw::mark::Fieldmark* pDropDownField) 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;
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);
diff --git a/sw/source/ui/vba/vbacontentcontrols.cxx b/sw/source/ui/vba/vbacontentcontrols.cxx
index 5a7dccef17f5..8383aee7e3f8 100644
--- a/sw/source/ui/vba/vbacontentcontrols.cxx
+++ b/sw/source/ui/vba/vbacontentcontrols.cxx
@@ -229,7 +229,7 @@ SwVbaContentControls::SwVbaContentControls(const uno::Reference<XHelperInterface
 // uno::Reference<ooo::vba::word::XContentControl> SwVbaContentControls::Add(const uno::Any& Range,
 //                                                                 sal_Int32 Type)
 // {
-//     sw::mark::IFieldmark* pFieldmark = nullptr;
+//     sw::mark::Fieldmark* pFieldmark = nullptr;
 //     switch (Type)
 //     {
 //         case ooo::vba::word::WdFieldType::wdFieldFormCheckBox:
diff --git a/sw/source/ui/vba/vbaformfield.cxx b/sw/source/ui/vba/vbaformfield.cxx
index 882773d17b2b..4fffbec0ff6c 100644
--- a/sw/source/ui/vba/vbaformfield.cxx
+++ b/sw/source/ui/vba/vbaformfield.cxx
@@ -34,7 +34,7 @@ using namespace ::com::sun::star;
 SwVbaFormField::SwVbaFormField(const uno::Reference<ooo::vba::XHelperInterface>& rParent,
                                const uno::Reference<uno::XComponentContext>& rContext,
                                const uno::Reference<text::XTextDocument>& xTextDocument,
-                               sw::mark::IFieldmark& rFormField)
+                               sw::mark::Fieldmark& rFormField)
     : SwVbaFormField_BASE(rParent, rContext)
     , m_xTextDocument(xTextDocument)
     , m_rFormField(rFormField)
@@ -71,8 +71,8 @@ uno::Any SwVbaFormField::Previous()
     if (!pMarkAccess)
         return uno::Any();
 
-    sw::mark::IFieldmark* pFieldMark = pMarkAccess->getFieldmarkBefore(m_rFormField.GetMarkPos(),
-                                                                       /*bLoop=*/false);
+    sw::mark::Fieldmark* pFieldMark = pMarkAccess->getFieldmarkBefore(m_rFormField.GetMarkPos(),
+                                                                      /*bLoop=*/false);
 
     // DateFields are a LO specialty, and do not exist natively in MS documents. Ignore if added...
     auto pDateField = dynamic_cast<sw::mark::DateFieldmark*>(pFieldMark);
@@ -99,8 +99,8 @@ uno::Any SwVbaFormField::Next()
     if (!pMarkAccess)
         return uno::Any();
 
-    sw::mark::IFieldmark* pFieldMark = pMarkAccess->getFieldmarkAfter(m_rFormField.GetMarkPos(),
-                                                                      /*bLoop=*/false);
+    sw::mark::Fieldmark* pFieldMark = pMarkAccess->getFieldmarkAfter(m_rFormField.GetMarkPos(),
+                                                                     /*bLoop=*/false);
 
     // DateFields are a LO specialty, and do not exist natively in MS documents. Ignore if added...
     auto pDateField = dynamic_cast<sw::mark::DateFieldmark*>(pFieldMark);
diff --git a/sw/source/ui/vba/vbaformfield.hxx b/sw/source/ui/vba/vbaformfield.hxx
index 260e79093589..bc5921e99929 100644
--- a/sw/source/ui/vba/vbaformfield.hxx
+++ b/sw/source/ui/vba/vbaformfield.hxx
@@ -21,14 +21,14 @@ class SwVbaFormField : public SwVbaFormField_BASE
 {
 private:
     css::uno::Reference<css::text::XTextDocument> m_xTextDocument;
-    sw::mark::IFieldmark& m_rFormField;
+    sw::mark::Fieldmark& m_rFormField;
 
 public:
     /// @throws css::uno::RuntimeException
     SwVbaFormField(const css::uno::Reference<ooo::vba::XHelperInterface>& rParent,
                    const css::uno::Reference<css::uno::XComponentContext>& rContext,
                    const uno::Reference<text::XTextDocument>& xTextDocument,
-                   sw::mark::IFieldmark& rFormField);
+                   sw::mark::Fieldmark& rFormField);
     ~SwVbaFormField() override;
 
     // XFormField Methods
diff --git a/sw/source/ui/vba/vbaformfieldcheckbox.cxx b/sw/source/ui/vba/vbaformfieldcheckbox.cxx
index 9ee7b15c3018..a6740970c1b8 100644
--- a/sw/source/ui/vba/vbaformfieldcheckbox.cxx
+++ b/sw/source/ui/vba/vbaformfieldcheckbox.cxx
@@ -23,7 +23,7 @@ using namespace ::com::sun::star;
  */
 SwVbaFormFieldCheckBox::SwVbaFormFieldCheckBox(
     const uno::Reference<ooo::vba::XHelperInterface>& rParent,
-    const uno::Reference<uno::XComponentContext>& rContext, sw::mark::IFieldmark& rFormField)
+    const uno::Reference<uno::XComponentContext>& rContext, sw::mark::Fieldmark& rFormField)
     : SwVbaFormFieldCheckBox_BASE(rParent, rContext)
     , m_pCheckBox(dynamic_cast<sw::mark::CheckboxFieldmark*>(&rFormField))
 {
diff --git a/sw/source/ui/vba/vbaformfieldcheckbox.hxx b/sw/source/ui/vba/vbaformfieldcheckbox.hxx
index 87aaf1238855..10753347b591 100644
--- a/sw/source/ui/vba/vbaformfieldcheckbox.hxx
+++ b/sw/source/ui/vba/vbaformfieldcheckbox.hxx
@@ -25,7 +25,7 @@ public:
     /// @throws css::uno::RuntimeException
     SwVbaFormFieldCheckBox(const css::uno::Reference<ooo::vba::XHelperInterface>& rParent,
                            const css::uno::Reference<css::uno::XComponentContext>& rContext,
-                           sw::mark::IFieldmark& rFormField);
+                           sw::mark::Fieldmark& rFormField);
     ~SwVbaFormFieldCheckBox() override;
 
     // XCheckBox
diff --git a/sw/source/ui/vba/vbaformfielddropdown.cxx b/sw/source/ui/vba/vbaformfielddropdown.cxx
index 01a219d752d3..448daba0af8d 100644
--- a/sw/source/ui/vba/vbaformfielddropdown.cxx
+++ b/sw/source/ui/vba/vbaformfielddropdown.cxx
@@ -24,7 +24,7 @@ using namespace ::com::sun::star;
  */
 SwVbaFormFieldDropDown::SwVbaFormFieldDropDown(
     const uno::Reference<ooo::vba::XHelperInterface>& rParent,
-    const uno::Reference<uno::XComponentContext>& rContext, ::sw::mark::IFieldmark& rFormField)
+    const uno::Reference<uno::XComponentContext>& rContext, ::sw::mark::Fieldmark& rFormField)
     : SwVbaFormFieldDropDown_BASE(rParent, rContext)
     , m_pDropDown(dynamic_cast<sw::mark::DropDownFieldmark*>(&rFormField))
 {
diff --git a/sw/source/ui/vba/vbaformfielddropdown.hxx b/sw/source/ui/vba/vbaformfielddropdown.hxx
index d4b30c1e665c..bc7355b7e014 100644
--- a/sw/source/ui/vba/vbaformfielddropdown.hxx
+++ b/sw/source/ui/vba/vbaformfielddropdown.hxx
@@ -25,7 +25,7 @@ public:
     /// @throws css::uno::RuntimeException
     SwVbaFormFieldDropDown(const css::uno::Reference<ooo::vba::XHelperInterface>& rParent,
                            const css::uno::Reference<css::uno::XComponentContext>& rContext,
-                           sw::mark::IFieldmark& rFormField);
+                           sw::mark::Fieldmark& rFormField);
     ~SwVbaFormFieldDropDown() override;
 
     // XDropDown
diff --git a/sw/source/ui/vba/vbaformfields.cxx b/sw/source/ui/vba/vbaformfields.cxx
index 426bb78a53c8..7f8a3ef5de1b 100644
--- a/sw/source/ui/vba/vbaformfields.cxx
+++ b/sw/source/ui/vba/vbaformfields.cxx
@@ -25,9 +25,9 @@ using namespace ::com::sun::star;
 // @param rIndex serves multiple purposes
 //        [in] -1 to indicate searching using the provided name, SAL_MAX_INT32 for totals
 //        [out] rIndex indicates the found index, or the total number of fieldmarks
-static sw::mark::IFieldmark* lcl_getFieldmark(std::string_view rName, sal_Int32& rIndex,
-                                              const uno::Reference<frame::XModel>& xModel,
-                                              uno::Sequence<OUString>* pElementNames = nullptr)
+static sw::mark::Fieldmark* lcl_getFieldmark(std::string_view rName, sal_Int32& rIndex,
+                                             const uno::Reference<frame::XModel>& xModel,
+                                             uno::Sequence<OUString>* pElementNames = nullptr)
 
 {
     SwDoc* pDoc = word::getDocShell(xModel)->GetDoc();
@@ -53,10 +53,10 @@ static sw::mark::IFieldmark* lcl_getFieldmark(std::string_view rName, sal_Int32&
                     && (*aIter)->GetName().equalsIgnoreAsciiCase(OUString::fromUtf8(rName)))
                 {
                     rIndex = nCounter;
-                    return dynamic_cast<sw::mark::IFieldmark*>(*aIter);
+                    return dynamic_cast<sw::mark::Fieldmark*>(*aIter);
                 }
                 else if (rIndex == nCounter)
-                    return dynamic_cast<sw::mark::IFieldmark*>(*aIter);
+                    return dynamic_cast<sw::mark::Fieldmark*>(*aIter);
 
                 ++nCounter;
                 if (pElementNames)
@@ -106,7 +106,7 @@ private:
     uno::Reference<XHelperInterface> mxParent;
     uno::Reference<uno::XComponentContext> mxContext;
     uno::Reference<text::XTextDocument> mxTextDocument;
-    sw::mark::IFieldmark* m_pCache;
+    sw::mark::Fieldmark* m_pCache;
 
 public:
     /// @throws css::uno::RuntimeException
@@ -199,7 +199,7 @@ void SwVbaFormFields::setShaded(sal_Bool /*bSet*/)
 // uno::Reference<ooo::vba::word::XFormField> SwVbaFormFields::Add(const uno::Any& Range,
 //                                                                 sal_Int32 Type)
 // {
-//     sw::mark::IFieldmark* pFieldmark = nullptr;
+//     sw::mark::Fieldmark* pFieldmark = nullptr;
 //     switch (Type)
 //     {
 //         case ooo::vba::word::WdFieldType::wdFieldFormCheckBox:
diff --git a/sw/source/ui/vba/vbaformfieldtextinput.cxx b/sw/source/ui/vba/vbaformfieldtextinput.cxx
index c4188491ca3f..7724b933709d 100644
--- a/sw/source/ui/vba/vbaformfieldtextinput.cxx
+++ b/sw/source/ui/vba/vbaformfieldtextinput.cxx
@@ -25,7 +25,7 @@ using namespace ::com::sun::star;
  */
 SwVbaFormFieldTextInput::SwVbaFormFieldTextInput(
     const uno::Reference<ooo::vba::XHelperInterface>& rParent,
-    const uno::Reference<uno::XComponentContext>& rContext, sw::mark::IFieldmark& rFormField)
+    const uno::Reference<uno::XComponentContext>& rContext, sw::mark::Fieldmark& rFormField)
     : SwVbaFormFieldTextInput_BASE(rParent, rContext)
     , m_rTextInput(rFormField)
 {
diff --git a/sw/source/ui/vba/vbaformfieldtextinput.hxx b/sw/source/ui/vba/vbaformfieldtextinput.hxx
index 513cac64defd..2df7a41d2895 100644
--- a/sw/source/ui/vba/vbaformfieldtextinput.hxx
+++ b/sw/source/ui/vba/vbaformfieldtextinput.hxx
@@ -19,13 +19,13 @@ typedef InheritedHelperInterfaceWeakImpl<ooo::vba::word::XTextInput> SwVbaFormFi
 class SwVbaFormFieldTextInput : public SwVbaFormFieldTextInput_BASE
 {
 private:
-    sw::mark::IFieldmark& m_rTextInput;
+    sw::mark::Fieldmark& m_rTextInput;
 
 public:
     /// @throws css::uno::RuntimeException
     SwVbaFormFieldTextInput(const css::uno::Reference<ooo::vba::XHelperInterface>& rParent,
                             const css::uno::Reference<css::uno::XComponentContext>& rContext,
-                            sw::mark::IFieldmark& rFormField);
+                            sw::mark::Fieldmark& rFormField);
     ~SwVbaFormFieldTextInput() override;
 
     // XTextInput