commit d0a481d09e696f6d5a2a0d40a9d5c48cfca559bf
author Mike Kaganski <mike.kaganski@collabora.com> Wed Aug 01 21:20:10 2018 +0200
committer Xisco Faulí <xiscofauli@libreoffice.org> Wed Aug 01 23:45:30 2018 +0200
tree f096f394aa5c379ad15ec41acace68c0e47657b5
parent 89fd0dff73e2442dfabcdbef6a5ad8a6c28772d6

tdf#119042: Also check if SfxViewFrame::Current() is nullptr

Change-Id: I5ac43ff626bfb4e2e754cacead5bf87115f3ce4b
Reviewed-on: https://gerrit.libreoffice.org/58447
Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
Tested-by: Jenkins

sw/source/uibase/uiview/pview.cxx

diff --git a/sw/source/uibase/uiview/pview.cxx b/sw/source/uibase/uiview/pview.cxx
index d43a046..14fd822 100644
--- a/sw/source/uibase/uiview/pview.cxx
+++ b/sw/source/uibase/uiview/pview.cxx
@@ -1231,8 +1231,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();