diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-06-29 13:05:06 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2020-06-29 16:18:27 +0200 |
| commit | 733023dd10d2f7e95dca2e8e7096ec216d5e9fb2 (patch) | |
| tree | 0add59da247a050bafede05a35468889eb23f3f9 /chart2 | |
| parent | 4162df8c0964ea81b57810b42ed69b7234f97245 (diff) | |
tdf#134386 set m_pTemplateProvider before creating any other pages
Change-Id: Icc501b127f92cdbfbf0987af9b0b560f1efbc056
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97404
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'chart2')
| -rw-r--r-- | chart2/source/controller/dialogs/dlg_CreationWizard.cxx | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx index 34a0e0800578..da073c2f9956 100644 --- a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx +++ b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx @@ -58,6 +58,11 @@ CreationWizard::CreationWizard(weld::Window* pParent, const uno::Reference<frame setTitleBase(SchResId(STR_DLG_CHART_WIZARD)); + // tdf#134386 set m_pTemplateProvider before creating any other pages + m_pTemplateProvider = static_cast<ChartTypeTabPage*>(GetOrCreatePage(STATE_CHARTTYPE)); + assert(m_pTemplateProvider && "must exist"); + m_pDialogModel->setTemplate(m_pTemplateProvider->getCurrentTemplate()); + WizardPath aPath = { STATE_CHARTTYPE, STATE_SIMPLE_RANGE, @@ -67,10 +72,6 @@ CreationWizard::CreationWizard(weld::Window* pParent, const uno::Reference<frame declarePath(PATH_FULL, aPath); - m_pTemplateProvider = static_cast<ChartTypeTabPage*>(GetOrCreatePage(STATE_CHARTTYPE)); - assert(m_pTemplateProvider && "must exist"); - m_pDialogModel->setTemplate(m_pTemplateProvider->getCurrentTemplate()); - SetRoadmapHelpId(HID_SCH_WIZARD_ROADMAP); if (!m_pDialogModel->getModel().isDataFromSpreadsheet()) |