[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - sw/qa sw/source

[Caolán McNamara]

 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 da8583e9ae9dd7085e463b289533d2eeeccd761c
Author: Caolán McNamara <caolanm at 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/28424
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: David Tardon <dtardon at 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 e120801..75ac47d 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)
         {