1 files changed, 18 insertions, 18 deletions

diff --git a/sw/source/ui/inc/column.hxx b/sw/source/ui/inc/column.hxx
index f2a5e37d283b..948f68c9d319 100644
--- a/sw/source/ui/inc/column.hxx
+++ b/sw/source/ui/inc/column.hxx
@@ -87,10 +87,10 @@ class SwColumnDlg : public SfxModalDialog
     long                nSelectionWidth;
     long                nPageWidth;
 
-    BOOL                bPageChanged : 1;
-    BOOL                bSectionChanged : 1;
-    BOOL                bSelSectionChanged : 1;
-    BOOL                bFrameChanged : 1;
+    sal_Bool                bPageChanged : 1;
+    sal_Bool                bSectionChanged : 1;
+    sal_Bool                bSelSectionChanged : 1;
+    sal_Bool                bFrameChanged : 1;
 
 
     DECL_LINK(ObjectHdl, ListBox*);
@@ -165,16 +165,16 @@ class SwColumnPage : public SfxTabPage
 
     SwColMgr*       pColMgr;
 
-    USHORT          nFirstVis;
-    USHORT          nCols;
+    sal_uInt16          nFirstVis;
+    sal_uInt16          nCols;
     long            nColWidth[nMaxCols];
     long            nColDist[nMaxCols];
-    USHORT          nMinWidth;
+    sal_uInt16          nMinWidth;
     PercentField    *pModifiedField;
-    BOOL            bFormat;
-    BOOL            bFrm;
-    BOOL            bHtmlMode;
-    BOOL            bLockUpdate;
+    sal_Bool            bFormat;
+    sal_Bool            bFrm;
+    sal_Bool            bHtmlMode;
+    sal_Bool            bLockUpdate;
 
     // Handler
     DECL_LINK( ColModify, NumericField * );
@@ -193,7 +193,7 @@ class SwColumnPage : public SfxTabPage
     void            UpdateCols();
     void            Init();
     void            ResetColWidth();
-    void            SetLabels( USHORT nVis );
+    void            SetLabels( sal_uInt16 nVis );
 
     using SfxTabPage::ActivatePage;
     using SfxTabPage::DeactivatePage;
@@ -207,18 +207,18 @@ public:
     virtual ~SwColumnPage();
 
     static SfxTabPage *Create(Window *pParent, const SfxItemSet &rSet);
-    static USHORT* GetRanges();
+    static sal_uInt16* GetRanges();
 
-    virtual BOOL    FillItemSet(SfxItemSet &rSet);
+    virtual sal_Bool    FillItemSet(SfxItemSet &rSet);
     virtual void    Reset(const SfxItemSet &rSet);
 
-    void SetFrmMode(BOOL bMod);
+    void SetFrmMode(sal_Bool bMod);
     void SetPageWidth(long nPageWidth);
 
-    void SetFormatUsed(BOOL bFmt) { bFormat = bFmt; }
+    void SetFormatUsed(sal_Bool bFmt) { bFormat = bFmt; }
 
-    void ShowBalance(BOOL bShow) {aBalanceColsCB.Show(bShow);}
-    void SetInSection(BOOL bSet);
+    void ShowBalance(sal_Bool bShow) {aBalanceColsCB.Show(bShow);}
+    void SetInSection(sal_Bool bSet);
 
     void ActivateColumnControl() {aCLNrEdt.GrabFocus();}
 };