diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-03-30 21:24:28 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-03-31 20:49:32 +0200 |
| commit | 1595604169f7643cf134f71e218ea512887ed8a3 (patch) | |
| tree | bef728dc91af919b58f94d4561bd5f815930c4ea /cui/source/factory | |
| parent | c8af8aebd1336e919e9531e39f84296085d91ea7 (diff) | |
weld SvxNewDictionaryDialog
Change-Id: Idf9a4a74615b3216918dde50563e9d081c61cd52
Reviewed-on: https://gerrit.libreoffice.org/52174
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 'cui/source/factory')
| -rw-r--r-- | cui/source/factory/dlgfact.cxx | 13 | ||||
| -rw-r--r-- | cui/source/factory/dlgfact.hxx | 14 |
2 files changed, 18 insertions, 9 deletions
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx index 6dc1f279693d..a3b1ced56c74 100644 --- a/cui/source/factory/dlgfact.cxx +++ b/cui/source/factory/dlgfact.cxx @@ -119,7 +119,11 @@ IMPL_ABSTDLG_BASE(AbstractSvxTransformTabDialog_Impl); IMPL_ABSTDLG_BASE(AbstractSvxCaptionDialog_Impl); IMPL_ABSTDLG_BASE(AbstractSvxJSearchOptionsDialog_Impl); IMPL_ABSTDLG_BASE(AbstractFmInputRecordNoDialog_Impl); -IMPL_ABSTDLG_BASE(AbstractSvxNewDictionaryDialog_Impl); + +short AbstractSvxNewDictionaryDialog_Impl::Execute() +{ + return m_xDlg->run(); +} short AbstractSvxNameDialog_Impl::Execute() { @@ -586,7 +590,7 @@ long AbstractFmInputRecordNoDialog_Impl::GetValue() const ::Reference< css::linguistic2::XDictionary > AbstractSvxNewDictionaryDialog_Impl::GetNewDictionary() { - return pDlg->GetNewDictionary(); + return m_xDlg->GetNewDictionary(); } void AbstractSvxNameDialog_Impl::GetName(OUString& rName) @@ -1116,10 +1120,9 @@ VclPtr<AbstractFmInputRecordNoDialog> AbstractDialogFactory_Impl::CreateFmInputR return VclPtr<AbstractFmInputRecordNoDialog_Impl>::Create( pDlg ); } -VclPtr<AbstractSvxNewDictionaryDialog> AbstractDialogFactory_Impl::CreateSvxNewDictionaryDialog( vcl::Window* pParent ) +VclPtr<AbstractSvxNewDictionaryDialog> AbstractDialogFactory_Impl::CreateSvxNewDictionaryDialog(weld::Window* pParent) { - VclPtrInstance<SvxNewDictionaryDialog> pDlg( pParent ); - return VclPtr<AbstractSvxNewDictionaryDialog_Impl>::Create( pDlg ); + return VclPtr<AbstractSvxNewDictionaryDialog_Impl>::Create(new SvxNewDictionaryDialog(pParent)); } VclPtr<VclAbstractDialog> AbstractDialogFactory_Impl::CreateSvxEditDictionaryDialog( vcl::Window* pParent, diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx index 25573f60a19e..2b36adee6204 100644 --- a/cui/source/factory/dlgfact.hxx +++ b/cui/source/factory/dlgfact.hxx @@ -300,7 +300,14 @@ class AbstractFmInputRecordNoDialog_Impl :public AbstractFmInputRecordNoDialog class SvxNewDictionaryDialog; class AbstractSvxNewDictionaryDialog_Impl :public AbstractSvxNewDictionaryDialog { - DECL_ABSTDLG_BASE(AbstractSvxNewDictionaryDialog_Impl,SvxNewDictionaryDialog) +protected: + std::unique_ptr<SvxNewDictionaryDialog> m_xDlg; +public: + explicit AbstractSvxNewDictionaryDialog_Impl(SvxNewDictionaryDialog* p) + : m_xDlg(p) + { + } + virtual short Execute() override; virtual css::uno::Reference< css::linguistic2::XDictionary > GetNewDictionary() override; }; @@ -599,9 +606,8 @@ public: const SfxItemSet& rOptionsSet, TransliterationFlags nInitialFlags) override; virtual VclPtr<AbstractFmInputRecordNoDialog> CreateFmInputRecordNoDialog() override; - virtual VclPtr<AbstractSvxNewDictionaryDialog> CreateSvxNewDictionaryDialog( vcl::Window* pParent ) override; - virtual VclPtr<VclAbstractDialog> CreateSvxEditDictionaryDialog( vcl::Window* pParent, - const OUString& rName) override; + virtual VclPtr<AbstractSvxNewDictionaryDialog> CreateSvxNewDictionaryDialog(weld::Window* pParent) override; + virtual VclPtr<VclAbstractDialog> CreateSvxEditDictionaryDialog(vcl::Window* pParent, const OUString& rName) override; virtual VclPtr<AbstractSvxNameDialog> CreateSvxNameDialog(weld::Window* pParent, const OUString& rName, const OUString& rDesc) override; // #i68101# |