Kaydet (Commit) 49877dc9 authored tarafından Justin Luth's avatar Justin Luth Kaydeden (comit) Miklos Vajna

sw:rtf - timely export of footnote char properties

related to tdf#82173 and tdf#108949.
Write the footnote character properties now - otherwise they will
affect text incorrectly later on.

Change-Id: I33af1586a51f9028ef5b0d646e4ba3d746c77a2c
Reviewed-on: https://gerrit.libreoffice.org/40435Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarMiklos Vajna <vmiklos@collabora.co.uk>
üst b23cd7ea
...@@ -33,10 +33,10 @@ DECLARE_RTFEXPORT_TEST(testTdf108949, "tdf108949_footnoteCharFormat.odt") ...@@ -33,10 +33,10 @@ DECLARE_RTFEXPORT_TEST(testTdf108949, "tdf108949_footnoteCharFormat.odt")
uno::Reference<text::XText> xFootnoteText; uno::Reference<text::XText> xFootnoteText;
xFootnotes->getByIndex(0) >>= xFootnoteText; xFootnotes->getByIndex(0) >>= xFootnoteText;
// This was green (0x00A800), the character property of the footnote character, not the footnote text // This was green (0x00A800), the character property of the footnote character, not the footnote text
//CPPUNIT_ASSERT_EQUAL(sal_Int32(0x000000), getProperty<sal_Int32>(getRun(getParagraphOfText(1, xFootnoteText),1), "CharColor")); CPPUNIT_ASSERT_MESSAGE ("Footnote Text color",sal_Int32(0x000000) >= getProperty<sal_Int32>(getRun(getParagraphOfText(1, xFootnoteText),1), "CharColor"));
} }
DECLARE_RTFIMPORT_TEST(testTdf108949_footnote, "tdf108949_footnote.rtf") DECLARE_RTFEXPORT_TEST(testTdf108949_footnote, "tdf108949_footnote.rtf")
{ {
CPPUNIT_ASSERT_EQUAL_MESSAGE("Paragraph Numbering style", OUString(), getProperty<OUString>(getParagraph(2), "NumberingStyleName")); CPPUNIT_ASSERT_EQUAL_MESSAGE("Paragraph Numbering style", OUString(), getProperty<OUString>(getParagraph(2), "NumberingStyleName"));
......
...@@ -2657,6 +2657,8 @@ void RtfAttributeOutput::TextFootnote_Impl(const SwFormatFootnote& rFootnote) ...@@ -2657,6 +2657,8 @@ void RtfAttributeOutput::TextFootnote_Impl(const SwFormatFootnote& rFootnote)
SAL_INFO("sw.rtf", OSL_THIS_FUNC << " start"); SAL_INFO("sw.rtf", OSL_THIS_FUNC << " start");
m_aRun->append("{" OOO_STRING_SVTOOLS_RTF_SUPER " "); m_aRun->append("{" OOO_STRING_SVTOOLS_RTF_SUPER " ");
EndRunProperties(nullptr);
m_aRun->append(' ');
WriteTextFootnoteNumStr(rFootnote); WriteTextFootnoteNumStr(rFootnote);
m_aRun->append("{" OOO_STRING_SVTOOLS_RTF_IGNORE OOO_STRING_SVTOOLS_RTF_FOOTNOTE); m_aRun->append("{" OOO_STRING_SVTOOLS_RTF_IGNORE OOO_STRING_SVTOOLS_RTF_FOOTNOTE);
if (rFootnote.IsEndNote() || m_rExport.m_pDoc->GetFootnoteInfo().ePos == FTNPOS_CHAPTER) if (rFootnote.IsEndNote() || m_rExport.m_pDoc->GetFootnoteInfo().ePos == FTNPOS_CHAPTER)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment