[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - sw/source

[Caolán McNamara]

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

New commits:
commit 87f31ec5a8fb968bde0ff1d1bd41324883b6e263
Author: Caolán McNamara <caol...@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/41037
    Reviewed-by: Michael Stahl <mst...@redhat.com>
    Tested-by: Jenkins <c...@libreoffice.org>

diff --git a/sw/source/ui/index/swuiidxmrk.cxx 
b/sw/source/ui/index/swuiidxmrk.cxx
index a4b817296e76..b266a1082554 100644
--- a/sw/source/ui/index/swuiidxmrk.cxx
+++ b/sw/source/ui/index/swuiidxmrk.cxx
@@ -1633,8 +1633,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()

_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits