[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - sw/source

[Caolán McNamara (via logerrit)]

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

New commits:
commit 16b9be87a59383ac04319e7d5297fcd63facb49c
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Nov 2 19:27:04 2020 +0000
Commit:     Michael Stahl <michael.stahl at cib.de>
CommitDate: Tue Nov 3 10:41:04 2020 +0100

    Resolves: rhbz#1893846 if last close had insert, index dialog open
    
    when starting a new writer document
    
    Change-Id: I83131c01aa53208a321abade48d48a6f7965d0ff
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105210
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <michael.stahl at cib.de>

diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx
index d8b3481b3286..150ca24920ad 100644
--- a/sw/source/ui/index/swuiidxmrk.cxx
+++ b/sw/source/ui/index/swuiidxmrk.cxx
@@ -960,7 +960,8 @@ SwIndexMarkFloatDlg::SwIndexMarkFloatDlg(SfxBindings* _pBindings,
         "modules/swriter/ui/indexentry.ui", "IndexEntryDialog")
     , m_aContent(m_xDialog, *m_xBuilder, bNew, *::GetActiveWrtShell())
 {
-    m_aContent.ReInitDlg(*::GetActiveWrtShell());
+    if (SwWrtShell* pSh = ::GetActiveWrtShell())
+        m_aContent.ReInitDlg(*pSh);
     Initialize(pInfo);
 }