diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-04-12 15:01:23 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2015-04-14 15:08:16 +0200 |
| commit | b056b9bb629082d8b2facfd470173720c7c5bbf6 (patch) | |
| tree | db2847526b29f6f6181b5fa8b02b61d2ba385f51 /writerfilter | |
| parent | a49ed808eeaa7b38706dd1a9fde3d0a7d1c9b2f4 (diff) | |
tdf#75614 RTF import: fix missing text after footnote
(cherry picked from commit cec5f2eab25578a9859134d697c200089c597faa)
Conflicts:
sw/qa/extras/rtfimport/rtfimport.cxx
Change-Id: I5901094cb603c35a1cd8ac718fd434a9dd55729b
Reviewed-on: https://gerrit.libreoffice.org/15271
Tested-by: David Tardon <dtardon@redhat.com>
Reviewed-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/rtftok/rtfdocumentimpl.cxx | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index 24183aa0d556..f00c49cf4d38 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -2323,8 +2323,12 @@ int RTFDocumentImpl::dispatchSymbol(RTFKeyword nKeyword) } break; case RTF_CHFTN: - // Nothing to do, dmapper assumes this is the default. + { + if (m_aStates.top().pCurrentBuffer == &m_aSuperBuffer) + // Stop buffering, there will be no custom mark for this footnote or endnote. + m_aStates.top().pCurrentBuffer = 0; break; + } case RTF_PAGE: { // Ignore page breaks inside tables. |