[Libreoffice-commits] core.git: sw/source

[Libreoffice Gerrit user]

 sw/source/uibase/uiview/pview.cxx |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit d0a481d09e696f6d5a2a0d40a9d5c48cfca559bf
Author:     Mike Kaganski <mike.kaganski at collabora.com>
AuthorDate: Wed Aug 1 21:20:10 2018 +0200
Commit:     Xisco Faulí <xiscofauli at libreoffice.org>
CommitDate: Wed Aug 1 23:45:30 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í <xiscofauli at libreoffice.org>
    Tested-by: Jenkins

diff --git a/sw/source/uibase/uiview/pview.cxx b/sw/source/uibase/uiview/pview.cxx
index d43a0460fd48..14fd822e1bf4 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();