core.git: sw/qa

[Xisco Fauli (via logerrit)]

 sw/qa/extras/ooxmlexport/ooxmlexport13.cxx |   65 +++++++++++++----------------
 1 file changed, 31 insertions(+), 34 deletions(-)

New commits:
commit 337162e50b38875f626a64667ddb83f8930eab35
Author:     Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Tue Oct 15 22:42:22 2024 +0200
Commit:     Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Wed Oct 16 00:44:21 2024 +0200

    CppunitTest_sw_ooxmlexport13: fix dead code
    
    isExported() always returns true after loadAndReload
    
    Change-Id: Ia1ca4e5d1efa9dc4a8131574fac8c226aebada03
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174983
    Tested-by: Jenkins
    Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>

diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
index 85b458ba3722..2db8bc8f1bcd 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
@@ -631,40 +631,37 @@ DECLARE_OOXMLEXPORT_TEST(testParaAdjustDistribute, 
"para-adjust-distribute.docx"
 
 CPPUNIT_TEST_FIXTURE(Test, testInputListExport)
 {
-    loadAndReload("tdf122186_input_list.odt");
-    if (!isExported()) // importing the ODT, an input field
-    {
-        uno::Reference<text::XTextFieldsSupplier> 
xTextFieldsSupplier(mxComponent, uno::UNO_QUERY);
-        uno::Reference<container::XEnumerationAccess> 
xFieldsAccess(xTextFieldsSupplier->getTextFields());
-        uno::Reference<container::XEnumeration> 
xFields(xFieldsAccess->createEnumeration());
-        CPPUNIT_ASSERT(xFields->hasMoreElements());
-        uno::Any aField = xFields->nextElement();
-        uno::Reference<lang::XServiceInfo> xServiceInfo(aField, 
uno::UNO_QUERY);
-        
CPPUNIT_ASSERT(xServiceInfo->supportsService(u"com.sun.star.text.textfield.DropDown"_ustr));
-    }
-    else // importing the DOCX, a content control
-    {
-        uno::Reference<beans::XPropertySet> 
xTextPortion(getRun(getParagraph(1), 1), uno::UNO_QUERY);
-        OUString aPortionType;
-        xTextPortion->getPropertyValue(u"TextPortionType"_ustr) >>= 
aPortionType;
-        CPPUNIT_ASSERT_EQUAL(u"ContentControl"_ustr, aPortionType);
-        uno::Reference<text::XTextContent> xContentControl;
-        xTextPortion->getPropertyValue(u"ContentControl"_ustr) >>= 
xContentControl;
-        uno::Reference<beans::XPropertySet> 
xContentControlProps(xContentControl, uno::UNO_QUERY);
-        uno::Sequence<beans::PropertyValues> aListItems;
-        xContentControlProps->getPropertyValue(u"ListItems"_ustr) >>= 
aListItems;
-        CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(3), 
aListItems.getLength());
-        comphelper::SequenceAsHashMap aMap0(aListItems[0]);
-        CPPUNIT_ASSERT_EQUAL(u"1"_ustr, aMap0[u"Value"_ustr].get<OUString>());
-        comphelper::SequenceAsHashMap aMap1(aListItems[1]);
-        CPPUNIT_ASSERT_EQUAL(u"2"_ustr, aMap1[u"Value"_ustr].get<OUString>());
-        comphelper::SequenceAsHashMap aMap2(aListItems[2]);
-        CPPUNIT_ASSERT_EQUAL(u"3"_ustr, aMap2[u"Value"_ustr].get<OUString>());
-        uno::Reference<container::XEnumerationAccess> 
xContentEnumAccess(xContentControl, uno::UNO_QUERY);
-        uno::Reference<container::XEnumeration> xContentEnum = 
xContentEnumAccess->createEnumeration();
-        uno::Reference<text::XTextRange> xContent(xContentEnum->nextElement(), 
uno::UNO_QUERY);
-        CPPUNIT_ASSERT_EQUAL(u"1"_ustr, xContent->getString());
-    }
+    createSwDoc("tdf122186_input_list.odt");
+    uno::Reference<text::XTextFieldsSupplier> xTextFieldsSupplier(mxComponent, 
uno::UNO_QUERY);
+    uno::Reference<container::XEnumerationAccess> 
xFieldsAccess(xTextFieldsSupplier->getTextFields());
+    uno::Reference<container::XEnumeration> 
xFields(xFieldsAccess->createEnumeration());
+    CPPUNIT_ASSERT(xFields->hasMoreElements());
+    uno::Any aField = xFields->nextElement();
+    uno::Reference<lang::XServiceInfo> xServiceInfo(aField, uno::UNO_QUERY);
+    
CPPUNIT_ASSERT(xServiceInfo->supportsService(u"com.sun.star.text.textfield.DropDown"_ustr));
+
+    saveAndReload(mpFilter);
+
+    uno::Reference<beans::XPropertySet> xTextPortion(getRun(getParagraph(1), 
1), uno::UNO_QUERY);
+    OUString aPortionType;
+    xTextPortion->getPropertyValue(u"TextPortionType"_ustr) >>= aPortionType;
+    CPPUNIT_ASSERT_EQUAL(u"ContentControl"_ustr, aPortionType);
+    uno::Reference<text::XTextContent> xContentControl;
+    xTextPortion->getPropertyValue(u"ContentControl"_ustr) >>= xContentControl;
+    uno::Reference<beans::XPropertySet> xContentControlProps(xContentControl, 
uno::UNO_QUERY);
+    uno::Sequence<beans::PropertyValues> aListItems;
+    xContentControlProps->getPropertyValue(u"ListItems"_ustr) >>= aListItems;
+    CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(3), aListItems.getLength());
+    comphelper::SequenceAsHashMap aMap0(aListItems[0]);
+    CPPUNIT_ASSERT_EQUAL(u"1"_ustr, aMap0[u"Value"_ustr].get<OUString>());
+    comphelper::SequenceAsHashMap aMap1(aListItems[1]);
+    CPPUNIT_ASSERT_EQUAL(u"2"_ustr, aMap1[u"Value"_ustr].get<OUString>());
+    comphelper::SequenceAsHashMap aMap2(aListItems[2]);
+    CPPUNIT_ASSERT_EQUAL(u"3"_ustr, aMap2[u"Value"_ustr].get<OUString>());
+    uno::Reference<container::XEnumerationAccess> 
xContentEnumAccess(xContentControl, uno::UNO_QUERY);
+    uno::Reference<container::XEnumeration> xContentEnum = 
xContentEnumAccess->createEnumeration();
+    uno::Reference<text::XTextRange> xContent(xContentEnum->nextElement(), 
uno::UNO_QUERY);
+    CPPUNIT_ASSERT_EQUAL(u"1"_ustr, xContent->getString());
 }
 
 DECLARE_OOXMLEXPORT_TEST(testTdf123435, "tdf123435.docx")