commit b01008eb17a1d37c3d020b86a5ba6fecd59b27ea
author Caolán McNamara <caolanm@redhat.com> Wed Jan 09 14:25:48 2019 +0000
committer Caolán McNamara <caolanm@redhat.com> Wed Jan 09 22:08:05 2019 +0100
tree 9263d6c846e5372f2281b8f75ec91a329e324c85
parent 8254b4abdc32c5d4b93cc7dbef4a479b3efc3460

Resolves: tdf#122449 crash after dismissing edit index entry dialog

Change-Id: I109833e175fce96c12877fefb4b093e518782ce8
Reviewed-on: https://gerrit.libreoffice.org/66038
Tested-by: Jenkins
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 a44fbee..172190a 100644
--- a/sw/source/uibase/inc/swuiidxmrk.hxx
+++ b/sw/source/uibase/inc/swuiidxmrk.hxx
@@ -153,6 +153,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;
};