[Libreoffice-commits] .: sw/source

[Caolán McNamara]

 sw/source/core/layout/ftnfrm.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit fd768eb1d726e63a9c9cad0b245d1603eba6b5d9
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Jun 24 14:22:22 2011 +0100

    Resolves: fdo#38623 imported .doc crashes layout

diff --git a/sw/source/core/layout/ftnfrm.cxx b/sw/source/core/layout/ftnfrm.cxx
index 8eb2418..9f69277 100644
--- a/sw/source/core/layout/ftnfrm.cxx
+++ b/sw/source/core/layout/ftnfrm.cxx
@@ -2678,7 +2678,7 @@ void SwPageFrm::UpdateFtnNum()
                             SwPageFrm* pPage = pTmpBoss->FindPageFrm();
                             pFtn = NULL;
                             lcl_NextFtnBoss( pTmpBoss, pPage, sal_False );
-                            SwFtnContFrm *pCont = pTmpBoss->FindNearestFtnCont();
+                            SwFtnContFrm *pCont = pTmpBoss ? pTmpBoss->FindNearestFtnCont() : NULL;
                             if ( pCont )
                                 pFtn = (SwFtnFrm*)pCont->Lower();
                         }