diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-03-21 10:33:23 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-03-21 15:48:12 +0100 |
| commit | 12efe34abb984ac37abae59ccac83a4f86a27e77 (patch) | |
| tree | d0b72087fe2911e9ce73a31b955582186f2ca7d8 /chart2 | |
| parent | 718c82d1de44d2d7c16e4299b61171b72186f50b (diff) | |
support both vcl and weld in genericunodialog for interim
Change-Id: Ife85dd7a4bd27260514b390ca3928152db0d688f
Reviewed-on: https://gerrit.libreoffice.org/51699
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'chart2')
| -rw-r--r-- | chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx | 8 | ||||
| -rw-r--r-- | chart2/source/controller/inc/dlg_ChartType_UNO.hxx | 2 |
2 files changed, 5 insertions, 5 deletions
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<Dialog> ChartTypeUnoDlg::createDialog(vcl::Window* _pParent) +svt::OGenericUnoDialog::Dialog ChartTypeUnoDlg::createDialog(vcl::Window* _pParent) { - return VclPtr<ChartTypeDialog>::Create( _pParent, m_xChartModel ); + return svt::OGenericUnoDialog::Dialog(VclPtr<ChartTypeDialog>::Create(_pParent, m_xChartModel)); } uno::Reference<beans::XPropertySetInfo> 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<Dialog> createDialog(vcl::Window* _pParent) override; + virtual svt::OGenericUnoDialog::Dialog createDialog(vcl::Window* _pParent) override; // XTypeProvider virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) override; |