sw/qa/extras/ooxmlexport/data/tdf117988.docx |binary writerfilter/source/filter/WriterFilter.cxx | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-)
New commits: commit 202bee1a819de7b1e8c75dd863c4154f66419400 Author: Justin Luth <[email protected]> AuthorDate: Tue Sep 24 19:39:29 2019 +0300 Commit: Miklos Vajna <[email protected]> CommitDate: Wed Sep 25 09:04:55 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 <[email protected]> Tested-by: Justin Luth <[email protected]> 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 89b4b3e57b5f..266367b4ac2b 100644 --- a/writerfilter/source/filter/WriterFilter.cxx +++ b/writerfilter/source/filter/WriterFilter.cxx @@ -292,7 +292,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)); _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
