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

tdf#112886 ooxmlimport: skip useless footnote placeholder

Inserting the 0x02 placeholder as the first entry in the line
interferes with the aesthetic tab code. lcl_text
has code to ignore that placeholder, but lcl_utext
doesn't. Ignoring at lcl_utext has the same affect as
not processing it at all. Only .docx adds 0x02, so
it should be fairly safe to avoid the 0x02 completely.

Nothing was detected missing by skipping the placeholder.
All of the code was inherited from OOo.

Change-Id: Ie8840e5946fec89f270fef5523c88ee5051ca8ef
Reviewed-on: https://gerrit.libreoffice.org/51912Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarJustin Luth <justin_luth@sil.org>
Reviewed-by: 's avatarMiklos Vajna <vmiklos@collabora.co.uk>
üst 6c57ae39
......@@ -986,9 +986,9 @@ DECLARE_OOXMLEXPORT_TEST(testTdf90810, "tdf90810short.docx")
// Original document doesn't have a leading tab in the footnote, but the
// export adds one unconditionally.
if (mbExported)
CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(91), sFootnoteText.getLength());
else
CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(90), sFootnoteText.getLength());
else
CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(89), sFootnoteText.getLength());
}
DECLARE_OOXMLEXPORT_TEST(testTdf89165, "tdf89165.docx")
......
......@@ -914,7 +914,7 @@ DECLARE_OOXMLEXPORT_TEST(testTdf105095, "tdf105095.docx")
uno::Reference<text::XTextRange> xTextRange(xFootnotes->getByIndex(0), uno::UNO_QUERY);
// This failed, tab between the footnote number and the footnote content
// was lost on import.
CPPUNIT_ASSERT(xTextRange->getString().endsWith("\tfootnote"));
CPPUNIT_ASSERT_EQUAL( OUString("\tfootnote"), xTextRange->getString() );
}
DECLARE_OOXMLEXPORT_TEST( testActiveXCheckbox, "activex_checkbox.docx" )
......
......@@ -32,7 +32,6 @@
#include "Handler.hxx"
static const sal_Unicode uCR = 0xd;
static const sal_Unicode uFtnEdnRef = 0x2;
static const sal_Unicode uFtnEdnSep = 0x3;
static const sal_Unicode uTab = 0x9;
static const sal_Unicode uPgNum = 0x0;
......@@ -497,8 +496,6 @@ void OOXMLFastContextHandler::lockField()
void OOXMLFastContextHandler::ftnednref()
{
if (isForwardEvents())
mpStream->utext(reinterpret_cast<const sal_uInt8*>(&uFtnEdnRef), 1);
}
void OOXMLFastContextHandler::ftnednsep()
......
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