sw/source/ui/index/swuiidxmrk.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
New commits: commit 51ac2bf234a98d8f7629132b59f6961597ecea14 Author: Oliver Specht <[email protected]> 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 Change-Id: Ieb8280ab57c3bccf95ce2ce96937aab261133ce0 Reviewed-on: https://gerrit.libreoffice.org/18330 Reviewed-by: Thorsten Behrens <[email protected]> Tested-by: Thorsten Behrens <[email protected]> diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx index 85584e0..79603ad 100644 --- a/sw/source/ui/index/swuiidxmrk.cxx +++ b/sw/source/ui/index/swuiidxmrk.cxx @@ -618,6 +618,7 @@ IMPL_LINK_NOARG_TYPED(SwIndexMarkPane, CloseHdl, Button*, void) } else { + SwViewShell::SetCareWin( 0 ); m_rDialog.EndDialog(); } } @@ -920,7 +921,6 @@ IMPL_LINK( SwIndexMarkPane, KeyDCBModifyHdl, ComboBox *, pBox ) SwIndexMarkPane::~SwIndexMarkPane() { delete pTOXMgr; - SwViewShell::SetCareWin( 0 ); } void SwIndexMarkPane::ReInitDlg(SwWrtShell& rWrtShell, SwTOXMark* pCurTOXMark) _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
