summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2016-07-08 16:09:36 +0100
committerMichael Meeks <michael.meeks@collabora.com>2016-07-12 19:17:49 +0000
commitf2dcce9155ddd9444f65b26c59c3b873ac603091 (patch)
tree52428b578315d8fe86f071c2b234cdafb89d9d03
parenta405a164357d86630d8fbd0386e07f53c5b6c9a1 (diff)
Resolves: tdf#100813 crash during pagination of particular docx
Change-Id: Id2c99cc6c5fe4c3a5bcf3c0b3f16b603cdd46239 (cherry picked from commit f374e01af32c7752b31455642e7d76f2056a2aeb) Reviewed-on: https://gerrit.libreoffice.org/27051 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
-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 850fc4e303be..8420956a4a18 100644
--- a/sw/source/core/layout/flowfrm.cxx
+++ b/sw/source/core/layout/flowfrm.cxx
@@ -2010,6 +2010,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;