diff options
| -rw-r--r-- | sw/qa/extras/ooxmlexport/ooxmlexport13.cxx | 2 | ||||
| -rw-r--r-- | sw/source/filter/ww8/docxexport.cxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx index 4254a619e17a..edbc0964685d 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx @@ -245,7 +245,7 @@ DECLARE_OOXMLEXPORT_TEST(testTextInput, "textinput.odt") if (!pXmlDoc) return; // Ensure we have a formfield - assertXPathContent(pXmlDoc, "/w:document/w:body/w:p/w:r[3]/w:instrText", " FORMTEXT "); + assertXPathContent(pXmlDoc, "/w:document/w:body/w:p/w:r[3]/w:instrText", " FILLIN \"\""); // and it's content is not gone assertXPathContent(pXmlDoc, "/w:document/w:body/w:p/w:r[5]/w:t", "SomeText"); } diff --git a/sw/source/filter/ww8/docxexport.cxx b/sw/source/filter/ww8/docxexport.cxx index 75a28e020a91..f0db6407c55d 100644 --- a/sw/source/filter/ww8/docxexport.cxx +++ b/sw/source/filter/ww8/docxexport.cxx @@ -378,8 +378,8 @@ void DocxExport::DoComboBox(const OUString& rName, void DocxExport::DoFormText(const SwInputField* pField) { assert(pField); - const OUString sStr = FieldString(ww::eFORMTEXT); - OutputField(pField, ww::eFORMTEXT, sStr); + const OUString sStr = FieldString(ww::eFILLIN) + "\"" + pField->GetPar2() + "\""; + OutputField(pField, ww::eFILLIN, sStr); } OString DocxExport::OutputChart( uno::Reference< frame::XModel > const & xModel, sal_Int32 nCount, ::sax_fastparser::FSHelperPtr const & m_pSerializer ) |