Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/764
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/64/764/1
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
---
M sw/source/core/docnode/ndtbl.cxx
1 file changed, 24 insertions(+), 27 deletions(-)
--
To view, visit https://gerrit.libreoffice.org/764
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4e90e852b314bf6f7885bde7b450dab7c668469e
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6
Gerrit-Owner: Michael Stahl <mstahl@redhat.com>
Context
- [PATCH] Change in core[libreoffice-3-6]: rhbz#820283, fdo#55462: sw: better fix for DOCX table import... · Michael Stahl (via Code Review)
Privacy Policy |
Impressum (Legal Info) |
Copyright information: Unless otherwise specified, all text and images
on this website are licensed under the
Creative Commons Attribution-Share Alike 3.0 License.
This does not include the source code of LibreOffice, which is
licensed under the Mozilla Public License (
MPLv2).
"LibreOffice" and "The Document Foundation" are
registered trademarks of their corresponding registered owners or are
in actual use as trademarks in one or more countries. Their respective
logos and icons are also subject to international copyright laws. Use
thereof is explained in our
trademark policy.