commit 2e8776c181d0e38a8d25481ac0eb33389940bf95
author Justin Luth <justin.luth@collabora.com> Mon Nov 21 11:13:20 2022 -0500
committer Justin Luth <jluth@mail.com> Wed Dec 21 00:24:16 2022 +0000
tree 680f932430f24a66c32cc38d71e0e097f1f843fe
parent 7d948d5c7edbbfd29a77b97a5101aa43917e5ec2

tdf#151548: second cleanup "Add basic word::XFormField support" etc.

Change-Id: I0647f29aa23959cbf9809cd745473e7b048901eb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143079
Tested-by: Jenkins
Reviewed-by: Justin Luth <jluth@mail.com>

sw/source/ui/vba/vbaformfield.cxx

diff --git a/sw/source/ui/vba/vbaformfield.cxx b/sw/source/ui/vba/vbaformfield.cxx
index 6178a3e..8755e56 100644
--- a/sw/source/ui/vba/vbaformfield.cxx
+++ b/sw/source/ui/vba/vbaformfield.cxx
@@ -26,9 +26,6 @@ using namespace ::ooo::vba;
using namespace ::com::sun::star;

/**
 * Information about the method and properties of FormFields was gathered from
 * https://www.codevba.com/Word/FormField.htm
 *
 * FormFields are inline text objects that are only found in MS Word.
 * They cannot be created in Excel or in Calc.
 *

sw/source/ui/vba/vbaformfielddropdownlistentries.cxx

diff --git a/sw/source/ui/vba/vbaformfielddropdownlistentries.cxx b/sw/source/ui/vba/vbaformfielddropdownlistentries.cxx
index f06ff3d..c167e16 100644
--- a/sw/source/ui/vba/vbaformfielddropdownlistentries.cxx
+++ b/sw/source/ui/vba/vbaformfielddropdownlistentries.cxx
@@ -102,8 +102,8 @@ SwVbaFormFieldDropDownListEntries::SwVbaFormFieldDropDownListEntries(
}

// XListEntries
uno::Reference<word::XListEntry>
    SAL_CALL SwVbaFormFieldDropDownListEntries::Add(const OUString& rName, const uno::Any& rIndex)
uno::Reference<word::XListEntry> SwVbaFormFieldDropDownListEntries::Add(const OUString& rName,
                                                                        const uno::Any& rIndex)
{
    sal_Int32 nZIndex = 0;
    rIndex >>= nZIndex;
@@ -124,7 +124,7 @@ uno::Reference<word::XListEntry>
        new SwVbaFormFieldDropDownListEntry(mxParent, mxContext, m_rDropDown, nZIndex));
}

void SAL_CALL SwVbaFormFieldDropDownListEntries::Clear() { m_rDropDown.DelContent(); }
void SwVbaFormFieldDropDownListEntries::Clear() { m_rDropDown.DelContent(); }

sal_Int32 SwVbaFormFieldDropDownListEntries::getCount()
{

sw/source/ui/vba/vbaformfielddropdownlistentry.cxx

diff --git a/sw/source/ui/vba/vbaformfielddropdownlistentry.cxx b/sw/source/ui/vba/vbaformfielddropdownlistentry.cxx
index dd9c94d..bc02439e 100644
--- a/sw/source/ui/vba/vbaformfielddropdownlistentry.cxx
+++ b/sw/source/ui/vba/vbaformfielddropdownlistentry.cxx
@@ -25,15 +25,15 @@ SwVbaFormFieldDropDownListEntry::SwVbaFormFieldDropDownListEntry(
SwVbaFormFieldDropDownListEntry::~SwVbaFormFieldDropDownListEntry() {}

// XListEntry
sal_Int32 SAL_CALL SwVbaFormFieldDropDownListEntry::getIndex() { return m_nZIndex + 1; }
sal_Int32 SwVbaFormFieldDropDownListEntry::getIndex() { return m_nZIndex + 1; }

OUString SAL_CALL SwVbaFormFieldDropDownListEntry::getName()
OUString SwVbaFormFieldDropDownListEntry::getName()
{
    sal_Int32 nZIndex = m_nZIndex;
    return m_rDropDown.GetContent(&nZIndex);
}

void SAL_CALL SwVbaFormFieldDropDownListEntry::setName(const OUString& rSet)
void SwVbaFormFieldDropDownListEntry::setName(const OUString& rSet)
{
    sal_Int32 nZIndex = m_nZIndex;
    m_rDropDown.ReplaceContent(&rSet, &nZIndex);