sw/source/filter/ww8/wrtw8nds.cxx | 1 -
1 file changed, 1 deletion(-)
New commits:
commit 235a543619d74f024087983cee35e4f03e5993b0
Author: Michael Stahl <mst...@redhat.com>
Date: Mon Jul 1 19:04:38 2013 +0200
fdo#66165: WW8 export: fix duplicated paragraph breaks
MSWordExportBase::OutputTextNode(): in commit
8f2a21eac4a904db3cc4c448179e2d2cf5878ef4
(which is not merged) a "WriteCR( pTextNodeInfoInner );" was moved up
a few lines, so it shows up as context in the other commit, and
the bug is that the cherry-pick 83ba821c10392c08334f7d8d3775fe3e8d08f8fd
erroneously adds this context line so now there are 2 WriteCR().
Change-Id: I08434b284f3d8d8426fa997623be352c37d6c7c2
(cherry picked from commit a201ae63ce798438057a1328dc644dc8b64fe4e8)
Reviewed-on: https://gerrit.libreoffice.org/4662
Reviewed-by: Fridrich Strba <fridr...@documentfoundation.org>
Tested-by: Fridrich Strba <fridr...@documentfoundation.org>
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx
b/sw/source/filter/ww8/wrtw8nds.cxx
index 83bd794..330d70c 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -2023,7 +2023,6 @@ void MSWordExportBase::OutputTextNode( const SwTxtNode&
rNode )
aAttrIter.OutFlys( nEnd );
// insert final bookmarks if any before CR and after flys
AppendBookmarks( rNode, nEnd, 1 );
- WriteCR( pTextNodeInfoInner );
// #i120928 - position of the bullet's graphic is at end of doc
if (bLastCR && (!bExported))
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
