diff options
| -rw-r--r-- | sw/source/core/layout/frmtool.cxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx index d9b9c98cb66a..7ece7bbcfdf4 100644 --- a/sw/source/core/layout/frmtool.cxx +++ b/sw/source/core/layout/frmtool.cxx @@ -3434,9 +3434,9 @@ bool IsFrameInSameContext( const SwFrame *pInnerFrame, const SwFrame *pFrame ) static SwTwips lcl_CalcCellRstHeight( SwLayoutFrame *pCell ) { - if ( pCell->Lower()->IsContentFrame() || pCell->Lower()->IsSctFrame() ) + SwFrame *pLow = pCell->Lower(); + if ( pLow && (pLow->IsContentFrame() || pLow->IsSctFrame()) ) { - SwFrame *pLow = pCell->Lower(); long nHeight = 0, nFlyAdd = 0; do { @@ -3463,7 +3463,6 @@ static SwTwips lcl_CalcCellRstHeight( SwLayoutFrame *pCell ) else { long nRstHeight = 0; - SwFrame *pLow = pCell->Lower(); while (pLow && pLow->IsLayoutFrame()) { nRstHeight += ::CalcRowRstHeight(static_cast<SwLayoutFrame*>(pLow)); |