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

Caolán McNamara caolanm at redhat.com
Fri Aug 11 12:15:54 UTC 2017


 sw/source/ui/index/swuiidxmrk.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit da3d4d2160ee71ebef9aa42ad4b9f2af9da2ed02
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Aug 11 13:10:29 2017 +0100

    Resolves: tdf#111571 crash on restarting writer with modeless biblio dialog
    
    Change-Id: I2663f84c28721f61c1ed7c8d92a228cafa8f1177
    Reviewed-on: https://gerrit.libreoffice.org/41036
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx
index 06eb81bbd41e..0e2296701967 100644
--- a/sw/source/ui/index/swuiidxmrk.cxx
+++ b/sw/source/ui/index/swuiidxmrk.cxx
@@ -1666,8 +1666,8 @@ SwAuthMarkFloatDlg::SwAuthMarkFloatDlg(SfxBindings* _pBindings,
 {
     Initialize(pInfo);
     SwWrtShell* pWrtShell = ::GetActiveWrtShell();
-    OSL_ENSURE(pWrtShell, "No shell?");
-    m_aContent.ReInitDlg(*pWrtShell);
+    if (pWrtShell)
+        m_aContent.ReInitDlg(*pWrtShell);
 }
 
 void SwAuthMarkFloatDlg::Activate()


More information about the Libreoffice-commits mailing list