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-07 11:32:15 +0200 |
| commit | 27d77a6e6f4959cd1781c2e78b4a957ed63e290f (patch) | |
| tree | a42cfa382d0a9d56d6d84fe559edd064e45c42df | |
| parent | b8f2e4e8ef900c61cd07e805eb90fdea294883b4 (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>
Signed-off-by: Lubos Lunak <llunak@novell.com>
| -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(); } |