[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-1+backports' - sw/qa sw/source

[Ilhan Yesil (via logerrit)]

 sw/qa/extras/ooxmlexport/ooxmlexport12.cxx |    2 +-
 sw/source/filter/ww8/docxexport.cxx        |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 7869bf3d5e71f5c5acfeb83f1695f643d57dd2f9
Author:     Ilhan Yesil <ilhanyesil at gmx.de>
AuthorDate: Thu May 23 17:52:04 2019 +0200
Commit:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Thu May 30 00:08:14 2019 +0200

    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.
    
    Reviewed-on: https://gerrit.libreoffice.org/72868
    Tested-by: Jenkins
    Reviewed-by: Vasily Melenchuk <vasily.melenchuk at cib.de>
    (cherry picked from commit 62aaaad156ef0daccd2680161ef8b9b99d8a7bc0)
    
    Change-Id: Id45330a96dfe002685c6ef3dc62e408c5f9f46c4
    Reviewed-on: https://gerrit.libreoffice.org/73100
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    Tested-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx
index 25fc6b4d69f7..cddb19256f2e 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx
@@ -777,7 +777,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 e4a2d274544e..cce452fe409c 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 )