sw/source/filter/ww8/wrtw8nds.cxx | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 108f7a5aa75e3f35b6fa57af402a1e903fefea24
Author: Cédric Bosdonnat <cedric.bosdon...@free.fr>
Date: Thu Aug 2 14:11:50 2012 +0200
fdo#46020: fixed missing footnote docx/doc/rtf export
Don't skip a next position when parsing a paragraph into runs to export.
Change-Id: If7e887ea84ad24256b37aa96187bc30ea154632b
Signed-off-by: Miklos Vajna <vmik...@suse.cz>
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx
b/sw/source/filter/ww8/wrtw8nds.cxx
index adeeb5a..d70ad1f 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -1622,8 +1622,10 @@ void MSWordExportBase::UpdatePosition( SwWW8AttrIter*
aAttrIter, xub_StrLen nAkt
xub_StrLen nNextPos;
// go to next attribute if no bookmark is found or if the bookmark is
behind the next attribute position
+ // It may happend that the WhereNext() wasn't used in the previous
increment because there was a
+ // bookmark before it. Use that position before trying to find another one.
bool bNextBookmark = NearestBookmark( nNextPos, nAktPos, true );
- if( !bNextBookmark || nNextPos > aAttrIter->WhereNext() )
+ if( nAktPos == aAttrIter->WhereNext() && ( !bNextBookmark || nNextPos >
aAttrIter->WhereNext() ) )
aAttrIter->NextPos();
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
