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

[Caolán McNamara]

 sw/source/core/layout/flowfrm.cxx |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

New commits:
commit e2bf47485575befd57b027a5339c35d6aa905680
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri May 1 12:12:28 2015 +0100

    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 at redhat.com>
    Tested-by: Michael Stahl <mstahl at redhat.com>

diff --git a/sw/source/core/layout/flowfrm.cxx b/sw/source/core/layout/flowfrm.cxx
index e9b05f9..255817a 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 )
     {