diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-12-13 13:51:24 +0000 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2017-02-08 11:56:05 +0100 |
| commit | a2a9b27273d9813647c555f2502aff572e9f3af5 (patch) | |
| tree | c015b37a5189d3868c0eb061f45419260f386d3a /sw/source | |
| parent | 9460b43a2aadf958eb5bb6202952742e48b6a007 (diff) | |
crashtesting: assert on loading certain rtf
Change-Id: I17acf270f552571fec898e19fa2d000ec4c00df5
(cherry picked from commit 82f25d5de546225548725e4056fdf1148fe605eb)
Reviewed-on: https://gerrit.libreoffice.org/31979
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
(cherry picked from commit 1d45caa9a3a326a1947265feb02d7d0a378c75f3)
Diffstat (limited to 'sw/source')
| -rw-r--r-- | sw/source/core/docnode/ndtbl.cxx | 2 | ||||
| -rw-r--r-- | sw/source/core/unocore/unotext.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx index b60c6fa07ae3..85d5040211a3 100644 --- a/sw/source/core/docnode/ndtbl.cxx +++ b/sw/source/core/docnode/ndtbl.cxx @@ -1302,7 +1302,7 @@ SwNodeRange * SwNodes::ExpandRangeForTableBox(const SwNodeRange & rRange) } SwNode * pNode = &aIndex.GetNode(); - while (pNode->IsEndNode()) + while (pNode->IsEndNode() && aIndex < Count() - 1) { SwNode * pStartNode = pNode->StartOfSectionNode(); SwNodeIndex aStartIndex(*pStartNode); diff --git a/sw/source/core/unocore/unotext.cxx b/sw/source/core/unocore/unotext.cxx index 6505f276645b..7e0879db2dd2 100644 --- a/sw/source/core/unocore/unotext.cxx +++ b/sw/source/core/unocore/unotext.cxx @@ -1845,7 +1845,7 @@ void SwXText::Impl::ConvertCell( SwNodeRange aTmpRange(aStartCellPam.Start()->nNode, aEndCellPam.End()->nNode); SwNodeRange * pCorrectedRange = - SwNodes::ExpandRangeForTableBox(aTmpRange); + m_pDoc->GetNodes().ExpandRangeForTableBox(aTmpRange); if (pCorrectedRange != nullptr) { |