diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-05-14 11:37:47 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-05-14 14:06:53 +0200 |
| commit | 165e57d6c9b980f22e57fb1c4c70d9a8c4aaf1c8 (patch) | |
| tree | b1db42500f85273d481f701b4fe0a387ca354868 /cui/source/factory | |
| parent | c7ac8480c9df601a58bad892c472dcf7c5e9dc01 (diff) | |
weld FmInputRecordNoDialog
Change-Id: I87f3dc3a576e30fe50871c14a67a5b777c21d3ba
Reviewed-on: https://gerrit.libreoffice.org/54308
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 | 15 | ||||
| -rw-r--r-- | cui/source/factory/dlgfact.hxx | 11 |
2 files changed, 18 insertions, 8 deletions
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx index a22a64c1f933..0bf6ea154642 100644 --- a/cui/source/factory/dlgfact.cxx +++ b/cui/source/factory/dlgfact.cxx @@ -124,7 +124,11 @@ short AbstractSvxSearchSimilarityDialog_Impl::Execute() IMPL_ABSTDLG_BASE(AbstractSvxTransformTabDialog_Impl); IMPL_ABSTDLG_BASE(AbstractSvxCaptionDialog_Impl); IMPL_ABSTDLG_BASE(AbstractSvxJSearchOptionsDialog_Impl); -IMPL_ABSTDLG_BASE(AbstractFmInputRecordNoDialog_Impl); + +short AbstractFmInputRecordNoDialog_Impl::Execute() +{ + return m_xDlg->run(); +} short AbstractSvxNewDictionaryDialog_Impl::Execute() { @@ -630,12 +634,12 @@ TransliterationFlags AbstractSvxJSearchOptionsDialog_Impl::GetTransliterationFla void AbstractFmInputRecordNoDialog_Impl::SetValue(long nNew) { - pDlg->SetValue(nNew); + m_xDlg->SetValue(nNew); } long AbstractFmInputRecordNoDialog_Impl::GetValue() const { - return pDlg->GetValue(); + return m_xDlg->GetValue(); } ::Reference< css::linguistic2::XDictionary > AbstractSvxNewDictionaryDialog_Impl::GetNewDictionary() @@ -1169,10 +1173,9 @@ VclPtr<AbstractSvxJSearchOptionsDialog> AbstractDialogFactory_Impl::CreateSvxJSe return VclPtr<AbstractSvxJSearchOptionsDialog_Impl>::Create( pDlg ); } -VclPtr<AbstractFmInputRecordNoDialog> AbstractDialogFactory_Impl::CreateFmInputRecordNoDialog( ) +VclPtr<AbstractFmInputRecordNoDialog> AbstractDialogFactory_Impl::CreateFmInputRecordNoDialog(weld::Window* pParent) { - VclPtrInstance<FmInputRecordNoDialog> pDlg( nullptr ); - return VclPtr<AbstractFmInputRecordNoDialog_Impl>::Create( pDlg ); + return VclPtr<AbstractFmInputRecordNoDialog_Impl>::Create(new FmInputRecordNoDialog(pParent)); } VclPtr<AbstractSvxNewDictionaryDialog> AbstractDialogFactory_Impl::CreateSvxNewDictionaryDialog(weld::Window* pParent) diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx index b1239c049e00..e5be4de5f999 100644 --- a/cui/source/factory/dlgfact.hxx +++ b/cui/source/factory/dlgfact.hxx @@ -314,7 +314,14 @@ class AbstractSvxCaptionDialog_Impl : public AbstractSvxCaptionDialog class FmInputRecordNoDialog; class AbstractFmInputRecordNoDialog_Impl :public AbstractFmInputRecordNoDialog { - DECL_ABSTDLG_BASE(AbstractFmInputRecordNoDialog_Impl,FmInputRecordNoDialog) +protected: + std::unique_ptr<FmInputRecordNoDialog> m_xDlg; +public: + explicit AbstractFmInputRecordNoDialog_Impl(FmInputRecordNoDialog* p) + : m_xDlg(p) + { + } + virtual short Execute() override; virtual void SetValue(long nNew) override ; virtual long GetValue() const override ; }; @@ -682,7 +689,7 @@ public: virtual VclPtr<AbstractSvxJSearchOptionsDialog> CreateSvxJSearchOptionsDialog( vcl::Window* pParent, const SfxItemSet& rOptionsSet, TransliterationFlags nInitialFlags) override; - virtual VclPtr<AbstractFmInputRecordNoDialog> CreateFmInputRecordNoDialog() override; + virtual VclPtr<AbstractFmInputRecordNoDialog> CreateFmInputRecordNoDialog(weld::Window* pParent) 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, |