diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-09-24 14:10:48 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-09-26 09:54:49 +0200 |
| commit | deb37c44ecfb8f6aa7c2ceec4771b0505fa7b6bb (patch) | |
| tree | 3953ca620e27fed0442272fdabea9735fd6f3dcd /chart2/source/controller/dialogs/dlg_CreationWizard.cxx | |
| parent | disinherit OWizardPage and SfxTabPage from vcl TabPage (diff) | |
| download | core-deb37c44ecfb8f6aa7c2ceec4771b0505fa7b6bb.tar.gz core-deb37c44ecfb8f6aa7c2ceec4771b0505fa7b6bb.zip | |
now drop TabPageParent intermediate
Change-Id: I47328f76342ac023628d9042bdfa8213a1c93d0c
Reviewed-on: https://gerrit.libreoffice.org/79469
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'chart2/source/controller/dialogs/dlg_CreationWizard.cxx')
| -rw-r--r-- | chart2/source/controller/dialogs/dlg_CreationWizard.cxx | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx index 228bcdbadba6..ef67bf7fe568 100644 --- a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx +++ b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx @@ -90,15 +90,13 @@ std::unique_ptr<BuilderPage> CreationWizard::createPage(WizardState nState) OString sIdent(OString::number(nState)); weld::Container* pPageContainer = m_xAssistant->append_page(sIdent); - // TODO eventually pass DialogController as distinct argument instead of bundling into TabPageParent - TabPageParent aParent(pPageContainer, this); switch( nState ) { case STATE_CHARTTYPE: { m_aTimerTriggeredControllerLock.startTimer(); - xRet = std::make_unique<ChartTypeTabPage>(aParent, m_xChartModel); + xRet = std::make_unique<ChartTypeTabPage>(pPageContainer, this, m_xChartModel); m_pTemplateProvider = static_cast<ChartTypeTabPage*>(xRet.get()); if (m_pDialogModel) m_pDialogModel->setTemplate( m_pTemplateProvider->getCurrentTemplate()); @@ -107,18 +105,18 @@ std::unique_ptr<BuilderPage> CreationWizard::createPage(WizardState nState) case STATE_SIMPLE_RANGE: { m_aTimerTriggeredControllerLock.startTimer(); - xRet = std::make_unique<RangeChooserTabPage>(aParent, *m_pDialogModel, m_pTemplateProvider, this); + xRet = std::make_unique<RangeChooserTabPage>(pPageContainer, this, *m_pDialogModel, m_pTemplateProvider); break; } case STATE_DATA_SERIES: { m_aTimerTriggeredControllerLock.startTimer(); - xRet = std::make_unique<DataSourceTabPage>(aParent, *m_pDialogModel, m_pTemplateProvider, this); + xRet = std::make_unique<DataSourceTabPage>(pPageContainer, this, *m_pDialogModel, m_pTemplateProvider); break; } case STATE_OBJECTS: { - xRet = std::make_unique<TitlesAndObjectsTabPage>(aParent, m_xChartModel, m_xComponentContext); + xRet = std::make_unique<TitlesAndObjectsTabPage>(pPageContainer, this, m_xChartModel, m_xComponentContext); m_aTimerTriggeredControllerLock.startTimer(); break; } |