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 /cui | |
| parent | 58a43332b3a86db3756e6ad18e31189969c85364 (diff) | |
re-insert erroneously converted delete calls.
Change-Id: Iebdf2af3866d884289f6913646106fe3f2d4dde5
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/dialogs/iconcdlg.cxx | 2 | ||||
| -rw-r--r-- | cui/source/factory/dlgfact.hxx | 2 | ||||
| -rw-r--r-- | cui/source/options/treeopt.cxx | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx index cb809619e0f7..4e0c09b1474b 100644 --- a/cui/source/dialogs/iconcdlg.cxx +++ b/cui/source/dialogs/iconcdlg.cxx @@ -242,7 +242,7 @@ void IconChoiceDialog::dispose() if ( pData->bOnDemand ) delete &pData->pPage->GetItemSet(); - delete pData->pPage; + pData->pPage.disposeAndClear(); } delete pData; } diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx index 98833f9a70be..808a80c96fa5 100644 --- a/cui/source/factory/dlgfact.hxx +++ b/cui/source/factory/dlgfact.hxx @@ -81,7 +81,7 @@ short Class::Execute() \ class VclAbstractDialog2_Impl : public VclAbstractDialog2 { - VclPtr<Dialog> m_pDlg; + ScopedVclPtr<Dialog> m_pDlg; Link m_aEndDlgHdl; public: VclAbstractDialog2_Impl( Dialog* p ) : m_pDlg( p ) {} diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index 6262d24f2f9e..ab31348d2479 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -465,7 +465,7 @@ static bool lcl_isOptionHidden( sal_uInt16 _nPageId, const SvtOptionsDialogOptio struct OptionsPageInfo { - VclPtr<SfxTabPage> m_pPage; + ScopedVclPtr<SfxTabPage> m_pPage; sal_uInt16 m_nPageId; OUString m_sPageURL; OUString m_sEventHdl; |