diff options
author | Caolán McNamara <caolanm@redhat.com> | 2019-03-09 20:11:25 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2019-03-10 20:18:43 +0100 |
commit | 57ab849c35ef96bac401893333af5f1e8139263d (patch) | |
tree | 69733a3e398090c760af60fa677d7f93664361e3 /sc/source/ui/inc | |
parent | 176c135fb89c0f5aa39dc65cb7e64d4074df9aab (diff) |
weld ScTpSubTotalGroup
Change-Id: Icab13fec62ac69305550fa860700f883ffaaf1f9
Reviewed-on: https://gerrit.libreoffice.org/68983
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sc/source/ui/inc')
-rw-r--r-- | sc/source/ui/inc/tpsubt.hxx | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/sc/source/ui/inc/tpsubt.hxx b/sc/source/ui/inc/tpsubt.hxx index 60f94a85c573..8711ba358e7f 100644 --- a/sc/source/ui/inc/tpsubt.hxx +++ b/sc/source/ui/inc/tpsubt.hxx @@ -35,21 +35,16 @@ struct ScSubTotalParam; class ScTpSubTotalGroup : public SfxTabPage { protected: - ScTpSubTotalGroup( vcl::Window* pParent, - const SfxItemSet& rArgSet ); + ScTpSubTotalGroup(TabPageParent pParent, const SfxItemSet& rArgSet); public: virtual ~ScTpSubTotalGroup() override; - virtual void dispose() override; bool DoReset ( sal_uInt16 nGroupNo, const SfxItemSet& rArgSet ); bool DoFillItemSet ( sal_uInt16 nGroupNo, SfxItemSet& rArgSet ); protected: - VclPtr<ListBox> mpLbGroup; - VclPtr<SvxCheckListBox> mpLbColumns; - VclPtr<ListBox> mpLbFunctions; const OUString aStrNone; const OUString aStrColumn; @@ -61,6 +56,10 @@ protected: SCCOL nFieldArr[SC_MAXFIELDS]; sal_uInt16 nFieldCount; + std::unique_ptr<weld::ComboBox> mxLbGroup; + std::unique_ptr<weld::TreeView> mxLbColumns; + std::unique_ptr<weld::TreeView> mxLbFunctions; + private: void Init (); void FillListBoxes (); @@ -69,16 +68,17 @@ private: sal_uInt16 GetFieldSelPos ( SCCOL nField ); // Handler ------------------------ - DECL_LINK( SelectListBoxHdl, ListBox&, void ); - DECL_LINK( SelectTreeListBoxHdl, SvTreeListBox*, void ); - DECL_LINK( CheckHdl, SvTreeListBox*, void ); - void SelectHdl(const void *); + DECL_LINK( SelectListBoxHdl, weld::ComboBox&, void ); + DECL_LINK( SelectTreeListBoxHdl, weld::TreeView&, void ); + typedef std::pair<int, int> row_col; + DECL_LINK(CheckHdl, const row_col&, void); + void SelectHdl(const weld::Widget*); }; class ScTpSubTotalGroup1 final : public ScTpSubTotalGroup { friend class VclPtr<ScTpSubTotalGroup1>; - ScTpSubTotalGroup1( vcl::Window* pParent, + ScTpSubTotalGroup1( TabPageParent pParent, const SfxItemSet& rArgSet ); public: @@ -93,7 +93,7 @@ public: class ScTpSubTotalGroup2 final : public ScTpSubTotalGroup { friend class VclPtr<ScTpSubTotalGroup2>; - ScTpSubTotalGroup2( vcl::Window* pParent, + ScTpSubTotalGroup2( TabPageParent pParent, const SfxItemSet& rArgSet ); public: @@ -108,7 +108,7 @@ public: class ScTpSubTotalGroup3 final : public ScTpSubTotalGroup { friend class VclPtr<ScTpSubTotalGroup3>; - ScTpSubTotalGroup3( vcl::Window* pParent, + ScTpSubTotalGroup3( TabPageParent pParent, const SfxItemSet& rArgSet ); public: |