diff options
author | Miklos Vajna <vmiklos@suse.cz> | 2012-10-25 16:59:52 +0200 |
---|---|---|
committer | Petr Mladek <pmladek@suse.cz> | 2012-11-05 18:07:15 +0100 |
commit | f53dd76d203ddd16428aee10f299e552c86db9bd (patch) | |
tree | 47224892d74cace4b3133b0f39b234ddc733bad8 /sw/source | |
parent | 1b370220d13557882eacbb2840d77743a26da737 (diff) |
fdo#55939 fix RTF export of footnotes
Regression from d4069372484f18b242a42a1996767f57b031fff6.
Conflicts:
sw/qa/extras/rtfexport/rtfexport.cxx
Change-Id: I58e8d48ac3222b795f7edfd0e74ecd86ea36f380
Reviewed-on: https://gerrit.libreoffice.org/913
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw/source')
-rw-r--r-- | sw/source/filter/ww8/rtfattributeoutput.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx index 622426553c67..99160de6a71e 100644 --- a/sw/source/filter/ww8/rtfattributeoutput.cxx +++ b/sw/source/filter/ww8/rtfattributeoutput.cxx @@ -2335,17 +2335,20 @@ void RtfAttributeOutput::TextFootnote_Impl( const SwFmtFtn& rFootnote ) /* * The footnote contains a whole paragraph, so we have to: - * 1) Reset, then later restore the contents of our run buffer. + * 1) Reset, then later restore the contents of our run buffer and run state. * 2) Buffer the output of the whole paragraph, as we do so for section headers already. */ const SwNodeIndex* pIndex = rFootnote.GetTxtFtn()->GetStartNode(); RtfStringBuffer aRun = m_aRun; m_aRun.clear(); + bool bInRunOrig = m_bInRun; + m_bInRun = false; m_bBufferSectionHeaders = true; m_rExport.WriteSpecialText( pIndex->GetIndex() + 1, pIndex->GetNode().EndOfSectionIndex(), !rFootnote.IsEndNote() ? TXT_FTN : TXT_EDN); m_bBufferSectionHeaders = false; + m_bInRun = bInRunOrig; m_aRun = aRun; m_aRun->append(m_aSectionHeaders.makeStringAndClear()); |