sw/source/ui/index/swuiidxmrk.cxx | 5 +++++ sw/source/uibase/inc/swuiidxmrk.hxx | 1 + 2 files changed, 6 insertions(+)
New commits: commit b01008eb17a1d37c3d020b86a5ba6fecd59b27ea Author: Caolán McNamara <caol...@redhat.com> AuthorDate: Wed Jan 9 14:25:48 2019 +0000 Commit: Caolán McNamara <caol...@redhat.com> CommitDate: Wed Jan 9 22:08:05 2019 +0100 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 <caol...@redhat.com> Tested-by: Caolán McNamara <caol...@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 a44fbeed8722..172190a3203a 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; }; _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits