From 2fbd16ed37ad0312faef79d1147d57731cfd980e Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Sun, 4 Aug 2024 15:28:12 +0200 Subject: simplify IMark hierarchy (3) merge IDropdownFieldmark into DropDownFieldmark Change-Id: I5dd9a166bc3f0710237b45fb0b063973547f2eb4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/171460 Tested-by: Jenkins Reviewed-by: Noel Grandin --- sw/source/ui/vba/vbaformfielddropdown.cxx | 2 +- sw/source/ui/vba/vbaformfielddropdown.hxx | 2 +- sw/source/ui/vba/vbaformfielddropdownlistentries.cxx | 9 ++++----- sw/source/ui/vba/vbaformfielddropdownlistentries.hxx | 4 ++-- sw/source/ui/vba/vbaformfielddropdownlistentry.cxx | 4 ++-- sw/source/ui/vba/vbaformfielddropdownlistentry.hxx | 4 ++-- 6 files changed, 12 insertions(+), 13 deletions(-) (limited to 'sw/source/ui') diff --git a/sw/source/ui/vba/vbaformfielddropdown.cxx b/sw/source/ui/vba/vbaformfielddropdown.cxx index 08648fb05065..01a219d752d3 100644 --- a/sw/source/ui/vba/vbaformfielddropdown.cxx +++ b/sw/source/ui/vba/vbaformfielddropdown.cxx @@ -26,7 +26,7 @@ SwVbaFormFieldDropDown::SwVbaFormFieldDropDown( const uno::Reference& rParent, const uno::Reference& rContext, ::sw::mark::IFieldmark& rFormField) : SwVbaFormFieldDropDown_BASE(rParent, rContext) - , m_pDropDown(dynamic_cast(&rFormField)) + , m_pDropDown(dynamic_cast(&rFormField)) { } diff --git a/sw/source/ui/vba/vbaformfielddropdown.hxx b/sw/source/ui/vba/vbaformfielddropdown.hxx index e92caa2f8e8c..d4b30c1e665c 100644 --- a/sw/source/ui/vba/vbaformfielddropdown.hxx +++ b/sw/source/ui/vba/vbaformfielddropdown.hxx @@ -19,7 +19,7 @@ typedef InheritedHelperInterfaceWeakImpl SwVbaFormFie class SwVbaFormFieldDropDown : public SwVbaFormFieldDropDown_BASE { private: - sw::mark::IDropdownFieldmark* m_pDropDown; + sw::mark::DropDownFieldmark* m_pDropDown; public: /// @throws css::uno::RuntimeException diff --git a/sw/source/ui/vba/vbaformfielddropdownlistentries.cxx b/sw/source/ui/vba/vbaformfielddropdownlistentries.cxx index 6f77079e1b6d..30af34a4988b 100644 --- a/sw/source/ui/vba/vbaformfielddropdownlistentries.cxx +++ b/sw/source/ui/vba/vbaformfielddropdownlistentries.cxx @@ -14,7 +14,7 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; -static uno::Sequence lcl_getListEntries(sw::mark::IDropdownFieldmark& rDropDown) +static uno::Sequence lcl_getListEntries(sw::mark::DropDownFieldmark& rDropDown) { uno::Sequence aSeq; (*rDropDown.GetParameters())[ODF_FORMDROPDOWN_LISTENTRY] >>= aSeq; @@ -53,13 +53,13 @@ class ListEntryCollectionHelper private: uno::Reference mxParent; uno::Reference mxContext; - sw::mark::IDropdownFieldmark& m_rDropDown; + sw::mark::DropDownFieldmark& m_rDropDown; public: /// @throws css::uno::RuntimeException ListEntryCollectionHelper(uno::Reference xParent, uno::Reference xContext, - sw::mark::IDropdownFieldmark& rFormField) + sw::mark::DropDownFieldmark& rFormField) : mxParent(std::move(xParent)) , mxContext(std::move(xContext)) , m_rDropDown(rFormField) @@ -91,8 +91,7 @@ public: SwVbaFormFieldDropDownListEntries::SwVbaFormFieldDropDownListEntries( const uno::Reference& xParent, - const uno::Reference& xContext, - sw::mark::IDropdownFieldmark& rFormField) + const uno::Reference& xContext, sw::mark::DropDownFieldmark& rFormField) : SwVbaFormFieldDropDownListEntries_BASE( xParent, xContext, uno::Reference( diff --git a/sw/source/ui/vba/vbaformfielddropdownlistentries.hxx b/sw/source/ui/vba/vbaformfielddropdownlistentries.hxx index ef1339127021..f8ea422678f0 100644 --- a/sw/source/ui/vba/vbaformfielddropdownlistentries.hxx +++ b/sw/source/ui/vba/vbaformfielddropdownlistentries.hxx @@ -21,14 +21,14 @@ typedef CollTestImplHelper SwVbaFormFieldDropDownL class SwVbaFormFieldDropDownListEntries : public SwVbaFormFieldDropDownListEntries_BASE { private: - sw::mark::IDropdownFieldmark& m_rDropDown; + sw::mark::DropDownFieldmark& m_rDropDown; public: /// @throws css::uno::RuntimeException SwVbaFormFieldDropDownListEntries( const css::uno::Reference& xParent, const css::uno::Reference& xContext, - sw::mark::IDropdownFieldmark& m_rDropDown); + sw::mark::DropDownFieldmark& m_rDropDown); // XListEntries css::uno::Reference diff --git a/sw/source/ui/vba/vbaformfielddropdownlistentry.cxx b/sw/source/ui/vba/vbaformfielddropdownlistentry.cxx index 10d58e113eb7..fc3cb39b0e2c 100644 --- a/sw/source/ui/vba/vbaformfielddropdownlistentry.cxx +++ b/sw/source/ui/vba/vbaformfielddropdownlistentry.cxx @@ -14,8 +14,8 @@ using namespace ::com::sun::star; SwVbaFormFieldDropDownListEntry::SwVbaFormFieldDropDownListEntry( const uno::Reference& rParent, - const uno::Reference& rContext, - sw::mark::IDropdownFieldmark& rFormField, sal_Int32 nZIndex) + const uno::Reference& rContext, sw::mark::DropDownFieldmark& rFormField, + sal_Int32 nZIndex) : SwVbaFormFieldDropDownListEntry_BASE(rParent, rContext) , m_rDropDown(rFormField) , m_nZIndex(nZIndex) diff --git a/sw/source/ui/vba/vbaformfielddropdownlistentry.hxx b/sw/source/ui/vba/vbaformfielddropdownlistentry.hxx index 4ded080e632e..32d76f0d08ad 100644 --- a/sw/source/ui/vba/vbaformfielddropdownlistentry.hxx +++ b/sw/source/ui/vba/vbaformfielddropdownlistentry.hxx @@ -20,7 +20,7 @@ typedef InheritedHelperInterfaceWeakImpl class SwVbaFormFieldDropDownListEntry : public SwVbaFormFieldDropDownListEntry_BASE { private: - sw::mark::IDropdownFieldmark& m_rDropDown; + sw::mark::DropDownFieldmark& m_rDropDown; // All LO and internal UNO functions are 0-based. Convert to 1-based when sending to VBA const sal_Int32 m_nZIndex; @@ -29,7 +29,7 @@ public: SwVbaFormFieldDropDownListEntry( const css::uno::Reference& rParent, const css::uno::Reference& rContext, - sw::mark::IDropdownFieldmark& rFormField, sal_Int32 nZIndex); + sw::mark::DropDownFieldmark& rFormField, sal_Int32 nZIndex); ~SwVbaFormFieldDropDownListEntry() override; // XListEntry -- cgit