summaryrefslogtreecommitdiff
path: root/sw/source
diff options
context:
space:
mode:
authorJuergen Funk <juergen.funk_ml@cib.de>2018-09-07 10:25:16 +0200
committerMichael Stahl <Michael.Stahl@cib.de>2018-09-10 18:46:29 +0200
commit860eca91ed159db46b527ebb2fc592e8d5423356 (patch)
tree0f8001619aac6c99042677f3f828cb084695c9ed /sw/source
parentec028a73aca92c9d16484d4803852526a1d845a1 (diff)
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 <Michael.Stahl@cib.de> Tested-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit 77d075facaf4fc8954666ad541ed14f75d964fba) Reviewed-on: https://gerrit.libreoffice.org/60249 Tested-by: Jenkins
Diffstat (limited to 'sw/source')
-rw-r--r--sw/source/core/crsr/crstrvl.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx
index 7a7d67d4fe86..cef97092485c 100644
--- a/sw/source/core/crsr/crstrvl.cxx
+++ b/sw/source/core/crsr/crstrvl.cxx
@@ -199,7 +199,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();