Blame SOURCES/0001-Resolves-rhbz-1893846-if-last-close-had-insert-index.patch
|
 |
2654e0 |
From d59960d5de3f07726594d980152a3bfeb58bace9 Mon Sep 17 00:00:00 2001
|
|
|
2654e0 |
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
|
|
|
2654e0 |
Date: Mon, 2 Nov 2020 19:27:04 +0000
|
|
|
2654e0 |
Subject: [PATCH 1/8] Resolves: rhbz#1893846 if last close had insert, index
|
|
|
2654e0 |
dialog open
|
|
|
2654e0 |
|
|
|
2654e0 |
when starting a new writer document
|
|
|
2654e0 |
|
|
|
2654e0 |
Change-Id: I83131c01aa53208a321abade48d48a6f7965d0ff
|
|
|
2654e0 |
---
|
|
|
2654e0 |
sw/source/ui/index/swuiidxmrk.cxx | 3 ++-
|
|
|
2654e0 |
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
2654e0 |
|
|
|
2654e0 |
diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx
|
|
|
2654e0 |
index 33a0eab8cd69..5eca069b963b 100644
|
|
|
2654e0 |
--- a/sw/source/ui/index/swuiidxmrk.cxx
|
|
|
2654e0 |
+++ b/sw/source/ui/index/swuiidxmrk.cxx
|
|
|
2654e0 |
@@ -955,7 +955,8 @@ SwIndexMarkFloatDlg::SwIndexMarkFloatDlg(SfxBindings* _pBindings,
|
|
|
2654e0 |
"modules/swriter/ui/indexentry.ui", "IndexEntryDialog")
|
|
|
2654e0 |
, m_aContent(m_xDialog, *m_xBuilder, bNew, *::GetActiveWrtShell())
|
|
|
2654e0 |
{
|
|
|
2654e0 |
- m_aContent.ReInitDlg(*::GetActiveWrtShell());
|
|
|
2654e0 |
+ if (SwWrtShell* pSh = ::GetActiveWrtShell())
|
|
|
2654e0 |
+ m_aContent.ReInitDlg(*pSh);
|
|
|
2654e0 |
Initialize(pInfo);
|
|
|
2654e0 |
}
|
|
|
2654e0 |
|
|
|
2654e0 |
--
|
|
|
2654e0 |
2.28.0
|
|
|
2654e0 |
|