diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-04-30 12:06:43 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-04-30 14:59:42 +0200 |
| commit | 7c112da22428ea56045f24911854a5569bd851df (patch) | |
| tree | 4e972be6e9727cc7b4291633cbba6b4249d132fa /sc/source/ui/attrdlg | |
| parent | 58c07ae9829c1d40f0a851d379c126933243fce3 (diff) | |
weld ScGroupDlg
Change-Id: If62c664dbc068bde3fee552aabe35243eeb28a47
Reviewed-on: https://gerrit.libreoffice.org/53659
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 | 14 | ||||
| -rw-r--r-- | sc/source/ui/attrdlg/scdlgfact.hxx | 11 |
2 files changed, 16 insertions, 9 deletions
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx b/sc/source/ui/attrdlg/scdlgfact.cxx index f8d4b8f0d542..1d3d3d10f1f9 100644 --- a/sc/source/ui/attrdlg/scdlgfact.cxx +++ b/sc/source/ui/attrdlg/scdlgfact.cxx @@ -97,7 +97,11 @@ short AbstractScDeleteContentsDlg_Impl::Execute() } IMPL_ABSTDLG_BASE(AbstractScFillSeriesDlg_Impl); -IMPL_ABSTDLG_BASE(AbstractScGroupDlg_Impl); + +short AbstractScGroupDlg_Impl::Execute() +{ + return m_xDlg->run(); +} short AbstractScInsertCellDlg_Impl::Execute() { @@ -307,7 +311,7 @@ void AbstractScFillSeriesDlg_Impl::SetEdStartValEnabled(bool bFlag) bool AbstractScGroupDlg_Impl::GetColsChecked() const { - return pDlg->GetColsChecked(); + return m_xDlg->GetColsChecked(); } InsCellCmd AbstractScInsertCellDlg_Impl::GetInsCellCmd() const @@ -721,11 +725,9 @@ VclPtr<AbstractScFillSeriesDlg> ScAbstractDialogFactory_Impl::CreateScFillSeries return VclPtr<AbstractScFillSeriesDlg_Impl>::Create( pDlg ); } -VclPtr<AbstractScGroupDlg> ScAbstractDialogFactory_Impl::CreateAbstractScGroupDlg( vcl::Window* pParent, - bool bUnGroup ) +VclPtr<AbstractScGroupDlg> ScAbstractDialogFactory_Impl::CreateAbstractScGroupDlg(weld::Window* pParent, bool bUnGroup) { - VclPtr<ScGroupDlg> pDlg = VclPtr<ScGroupDlg>::Create( pParent, bUnGroup, true/*bRows*/); - return VclPtr<AbstractScGroupDlg_Impl>::Create( pDlg ); + return VclPtr<AbstractScGroupDlg_Impl>::Create(new ScGroupDlg(pParent, bUnGroup, true/*bRows*/)); } VclPtr<AbstractScInsertCellDlg> ScAbstractDialogFactory_Impl::CreateScInsertCellDlg(weld::Window* pParent, diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx b/sc/source/ui/attrdlg/scdlgfact.hxx index 3b1d5334b08b..d4565762ed22 100644 --- a/sc/source/ui/attrdlg/scdlgfact.hxx +++ b/sc/source/ui/attrdlg/scdlgfact.hxx @@ -206,7 +206,13 @@ class AbstractScFillSeriesDlg_Impl:public AbstractScFillSeriesDlg class AbstractScGroupDlg_Impl : public AbstractScGroupDlg { - DECL_ABSTDLG_BASE( AbstractScGroupDlg_Impl, ScGroupDlg) + std::unique_ptr<ScGroupDlg> m_xDlg; +public: + explicit AbstractScGroupDlg_Impl(ScGroupDlg* p) + : m_xDlg(p) + { + } + virtual short Execute() override; virtual bool GetColsChecked() const override; }; @@ -469,8 +475,7 @@ public: double fStep, double fMax, sal_uInt16 nPossDir) override; - virtual VclPtr<AbstractScGroupDlg> CreateAbstractScGroupDlg( vcl::Window* pParent, - bool bUnGroup = false) override; + virtual VclPtr<AbstractScGroupDlg> CreateAbstractScGroupDlg(weld::Window* pParent, bool bUnGroup = false) override; virtual VclPtr<AbstractScInsertCellDlg> CreateScInsertCellDlg(weld::Window* pParent, bool bDisallowCellMove) override; |