diff options
| author | Cédric Bosdonnat <cedric.bosdonnat@free.fr> | 2012-08-02 14:11:50 +0200 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.cz> | 2012-08-06 15:55:42 +0200 |
| commit | 2e395b785b1d22922572e94f480a5f581027f9de (patch) | |
| tree | 26a42d3387645735147acd27a87d742d04a34064 | |
| parent | 3347e2644f44d4a4165d594126bcd1c924b82a9a (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>
Signed-off-by: Petr Mladek <pmladek@suse.cz>
| -rw-r--r-- | sw/source/filter/ww8/wrtw8nds.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx index 50e6c60c0248..cfb4a6603c76 100644 --- a/sw/source/filter/ww8/wrtw8nds.cxx +++ b/sw/source/filter/ww8/wrtw8nds.cxx @@ -1626,8 +1626,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(); } |