diff options
author | Ilhan Yesil <ilhanyesil@gmx.de> | 2019-05-23 17:52:04 +0200 |
---|---|---|
committer | Vasily Melenchuk <vasily.melenchuk@cib.de> | 2019-05-27 08:41:17 +0200 |
commit | 62aaaad156ef0daccd2680161ef8b9b99d8a7bc0 (patch) | |
tree | 9152d68e4ad9d77a726694d99ad91d985cfcbece | |
parent | b6c94e4e04fef032c82c6517ce58ab9eb2b53d59 (diff) |
tdf#125103 Writer: input fields will be exported to docx
Changed the solution https://gerrit.libreoffice.org/#/c/70786/
of Vasily sligthly, so MS Office can recognize fields still
as fields.
Change-Id: Id45330a96dfe002685c6ef3dc62e408c5f9f46c4
Reviewed-on: https://gerrit.libreoffice.org/72868
Tested-by: Jenkins
Reviewed-by: Vasily Melenchuk <vasily.melenchuk@cib.de>
-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 ) |