diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2017-01-18 09:25:55 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2017-01-20 20:25:06 +0000 |
| commit | 8098cdaca08abaf12a32bbebcd058a98c2af03bd (patch) | |
| tree | b32454d87334a2d8f94546fdd54315a5acc913c5 | |
| parent | 5bfa9f02f41c9beb755e3b2f69ba5bdf05b1613f (diff) | |
tdf#104181 related: don't throw on this document
Related to: http://crashreport.libreoffice.org/stats/signature/SwContentFrame::MoveFootnoteCntFwd(bool,SwFootnoteBossFrame%20*)
Change-Id: I53abf3267e1a75e944de82222c6ea80a72de0e7e
Reviewed-on: https://gerrit.libreoffice.org/33245
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Tested-by: Mike Kaganski <mike.kaganski@collabora.com>
(cherry picked from commit 1281bd5d87361fa516cdf247b055aeb4bb5e13fb)
Reviewed-on: https://gerrit.libreoffice.org/33336
Tested-by: Jenkins <ci@libreoffice.org>
| -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 d517103922d6..f9faba423589 100644 --- a/sw/source/core/layout/flowfrm.cxx +++ b/sw/source/core/layout/flowfrm.cxx @@ -1800,6 +1800,9 @@ bool SwFlowFrame::MoveFwd( bool bMakePage, bool bPageBreak, bool bMoveAlways ) { //!!!!MoveFootnoteCntFwd might need to be updated as well. SwFootnoteBossFrame *pOldBoss = m_rThis.FindFootnoteBossFrame(); + assert(pOldBoss); + if (!pOldBoss) + return false; if (m_rThis.IsInFootnote()) { if (!m_rThis.IsContentFrame()) |