[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - sw/source

[Libreoffice Gerrit user]

 sw/source/ui/index/swuiidxmrk.cxx   |    5 +++++
 sw/source/uibase/inc/swuiidxmrk.hxx |    1 +
 2 files changed, 6 insertions(+)

New commits:
commit d5c09698b02cc41cba0719d9a2e61690a427b46b
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Jan 9 14:25:48 2019 +0000
Commit:     Xisco Faulí <xiscofauli at libreoffice.org>
CommitDate: Thu Jan 10 00:29:37 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>

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;
 };