diff options
| author | Oliver Specht <oliver.specht@cib.de> | 2015-09-04 09:01:07 +0200 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2015-09-04 08:41:36 +0000 |
| commit | 51ac2bf234a98d8f7629132b59f6961597ecea14 (patch) | |
| tree | 4520e4a3665a9aac5459ac1eef987e0f5402fa77 /sw | |
| parent | 012a7115d11c6bc2f4c3c33180c319d043a22d51 (diff) | |
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 <Thorsten.Behrens@CIB.de>
Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/ui/index/swuiidxmrk.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx index 85584e0ff2f8..79603ad3f89e 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) |