From b7c2124b39e8a93c8dadfaec5257e491da9fdda1 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Mon, 12 Mar 2012 22:42:15 +0100 Subject: [PATCH] SwFlowFrm::CalcUpperSpace: fix crash with null pPrevFrm in framework_unoapi --- sw/source/core/layout/flowfrm.cxx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sw/source/core/layout/flowfrm.cxx b/sw/source/core/layout/flowfrm.cxx index fe1ed540fe7b..1aacdbcefda0 100644 --- a/sw/source/core/layout/flowfrm.cxx +++ b/sw/source/core/layout/flowfrm.cxx @@ -1626,8 +1626,11 @@ SwTwips SwFlowFrm::CalcUpperSpace( const SwBorderAttrs *pAttrs, bool bContextualSpacing = pAttrs->GetULSpace().GetContext(); delete pAccess; - if (bContextualSpacing && lcl_getContextualSpacing(pPrevFrm) && lcl_IdenticalStyles(pPrevFrm, &rThis)) + if (bContextualSpacing && pPrevFrm && lcl_getContextualSpacing(pPrevFrm) + && lcl_IdenticalStyles(pPrevFrm, &rThis)) + { return 0; + } else return nUpper; }