From 12efe34abb984ac37abae59ccac83a4f86a27e77 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Wed, 21 Mar 2018 10:33:23 +0000 Subject: support both vcl and weld in genericunodialog for interim MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ife85dd7a4bd27260514b390ca3928152db0d688f Reviewed-on: https://gerrit.libreoffice.org/51699 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx | 8 ++++---- chart2/source/controller/inc/dlg_ChartType_UNO.hxx | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'chart2') diff --git a/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx b/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx index c0563986ea91..78497a0d8a1b 100644 --- a/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx +++ b/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx @@ -33,10 +33,10 @@ ChartTypeUnoDlg::~ChartTypeUnoDlg() { // we do this here cause the base class' call to destroyDialog won't reach us anymore: we're within an dtor, // so this virtual-method-call the base class does not work, we're already dead then... - if (m_pDialog) + if (m_aDialog) { ::osl::MutexGuard aGuard(m_aMutex); - if (m_pDialog) + if (m_aDialog) destroyDialog(); } } @@ -67,9 +67,9 @@ void ChartTypeUnoDlg::implInitialize(const uno::Any& _rValue) else ChartTypeUnoDlg_BASE::implInitialize(_rValue); } -VclPtr ChartTypeUnoDlg::createDialog(vcl::Window* _pParent) +svt::OGenericUnoDialog::Dialog ChartTypeUnoDlg::createDialog(vcl::Window* _pParent) { - return VclPtr::Create( _pParent, m_xChartModel ); + return svt::OGenericUnoDialog::Dialog(VclPtr::Create(_pParent, m_xChartModel)); } uno::Reference SAL_CALL ChartTypeUnoDlg::getPropertySetInfo() { diff --git a/chart2/source/controller/inc/dlg_ChartType_UNO.hxx b/chart2/source/controller/inc/dlg_ChartType_UNO.hxx index 76f7a15d790c..81c28734ba6f 100644 --- a/chart2/source/controller/inc/dlg_ChartType_UNO.hxx +++ b/chart2/source/controller/inc/dlg_ChartType_UNO.hxx @@ -41,7 +41,7 @@ private: // OGenericUnoDialog overridables virtual void implInitialize(const css::uno::Any& _rValue) override; - virtual VclPtr createDialog(vcl::Window* _pParent) override; + virtual svt::OGenericUnoDialog::Dialog createDialog(vcl::Window* _pParent) override; // XTypeProvider virtual css::uno::Sequence SAL_CALL getImplementationId( ) override; -- cgit