diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-05-01 12:12:28 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-05-11 12:26:24 +0000 |
| commit | e2bf47485575befd57b027a5339c35d6aa905680 (patch) | |
| tree | d59ccaf268b97a2b702a28b45bb641a908424338 | |
| parent | ca3a36ef07e6be9e39651fc55858f9e0f50e9725 (diff) | |
Resolves: tdf#90141 layout crash with table in footnote
this also makes cloudon File_1308.docx not crash, which
is the last outstanding crashtesting import failure
Change-Id: I06867a1b06316c6dab62ebd8a55f3a02b57b9f31
(cherry picked from commit 971adcd9e19e0bcab5855aae9be58d2203b46169)
Reviewed-on: https://gerrit.libreoffice.org/15584
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
| -rw-r--r-- | sw/source/core/layout/flowfrm.cxx | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/sw/source/core/layout/flowfrm.cxx b/sw/source/core/layout/flowfrm.cxx index e9b05f990d22..255817ae9746 100644 --- a/sw/source/core/layout/flowfrm.cxx +++ b/sw/source/core/layout/flowfrm.cxx @@ -1780,8 +1780,15 @@ bool SwFlowFrm::MoveFwd( bool bMakePage, bool bPageBreak, bool bMoveAlways ) { //!!!!MoveFtnCntFwd might need to be updated as well. SwFtnBossFrm *pOldBoss = m_rThis.FindFtnBossFrm(); - if ( m_rThis.IsInFtn() ) + if (m_rThis.IsInFtn()) + { + if (!m_rThis.IsCntntFrm()) + { + SAL_WARN("sw.core", "Tables in footnotes are not truly supported"); + return false; + } return static_cast<SwCntntFrm&>(m_rThis).MoveFtnCntFwd( bMakePage, pOldBoss ); + } if( !IsFwdMoveAllowed() && !bMoveAlways ) { |