diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-10-06 15:54:11 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-10-06 20:54:24 +0200 |
| commit | 8a63cdd32c4eb348cb6625b4be6739fe391cb0b4 (patch) | |
| tree | 4ea85a14afcdbf241254cfaa241a910140058805 /chart2 | |
| parent | e650279db77281fe98aaff28e31c2269611c31e4 (diff) | |
make OGenericUnoDialog take an awt::XWindow
Change-Id: I7c63397d0579306f4ade1947ce5bf9e1866bf876
Reviewed-on: https://gerrit.libreoffice.org/61469
Tested-by: Jenkins
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 | 5 | ||||
| -rw-r--r-- | chart2/source/controller/inc/dlg_ChartType_UNO.hxx | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx b/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx index 78497a0d8a1b..c9f3c57565e7 100644 --- a/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx +++ b/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx @@ -21,6 +21,7 @@ #include <dlg_ChartType.hxx> #include <servicenames.hxx> #include <osl/mutex.hxx> +#include <toolkit/helper/vclunohelper.hxx> namespace chart { @@ -67,9 +68,9 @@ void ChartTypeUnoDlg::implInitialize(const uno::Any& _rValue) else ChartTypeUnoDlg_BASE::implInitialize(_rValue); } -svt::OGenericUnoDialog::Dialog ChartTypeUnoDlg::createDialog(vcl::Window* _pParent) +svt::OGenericUnoDialog::Dialog ChartTypeUnoDlg::createDialog(const css::uno::Reference<css::awt::XWindow>& rParent) { - return svt::OGenericUnoDialog::Dialog(VclPtr<ChartTypeDialog>::Create(_pParent, m_xChartModel)); + return svt::OGenericUnoDialog::Dialog(VclPtr<ChartTypeDialog>::Create(VCLUnoHelper::GetWindow(rParent), 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 465d66748903..bc6c211205bc 100644 --- a/chart2/source/controller/inc/dlg_ChartType_UNO.hxx +++ b/chart2/source/controller/inc/dlg_ChartType_UNO.hxx @@ -40,7 +40,7 @@ private: // OGenericUnoDialog overridables virtual void implInitialize(const css::uno::Any& _rValue) override; - virtual svt::OGenericUnoDialog::Dialog createDialog(vcl::Window* _pParent) override; + virtual svt::OGenericUnoDialog::Dialog createDialog(const css::uno::Reference<css::awt::XWindow>& rParent) override; // XTypeProvider virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) override; |