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 /svx | |
| 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 'svx')
| -rw-r--r-- | svx/source/form/xfm_addcondition.cxx | 13 | ||||
| -rw-r--r-- | svx/source/inc/xfm_addcondition.hxx | 2 |
2 files changed, 4 insertions, 11 deletions
diff --git a/svx/source/form/xfm_addcondition.cxx b/svx/source/form/xfm_addcondition.cxx index a16ad62628b0..4d6b8f579acd 100644 --- a/svx/source/form/xfm_addcondition.cxx +++ b/svx/source/form/xfm_addcondition.cxx @@ -125,13 +125,11 @@ namespace svxform return createPropertySetInfo( getInfoHelper() ); } - ::cppu::IPropertyArrayHelper& OAddConditionDialog::getInfoHelper() { return *getArrayHelper(); } - ::cppu::IPropertyArrayHelper* OAddConditionDialog::createArrayHelper( ) const { Sequence< Property > aProperties; @@ -139,25 +137,20 @@ namespace svxform return new ::cppu::OPropertyArrayHelper( aProperties ); } - - VclPtr<Dialog> OAddConditionDialog::createDialog(vcl::Window* _pParent) + svt::OGenericUnoDialog::Dialog OAddConditionDialog::createDialog(vcl::Window* _pParent) { if ( !m_xBinding.is() || m_sFacetName.isEmpty() ) throw RuntimeException( OUString(), *this ); - return VclPtr<AddConditionDialog>::Create( _pParent, m_sFacetName, m_xBinding ); + return svt::OGenericUnoDialog::Dialog(VclPtr<AddConditionDialog>::Create(_pParent, m_sFacetName, m_xBinding)); } - void OAddConditionDialog::executedDialog( sal_Int16 _nExecutionResult ) { OAddConditionDialogBase::executedDialog( _nExecutionResult ); if ( _nExecutionResult == RET_OK ) - m_sConditionValue = static_cast< AddConditionDialog* >( m_pDialog.get() )->GetCondition(); + m_sConditionValue = static_cast< AddConditionDialog* >( m_aDialog.m_xVclDialog.get() )->GetCondition(); } - - } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/inc/xfm_addcondition.hxx b/svx/source/inc/xfm_addcondition.hxx index d55e16bb8084..01f97fe8a064 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 VclPtr<Dialog> createDialog(vcl::Window* _pParent) override; + virtual svt::OGenericUnoDialog::Dialog createDialog(vcl::Window* _pParent) override; virtual void executedDialog(sal_Int16 _nExecutionResult) override; css::uno::Reference< css::beans::XPropertySet > |