[Libreoffice-commits] core.git: sw/source

[Oliver Specht]

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

New commits:
commit fbff75a64c7449aac85d640f67b1de147db35c3e
Author: Oliver Specht <oliver.specht at cib.de>
Date:   Wed Oct 28 16:11:55 2015 +0100

    tdf#89337: Fixing crash in edit/index dialog, again
    
    the fix of tdf#92732 moved the crash from pressing Close/OK to
    pressing the window closer. Now the CareWindow is set in dispose
    and this works for all
    
    Change-Id: Id9c272acec48890556a5042c0f5310e69c0a67da
    Reviewed-on: https://gerrit.libreoffice.org/19645
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Oliver Specht <oliver.specht at cib.de>

diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx
index a1726f1..c2f4fa4 100644
--- a/sw/source/ui/index/swuiidxmrk.cxx
+++ b/sw/source/ui/index/swuiidxmrk.cxx
@@ -616,7 +616,6 @@ IMPL_LINK_NOARG_TYPED(SwIndexMarkPane, CloseHdl, Button*, void)
     }
     else
     {
-        SwViewShell::SetCareWin( 0 );
         m_rDialog.EndDialog();
     }
 }
@@ -976,6 +975,12 @@ void SwIndexMarkModalDlg::Apply()
     m_aContent.Apply();
 }
 
+void SwIndexMarkModalDlg::dispose()
+{
+    SwViewShell::SetCareWin(0);
+    SvxStandardDialog::dispose();
+}
+
 class SwCreateAuthEntryDlg_Impl : public ModalDialog
 {
     VclPtr<FixedText>      pFixedTexts[AUTH_FIELD_END];
diff --git a/sw/source/uibase/inc/swuiidxmrk.hxx b/sw/source/uibase/inc/swuiidxmrk.hxx
index 44db42e..41ab574 100644
--- a/sw/source/uibase/inc/swuiidxmrk.hxx
+++ b/sw/source/uibase/inc/swuiidxmrk.hxx
@@ -170,6 +170,7 @@ public:
     SwIndexMarkModalDlg(vcl::Window *pParent, SwWrtShell& rSh, SwTOXMark* pCurTOXMark);
 
     virtual void        Apply() override;
+    virtual void        dispose() override;
 };
 
 class SwAuthMarkModalDlg;