From 6a8b0d2a9c52b0706772c3b05edc4da995211dc6 Mon Sep 17 00:00:00 2001 From: Juergen Funk Date: Fri, 7 Sep 2018 10:25:16 +0200 Subject: sw: tdf#119742 fix null pointer in SetCursorInHdFt In SwWrtShell::ChangeHeaderOrFooter the ChgPageDesc destroys the frames of the header, that's why GetCurrFrame returns null later. Change-Id: I26915237c8b455a5b8ad0bbd5c2de38537dfef08 Reviewed-on: https://gerrit.libreoffice.org/60130 Reviewed-by: Michael Stahl Tested-by: Michael Stahl (cherry picked from commit 77d075facaf4fc8954666ad541ed14f75d964fba) Reviewed-on: https://gerrit.libreoffice.org/60302 Tested-by: Jenkins --- sw/source/core/crsr/crstrvl.cxx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx index 798793238edd..f4df137fe82d 100644 --- a/sw/source/core/crsr/crstrvl.cxx +++ b/sw/source/core/crsr/crstrvl.cxx @@ -200,7 +200,8 @@ bool SwCursorShell::SetCursorInHdFt( size_t nDescNo, bool bInHeader ) if( SIZE_MAX == nDescNo ) { // take the current one - const SwPageFrame* pPage = GetCurrFrame()->FindPageFrame(); + const SwContentFrame *pCurrFrame = GetCurrFrame(); + const SwPageFrame* pPage = (pCurrFrame == nullptr) ? nullptr : pCurrFrame->FindPageFrame(); if( pPage && pMyDoc->ContainsPageDesc( pPage->GetPageDesc(), &nDescNo) ) pDesc = pPage->GetPageDesc(); -- cgit v1.2.3