commit 222f6a1c43b7ae7bf8e2f1fbc1dbe6457e611ab7
author László Németh <nemeth@numbertext.org> Tue Jun 04 15:00:19 2019 +0200
committer László Németh <nemeth@numbertext.org> Tue Jun 04 18:44:08 2019 +0200
tree 5a2ff73afa5a9ab6f1bf8585a19a62ba2f7775bc
parent 1e1535d46f9d89a2584409d88f35b57ef920eefa

tdf#70234 DOCX export: fix only expanded fields

The commit caf2f5fff39caf06204f71d0c2276b415ef047c3
"tdf#70234 DOCX: export tracked deletion of fields"
must handle only the fields with multiple runs
(expanded fields).

Change-Id: I2303bade75401e07accf3f0a874f093458fe7efa
Reviewed-on: https://gerrit.libreoffice.org/73453
Tested-by: Jenkins
Reviewed-by: László Németh <nemeth@numbertext.org>

sw/source/filter/ww8/docxattributeoutput.cxx

diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index 5a0b170..9fdd2b9 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -1917,8 +1917,6 @@
        }
        else
        {
            m_bWritingField = true;

            // Write the field start
            if ( rInfos.pField && (rInfos.pField->Which() == SwFieldIds::DateTime) && rInfos.pField->GetSubType() & FIXEDFLD )
            {
@@ -1944,6 +1942,8 @@
            // normally in the text run
            if ( !rInfos.pField )
                CmdField_Impl( pNode, nPos, rInfos, bWriteRun );
            else
                m_bWritingField = true;
        }
    }
}