summaryrefslogtreecommitdiff
path: root/writerfilter
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2015-11-16 20:41:32 +0100
committerAndras Timar <andras.timar@collabora.com>2015-11-28 14:15:45 +0100
commit61bef812e17e27bed7ff119ff8abdb7dfb9921b3 (patch)
treef57b2e851a8cdf4750c2e6d6dee1855b11e72874 /writerfilter
parenta8a8c8c3d4a7dd9fa4cf68f5729ea32a3aed4791 (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> (cherry picked from commit 0750162d3dbdd1bbd01ad01c383a26199e58419a)
Diffstat (limited to 'writerfilter')
-rw-r--r--writerfilter/source/dmapper/StyleSheetTable.cxx1
1 files changed, 0 insertions, 1 deletions
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",