commit 35d3f2bdc820bce8bfb98cfe942e9e91a338973b
author Justin Luth <justin_luth@sil.org> Tue Sep 24 19:39:29 2019 +0300
committer Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Thu Sep 26 14:35:29 2019 +0200
tree b54aef6e53f9f0427727065fdeacdf7f03705fbd
parent 2d9ac03b943d70d94e94319ae903c66ed25dcc9c

Revert "tdf#117988 writerfilter: IgnoreTabsAndBlanksForLineCalculation"

This reverts LO 6.2 commit 49ddaad2f3ba4e17e1e41e94824fb94468d2b680.
tdf#127617 proves it simply was not the correct solution.

I replaced the unit test document with one that clearly demonstrates
that spaces/tabs should NOT be used in line height calculations.
Example document tested with Office 2003, 2010, 2016.

Change-Id: I2833384a017526d665adef0cae968bc4aef0dd94
Reviewed-on: https://gerrit.libreoffice.org/79473
Reviewed-by: Justin Luth <justin_luth@sil.org>
Tested-by: Justin Luth <justin_luth@sil.org>
(cherry picked from commit 202bee1a819de7b1e8c75dd863c4154f66419400)
Reviewed-on: https://gerrit.libreoffice.org/79484
Tested-by: Jenkins
Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
(cherry picked from commit b0c5bc47d0d170df1384dd48cee9291ce6044083)
Reviewed-on: https://gerrit.libreoffice.org/79527

sw/qa/extras/ooxmlexport/data/tdf117988.docx

diff --git a/sw/qa/extras/ooxmlexport/data/tdf117988.docx b/sw/qa/extras/ooxmlexport/data/tdf117988.docx
index 86f1672..5c92f20 100644
--- a/sw/qa/extras/ooxmlexport/data/tdf117988.docx
+++ b/sw/qa/extras/ooxmlexport/data/tdf117988.docx
Binary files differ

writerfilter/source/filter/WriterFilter.cxx

diff --git a/writerfilter/source/filter/WriterFilter.cxx b/writerfilter/source/filter/WriterFilter.cxx
index 08bc0c4..655b0e57 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(false));
    xSettings->setPropertyValue("IgnoreTabsAndBlanksForLineCalculation", uno::makeAny(true));
    xSettings->setPropertyValue("InvertBorderSpacing", uno::makeAny(true));
    xSettings->setPropertyValue("CollapseEmptyCellPara", uno::makeAny(true));
    xSettings->setPropertyValue("TabOverflow", uno::makeAny(true));