summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sw/qa/extras/ooxmlimport/data/tdf83300.docxbin0 -> 9948 bytes
-rw-r--r--sw/qa/extras/ooxmlimport/ooxmlimport.cxx6
-rw-r--r--writerfilter/source/dmapper/StyleSheetTable.cxx1
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 d463bf4e9803..c56ed5e6cc03 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -2836,6 +2836,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 211d2a0cd49d..e95e755e4f57 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.cxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.cxx
@@ -1359,7 +1359,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",