diff options
Diffstat (limited to 'dbaccess/source/ui/dlg/dbwiz.cxx')
| -rw-r--r-- | dbaccess/source/ui/dlg/dbwiz.cxx | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/dbaccess/source/ui/dlg/dbwiz.cxx b/dbaccess/source/ui/dlg/dbwiz.cxx index f39d0dba2454..566c30af0fa0 100644 --- a/dbaccess/source/ui/dlg/dbwiz.cxx +++ b/dbaccess/source/ui/dlg/dbwiz.cxx @@ -102,7 +102,13 @@ ODbTypeWizDialog::ODbTypeWizDialog(vcl::Window* _pParent ODbTypeWizDialog::~ODbTypeWizDialog() { + disposeOnce(); +} + +void ODbTypeWizDialog::dispose() +{ delete m_pOutSet; + svt::OWizardMachine::dispose(); } IMPL_LINK(ODbTypeWizDialog, OnTypeSelected, OGeneralPage*, _pTabPage) @@ -227,16 +233,16 @@ void ODbTypeWizDialog::clearPassword() m_pImpl->clearPassword(); } -TabPage* ODbTypeWizDialog::createPage(WizardState _nState) +VclPtr<TabPage> ODbTypeWizDialog::createPage(WizardState _nState) { sal_uInt16 nStringId = STR_PAGETITLE_ADVANCED; - TabPage* pPage = NULL; + VclPtr<TabPage> pPage; switch(_nState) { case START_PAGE: // start state { - pPage = new OGeneralPageDialog(this,*m_pOutSet); - OGeneralPage* pGeneralPage = static_cast< OGeneralPage* >( pPage ); + pPage = VclPtr<OGeneralPageDialog>::Create(this,*m_pOutSet); + OGeneralPage* pGeneralPage = static_cast< OGeneralPage* >( pPage.get() ); pGeneralPage->SetTypeSelectHandler( LINK( this, ODbTypeWizDialog, OnTypeSelected)); nStringId = STR_PAGETITLE_GENERAL; } @@ -284,8 +290,8 @@ TabPage* ODbTypeWizDialog::createPage(WizardState _nState) // register ourself as modified listener if ( pPage ) { - static_cast<OGenericAdministrationPage*>(pPage)->SetServiceFactory( m_pImpl->getORB() ); - static_cast<OGenericAdministrationPage*>(pPage)->SetAdminDialog(this,this); + static_cast<OGenericAdministrationPage*>(pPage.get())->SetServiceFactory( m_pImpl->getORB() ); + static_cast<OGenericAdministrationPage*>(pPage.get())->SetAdminDialog(this,this); pPage->SetText(ModuleRes(nStringId)); defaultButton( _nState == START_PAGE ? WZB_NEXT : WZB_FINISH ); enableButtons( WZB_FINISH, _nState != START_PAGE); |