diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2015-03-20 15:00:03 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2015-04-10 13:01:48 +0100 |
| commit | d1091fd50adb1c01d1b1393fd662278611f9e7e1 (patch) | |
| tree | db279bb0b9641b8e912c55d72ce4a9a7ccb2f4b5 /sfx2/source/dialog | |
| parent | wrap more stuff in VclPtr (diff) | |
| download | core-d1091fd50adb1c01d1b1393fd662278611f9e7e1.tar.gz core-d1091fd50adb1c01d1b1393fd662278611f9e7e1.zip | |
re-insert erroneously converted delete calls.
Change-Id: Iebdf2af3866d884289f6913646106fe3f2d4dde5
Diffstat (limited to 'sfx2/source/dialog')
| -rw-r--r-- | sfx2/source/dialog/basedlgs.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/dialog/infobar.cxx | 9 | ||||
| -rw-r--r-- | sfx2/source/dialog/templdlg.cxx | 1 |
3 files changed, 10 insertions, 2 deletions
diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx index 6a6e4b597090..285e618b398f 100644 --- a/sfx2/source/dialog/basedlgs.cxx +++ b/sfx2/source/dialog/basedlgs.cxx @@ -712,6 +712,8 @@ SfxSingleTabDialog::~SfxSingleTabDialog() void SfxSingleTabDialog::dispose() { + pImpl->m_pSfxPage.disposeAndClear(); + pImpl->m_pLine.disposeAndClear(); delete pImpl; pOKBtn.clear(); pCancelBtn.clear(); diff --git a/sfx2/source/dialog/infobar.cxx b/sfx2/source/dialog/infobar.cxx index 88377b3d0a56..2b1177a723d0 100644 --- a/sfx2/source/dialog/infobar.cxx +++ b/sfx2/source/dialog/infobar.cxx @@ -150,8 +150,11 @@ SfxInfoBarWindow::~SfxInfoBarWindow() void SfxInfoBarWindow::dispose() { - m_pMessage.clear(); - m_pCloseBtn.clear(); + for ( auto it = m_aActionBtns.begin( ); it != m_aActionBtns.end( ); ++it ) + it->disposeAndClear(); + + m_pMessage.disposeAndClear(); + m_pCloseBtn.disposeAndClear(); m_aActionBtns.clear( ); vcl::Window::dispose(); } @@ -247,6 +250,8 @@ SfxInfoBarContainerWindow::~SfxInfoBarContainerWindow() void SfxInfoBarContainerWindow::dispose() { + for ( auto it = m_pInfoBars.begin( ); it != m_pInfoBars.end( ); ++it ) + it->disposeAndClear(); m_pInfoBars.clear( ); Window::dispose(); } diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index b1c8bf013b0d..cbe8217dd03e 100644 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -765,6 +765,7 @@ SfxCommonTemplateDialog_Impl::~SfxCommonTemplateDialog_Impl() if ( pStyleSheetPool ) EndListening(*pStyleSheetPool); pStyleSheetPool = NULL; + pTreeBox.disposeAndClear(); delete pIdle; if ( m_pDeletionWatcher ) m_pDeletionWatcher->signal(); |