diff options
| author | Justin Luth <justin_luth@sil.org> | 2018-07-25 16:33:47 +0300 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2018-07-27 09:45:54 +0200 |
| commit | 49ddaad2f3ba4e17e1e41e94824fb94468d2b680 (patch) | |
| tree | 6f55c641dbf0b04d91cd8d4e4eeff1a312462116 | |
| parent | 8af5cb7870032fbdb50f0b3ad6d855e488af4b99 (diff) | |
tdf#117988 writerfilter: IgnoreTabsAndBlanksForLineCalculation
Introduced in LO 4.0 in a mass copy of compat settings in
commit 355d25eac764713f4d52eac801ade6e2ff1deab0
Change-Id: I0d95941ff2815a43e571be1a6a0dbab1d12185d6
Reviewed-on: https://gerrit.libreoffice.org/57991
Tested-by: Jenkins
Reviewed-by: Justin Luth <justin_luth@sil.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
| -rw-r--r-- | sw/qa/extras/ooxmlexport/data/tdf117988.docx | bin | 0 -> 11587 bytes | |||
| -rw-r--r-- | sw/qa/extras/ooxmlexport/ooxmlexport11.cxx | 5 | ||||
| -rw-r--r-- | writerfilter/source/filter/WriterFilter.cxx | 2 |
3 files changed, 6 insertions, 1 deletions
diff --git a/sw/qa/extras/ooxmlexport/data/tdf117988.docx b/sw/qa/extras/ooxmlexport/data/tdf117988.docx Binary files differnew file mode 100644 index 000000000000..86f1672fa023 --- /dev/null +++ b/sw/qa/extras/ooxmlexport/data/tdf117988.docx diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx index 229b3d66096c..5f8b5bb2a3b6 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx @@ -177,6 +177,11 @@ DECLARE_OOXMLEXPORT_TEST(testDefaultStyle, "defaultStyle.docx") CPPUNIT_ASSERT_EQUAL(2, getPages()); } +DECLARE_OOXMLEXPORT_TEST(testTdf117988, "tdf117988.docx") +{ + CPPUNIT_ASSERT_EQUAL(1, getPages()); +} + DECLARE_OOXMLEXPORT_TEST(testParagraphSplitOnSectionBorder, "parasplit-on-section-border.odt") { xmlDocPtr pXmlDoc = parseExport("word/document.xml"); diff --git a/writerfilter/source/filter/WriterFilter.cxx b/writerfilter/source/filter/WriterFilter.cxx index 655b0e57b17e..08bc0c420ec7 100644 --- a/writerfilter/source/filter/WriterFilter.cxx +++ b/writerfilter/source/filter/WriterFilter.cxx @@ -286,7 +286,7 @@ void WriterFilter::setTargetDocument(const uno::Reference< lang::XComponent >& x xSettings->setPropertyValue("ConsiderTextWrapOnObjPos", uno::makeAny(true)); xSettings->setPropertyValue("UseFormerTextWrapping", uno::makeAny(false)); xSettings->setPropertyValue("TableRowKeep", uno::makeAny(true)); - xSettings->setPropertyValue("IgnoreTabsAndBlanksForLineCalculation", uno::makeAny(true)); + xSettings->setPropertyValue("IgnoreTabsAndBlanksForLineCalculation", uno::makeAny(false)); xSettings->setPropertyValue("InvertBorderSpacing", uno::makeAny(true)); xSettings->setPropertyValue("CollapseEmptyCellPara", uno::makeAny(true)); xSettings->setPropertyValue("TabOverflow", uno::makeAny(true)); |