diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-07-01 19:04:38 +0200 |
|---|---|---|
| committer | Fridrich Strba <fridrich@documentfoundation.org> | 2013-07-02 07:14:44 +0000 |
| commit | 2a36c1fb1b5d33b49444deb465c861bb1850732b (patch) | |
| tree | ec75feacb227e7d5142a0dd79fc26ca04e968a5b | |
| parent | a19db54f78720dc8200b3504e84cd19d445f4d18 (diff) | |
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/4663
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
| -rw-r--r-- | sw/source/filter/ww8/wrtw8nds.cxx | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx index e5b312de5410..cb69180abe0b 100644 --- a/sw/source/filter/ww8/wrtw8nds.cxx +++ b/sw/source/filter/ww8/wrtw8nds.cxx @@ -2024,7 +2024,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)) { |