[Libreoffice-commits] core.git: Branch 'libreoffice-6-2-0' - sw/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Fri Jan 11 21:09:38 UTC 2019
sw/source/ui/index/swuiidxmrk.cxx | 5 +++++
sw/source/uibase/inc/swuiidxmrk.hxx | 1 +
2 files changed, 6 insertions(+)
New commits:
commit 52af98a739daccbd29f9c6626e81203454de742a
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Jan 9 14:25:48 2019 +0000
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Fri Jan 11 22:09:14 2019 +0100
Resolves: tdf#122449 crash after dismissing edit index entry dialog
Change-Id: I109833e175fce96c12877fefb4b093e518782ce8
Reviewed-on: https://gerrit.libreoffice.org/66039
Tested-by: Jenkins
Reviewed-by: Xisco Faulí <xiscofauli at libreoffice.org>
(cherry picked from commit d5c09698b02cc41cba0719d9a2e61690a427b46b)
Reviewed-on: https://gerrit.libreoffice.org/66057
Reviewed-by: Michael Stahl <Michael.Stahl at cib.de>
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 b30f5769710d..dd0676bc0818 100644
--- a/sw/source/ui/index/swuiidxmrk.cxx
+++ b/sw/source/ui/index/swuiidxmrk.cxx
@@ -975,6 +975,11 @@ SwIndexMarkModalDlg::SwIndexMarkModalDlg(weld::Window *pParent, SwWrtShell& rSh,
m_aContent.ReInitDlg(rSh, pCurTOXMark);
}
+SwIndexMarkModalDlg::~SwIndexMarkModalDlg()
+{
+ SwViewShell::SetCareDialog(nullptr);
+}
+
short SwIndexMarkModalDlg::run()
{
short nRet = SfxDialogController::run();
diff --git a/sw/source/uibase/inc/swuiidxmrk.hxx b/sw/source/uibase/inc/swuiidxmrk.hxx
index 5d64b9d670c1..383bec07aea0 100644
--- a/sw/source/uibase/inc/swuiidxmrk.hxx
+++ b/sw/source/uibase/inc/swuiidxmrk.hxx
@@ -162,6 +162,7 @@ class SwIndexMarkModalDlg : public SfxDialogController
SwIndexMarkPane m_aContent;
public:
SwIndexMarkModalDlg(weld::Window *pParent, SwWrtShell& rSh, SwTOXMark const * pCurTOXMark);
+ virtual ~SwIndexMarkModalDlg() override;
virtual short int run() override;
};
More information about the Libreoffice-commits
mailing list