[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - sw/qa writerfilter/source

[Justin Luth (via logerrit)]

 sw/qa/extras/ooxmlexport/data/tdf117988.docx |binary
 writerfilter/source/filter/WriterFilter.cxx  |    2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 35d3f2bdc820bce8bfb98cfe942e9e91a338973b
Author:     Justin Luth <justin_luth at sil.org>
AuthorDate: Tue Sep 24 19:39:29 2019 +0300
Commit:     Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
CommitDate: Thu Sep 26 14:35:29 2019 +0200

    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 at sil.org>
    Tested-by: Justin Luth <justin_luth at sil.org>
    (cherry picked from commit 202bee1a819de7b1e8c75dd863c4154f66419400)
    Reviewed-on: https://gerrit.libreoffice.org/79484
    Tested-by: Jenkins
    Reviewed-by: Xisco Faulí <xiscofauli at libreoffice.org>
    (cherry picked from commit b0c5bc47d0d170df1384dd48cee9291ce6044083)
    Reviewed-on: https://gerrit.libreoffice.org/79527

diff --git a/sw/qa/extras/ooxmlexport/data/tdf117988.docx b/sw/qa/extras/ooxmlexport/data/tdf117988.docx
index 86f1672fa023..5c92f209a9ae 100644
Binary files a/sw/qa/extras/ooxmlexport/data/tdf117988.docx and b/sw/qa/extras/ooxmlexport/data/tdf117988.docx differ
diff --git a/writerfilter/source/filter/WriterFilter.cxx b/writerfilter/source/filter/WriterFilter.cxx
index 08bc0c420ec7..655b0e57b17e 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));