[Libreoffice-commits] core.git: sw/source

[László Németh (via logerrit)]

 sw/source/filter/ww8/docxattributeoutput.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 222f6a1c43b7ae7bf8e2f1fbc1dbe6457e611ab7
Author:     László Németh <nemeth at numbertext.org>
AuthorDate: Tue Jun 4 15:00:19 2019 +0200
Commit:     László Németh <nemeth at numbertext.org>
CommitDate: Tue Jun 4 18:44:08 2019 +0200

    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 at numbertext.org>

diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index 5a0b1708c6f5..9fdd2b94d575 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -1917,8 +1917,6 @@ void DocxAttributeOutput::StartField_Impl( const SwTextNode* pNode, sal_Int32 nP
         }
         else
         {
-            m_bWritingField = true;
-
             // Write the field start
             if ( rInfos.pField && (rInfos.pField->Which() == SwFieldIds::DateTime) && rInfos.pField->GetSubType() & FIXEDFLD )
             {
@@ -1944,6 +1942,8 @@ void DocxAttributeOutput::StartField_Impl( const SwTextNode* pNode, sal_Int32 nP
             // normally in the text run
             if ( !rInfos.pField )
                 CmdField_Impl( pNode, nPos, rInfos, bWriteRun );
+            else
+                m_bWritingField = true;
         }
     }
 }