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

[Caolán McNamara]

 sw/qa/core/data/rtf/fail/table-2.rtf |binary
 sw/source/core/unocore/unotext.cxx   |    2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0aa73cd0ff10c9b680c38e59147db684ff1ab14c
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Sep 12 10:11:37 2016 +0100

    fftester: break as soon as an exception is required
    
    Change-Id: Ia787c42f484c00242f1bcaca8ea7459890ec5745
    Reviewed-on: https://gerrit.libreoffice.org/28830
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/sw/qa/core/data/rtf/fail/table-2.rtf b/sw/qa/core/data/rtf/fail/table-2.rtf
new file mode 100644
index 0000000..35e859b
Binary files /dev/null and b/sw/qa/core/data/rtf/fail/table-2.rtf differ
diff --git a/sw/source/core/unocore/unotext.cxx b/sw/source/core/unocore/unotext.cxx
index 454dda6..6505f27 100644
--- a/sw/source/core/unocore/unotext.cxx
+++ b/sw/source/core/unocore/unotext.cxx
@@ -2242,7 +2242,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
             break;
         }
 
-        for (sal_Int32 nCell = 0; nCell < nCells; ++nCell)
+        for (sal_Int32 nCell = 0; !bExcept && nCell < nCells; ++nCell)
         {
             SwNodeRange *const pLastCell(
                 (nCell == 0)