diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-05-14 17:32:27 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-05-15 09:51:59 +0200 |
| commit | d9f4c8ded46ddc4892bb47128011ba85d6f7cd22 (patch) | |
| tree | 85caaff4c867c06b8ec1c5e7f43f6b8ca8fb7995 /sc/source/ui/attrdlg | |
| parent | 0e4f93e88bfae3489d2de84fc2febed100880628 (diff) | |
weld ScFillSeriesDlg
Change-Id: I1b4c6777d3334813c6bfe47efbb67f065efa555c
Reviewed-on: https://gerrit.libreoffice.org/54338
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 'sc/source/ui/attrdlg')
| -rw-r--r-- | sc/source/ui/attrdlg/scdlgfact.cxx | 26 | ||||
| -rw-r--r-- | sc/source/ui/attrdlg/scdlgfact.hxx | 10 |
2 files changed, 22 insertions, 14 deletions
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx b/sc/source/ui/attrdlg/scdlgfact.cxx index 35279d838fc8..d00b2d76f0a0 100644 --- a/sc/source/ui/attrdlg/scdlgfact.cxx +++ b/sc/source/ui/attrdlg/scdlgfact.cxx @@ -96,7 +96,10 @@ short AbstractScDeleteContentsDlg_Impl::Execute() return m_xDlg->run(); } -IMPL_ABSTDLG_BASE(AbstractScFillSeriesDlg_Impl); +short AbstractScFillSeriesDlg_Impl::Execute() +{ + return m_xDlg->run(); +} short AbstractScGroupDlg_Impl::Execute() { @@ -289,42 +292,42 @@ InsertDeleteFlags AbstractScDeleteContentsDlg_Impl::GetDelContentsCmdBits() cons FillDir AbstractScFillSeriesDlg_Impl::GetFillDir() const { - return pDlg->GetFillDir(); + return m_xDlg->GetFillDir(); } FillCmd AbstractScFillSeriesDlg_Impl::GetFillCmd() const { - return pDlg->GetFillCmd(); + return m_xDlg->GetFillCmd(); } FillDateCmd AbstractScFillSeriesDlg_Impl::GetFillDateCmd() const { - return pDlg->GetFillDateCmd(); + return m_xDlg->GetFillDateCmd(); } double AbstractScFillSeriesDlg_Impl::GetStart() const { - return pDlg->GetStart(); + return m_xDlg->GetStart(); } double AbstractScFillSeriesDlg_Impl::GetStep() const { - return pDlg->GetStep(); + return m_xDlg->GetStep(); } double AbstractScFillSeriesDlg_Impl::GetMax() const { - return pDlg->GetMax(); + return m_xDlg->GetMax(); } OUString AbstractScFillSeriesDlg_Impl::GetStartStr() const { - return pDlg->GetStartStr(); + return m_xDlg->GetStartStr(); } void AbstractScFillSeriesDlg_Impl::SetEdStartValEnabled(bool bFlag) { - pDlg->SetEdStartValEnabled(bFlag); + m_xDlg->SetEdStartValEnabled(bFlag); } bool AbstractScGroupDlg_Impl::GetColsChecked() const @@ -724,7 +727,7 @@ VclPtr<AbstractScDeleteContentsDlg> ScAbstractDialogFactory_Impl::CreateScDelete return VclPtr<AbstractScDeleteContentsDlg_Impl>::Create(new ScDeleteContentsDlg(pParent)); } -VclPtr<AbstractScFillSeriesDlg> ScAbstractDialogFactory_Impl::CreateScFillSeriesDlg( vcl::Window* pParent, +VclPtr<AbstractScFillSeriesDlg> ScAbstractDialogFactory_Impl::CreateScFillSeriesDlg(weld::Window* pParent, ScDocument& rDocument, FillDir eFillDir, FillCmd eFillCmd, @@ -734,8 +737,7 @@ VclPtr<AbstractScFillSeriesDlg> ScAbstractDialogFactory_Impl::CreateScFillSeries double fMax, sal_uInt16 nPossDir) { - VclPtr<ScFillSeriesDlg> pDlg = VclPtr<ScFillSeriesDlg>::Create( pParent, rDocument,eFillDir, eFillCmd,eFillDateCmd, aStartStr,fStep,fMax,nPossDir); - return VclPtr<AbstractScFillSeriesDlg_Impl>::Create( pDlg ); + return VclPtr<AbstractScFillSeriesDlg_Impl>::Create(new ScFillSeriesDlg(pParent, rDocument,eFillDir, eFillCmd,eFillDateCmd, aStartStr,fStep,fMax,nPossDir)); } VclPtr<AbstractScGroupDlg> ScAbstractDialogFactory_Impl::CreateAbstractScGroupDlg(weld::Window* pParent, bool bUnGroup) diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx b/sc/source/ui/attrdlg/scdlgfact.hxx index 3da1d5a9767d..f0fdfbf67fa2 100644 --- a/sc/source/ui/attrdlg/scdlgfact.hxx +++ b/sc/source/ui/attrdlg/scdlgfact.hxx @@ -193,7 +193,13 @@ public: class AbstractScFillSeriesDlg_Impl:public AbstractScFillSeriesDlg { - DECL_ABSTDLG_BASE(AbstractScFillSeriesDlg_Impl, ScFillSeriesDlg) + std::unique_ptr<ScFillSeriesDlg> m_xDlg; +public: + explicit AbstractScFillSeriesDlg_Impl(ScFillSeriesDlg* p) + : m_xDlg(p) + { + } + virtual short Execute() override; virtual FillDir GetFillDir() const override; virtual FillCmd GetFillCmd() const override; virtual FillDateCmd GetFillDateCmd() const override; @@ -485,7 +491,7 @@ public: virtual VclPtr<AbstractScDeleteContentsDlg> CreateScDeleteContentsDlg(weld::Window* pParent) override; - virtual VclPtr<AbstractScFillSeriesDlg> CreateScFillSeriesDlg( vcl::Window* pParent, + virtual VclPtr<AbstractScFillSeriesDlg> CreateScFillSeriesDlg(weld::Window* pParent, ScDocument& rDocument, FillDir eFillDir, FillCmd eFillCmd, |