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 /svx | |
| 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 'svx')
| -rw-r--r-- | svx/source/form/xfm_addcondition.cxx | 5 | ||||
| -rw-r--r-- | svx/source/inc/xfm_addcondition.hxx | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/svx/source/form/xfm_addcondition.cxx b/svx/source/form/xfm_addcondition.cxx index 4d6b8f579acd..e4061337986f 100644 --- a/svx/source/form/xfm_addcondition.cxx +++ b/svx/source/form/xfm_addcondition.cxx @@ -22,6 +22,7 @@ #include <comphelper/processfactory.hxx> #include <cppuhelper/typeprovider.hxx> +#include <toolkit/helper/vclunohelper.hxx> #include <datanavi.hxx> #include <fmservs.hxx> @@ -137,12 +138,12 @@ namespace svxform return new ::cppu::OPropertyArrayHelper( aProperties ); } - svt::OGenericUnoDialog::Dialog OAddConditionDialog::createDialog(vcl::Window* _pParent) + svt::OGenericUnoDialog::Dialog 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(VclPtr<AddConditionDialog>::Create(_pParent, m_sFacetName, m_xBinding)); + return svt::OGenericUnoDialog::Dialog(VclPtr<AddConditionDialog>::Create(VCLUnoHelper::GetWindow(rParent), m_sFacetName, m_xBinding)); } void OAddConditionDialog::executedDialog( sal_Int16 _nExecutionResult ) diff --git a/svx/source/inc/xfm_addcondition.hxx b/svx/source/inc/xfm_addcondition.hxx index 01f97fe8a064..34d6a06b9ad4 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(vcl::Window* _pParent) override; + virtual svt::OGenericUnoDialog::Dialog createDialog(const css::uno::Reference<css::awt::XWindow>& rParent) override; virtual void executedDialog(sal_Int16 _nExecutionResult) override; css::uno::Reference< css::beans::XPropertySet > |