diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-11-16 20:41:32 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-11-23 17:12:14 +0000 |
| commit | 0750162d3dbdd1bbd01ad01c383a26199e58419a (patch) | |
| tree | b46b4d582164e80ec3f36a269b61adf0970ae982 | |
| parent | afa3f711d48d18c7132feed29a09c5665f305285 (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
(cherry picked from commit 70f3c595cae858e97616bf1f23adea8a75e42d4b)
Reviewed-on: https://gerrit.libreoffice.org/20037
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | sw/qa/extras/ooxmlimport/data/tdf83300.docx | bin | 0 -> 9948 bytes | |||
| -rw-r--r-- | sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 6 | ||||
| -rw-r--r-- | writerfilter/source/dmapper/StyleSheetTable.cxx | 1 |
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 Binary files differnew file mode 100644 index 000000000000..aa3ad22d10fc --- /dev/null +++ b/sw/qa/extras/ooxmlimport/data/tdf83300.docx 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", |