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

[Justin Luth]

 sw/source/filter/ww8/wrtw8nds.cxx |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

New commits:
commit b39feae4f12b07a0fdb2c8c2a48d5aae613cd7c9
Author: Justin Luth <justin_luth at sil.org>
Date:   Tue Oct 11 19:26:15 2016 +0300

    tdf#89317 ww8export: don't corrupt table with postponed text
    
    at least two unanticipated problems were seen when outputting text was delayed
    inside of a table context. When a fly anchor is at the end of a cell node,
    the cell was not created. Also +Fkp: selber FC mehrfach benutzt
    
    avoids regression caused by 80fd9fb7209cfd5c0622ee99d59e42e6db32f021
    
    Change-Id: I94482d59218800c04f59c777f28356e8a6264087
    Reviewed-on: https://gerrit.libreoffice.org/29706
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx
index dc070a66..80a059d 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -2173,9 +2173,14 @@ void MSWordExportBase::OutputTextNode( const SwTextNode& rNode )
             2) Ensure that it is a text node and not in a fly.
             3) If the anchor is associated with a text node with empty text then we ignore.
         */
-        if ( rNode.IsTextNode() && aStr != aStringForImage && !aStr.isEmpty() &&
-            !rNode.GetFlyFormat() && aAttrIter.IsAnchorLinkedToThisNode(rNode.GetIndex()))
+        if( rNode.IsTextNode()
+            && aStr != aStringForImage && !aStr.isEmpty()
+            && !rNode.GetFlyFormat()
+            && !IsInTable()
+            && aAttrIter.IsAnchorLinkedToThisNode(rNode.GetIndex()) )
+        {
             bPostponeWritingText = true ;
+        }
 
         nStateOfFlyFrame = aAttrIter.OutFlys( nAktPos );
         AttrOutput().SetStateOfFlyFrame( nStateOfFlyFrame );