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 /svx | |
| 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 'svx')
| -rw-r--r-- | svx/source/form/xfm_addcondition.cxx | 6 | ||||
| -rw-r--r-- | svx/source/inc/xfm_addcondition.hxx | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/svx/source/form/xfm_addcondition.cxx b/svx/source/form/xfm_addcondition.cxx index fecbc2d99c27..398623cf9460 100644 --- a/svx/source/form/xfm_addcondition.cxx +++ b/svx/source/form/xfm_addcondition.cxx @@ -139,19 +139,19 @@ namespace svxform return new ::cppu::OPropertyArrayHelper( aProperties ); } - svt::OGenericUnoDialog::Dialog OAddConditionDialog::createDialog(const css::uno::Reference<css::awt::XWindow>& rParent) + std::unique_ptr<weld::DialogController> OAddConditionDialog::createDialog(const css::uno::Reference<css::awt::XWindow>& rParent) { if ( !m_xBinding.is() || m_sFacetName.isEmpty() ) throw RuntimeException( OUString(), *this ); - return svt::OGenericUnoDialog::Dialog(std::make_unique<AddConditionDialog>(Application::GetFrameWeld(rParent), m_sFacetName, m_xBinding)); + return std::make_unique<AddConditionDialog>(Application::GetFrameWeld(rParent), m_sFacetName, m_xBinding); } void OAddConditionDialog::executedDialog( sal_Int16 _nExecutionResult ) { OAddConditionDialogBase::executedDialog( _nExecutionResult ); if ( _nExecutionResult == RET_OK ) - m_sConditionValue = static_cast< AddConditionDialog* >( m_aDialog.m_xWeldDialog.get() )->GetCondition(); + m_sConditionValue = static_cast<AddConditionDialog*>(m_xDialog.get())->GetCondition(); } } diff --git a/svx/source/inc/xfm_addcondition.hxx b/svx/source/inc/xfm_addcondition.hxx index 34d6a06b9ad4..10d4674cbf57 100644 --- a/svx/source/inc/xfm_addcondition.hxx +++ b/svx/source/inc/xfm_addcondition.hxx @@ -56,7 +56,7 @@ namespace svxform virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const override; // OGenericUnoDialog overridables - 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; virtual void executedDialog(sal_Int16 _nExecutionResult) override; css::uno::Reference< css::beans::XPropertySet > |