1 files changed, 26 insertions, 26 deletions

diff --git a/sw/inc/fmtcol.hxx b/sw/inc/fmtcol.hxx
index 46fbec471cb4..4f941e084132 100644
--- a/sw/inc/fmtcol.hxx
+++ b/sw/inc/fmtcol.hxx
@@ -39,16 +39,16 @@ class SwFmtColl : public SwFmt
 {
 protected:
     SwFmtColl( SwAttrPool& rPool, const sal_Char* pFmtName,
-                const USHORT* pWhichRanges, SwFmtColl* pDerFrom,
-                USHORT nFmtWhich )
+                const sal_uInt16* pWhichRanges, SwFmtColl* pDerFrom,
+                sal_uInt16 nFmtWhich )
           : SwFmt( rPool, pFmtName, pWhichRanges, pDerFrom, nFmtWhich )
-    { SetAuto( FALSE ); }
+    { SetAuto( sal_False ); }
 
     SwFmtColl( SwAttrPool& rPool, const String &rFmtName,
-                const USHORT* pWhichRanges, SwFmtColl* pDerFrom,
-                USHORT nFmtWhich )
+                const sal_uInt16* pWhichRanges, SwFmtColl* pDerFrom,
+                sal_uInt16 nFmtWhich )
           : SwFmt( rPool, rFmtName, pWhichRanges, pDerFrom, nFmtWhich )
-    { SetAuto( FALSE ); }
+    { SetAuto( sal_False ); }
 
 private:
 
@@ -73,7 +73,7 @@ protected:
 
     SwTxtFmtColl( SwAttrPool& rPool, const sal_Char* pFmtCollName,
                     SwTxtFmtColl* pDerFrom = 0,
-                    USHORT nFmtWh = RES_TXTFMTCOLL )
+                    sal_uInt16 nFmtWh = RES_TXTFMTCOLL )
         : SwFmtColl( rPool, pFmtCollName, aTxtFmtCollSetRange,
                         pDerFrom, nFmtWh ),
           mbStayAssignedToListLevelOfOutlineStyle( false ),
@@ -83,7 +83,7 @@ protected:
 
     SwTxtFmtColl( SwAttrPool& rPool, const String &rFmtCollName,
                     SwTxtFmtColl* pDerFrom = 0,
-                    USHORT nFmtWh = RES_TXTFMTCOLL )
+                    sal_uInt16 nFmtWh = RES_TXTFMTCOLL )
         : SwFmtColl( rPool, rFmtCollName, aTxtFmtCollSetRange,
                         pDerFrom, nFmtWh ),
 
@@ -101,7 +101,7 @@ public:
     inline void SetNextTxtFmtColl(SwTxtFmtColl& rNext);
     SwTxtFmtColl& GetNextTxtFmtColl() const { return *pNextTxtFmtColl; }
 
-    BOOL IsAtDocNodeSet() const;
+    sal_Bool IsAtDocNodeSet() const;
 
     void SetAttrOutlineLevel( int );
     int  GetAttrOutlineLevel() const;
@@ -115,12 +115,12 @@ public:
 
     // Override to recognize changes on the <SwNumRuleItem> and register/unregister
     // the paragragh style at the corresponding <SwNumRule> instance.
-    virtual BOOL SetFmtAttr( const SfxPoolItem& rAttr );
-    virtual BOOL SetFmtAttr( const SfxItemSet& rSet );
-    virtual BOOL ResetFmtAttr( USHORT nWhich1, USHORT nWhich2 = 0 );
+    virtual sal_Bool SetFmtAttr( const SfxPoolItem& rAttr );
+    virtual sal_Bool SetFmtAttr( const SfxItemSet& rSet );
+    virtual sal_Bool ResetFmtAttr( sal_uInt16 nWhich1, sal_uInt16 nWhich2 = 0 );
 
     // Override <ResetAllFmtAttr()> to stay assigned to list level of outline style.
-    virtual USHORT ResetAllFmtAttr();
+    virtual sal_uInt16 ResetAllFmtAttr();
 
     inline bool StayAssignedToListLevelOfOutlineStyle() const
     {
@@ -135,15 +135,15 @@ public:
  in TextNode and here in TxtCollection in order to make both
  the inheritance of and the access to set attributes function correctly!
 
-    virtual BOOL SetDerivedFrom( SwFmtColl* pDerFrom = 0 );
+    virtual sal_Bool SetDerivedFrom( SwFmtColl* pDerFrom = 0 );
 
     inline SwCharFmt* GetCharFmt() const;
-    inline BOOL IsCharFmtSet() const;
+    inline sal_Bool IsCharFmtSet() const;
     void SetCharFmt(SwCharFmt *);
     void ResetCharFmt();
-    inline BOOL SwTxtFmtColl::IsCharFmtSet() const
+    inline sal_Bool SwTxtFmtColl::IsCharFmtSet() const
     {
-        return aCharDepend.GetRegisteredIn() ? TRUE : FALSE;
+        return aCharDepend.GetRegisteredIn() ? sal_True : sal_False;
     }
     inline SwCharFmt* SwTxtFmtColl::GetCharFmt() const
     {
@@ -198,19 +198,19 @@ enum Master_CollConditions
 
 class SW_DLLPUBLIC SwCollCondition : public SwClient
 {
-    ULONG nCondition;
+    sal_uLong nCondition;
     union
     {
-        ULONG nSubCondition;
+        sal_uLong nSubCondition;
         String* pFldExpression;
     } aSubCondition;
 
 public:
     TYPEINFO(); // Already in base class Client.
 
-    SwCollCondition( SwTxtFmtColl* pColl, ULONG nMasterCond,
-                    ULONG nSubCond = 0 );
-    SwCollCondition( SwTxtFmtColl* pColl, ULONG nMasterCond,
+    SwCollCondition( SwTxtFmtColl* pColl, sal_uLong nMasterCond,
+                    sal_uLong nSubCond = 0 );
+    SwCollCondition( SwTxtFmtColl* pColl, sal_uLong nMasterCond,
                     const String& rSubExp );
     virtual ~SwCollCondition();
 
@@ -225,12 +225,12 @@ public:
     int operator!=( const SwCollCondition& rCmp ) const
                             { return ! (*this == rCmp); }
 
-    ULONG GetCondition() const      { return nCondition; }
-    ULONG GetSubCondition() const   { return aSubCondition.nSubCondition; }
+    sal_uLong GetCondition() const      { return nCondition; }
+    sal_uLong GetSubCondition() const   { return aSubCondition.nSubCondition; }
     const String* GetFldExpression() const
                                     { return aSubCondition.pFldExpression; }
 
-    void SetCondition( ULONG nCond, ULONG nSubCond );
+    void SetCondition( sal_uLong nCond, sal_uLong nSubCond );
     SwTxtFmtColl* GetTxtFmtColl() const     { return (SwTxtFmtColl*)GetRegisteredIn(); }
 };
 
@@ -260,7 +260,7 @@ public:
     const SwCollCondition* HasCondition( const SwCollCondition& rCond ) const;
     const SwFmtCollConditions& GetCondColls() const     { return aCondColls; }
     void InsertCondition( const SwCollCondition& rCond );
-    BOOL RemoveCondition( const SwCollCondition& rCond );
+    sal_Bool RemoveCondition( const SwCollCondition& rCond );
 
     void SetConditions( const SwFmtCollConditions& );
 };