diff options
| author | Kohei Yoshida <kyoshida@novell.com> | 2011-03-10 16:55:21 -0500 |
|---|---|---|
| committer | Kohei Yoshida <kyoshida@novell.com> | 2011-03-10 20:21:13 -0500 |
| commit | 12343c15568dcc2c9209d8ca41fda2263122448f (patch) | |
| tree | 3212a89c6cd8ea2e0aee7103aa9669bbb8a6f307 /sc/source/ui/inc/tpsubt.hxx | |
| parent | 99745dbcbb25b61437914c9782475d0b67a4b0bd (diff) | |
| parent | ce6308e4fad2281241bf4ca78280eba29f744d43 (diff) | |
Merge commit 'ooo/DEV300_m101' into integration/dev300_m101
Diffstat (limited to 'sc/source/ui/inc/tpsubt.hxx')
| -rw-r--r-- | sc/source/ui/inc/tpsubt.hxx | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/sc/source/ui/inc/tpsubt.hxx b/sc/source/ui/inc/tpsubt.hxx index 1a2bd22c4a5b..049633ad40b6 100644 --- a/sc/source/ui/inc/tpsubt.hxx +++ b/sc/source/ui/inc/tpsubt.hxx @@ -48,16 +48,16 @@ class ScDocument; class ScTpSubTotalGroup : public SfxTabPage { protected: - ScTpSubTotalGroup( Window* pParent, USHORT nResId, + ScTpSubTotalGroup( Window* pParent, sal_uInt16 nResId, const SfxItemSet& rArgSet ); public: virtual ~ScTpSubTotalGroup(); - static USHORT* GetRanges (); - BOOL DoReset ( USHORT nGroupNo, + static sal_uInt16* GetRanges (); + sal_Bool DoReset ( sal_uInt16 nGroupNo, const SfxItemSet& rArgSet ); - BOOL DoFillItemSet ( USHORT nGroupNo, + sal_Bool DoFillItemSet ( sal_uInt16 nGroupNo, SfxItemSet& rArgSet ); protected: FixedText aFtGroup; @@ -72,17 +72,17 @@ protected: ScViewData* pViewData; ScDocument* pDoc; - const USHORT nWhichSubTotals; + const sal_uInt16 nWhichSubTotals; const ScSubTotalParam& rSubTotalData; SCCOL nFieldArr[SC_MAXFIELDS]; - const USHORT nFieldCount; + const sal_uInt16 nFieldCount; private: void Init (); void FillListBoxes (); - ScSubTotalFunc LbPosToFunc ( USHORT nPos ); - USHORT FuncToLbPos ( ScSubTotalFunc eFunc ); - USHORT GetFieldSelPos ( SCCOL nField ); + ScSubTotalFunc LbPosToFunc ( sal_uInt16 nPos ); + sal_uInt16 FuncToLbPos ( ScSubTotalFunc eFunc ); + sal_uInt16 GetFieldSelPos ( SCCOL nField ); // Handler ------------------------ DECL_LINK( SelectHdl, ListBox * ); @@ -102,7 +102,7 @@ public: static SfxTabPage* Create ( Window* pParent, const SfxItemSet& rArgSet ); - virtual BOOL FillItemSet ( SfxItemSet& rArgSet ); + virtual sal_Bool FillItemSet ( SfxItemSet& rArgSet ); virtual void Reset ( const SfxItemSet& rArgSet ); }; @@ -119,7 +119,7 @@ public: static SfxTabPage* Create ( Window* pParent, const SfxItemSet& rArgSet ); - virtual BOOL FillItemSet ( SfxItemSet& rArgSet ); + virtual sal_Bool FillItemSet ( SfxItemSet& rArgSet ); virtual void Reset ( const SfxItemSet& rArgSet ); }; @@ -136,7 +136,7 @@ public: static SfxTabPage* Create ( Window* pParent, const SfxItemSet& rArgSet ); - virtual BOOL FillItemSet ( SfxItemSet& rArgSet ); + virtual sal_Bool FillItemSet ( SfxItemSet& rArgSet ); virtual void Reset ( const SfxItemSet& rArgSet ); }; @@ -152,10 +152,10 @@ protected: public: virtual ~ScTpSubTotalOptions(); - static USHORT* GetRanges (); + static sal_uInt16* GetRanges (); static SfxTabPage* Create ( Window* pParent, const SfxItemSet& rArgSet ); - virtual BOOL FillItemSet ( SfxItemSet& rArgSet ); + virtual sal_Bool FillItemSet ( SfxItemSet& rArgSet ); virtual void Reset ( const SfxItemSet& rArgSet ); private: @@ -172,7 +172,7 @@ private: ScViewData* pViewData; ScDocument* pDoc; - const USHORT nWhichSubTotals; + const sal_uInt16 nWhichSubTotals; const ScSubTotalParam& rSubTotalData; private: |