sw/source/core/layout/flowfrm.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit d7858b0d23f88a3ecec4ed7cc863ee0867086209
Author: Caolán McNamara <caol...@redhat.com>
Date: Thu Jan 19 10:47:56 2017 +0000
Related: tdf#100813 don't crash traversing table in page 43
master has...
commit 1281bd5d87361fa516cdf247b055aeb4bb5e13fb
Author: Mike Kaganski <mike.kagan...@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 <c...@libreoffice.org>
Reviewed-by: Miklos Vajna <vmik...@collabora.co.uk>
diff --git a/sw/source/core/layout/flowfrm.cxx
b/sw/source/core/layout/flowfrm.cxx
index f9faba4..29e1300 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;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
