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/scuitphfedit.hxx | |
| parent | 99745dbcbb25b61437914c9782475d0b67a4b0bd (diff) | |
| parent | ce6308e4fad2281241bf4ca78280eba29f744d43 (diff) | |
Merge commit 'ooo/DEV300_m101' into integration/dev300_m101
Diffstat (limited to 'sc/source/ui/inc/scuitphfedit.hxx')
| -rw-r--r-- | sc/source/ui/inc/scuitphfedit.hxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sc/source/ui/inc/scuitphfedit.hxx b/sc/source/ui/inc/scuitphfedit.hxx index 6c0d3768d7c3..b8c3e20b8136 100644 --- a/sc/source/ui/inc/scuitphfedit.hxx +++ b/sc/source/ui/inc/scuitphfedit.hxx @@ -60,7 +60,7 @@ class ScAccessibleEditObject; class ScHFEditPage : public SfxTabPage { public: - virtual BOOL FillItemSet ( SfxItemSet& rCoreSet ); + virtual sal_Bool FillItemSet ( SfxItemSet& rCoreSet ); virtual void Reset ( const SfxItemSet& rCoreSet ); void SetNumType(SvxNumType eNumType); @@ -68,9 +68,9 @@ public: protected: ScHFEditPage( Window* pParent, - USHORT nResId, + sal_uInt16 nResId, const SfxItemSet& rCoreSet, - USHORT nWhich, bool bHeader ); + sal_uInt16 nWhich, bool bHeader ); virtual ~ScHFEditPage(); private: @@ -94,7 +94,7 @@ private: FixedInfo aFtInfo; ScPopupMenu aPopUpFile; - USHORT nWhich; + sal_uInt16 nWhich; String aCmdArr[6]; private: @@ -120,7 +120,7 @@ class ScRightHeaderEditPage : public ScHFEditPage { public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rCoreSet ); - static USHORT* GetRanges(); + static sal_uInt16* GetRanges(); private: ScRightHeaderEditPage( Window* pParent, const SfxItemSet& rSet ); @@ -132,7 +132,7 @@ class ScLeftHeaderEditPage : public ScHFEditPage { public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rCoreSet ); - static USHORT* GetRanges(); + static sal_uInt16* GetRanges(); private: ScLeftHeaderEditPage( Window* pParent, const SfxItemSet& rSet ); @@ -144,7 +144,7 @@ class ScRightFooterEditPage : public ScHFEditPage { public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rCoreSet ); - static USHORT* GetRanges(); + static sal_uInt16* GetRanges(); private: ScRightFooterEditPage( Window* pParent, const SfxItemSet& rSet ); @@ -156,7 +156,7 @@ class ScLeftFooterEditPage : public ScHFEditPage { public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rCoreSet ); - static USHORT* GetRanges(); + static sal_uInt16* GetRanges(); private: ScLeftFooterEditPage( Window* pParent, const SfxItemSet& rSet ); |