diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-01-19 10:47:56 +0000 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-01-25 15:37:38 +0000 |
| commit | d7858b0d23f88a3ecec4ed7cc863ee0867086209 (patch) | |
| tree | 183900a385b039fb3022fcecd5057daa4fe862eb | |
| parent | 56f2d3728b74e39b658cd1c59a55b4b338ea230d (diff) | |
Related: tdf#100813 don't crash traversing table in page 43
master has...
commit 1281bd5d87361fa516cdf247b055aeb4bb5e13fb
Author: Mike Kaganski <mike.kaganski@collabora.com>
Date: Wed Jan 18 09:25:55 2017 +0300
tdf#104181 related: don't throw on this document
which is more extreme, keep it minimal for the backport,
MoveFootnoteCntFwd always derefs pOldBoss so check for null
before calling into it here
Change-Id: I726095567e4101170f2bf9244efbf8960cc39380
Reviewed-on: https://gerrit.libreoffice.org/33304
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
| -rw-r--r-- | sw/source/core/layout/flowfrm.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/source/core/layout/flowfrm.cxx b/sw/source/core/layout/flowfrm.cxx index f9faba423589..29e1300a4a98 100644 --- a/sw/source/core/layout/flowfrm.cxx +++ b/sw/source/core/layout/flowfrm.cxx @@ -1805,7 +1805,7 @@ bool SwFlowFrame::MoveFwd( bool bMakePage, bool bPageBreak, bool bMoveAlways ) return false; if (m_rThis.IsInFootnote()) { - if (!m_rThis.IsContentFrame()) + if (!m_rThis.IsContentFrame() || !pOldBoss) { SAL_WARN("sw.core", "Tables in footnotes are not truly supported"); return false; |