commit a108e875a3b07c78a8a2a052fb1bbab9aab28c51
author Justin Luth <justin_luth@sil.org> Tue Mar 17 21:18:41 2020 +0300
committer Michael Stahl <michael.stahl@cib.de> Mon Mar 23 14:14:01 2020 +0100
tree 944d3628c908a44689999cc9b0f07d29cc1609d9
parent ff1588da212285122e4c4efdbfb723fe9c56caa8

tdf#130746: avoid nullptr dereference

Change-Id: I32979a23caffea844f1c8eac9f408b18f0768b62
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90661
Tested-by: Jenkins
Reviewed-by: Justin Luth <justin_luth@sil.org>
(cherry picked from commit 81588ff2f0eb55576a5288778be2dfb5b4bc5e81)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90635
Reviewed-by: Michael Stahl <michael.stahl@cib.de>

sw/source/core/layout/frmtool.cxx

diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx
index d9b9c98c..7ece7bb 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));