diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-01-20 09:04:45 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-01-20 10:11:53 +0000 |
| commit | 7140efd3e2ea9c25264ac9a513480a2586610af4 (patch) | |
| tree | 38d21ea0958ac677ecf8355dbfea6e8e199da6ef | |
| parent | e2805decab47bcdc4080c218933acad51d028589 (diff) | |
Related: tdf#100813 don't crash traversing table in page 43 master has...
align master with the more conservative 5-2/5-3 reproducible problem
Change-Id: Ie7a53e94c062af894bee85ea05f1acf64bcb13f1
| -rw-r--r-- | sw/source/core/layout/flowfrm.cxx | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sw/source/core/layout/flowfrm.cxx b/sw/source/core/layout/flowfrm.cxx index 6b831dacb311..0924eac33c95 100644 --- a/sw/source/core/layout/flowfrm.cxx +++ b/sw/source/core/layout/flowfrm.cxx @@ -1800,12 +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()) + if (!m_rThis.IsContentFrame() || !pOldBoss) { SAL_WARN("sw.core", "Tables in footnotes are not truly supported"); return false; |