diff options
| author | Justin Luth <justin_luth@sil.org> | 2016-10-11 19:26:15 +0300 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-10-13 06:48:35 +0000 |
| commit | b39feae4f12b07a0fdb2c8c2a48d5aae613cd7c9 (patch) | |
| tree | 1382e9d1cb0e56d83408b7144bff5361ed4f4e50 /sw/source | |
| parent | 62223f9a8a4d069b34e37ad0c1bf5b73916a646e (diff) | |
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@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'sw/source')
| -rw-r--r-- | sw/source/filter/ww8/wrtw8nds.cxx | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx index dc070a66c5ef..80a059d36eef 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 ); |