[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - chart2/source

[Caolán McNamara (via logerrit)]

 chart2/source/controller/dialogs/dlg_CreationWizard.cxx |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

New commits:
commit f7ebfc787a691dfcde823ac8380ee21a0057bb38
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Jun 29 13:05:06 2020 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Mon Jun 29 16:58:54 2020 +0200

    tdf#134386 set m_pTemplateProvider before creating any other pages
    
    Change-Id: Icc501b127f92cdbfbf0987af9b0b560f1efbc056
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97377
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

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())