commit 52af98a739daccbd29f9c6626e81203454de742a
author Caolán McNamara <caolanm@redhat.com> Wed Jan 09 14:25:48 2019 +0000
committer Caolán McNamara <caolanm@redhat.com> Fri Jan 11 22:09:14 2019 +0100
tree b4ea75cd461c8a3d4f605769b31b7dbf11afc92d
parent d5289906cd67d27701ee94351885bf1e641606fa

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@libreoffice.org>
(cherry picked from commit d5c09698b02cc41cba0719d9a2e61690a427b46b)
Reviewed-on: https://gerrit.libreoffice.org/66057
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

sw/source/ui/index/swuiidxmrk.cxx

diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx
index b30f5769..dd0676b 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();

sw/source/uibase/inc/swuiidxmrk.hxx

diff --git a/sw/source/uibase/inc/swuiidxmrk.hxx b/sw/source/uibase/inc/swuiidxmrk.hxx
index 5d64b9d..383bec0 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;
};