diff options
| author | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-05-12 19:54:18 -0400 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-05-12 19:59:57 -0400 |
| commit | 36122c27539ae22c3a67fab89ecf1a262074c3b4 (patch) | |
| tree | 7817448f174284adb262293b394efae0c9320145 /chart2/source/controller/dialogs/dlg_CreationWizard.cxx | |
| parent | vcl: move Window clipping functions to clipping.cxx (diff) | |
| download | core-36122c27539ae22c3a67fab89ecf1a262074c3b4.tar.gz core-36122c27539ae22c3a67fab89ecf1a262074c3b4.zip | |
Replace auto_ptr with boost::scoped_ptr.
Change-Id: Ibc6d532eff59146d8fbe7dcc7f9155ce6119f474
Diffstat (limited to 'chart2/source/controller/dialogs/dlg_CreationWizard.cxx')
| -rw-r--r-- | chart2/source/controller/dialogs/dlg_CreationWizard.cxx | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx index 6b018be7f68e..2a3e219bac3d 100644 --- a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx +++ b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx @@ -66,7 +66,7 @@ CreationWizard::CreationWizard( Window* pParent, const uno::Reference< frame::XM , m_aTimerTriggeredControllerLock( xChartModel ) , m_bCanTravel( true ) { - m_apDialogModel.reset( new DialogModel( m_xChartModel, m_xCC )); + m_pDialogModel.reset( new DialogModel( m_xChartModel, m_xCC )); // Do not call FreeResource(), because there are no sub-elements defined in // the dialog resource ShowButtonFixedLine( true ); @@ -124,21 +124,20 @@ svt::OWizardPage* CreationWizard::createPage(WizardState nState) ChartTypeTabPage* pChartTypeTabPage = new ChartTypeTabPage(this,m_xChartModel,m_xCC,bDoLiveUpdate); pRet = pChartTypeTabPage; m_pTemplateProvider = pChartTypeTabPage; - if( m_pTemplateProvider && - m_apDialogModel.get() ) - m_apDialogModel->setTemplate( m_pTemplateProvider->getCurrentTemplate()); + if (m_pTemplateProvider && m_pDialogModel) + m_pDialogModel->setTemplate( m_pTemplateProvider->getCurrentTemplate()); } break; case STATE_SIMPLE_RANGE: { m_aTimerTriggeredControllerLock.startTimer(); - pRet = new RangeChooserTabPage(this,*(m_apDialogModel.get()),m_pTemplateProvider,this); + pRet = new RangeChooserTabPage(this, *m_pDialogModel, m_pTemplateProvider, this); } break; case STATE_DATA_SERIES: { m_aTimerTriggeredControllerLock.startTimer(); - pRet = new DataSourceTabPage(this,*(m_apDialogModel.get()),m_pTemplateProvider,this); + pRet = new DataSourceTabPage(this, *m_pDialogModel, m_pTemplateProvider, this); } break; case STATE_OBJECTS: |