sw/qa/core/data/rtf/pass/tabbox-1.rtf |binary
sw/source/core/docnode/ndtbl.cxx | 2 ++
2 files changed, 2 insertions(+)
New commits:
commit e3cc5adb5999c51aa732befdfbe328c8e885fb22
Author: Caolán McNamara <caol...@redhat.com>
Date: Sat Aug 27 14:16:22 2016 +0100
fftester: empty tabbox protection
Change-Id: I56b0845205d6968355b3327721bf9ca0930903e1
(cherry picked from commit b3533883fd0397dbe9110145d62ef35944b64f69)
Reviewed-on: https://gerrit.libreoffice.org/28425
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: David Tardon <dtar...@redhat.com>
diff --git a/sw/qa/core/data/rtf/pass/tabbox-1.rtf
b/sw/qa/core/data/rtf/pass/tabbox-1.rtf
new file mode 100644
index 0000000..19d3851
Binary files /dev/null and b/sw/qa/core/data/rtf/pass/tabbox-1.rtf differ
diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index 6367691..7c66f53 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -1329,6 +1329,8 @@ lcl_SetTableBoxWidths2(SwTable & rTable, size_t const
nMaxBoxes,
for (size_t nTmpLine = 0; nTmpLine < rLines.size(); ++nTmpLine)
{
SwTableBoxes & rBoxes = rLines[nTmpLine]->GetTabBoxes();
+ if (rBoxes.empty())
+ continue;
size_t const nMissing = nMaxBoxes - rBoxes.size();
if (nMissing)
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
