[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - sw/source

[Mike Kaganski]

 sw/source/core/layout/flowfrm.cxx |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 8098cdaca08abaf12a32bbebcd058a98c2af03bd
Author: Mike Kaganski <mike.kaganski at collabora.com>
Date:   Wed Jan 18 09:25:55 2017 +0300

    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 at collabora.com>
    Tested-by: Mike Kaganski <mike.kaganski at collabora.com>
    (cherry picked from commit 1281bd5d87361fa516cdf247b055aeb4bb5e13fb)
    Reviewed-on: https://gerrit.libreoffice.org/33336
    Tested-by: Jenkins <ci at libreoffice.org>

diff --git a/sw/source/core/layout/flowfrm.cxx b/sw/source/core/layout/flowfrm.cxx
index d517103..f9faba4 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())