From 31fd3641b363c81ab23e10e6425a39e27a224c3d Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Sat, 16 Nov 2019 16:40:33 +0000
Subject: cid#1453998 Wrapper object use after free
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I1dc733e72ba63db1eaa20113a7599ea7580eef31
Reviewed-on: https://gerrit.libreoffice.org/82988
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
---
 chart2/source/controller/dialogs/dlg_CreationWizard.cxx | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'chart2')

diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
index ccf2cdc5221f..2bdedc962856 100644
--- a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
+++ b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
@@ -68,6 +68,10 @@ 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())
@@ -97,9 +101,6 @@ std::unique_ptr<BuilderPage> CreationWizard::createPage(WizardState nState)
         {
             m_aTimerTriggeredControllerLock.startTimer();
             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());
             break;
         }
         case STATE_SIMPLE_RANGE:
-- 
cgit