sw/source/filter/ww8/rtfattributeoutput.cxx | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit eee2704a66075793d49a6972babe9444c3df7a87
Author: Miklos Vajna <vmik...@suse.cz>
Date: Thu Oct 25 16:59:52 2012 +0200
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 <caol...@redhat.com>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx
b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 6224265..99160de 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());
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
