sw/source/uibase/uiview/pview.cxx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
New commits: commit e9c56f20687b9c950977e095476c18ff510fae1e Author: Mike Kaganski <[email protected]> AuthorDate: Wed Aug 1 21:20:10 2018 +0200 Commit: Michael Stahl <[email protected]> CommitDate: Thu Aug 2 16:31:08 2018 +0200 tdf#119042: Also check if SfxViewFrame::Current() is nullptr Change-Id: I5ac43ff626bfb4e2e754cacead5bf87115f3ce4b Reviewed-on: https://gerrit.libreoffice.org/58447 Reviewed-by: Xisco Faulí <[email protected]> Tested-by: Jenkins (cherry picked from commit d0a481d09e696f6d5a2a0d40a9d5c48cfca559bf) Reviewed-on: https://gerrit.libreoffice.org/58457 Reviewed-by: Michael Stahl <[email protected]> diff --git a/sw/source/uibase/uiview/pview.cxx b/sw/source/uibase/uiview/pview.cxx index 7b71101baa8a..d0c2cbbbf0a3 100644 --- a/sw/source/uibase/uiview/pview.cxx +++ b/sw/source/uibase/uiview/pview.cxx @@ -1248,8 +1248,9 @@ SwPagePreview::~SwPagePreview() delete pVShell; m_pViewWin.disposeAndClear(); - if (auto& pBar = SfxViewFrame::Current()->GetWindow().GetSystemWindow()->GetNotebookBar()) - pBar->ControlListener(false); + if (SfxViewFrame* pCurrent = SfxViewFrame::Current()) + if (auto& pBar = pCurrent->GetWindow().GetSystemWindow()->GetNotebookBar()) + pBar->ControlListener(false); m_pScrollFill.disposeAndClear(); m_pHScrollbar.disposeAndClear(); m_pVScrollbar.disposeAndClear(); _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
