Kaydet (Commit) 70f3c595 authored tarafından Miklos Vajna's avatar Miklos Vajna

tdf#83300 DOCX import: 'TOC Heading' should not be 'keep with next' by default

On one hand, neither our binary DOC import, nor Word maps the "TOC
Heading" style to something special, and that's how the DOCX import
added that property to some paragraphs in the document, moving the
as-char picture from the first to the second page.

OTOH, the DOCX export filter has a lcl_guessQFormat() function that
explicitly assumes that such a style name exists in Writer document
models, so again it doesn't make sense to handle this style name with
special care.

Change-Id: I3af548930f9683695fc3ad56b486e013f107d61a
üst 72ac345a
......@@ -2909,6 +2909,12 @@ DECLARE_OOXMLIMPORT_TEST(testTdf94374, "hello.docx")
CPPUNIT_ASSERT(paste("tdf94374.docx", xEnd));
}
DECLARE_OOXMLIMPORT_TEST(testTdf83300, "tdf83300.docx")
{
// This was 'Contents Heading', which (in the original document) implied 'keep with next' on unexpected paragraphs.
CPPUNIT_ASSERT_EQUAL(OUString("TOC Heading"), getProperty<OUString>(getParagraph(1), "ParaStyleName"));
}
DECLARE_OOXMLIMPORT_TEST(testTdf85232, "tdf85232.docx")
{
uno::Reference<drawing::XShapes> xShapes(getShapeByName("Group 219"), uno::UNO_QUERY);
......
......@@ -1343,7 +1343,6 @@ static const sal_Char* const aStyleNamePairs[] =
"TOC 7", "Contents 7",
"TOC 8", "Contents 8",
"TOC 9", "Contents 9",
"TOC Heading", "Contents Heading",
"TOCHeading", "Contents Heading",
"toc 1", "Contents 1",
"toc 2", "Contents 2",
......
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