1 files changed, 11 insertions, 11 deletions
diff --git a/svx/inc/svx/hdft.hxx b/svx/inc/svx/hdft.hxx
index d4341ae0a6fd..b1dd6b82e58c 100644..100755
--- a/svx/inc/svx/hdft.hxx
+++ b/svx/inc/svx/hdft.hxx
@@ -49,22 +49,23 @@ class SVX_DLLPUBLIC SvxHFPage: public SfxTabPage
 
 public:
 
-    virtual BOOL    FillItemSet( SfxItemSet& rOutSet );
+    virtual sal_Bool    FillItemSet( SfxItemSet& rOutSet );
     virtual void    Reset( const SfxItemSet& rSet );
 
     virtual         ~SvxHFPage();
 
-    void            DisableDeleteQueryBox() { bDisableQueryBox = TRUE; }
-    void            EnableBackgroundSelector( BOOL bNew ) { bEnableBackgroundSelector = bNew; }
+    void            DisableDeleteQueryBox() { bDisableQueryBox = sal_True; }
+    void            EnableBackgroundSelector( sal_Bool bNew ) { bEnableBackgroundSelector = bNew; }
     void            EnableDynamicSpacing();
 
 protected:
     virtual void    ActivatePage( const SfxItemSet& rSet );
     virtual int     DeactivatePage( SfxItemSet* pSet = 0 );
 
-    SvxHFPage( Window* pParent, USHORT nResId, const SfxItemSet& rSet,
-               USHORT nSetId );
+    SvxHFPage( Window* pParent, sal_uInt16 nResId, const SfxItemSet& rSet,
+               sal_uInt16 nSetId );
 
+    FixedLine       aFrm;
     CheckBox        aTurnOnBox;
     CheckBox        aCntSharedBox;
     FixedText       aLMLbl;
@@ -77,14 +78,13 @@ protected:
     FixedText       aHeightFT;
     MetricField     aHeightEdit;
     CheckBox        aHeightDynBtn;
-    FixedLine       aFrm;
     SvxPageWindow   aBspWin;
     PushButton      aBackgroundBtn;
 
-    USHORT          nId;
+    sal_uInt16          nId;
     SfxItemSet*     pBBSet;
-    BOOL            bDisableQueryBox;
-    BOOL            bEnableBackgroundSelector;
+    sal_Bool            bDisableQueryBox;
+    sal_Bool            bEnableBackgroundSelector;
     bool            bInReset;
 
     void            InitHandler();
@@ -109,7 +109,7 @@ class SVX_DLLPUBLIC SvxHeaderPage : public SvxHFPage
 {
 public:
     static SfxTabPage*  Create( Window* pParent, const SfxItemSet& rSet );
-    static USHORT*      GetRanges();
+    static sal_uInt16*      GetRanges();
 
 private:
     SvxHeaderPage( Window* pParent, const SfxItemSet& rSet );
@@ -121,7 +121,7 @@ class SVX_DLLPUBLIC SvxFooterPage : public SvxHFPage
 {
 public:
     static SfxTabPage*  Create( Window* pParent, const SfxItemSet& rSet );
-    static USHORT*      GetRanges();
+    static sal_uInt16*      GetRanges();
 
 private:
     SVX_DLLPRIVATE SvxFooterPage(   Window* pParent, const SfxItemSet& rSet );