sw/qa/core/data/rtf/fail/table-2.rtf |binary sw/source/core/unocore/unotext.cxx | 2 +- writerfilter/qa/cppunittests/rtftok/data/fail/tablemanager-7.rtf |binary writerfilter/source/dmapper/DomainMapper_Impl.cxx | 2 +- 4 files changed, 2 insertions(+), 2 deletions(-)
New commits: commit 4bed0a6fbb7a77517e99578e53c94f0391f1b308 Author: Caolán McNamara <[email protected]> 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/28829 Tested-by: Jenkins <[email protected]> Reviewed-by: Miklos Vajna <[email protected]> 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 b402d86..bad069f 100644 --- a/sw/source/core/unocore/unotext.cxx +++ b/sw/source/core/unocore/unotext.cxx @@ -2236,7 +2236,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) commit 06f64551358c6e59897da067162f56f8b0789838 Author: Caolán McNamara <[email protected]> Date: Mon Sep 12 09:34:21 2016 +0100 fftester: no table manager Change-Id: Icb3c640e04416f9120d37558646a570daeddf0a4 Reviewed-on: https://gerrit.libreoffice.org/28826 Tested-by: Jenkins <[email protected]> Reviewed-by: Miklos Vajna <[email protected]> diff --git a/writerfilter/qa/cppunittests/rtftok/data/fail/tablemanager-7.rtf b/writerfilter/qa/cppunittests/rtftok/data/fail/tablemanager-7.rtf new file mode 100644 index 0000000..df41b1f Binary files /dev/null and b/writerfilter/qa/cppunittests/rtftok/data/fail/tablemanager-7.rtf differ diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index 24049b1..dc054bc 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -830,7 +830,7 @@ void DomainMapper_Impl::CheckUnregisteredFrameConversion( ) TextAppendContext& rAppendContext = m_aTextAppendStack.top(); // n#779642: ignore fly frame inside table as it could lead to messy situations if( rAppendContext.pLastParagraphProperties.get() && rAppendContext.pLastParagraphProperties->IsFrameMode() - && !getTableManager().isInTable() ) + && hasTableManager() && !getTableManager().isInTable() ) { try {
_______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
