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 /filter/source/flash | |
| parent | Support estimateUsageInBytes for SystemDependentData (diff) | |
| download | core-8a63cdd32c4eb348cb6625b4be6739fe391cb0b4.tar.gz core-8a63cdd32c4eb348cb6625b4be6739fe391cb0b4.zip | |
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 'filter/source/flash')
| -rw-r--r-- | filter/source/flash/swfdialog.cxx | 5 | ||||
| -rw-r--r-- | filter/source/flash/swfdialog.hxx | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/filter/source/flash/swfdialog.cxx b/filter/source/flash/swfdialog.cxx index 4116900ee29b..92940f111f00 100644 --- a/filter/source/flash/swfdialog.cxx +++ b/filter/source/flash/swfdialog.cxx @@ -29,6 +29,7 @@ #include <com/sun/star/view/XRenderable.hpp> #include <com/sun/star/frame/XController.hpp> #include <com/sun/star/view/XSelectionSupplier.hpp> +#include <toolkit/helper/vclunohelper.hxx> using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -117,7 +118,7 @@ Sequence< OUString > SAL_CALL SWFDialog::getSupportedServiceNames() } -svt::OGenericUnoDialog::Dialog SWFDialog::createDialog( vcl::Window* pParent ) +svt::OGenericUnoDialog::Dialog SWFDialog::createDialog(const css::uno::Reference<css::awt::XWindow>& rParent) { VclPtr<::Dialog> pRet; @@ -143,7 +144,7 @@ svt::OGenericUnoDialog::Dialog SWFDialog::createDialog( vcl::Window* pParent ) { } */ - pRet.reset( VclPtr<ImpSWFDialog>::Create( pParent, maFilterData ) ); + pRet.reset(VclPtr<ImpSWFDialog>::Create(VCLUnoHelper::GetWindow(rParent), maFilterData)); } return svt::OGenericUnoDialog::Dialog(pRet); diff --git a/filter/source/flash/swfdialog.hxx b/filter/source/flash/swfdialog.hxx index 3315ab088832..c48a13198f2c 100644 --- a/filter/source/flash/swfdialog.hxx +++ b/filter/source/flash/swfdialog.hxx @@ -51,7 +51,7 @@ private: virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override; virtual OUString SAL_CALL getImplementationName() override; virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; - 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; virtual css::uno::Reference< css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() override; virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; |