diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-05-01 12:12:28 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-05-01 12:13:50 +0100 |
| commit | 971adcd9e19e0bcab5855aae9be58d2203b46169 (patch) | |
| tree | 297d8e5d9d894b98edd2d1b2f85669949297027b | |
| parent | 5b8acf459e4a6728ea656e7abd5dfb08ad2ae345 (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
| -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 4fc786d50b96..f84d7a8311e9 100644 --- a/sw/source/core/layout/flowfrm.cxx +++ b/sw/source/core/layout/flowfrm.cxx @@ -1792,8 +1792,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 ) { |