From 8329591d1ed0a0b0af492ea548a36658dbf9f08c Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Nov 02 2020 19:56:14 +0000
Subject: rhbz#1893846 crash on restoration of insert, index in new doc


---

diff --git a/0001-Resolves-rhbz-1893846-if-last-close-had-insert-index.patch b/0001-Resolves-rhbz-1893846-if-last-close-had-insert-index.patch
new file mode 100644
index 0000000..8482525
--- /dev/null
+++ b/0001-Resolves-rhbz-1893846-if-last-close-had-insert-index.patch
@@ -0,0 +1,30 @@
+From 0810398a3be71306fb75c8ed4f000ca2d7a1fb6f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
+Date: Mon, 2 Nov 2020 19:27:04 +0000
+Subject: [PATCH] Resolves: rhbz#1893846 if last close had insert, index dialog
+ open
+
+when starting a new writer document
+
+Change-Id: I83131c01aa53208a321abade48d48a6f7965d0ff
+---
+ sw/source/ui/index/swuiidxmrk.cxx | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx
+index 33a0eab8cd69..5eca069b963b 100644
+--- a/sw/source/ui/index/swuiidxmrk.cxx
++++ b/sw/source/ui/index/swuiidxmrk.cxx
+@@ -955,7 +955,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);
+ }
+ 
+-- 
+2.28.0
+
diff --git a/libreoffice.spec b/libreoffice.spec
index 44fe139..e05e601 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -50,7 +50,7 @@ Summary:        Free Software Productivity Suite
 Name:           libreoffice
 Epoch:          1
 Version:        %{libo_version}.2
-Release:        2%{?libo_prerelease}%{?dist}
+Release:        3%{?libo_prerelease}%{?dist}
 License:        (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and MPLv2.0 and CC0
 URL:            http://www.libreoffice.org/
 
@@ -249,6 +249,7 @@ Patch9: 0001-export-HYPERLINK-target-in-html-clipboard-export.patch
 Patch10: 0001-use-gdk_wayland_window_set_application_id-when-it-be.patch
 Patch11: 0001-tdf-137209-unparent-widgets-in-fragment-dtor.patch
 Patch12: 0001-rhbz-1891326-suggest-package-install-of-the-most-app.patch
+Patch13: 0001-Resolves-rhbz-1893846-if-last-close-had-insert-index.patch
 
 %if 0%{?rhel}
 # not upstreamed
@@ -2236,6 +2237,9 @@ done
 %{_includedir}/LibreOfficeKit
 
 %changelog
+* Mon Nov 02 2020 Caolán McNamara <caolanm@redhat.com> - 1:6.4.7.2-3
+- rhbz#1893846 crash on restoration of insert, index in new doc
+
 * Mon Oct 26 2020 Caolán McNamara <caolanm@redhat.com> - 1:6.4.7.2-2
 - rhbz#1891326 suggest pt-PT langpack install under pt_PT locale