Kaydet (Commit) b39feae4 authored tarafından Justin Luth's avatar Justin Luth Kaydeden (comit) Miklos Vajna

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 80fd9fb7

Change-Id: I94482d59218800c04f59c777f28356e8a6264087
Reviewed-on: https://gerrit.libreoffice.org/29706Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarMiklos Vajna <vmiklos@collabora.co.uk>
üst 62223f9a
......@@ -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 );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment