diff options
authorMiklos Vajna <>2015-11-16 20:41:32 +0100
committerMiklos Vajna <>2015-11-16 20:42:30 +0100
commit70f3c595cae858e97616bf1f23adea8a75e42d4b (patch)
parent72ac345ab4eea1654bb5eb01ce9901c90102300c (diff)
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
-rw-r--r--sw/qa/extras/ooxmlimport/data/tdf83300.docxbin0 -> 9948 bytes
3 files changed, 6 insertions, 1 deletions
diff --git a/sw/qa/extras/ooxmlimport/data/tdf83300.docx b/sw/qa/extras/ooxmlimport/data/tdf83300.docx
new file mode 100644
index 000000000000..aa3ad22d10fc
--- /dev/null
+++ b/sw/qa/extras/ooxmlimport/data/tdf83300.docx
Binary files differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 0a9d900472dc..8a11157ef8ed 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -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);
diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx
index 31206a7cefcc..293064c51814 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.cxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.cxx
@@ -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",