summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2016-07-08 16:09:36 +0100
committerMiklos Vajna <vmiklos@collabora.co.uk>2016-07-15 12:53:42 +0000
commitdf89407a3827d5c1f0bf97490337d55660a8321d (patch)
treeded6e5095e300c49afd0cbc069451bbddc2fdd5d
parent79e3fd9df519bc5aad349f137d4aa74168e9ef2e (diff)
Resolves: tdf#100813 crash during pagination of particular docx
Change-Id: Id2c99cc6c5fe4c3a5bcf3c0b3f16b603cdd46239 (cherry picked from commit f374e01af32c7752b31455642e7d76f2056a2aeb) Reviewed-on: https://gerrit.libreoffice.org/27050 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
-rw-r--r--sw/source/core/layout/flowfrm.cxx3
1 files changed, 3 insertions, 0 deletions
diff --git a/sw/source/core/layout/flowfrm.cxx b/sw/source/core/layout/flowfrm.cxx
index dad6f97c0a89..0f105c85ae0e 100644
--- a/sw/source/core/layout/flowfrm.cxx
+++ b/sw/source/core/layout/flowfrm.cxx
@@ -2017,6 +2017,9 @@ bool SwFlowFrame::MoveBwd( bool &rbReformat )
}
SwFootnoteBossFrame * pOldBoss = m_rThis.FindFootnoteBossFrame();
+ if (!pOldBoss)
+ return false;
+
SwPageFrame * const pOldPage = pOldBoss->FindPageFrame();
SwLayoutFrame *pNewUpper = nullptr;
bool bCheckPageDescs = false;