[Libreoffice-commits] .: Branch 'libreoffice-3-4' - sw/source
Jan Holesovsky
kendy at kemper.freedesktop.org
Fri Jun 24 07:01:39 PDT 2011
sw/source/core/layout/ftnfrm.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 39d4ce1b676e659e8de0e0752516d22aa5777953
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Jun 24 14:22:22 2011 +0100
Resolves: fdo#38623 imported .doc crashes layout
Signed-off-by: Jan Holesovsky <kendy at suse.cz>
diff --git a/sw/source/core/layout/ftnfrm.cxx b/sw/source/core/layout/ftnfrm.cxx
index ce57fec..a8e1b46 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();
}
More information about the Libreoffice-commits
mailing list