[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - sw/source

[Oliver Specht]

 sw/source/ui/index/swuiidxmrk.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9621bd268859c4810ddd3abd631f13c794e083c9
Author: Oliver Specht <oliver.specht at cib.de>
Date:   Fri Sep 4 09:01:07 2015 +0200

    tdf#92732: fix vclptr lifecycle for index entry editing dialog
    
    Call SwViewShell::SetCareWin() in closeHdl instead of d'tor
    since with care window set the d'tor is never called
    
    Reviewed-on: https://gerrit.libreoffice.org/18330
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    Tested-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    (cherry picked from commit 51ac2bf234a98d8f7629132b59f6961597ecea14)
    
    Change-Id: Ieb8280ab57c3bccf95ce2ce96937aab261133ce0
    Reviewed-on: https://gerrit.libreoffice.org/18333
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx
index 8af83aa..c3e0d6b 100644
--- a/sw/source/ui/index/swuiidxmrk.cxx
+++ b/sw/source/ui/index/swuiidxmrk.cxx
@@ -621,6 +621,7 @@ IMPL_LINK_NOARG(SwIndexMarkPane, CloseHdl)
     }
     else
     {
+        SwViewShell::SetCareWin( 0 );
         m_rDialog.EndDialog(RET_CANCEL);
     }
     return 0;
@@ -930,7 +931,6 @@ IMPL_LINK( SwIndexMarkPane, KeyDCBModifyHdl, ComboBox *, pBox )
 SwIndexMarkPane::~SwIndexMarkPane()
 {
     delete pTOXMgr;
-    SwViewShell::SetCareWin( 0 );
 }
 
 void    SwIndexMarkPane::ReInitDlg(SwWrtShell& rWrtShell, SwTOXMark* pCurTOXMark)