diff options
Diffstat (limited to 'sc/source/ui/inc/tpsubt.hxx')
| -rw-r--r-- | sc/source/ui/inc/tpsubt.hxx | 35 |
1 files changed, 18 insertions, 17 deletions
diff --git a/sc/source/ui/inc/tpsubt.hxx b/sc/source/ui/inc/tpsubt.hxx index ffff1e061ba3..ecc8e0305483 100644 --- a/sc/source/ui/inc/tpsubt.hxx +++ b/sc/source/ui/inc/tpsubt.hxx @@ -41,15 +41,16 @@ protected: public: virtual ~ScTpSubTotalGroup(); + virtual void dispose() SAL_OVERRIDE; bool DoReset ( sal_uInt16 nGroupNo, const SfxItemSet& rArgSet ); bool DoFillItemSet ( sal_uInt16 nGroupNo, SfxItemSet& rArgSet ); protected: - ListBox* mpLbGroup; - SvxCheckListBox* mpLbColumns; - ListBox* mpLbFunctions; + VclPtr<ListBox> mpLbGroup; + VclPtr<SvxCheckListBox> mpLbColumns; + VclPtr<ListBox> mpLbFunctions; const OUString aStrNone; const OUString aStrColumn; @@ -82,7 +83,7 @@ protected: public: virtual ~ScTpSubTotalGroup1(); - static SfxTabPage* Create ( vcl::Window* pParent, + static VclPtr<SfxTabPage> Create ( vcl::Window* pParent, const SfxItemSet* rArgSet ); virtual bool FillItemSet ( SfxItemSet* rArgSet ) SAL_OVERRIDE; virtual void Reset ( const SfxItemSet* rArgSet ) SAL_OVERRIDE; @@ -97,7 +98,7 @@ protected: public: virtual ~ScTpSubTotalGroup2(); - static SfxTabPage* Create ( vcl::Window* pParent, + static VclPtr<SfxTabPage> Create ( vcl::Window* pParent, const SfxItemSet* rArgSet ); virtual bool FillItemSet ( SfxItemSet* rArgSet ) SAL_OVERRIDE; virtual void Reset ( const SfxItemSet* rArgSet ) SAL_OVERRIDE; @@ -112,7 +113,7 @@ protected: public: virtual ~ScTpSubTotalGroup3(); - static SfxTabPage* Create ( vcl::Window* pParent, + static VclPtr<SfxTabPage> Create ( vcl::Window* pParent, const SfxItemSet* rArgSet ); virtual bool FillItemSet ( SfxItemSet* rArgSet ) SAL_OVERRIDE; virtual void Reset ( const SfxItemSet* rArgSet ) SAL_OVERRIDE; @@ -126,22 +127,22 @@ protected: public: virtual ~ScTpSubTotalOptions(); - - static SfxTabPage* Create ( vcl::Window* pParent, + virtual void dispose() SAL_OVERRIDE; + static VclPtr<SfxTabPage> Create ( vcl::Window* pParent, const SfxItemSet* rArgSet ); virtual bool FillItemSet ( SfxItemSet* rArgSet ) SAL_OVERRIDE; virtual void Reset ( const SfxItemSet* rArgSet ) SAL_OVERRIDE; private: - CheckBox* pBtnPagebreak; - CheckBox* pBtnCase; - CheckBox* pBtnSort; - FixedText* pFlSort; - RadioButton* pBtnAscending; - RadioButton* pBtnDescending; - CheckBox* pBtnFormats; - CheckBox* pBtnUserDef; - ListBox* pLbUserDef; + VclPtr<CheckBox> pBtnPagebreak; + VclPtr<CheckBox> pBtnCase; + VclPtr<CheckBox> pBtnSort; + VclPtr<FixedText> pFlSort; + VclPtr<RadioButton> pBtnAscending; + VclPtr<RadioButton> pBtnDescending; + VclPtr<CheckBox> pBtnFormats; + VclPtr<CheckBox> pBtnUserDef; + VclPtr<ListBox> pLbUserDef; ScViewData* pViewData; ScDocument* pDoc; |