sw/source/core/crsr/crstrvl.cxx | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 6a8b0d2a9c52b0706772c3b05edc4da995211dc6
Author: Juergen Funk <juergen.funk...@cib.de>
AuthorDate: Fri Sep 7 10:25:16 2018 +0200
Commit: Michael Stahl <michael.st...@cib.de>
CommitDate: Tue Sep 11 12:15:41 2018 +0200
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.st...@cib.de>
Tested-by: Michael Stahl <michael.st...@cib.de>
(cherry picked from commit 77d075facaf4fc8954666ad541ed14f75d964fba)
Reviewed-on: https://gerrit.libreoffice.org/60302
Tested-by: Jenkins
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();
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
