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 /filter/source/pdf | |
| 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 'filter/source/pdf')
| -rw-r--r-- | filter/source/pdf/pdfdialog.cxx | 10 | ||||
| -rw-r--r-- | filter/source/pdf/pdfdialog.hxx | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/filter/source/pdf/pdfdialog.cxx b/filter/source/pdf/pdfdialog.cxx index da1333cb14bb..79dec365d437 100644 --- a/filter/source/pdf/pdfdialog.cxx +++ b/filter/source/pdf/pdfdialog.cxx @@ -83,17 +83,17 @@ Sequence< OUString > SAL_CALL PDFDialog::getSupportedServiceNames() return PDFDialog_getSupportedServiceNames(); } -svt::OGenericUnoDialog::Dialog PDFDialog::createDialog(const css::uno::Reference<css::awt::XWindow>& rParent) +std::unique_ptr<weld::DialogController> PDFDialog::createDialog(const css::uno::Reference<css::awt::XWindow>& rParent) { if( mxSrcDoc.is() ) - return svt::OGenericUnoDialog::Dialog(std::make_unique<ImpPDFTabDialog>(Application::GetFrameWeld(rParent), maFilterData, mxSrcDoc)); - return svt::OGenericUnoDialog::Dialog(); + return std::make_unique<ImpPDFTabDialog>(Application::GetFrameWeld(rParent), maFilterData, mxSrcDoc); + return nullptr; } void PDFDialog::executedDialog( sal_Int16 nExecutionResult ) { - if (nExecutionResult && m_aDialog) - maFilterData = static_cast<ImpPDFTabDialog*>(m_aDialog.m_xWeldDialog.get())->GetFilterData(); + if (nExecutionResult && m_xDialog) + maFilterData = static_cast<ImpPDFTabDialog*>(m_xDialog.get())->GetFilterData(); destroyDialog(); } diff --git a/filter/source/pdf/pdfdialog.hxx b/filter/source/pdf/pdfdialog.hxx index 953555668b0f..2fa7ba76e257 100644 --- a/filter/source/pdf/pdfdialog.hxx +++ b/filter/source/pdf/pdfdialog.hxx @@ -44,7 +44,7 @@ private: virtual Sequence< sal_Int8 > SAL_CALL getImplementationId() override; virtual OUString SAL_CALL getImplementationName() override; virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() override; - 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; virtual Reference< XPropertySetInfo> SAL_CALL getPropertySetInfo() override; virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; |