summaryrefslogtreecommitdiff
path: root/sw/source/uibase/docvw
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.com>2019-03-11 21:40:44 +0100
committerXisco Faulí <xiscofauli@libreoffice.org>2019-03-13 12:34:43 +0100
commit77cc7463bcd3fe9a6528ed1b0309708608cd1cc7 (patch)
tree1a9b9da496b42b95e19f63181a2a3fa62bc17679 /sw/source/uibase/docvw
parent1ffbe6da60391bcf71c579d4da9543f0b769bfc8 (diff)
tdf#123104 DOCX import: fix lack of vertical merge due to rounding
Regression from commit 29cbbad64088354425c606f9eb6c267bdf7731dc (DOCX import: fix rounding error in table cell widths, 2014-11-07), which changed truncation to rounding for the twips -> 1/10000th of relative width conversion during import, but left export unchanged. But adapting the export is not that easy: one part would be the std::unique() call in WW8TableNodeInfoInner::getColumnWidthsBasedOnAllRows() to not require exact comparison, but doing so has it own side effects (multiple failing tests). So just revert the mentioned commit, as a minor rounding error is much better than a broken vertical merge. And once it's clear how to adapt export at the same time, this rounding on the import side can be re-introduced. (cherry picked from commit e502463fa9a601963aa9f5a8783eb1318de36c13) Conflicts: sw/qa/extras/rtfexport/rtfexport5.cxx Change-Id: I9e01ea5cc2c2f8aabe1e21cb8118c9c0e2c45494 Reviewed-on: https://gerrit.libreoffice.org/69154 Tested-by: Jenkins Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
Diffstat (limited to 'sw/source/uibase/docvw')
0 files changed, 0 insertions, 0 deletions