1 files changed, 16 insertions, 17 deletions

diff --git a/sc/source/ui/inc/filldlg.hxx b/sc/source/ui/inc/filldlg.hxx
index 7f2fb046093c..49173487ef56 100644
--- a/sc/source/ui/inc/filldlg.hxx
+++ b/sc/source/ui/inc/filldlg.hxx
@@ -64,7 +64,7 @@ public:
                              String         aStartStr,
                              double         fStep,
                              double         fMax,
-                             USHORT         nPossDir );
+                             sal_uInt16         nPossDir );
             ~ScFillSeriesDlg();
 
     FillDir     GetFillDir() const          { return theFillDir; }
@@ -76,9 +76,18 @@ public:
 
     String      GetStartStr() const         { return aEdStartVal.GetText(); }
 
-    void        SetEdStartValEnabled(BOOL bFlag=FALSE);
+    void        SetEdStartValEnabled(sal_Bool bFlag=sal_False);
 
 private:
+    FixedText       aFtStartVal;
+    Edit            aEdStartVal;
+    String          aStartStrVal;
+
+    FixedText       aFtEndVal;
+    Edit            aEdEndVal;
+
+    FixedText       aFtIncrement;
+    Edit            aEdIncrement;
     FixedLine       aFlDirection;
     RadioButton     aBtnDown;
     RadioButton     aBtnRight;
@@ -98,17 +107,7 @@ private:
     RadioButton     aBtnDayOfWeek;
     RadioButton     aBtnMonth;
     RadioButton     aBtnYear;
-
-    BOOL            bStartValFlag;
-    FixedText       aFtStartVal;
-    Edit            aEdStartVal;
-    String          aStartStrVal;
-
-    FixedText       aFtEndVal;
-    Edit            aEdEndVal;
-
-    FixedText       aFtIncrement;
-    Edit            aEdIncrement;
+    sal_Bool        bStartValFlag;
 
     OKButton        aBtnOk;
     CancelButton    aBtnCancel;
@@ -128,10 +127,10 @@ private:
 
 #ifdef _FILLDLG_CXX
 private:
-    void Init( USHORT nPossDir );
-    BOOL CheckStartVal();
-    BOOL CheckIncrementVal();
-    BOOL CheckEndVal();
+    void Init( sal_uInt16 nPossDir );
+    sal_Bool CheckStartVal();
+    sal_Bool CheckIncrementVal();
+    sal_Bool CheckEndVal();
 
     DECL_LINK( OKHdl, void * );
     DECL_LINK( DisableHdl, Button * );