summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2011-06-24 14:22:22 +0100
committerJan Holesovsky <kendy@suse.cz>2011-06-24 16:01:03 +0200
commit39d4ce1b676e659e8de0e0752516d22aa5777953 (patch)
treee7b0baa5b81cc1daacd9bc34deece4f1faf32c3e
parent87d003eb1e16a84e0bb478cb4ffc20ba9c2b2182 (diff)
Resolves: fdo#38623 imported .doc crashes layout
Signed-off-by: Jan Holesovsky <kendy@suse.cz>
-rw-r--r--sw/source/core/layout/ftnfrm.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/source/core/layout/ftnfrm.cxx b/sw/source/core/layout/ftnfrm.cxx
index ce57fec940..a8e1b46bba 100644
--- a/sw/source/core/layout/ftnfrm.cxx
+++ b/sw/source/core/layout/ftnfrm.cxx
@@ -2701,7 +2701,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();
}