summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2012-10-04 19:17:56 +0200
committerMiklos Vajna <vmiklos@suse.cz>2012-10-29 20:30:04 +0100
commit75bfe93856a2316874a09dcac1ba204ef48d134a (patch)
tree1d11d583bfd26af37eab38ec61f6df2e89466156 /svx
parent91d057474682c52e978e1ea93d05655622cc5914 (diff)
rhbz#820283, fdo#55462: sw: better fix for DOCX table import crash:
The fix in 6d2e09db4a677068095b0bebd08fbbb96620d60c is completely bogus. Only vertically merged boxes result in dummy boxes with negative span, while horizontally merged boxes result in different numbers of boxes per line. So instead of inserting boxes, adjust the width of the last box in rows that are missing boxes, such that all lines have the same width. (cherry picked from commit 4113d9664c60d004474dfc1cffbcd7dc50fa6dc4) Conflicts: sw/source/core/docnode/ndtbl.cxx Change-Id: I4e90e852b314bf6f7885bde7b450dab7c668469e Reviewed-on: https://gerrit.libreoffice.org/764 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
Diffstat (limited to 'svx')
0 files changed, 0 insertions, 0 deletions