summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2016-09-12 10:11:37 +0100
committerMichael Stahl <mstahl@redhat.com>2016-09-15 20:22:44 +0000
commit0aa73cd0ff10c9b680c38e59147db684ff1ab14c (patch)
treeff3ad89bb874747e9455584cb8864db4c5ffbe2f
parent2e81f0770706758191ad871395fb36cfa5355cd4 (diff)
fftester: break as soon as an exception is required
Change-Id: Ia787c42f484c00242f1bcaca8ea7459890ec5745 Reviewed-on: https://gerrit.libreoffice.org/28830 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
-rw-r--r--sw/qa/core/data/rtf/fail/table-2.rtfbin0 -> 1618 bytes
-rw-r--r--sw/source/core/unocore/unotext.cxx2
2 files changed, 1 insertions, 1 deletions
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 000000000000..35e859b309f5
--- /dev/null
+++ b/sw/qa/core/data/rtf/fail/table-2.rtf
Binary files differ
diff --git a/sw/source/core/unocore/unotext.cxx b/sw/source/core/unocore/unotext.cxx
index 454dda669c5b..6505f276645b 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)