diff options
| author | Michael Stahl <Michael.Stahl@cib.de> | 2020-06-18 19:16:27 +0200 |
|---|---|---|
| committer | Adolfo Jayme Barrientos <fitojb@ubuntu.com> | 2020-06-19 12:12:13 +0200 |
| commit | 8e917d54483d916661467dac110e0c5e9774bcc2 (patch) | |
| tree | 207b9c21f32f6f6cc982a003cd6bbd693d07822d /sw/source/core/layout | |
| parent | c441cc1529d21cb9dd9aac92f28601ff8b111745 (diff) | |
tdf#133981 sw_redlinehide: oops, InsertCnt_() is missing null...
... pointer check.
(regression from 55576842ec72a748d0bad123d41fa03c89fc136d)
Change-Id: I4478c45d10ac516afd6360e4083b00d667c678fb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96621
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@cib.de>
(cherry picked from commit 17f47b3972301273716466656e775f3f09d681d8)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96692
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Diffstat (limited to 'sw/source/core/layout')
| -rw-r--r-- | sw/source/core/layout/frmtool.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx index 2a2a59377636..9765451c3aca 100644 --- a/sw/source/core/layout/frmtool.cxx +++ b/sw/source/core/layout/frmtool.cxx @@ -1701,7 +1701,8 @@ void InsertCnt_( SwLayoutFrame *pLay, SwDoc *pDoc, SwFrame *const pNext( // if there's a parent section, it has been split // into 2 SwSectionFrame already :( - ( pFrame->GetNext()->IsSctFrame() + ( pFrame->GetNext() + && pFrame->GetNext()->IsSctFrame() && pActualSection->GetUpper() && pActualSection->GetUpper()->GetSectionNode() == static_cast<SwSectionFrame const*>(pFrame->GetNext())->GetSection()->GetFormat()->GetSectionNode()) |