summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorC├ędric Bosdonnat <cedric.bosdonnat@free.fr>2012-08-02 14:11:50 +0200
committerMiklos Vajna <vmiklos@suse.cz>2012-08-03 09:52:01 +0200
commit108f7a5aa75e3f35b6fa57af402a1e903fefea24 (patch)
tree3cc427d4c27ddfe7fc1324ccdeb66ede4bf41c28 /sw
parentee1ee06ec96c6db87203970bf05dd6cd7513f674 (diff)
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 <vmiklos@suse.cz>
Diffstat (limited to 'sw')
-rw-r--r--sw/source/filter/ww8/wrtw8nds.cxx4
1 files changed, 3 insertions, 1 deletions
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx
index adeeb5a4f067..d70ad1f89d31 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();
}