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/tphf.hxx | |
| parent | 99745dbcbb25b61437914c9782475d0b67a4b0bd (diff) | |
| parent | ce6308e4fad2281241bf4ca78280eba29f744d43 (diff) | |
Merge commit 'ooo/DEV300_m101' into integration/dev300_m101
Diffstat (limited to 'sc/source/ui/inc/tphf.hxx')
| -rw-r--r-- | sc/source/ui/inc/tphf.hxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sc/source/ui/inc/tphf.hxx b/sc/source/ui/inc/tphf.hxx index 386015e0337c..171b1a56af90 100644 --- a/sc/source/ui/inc/tphf.hxx +++ b/sc/source/ui/inc/tphf.hxx @@ -30,7 +30,7 @@ #define SC_TPHF_HXX -#include <svx/hdft2.hxx> +#include <svx/hdft.hxx> class ScStyleDlg; @@ -42,16 +42,16 @@ public: virtual ~ScHFPage(); virtual void Reset( const SfxItemSet& rSet ); - virtual BOOL FillItemSet( SfxItemSet& rOutSet ); + virtual sal_Bool FillItemSet( SfxItemSet& rOutSet ); void SetPageStyle( const String& rName ) { aStrPageStyle = rName; } void SetStyleDlg ( const ScStyleDlg* pDlg ) { pStyleDlg = pDlg; } protected: ScHFPage( Window* pParent, - USHORT nResId, + sal_uInt16 nResId, const SfxItemSet& rSet, - USHORT nSetId ); + sal_uInt16 nSetId ); virtual void ActivatePage(); virtual void DeactivatePage(); @@ -62,7 +62,7 @@ private: PushButton aBtnEdit; SfxItemSet aDataSet; String aStrPageStyle; - USHORT nPageUsage; + sal_uInt16 nPageUsage; const ScStyleDlg* pStyleDlg; #ifdef _TPHF_CXX @@ -79,7 +79,7 @@ class ScHeaderPage : public ScHFPage { public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); - static USHORT* GetRanges(); + static sal_uInt16* GetRanges(); private: ScHeaderPage( Window* pParent, const SfxItemSet& rSet ); @@ -91,7 +91,7 @@ class ScFooterPage : public ScHFPage { public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); - static USHORT* GetRanges(); + static sal_uInt16* GetRanges(); private: ScFooterPage( Window* pParent, const SfxItemSet& rSet ); |