diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-09-15 20:41:25 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-09-20 21:25:12 +0200 |
| commit | 024a57017384a61b4a61056f1de275f44642bef3 (patch) | |
| tree | 6d9896c34326c1ef79325dd6e8d8730a40df5c4a /chart2/source/controller | |
| parent | e0750697dcd30848411a162453813c5b0fafc44b (diff) | |
drop newly unnecessary OGenericUnoDialog::Dialog
Change-Id: If047d08cea93fdfacff9ee00c69cf57ba08c916c
Reviewed-on: https://gerrit.libreoffice.org/78972
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'chart2/source/controller')
| -rw-r--r-- | chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx | 10 | ||||
| -rw-r--r-- | chart2/source/controller/inc/dlg_ChartType_UNO.hxx | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx b/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx index 1b2aa97aa766..51a3fa06ff3d 100644 --- a/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx +++ b/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx @@ -37,10 +37,10 @@ ChartTypeUnoDlg::~ChartTypeUnoDlg() { // we do this here cause the base class' call to destroyDialog won't reach us anymore: we're within a dtor, // so this virtual-method-call the base class does not work, we're already dead then... - if (m_aDialog) + if (m_xDialog) { ::osl::MutexGuard aGuard(m_aMutex); - if (m_aDialog) + if (m_xDialog) destroyDialog(); } } @@ -71,10 +71,12 @@ void ChartTypeUnoDlg::implInitialize(const uno::Any& _rValue) else ChartTypeUnoDlg_BASE::implInitialize(_rValue); } -svt::OGenericUnoDialog::Dialog ChartTypeUnoDlg::createDialog(const css::uno::Reference<css::awt::XWindow>& rParent) + +std::unique_ptr<weld::DialogController> ChartTypeUnoDlg::createDialog(const css::uno::Reference<css::awt::XWindow>& rParent) { - return svt::OGenericUnoDialog::Dialog(std::make_unique<ChartTypeDialog>(Application::GetFrameWeld(rParent), m_xChartModel)); + return std::make_unique<ChartTypeDialog>(Application::GetFrameWeld(rParent), m_xChartModel); } + uno::Reference<beans::XPropertySetInfo> SAL_CALL ChartTypeUnoDlg::getPropertySetInfo() { return createPropertySetInfo( getInfoHelper() ); diff --git a/chart2/source/controller/inc/dlg_ChartType_UNO.hxx b/chart2/source/controller/inc/dlg_ChartType_UNO.hxx index bc6c211205bc..6cadcd5e6573 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(const css::uno::Reference<css::awt::XWindow>& rParent) override; + virtual std::unique_ptr<weld::DialogController> createDialog(const css::uno::Reference<css::awt::XWindow>& rParent) override; // XTypeProvider virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) override; |