diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2015-04-14 14:11:02 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2015-04-14 14:11:02 +0100 |
| commit | bd5c762e0702ad341bf3a87bb29c0218ffd957ab (patch) | |
| tree | 1a9f6f4258d89be77902236cf1aa32b08c38597c /sfx2 | |
| parent | ae5f75ab0515f8ee63813ec9284fbfb2124f0a5d (diff) | |
More missing lifecycle pieces.
Change-Id: I45ea68d75b03389a1ac0cdb74486c3701c1730a8
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/dialog/templdlg.cxx | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index 7cbc5be5a7a1..b5cd56cdf67f 100644 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -769,6 +769,8 @@ SfxCommonTemplateDialog_Impl::~SfxCommonTemplateDialog_Impl() delete pIdle; if ( m_pDeletionWatcher ) m_pDeletionWatcher->signal(); + aFmtLb.disposeAndClear(); + aFilterLb.disposeAndClear(); } namespace SfxTemplate @@ -2064,8 +2066,8 @@ SfxTemplateDialog_Impl::SfxTemplateDialog_Impl( : SfxCommonTemplateDialog_Impl( pB, pDlgWindow, true ), m_pFloat ( pDlgWindow ), m_bZoomIn ( false ), - m_aActionTbL ( new DropToolBox_Impl(pDlgWindow, this) ), - m_aActionTbR ( new ToolBox(pDlgWindow, SfxResId( TB_ACTION )) ) + m_aActionTbL ( VclPtrInstance<DropToolBox_Impl>(pDlgWindow, this) ), + m_aActionTbR ( VclPtrInstance<ToolBox> (pDlgWindow, SfxResId( TB_ACTION ) ) ) { pDlgWindow->FreeResource(); Initialize(); @@ -2160,6 +2162,9 @@ void SfxCommonTemplateDialog_Impl::InvalidateBindings() SfxTemplateDialog_Impl::~SfxTemplateDialog_Impl() { + m_pFloat.clear(); + m_aActionTbL.disposeAndClear(); + m_aActionTbR.disposeAndClear(); } void SfxTemplateDialog_Impl::LoadedFamilies() |