tdf#122186: Fix broken Input list after RT in DOCX format

We should not write out the text of the field, because it
confuses the import code and it's unneeded anyway.

Reviewed-on: https://gerrit.libreoffice.org/66338
Tested-by: Jenkins
Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
(cherry picked from commit 35ea8fc2)

Change-Id: Id114f74c5d135e9fe6cb059e25ebf324464c8362
Reviewed-on: https://gerrit.libreoffice.org/66378Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>

sw/qa/extras/ooxmlexport/ooxmlexport11.cxx

@@ -403,6 +403,16 @@ DECLARE_OOXMLEXPORT_TEST(testTdf58944RepeatingTableHeader, "tdf58944-repeating-t
                          parseDump("/root/page[2]/body/tab/row[2]/cell[1]/txt/text()"));
 }
 
+DECLARE_OOXMLEXPORT_TEST(testInputListExport, "tdf122186_input_list.odt")
+{
+    // We need to make sure we don't export the text itself next to the input list field
+    xmlDocPtr pXmlDoc = parseExport("word/document.xml");
+    if (!pXmlDoc)
+        return;
+    assertXPath(pXmlDoc, "/w:document/w:body/w:p/w:r", 5);
+    assertXPath(pXmlDoc, "/w:document/w:body/w:p/w:r[4]/w:t", 0);
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

sw/source/filter/ww8/docxattributeoutput.cxx

@@ -1921,7 +1921,7 @@ void DocxAttributeOutput::EndField_Impl( const SwTextNode* pNode, sal_Int32 nPos
             sExpand = static_cast<SwAuthorityField const*>(rInfos.pField.get())
                         ->ExpandCitation(AUTH_FIELD_TITLE);
         }
-        else
+        else if(rInfos.eType != ww::eFORMDROPDOWN)
         {
             sExpand = rInfos.pField->ExpandField( true );
         }