diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-07-08 16:09:36 +0100 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2016-08-02 16:45:16 +0300 |
| commit | 286dac62e3fc31d93b6362201092611483cb2309 (patch) | |
| tree | 7918adfca6749272a847b39e20170add435ae744 | |
| parent | loplugin:staticcall (diff) | |
| download | core-286dac62e3fc31d93b6362201092611483cb2309.tar.gz core-286dac62e3fc31d93b6362201092611483cb2309.zip | |
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>
(cherry picked from commit f2dcce9155ddd9444f65b26c59c3b873ac603091)
| -rw-r--r-- | sw/source/core/layout/flowfrm.cxx | 3 |
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; |