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 /filter | |
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 'filter')
-rw-r--r-- | filter/source/flash/swfdialog.cxx | 10 | ||||
-rw-r--r-- | filter/source/flash/swfdialog.hxx | 2 | ||||
-rw-r--r-- | filter/source/pdf/pdfdialog.cxx | 12 | ||||
-rw-r--r-- | filter/source/pdf/pdfdialog.hxx | 2 | ||||
-rw-r--r-- | filter/source/svg/svgdialog.cxx | 12 | ||||
-rw-r--r-- | filter/source/svg/svgdialog.hxx | 2 |
6 files changed, 18 insertions, 22 deletions
diff --git a/filter/source/flash/swfdialog.cxx b/filter/source/flash/swfdialog.cxx index aabf1bf9c91b..4116900ee29b 100644 --- a/filter/source/flash/swfdialog.cxx +++ b/filter/source/flash/swfdialog.cxx @@ -117,9 +117,9 @@ Sequence< OUString > SAL_CALL SWFDialog::getSupportedServiceNames() } -VclPtr<Dialog> SWFDialog::createDialog( vcl::Window* pParent ) +svt::OGenericUnoDialog::Dialog SWFDialog::createDialog( vcl::Window* pParent ) { - VclPtr<Dialog> pRet; + VclPtr<::Dialog> pRet; if (mxSrcDoc.is()) { @@ -146,14 +146,14 @@ VclPtr<Dialog> SWFDialog::createDialog( vcl::Window* pParent ) pRet.reset( VclPtr<ImpSWFDialog>::Create( pParent, maFilterData ) ); } - return pRet; + return svt::OGenericUnoDialog::Dialog(pRet); } void SWFDialog::executedDialog( sal_Int16 nExecutionResult ) { - if( nExecutionResult && m_pDialog ) - maFilterData = static_cast< ImpSWFDialog* >( m_pDialog.get() )->GetFilterData(); + if (nExecutionResult && m_aDialog) + maFilterData = static_cast< ImpSWFDialog* >(m_aDialog.m_xVclDialog.get())->GetFilterData(); destroyDialog(); } diff --git a/filter/source/flash/swfdialog.hxx b/filter/source/flash/swfdialog.hxx index e75d8ba08a87..c444ddf02328 100644 --- a/filter/source/flash/swfdialog.hxx +++ b/filter/source/flash/swfdialog.hxx @@ -50,7 +50,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 VclPtr<Dialog> createDialog( vcl::Window* pParent ) override; + virtual svt::OGenericUnoDialog::Dialog createDialog( vcl::Window* pParent ) 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; diff --git a/filter/source/pdf/pdfdialog.cxx b/filter/source/pdf/pdfdialog.cxx index fcd66f01a56b..f66eb343e0c5 100644 --- a/filter/source/pdf/pdfdialog.cxx +++ b/filter/source/pdf/pdfdialog.cxx @@ -83,19 +83,17 @@ Sequence< OUString > SAL_CALL PDFDialog::getSupportedServiceNames() return PDFDialog_getSupportedServiceNames(); } - -VclPtr<Dialog> PDFDialog::createDialog( vcl::Window* pParent ) +svt::OGenericUnoDialog::Dialog PDFDialog::createDialog( vcl::Window* pParent ) { if( mxSrcDoc.is() ) - return VclPtr<ImpPDFTabDialog>::Create( pParent, maFilterData, mxSrcDoc ); - return VclPtr<Dialog>(); + return svt::OGenericUnoDialog::Dialog(VclPtr<ImpPDFTabDialog>::Create(pParent, maFilterData, mxSrcDoc)); + return svt::OGenericUnoDialog::Dialog(VclPtr<::Dialog>()); } - void PDFDialog::executedDialog( sal_Int16 nExecutionResult ) { - if( nExecutionResult && m_pDialog ) - maFilterData = static_cast< ImpPDFTabDialog* >( m_pDialog.get() )->GetFilterData(); + if (nExecutionResult && m_aDialog) + maFilterData = static_cast< ImpPDFTabDialog* >( m_aDialog.m_xVclDialog.get() )->GetFilterData(); destroyDialog(); } diff --git a/filter/source/pdf/pdfdialog.hxx b/filter/source/pdf/pdfdialog.hxx index 671db03ed6fa..ce6a2a0f407d 100644 --- a/filter/source/pdf/pdfdialog.hxx +++ b/filter/source/pdf/pdfdialog.hxx @@ -43,7 +43,7 @@ private: virtual Sequence< sal_Int8 > SAL_CALL getImplementationId() override; virtual OUString SAL_CALL getImplementationName() override; virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() override; - virtual VclPtr<Dialog> createDialog( vcl::Window* pParent ) override; + virtual svt::OGenericUnoDialog::Dialog createDialog(vcl::Window* pParent) override; virtual void executedDialog( sal_Int16 nExecutionResult ) override; virtual Reference< XPropertySetInfo> SAL_CALL getPropertySetInfo() override; virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; diff --git a/filter/source/svg/svgdialog.cxx b/filter/source/svg/svgdialog.cxx index ddf3693c37df..71138a7d5291 100644 --- a/filter/source/svg/svgdialog.cxx +++ b/filter/source/svg/svgdialog.cxx @@ -115,20 +115,18 @@ Sequence< OUString > SAL_CALL SVGDialog::getSupportedServiceNames() return SVGDialog_getSupportedServiceNames(); } - -VclPtr<Dialog> SVGDialog::createDialog( vcl::Window* pParent ) +svt::OGenericUnoDialog::Dialog SVGDialog::createDialog( vcl::Window* pParent ) { if( mxSrcDoc.is() ) - return VclPtr<ImpSVGDialog>::Create( pParent, maFilterData ); + return svt::OGenericUnoDialog::Dialog(VclPtr<ImpSVGDialog>::Create( pParent, maFilterData )); else - return VclPtr<Dialog>(); + return svt::OGenericUnoDialog::Dialog(VclPtr<::Dialog>()); } - void SVGDialog::executedDialog( sal_Int16 nExecutionResult ) { - if( nExecutionResult && m_pDialog ) - maFilterData = static_cast< ImpSVGDialog* >( m_pDialog.get() )->GetFilterData(); + if (nExecutionResult && m_aDialog) + maFilterData = static_cast< ImpSVGDialog* >(m_aDialog.m_xVclDialog.get())->GetFilterData(); destroyDialog(); } diff --git a/filter/source/svg/svgdialog.hxx b/filter/source/svg/svgdialog.hxx index ed4bcbee343f..9016f0427ba4 100644 --- a/filter/source/svg/svgdialog.hxx +++ b/filter/source/svg/svgdialog.hxx @@ -49,7 +49,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 VclPtr<Dialog> createDialog( vcl::Window* pParent ) override; + virtual svt::OGenericUnoDialog::Dialog createDialog( vcl::Window* pParent ) 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; |