removetooltypes01: #i112600# adjust rebase in sw

43 files changed, 264 insertions, 264 deletions

diff --git a/sw/inc/IDocumentFieldsAccess.hxx b/sw/inc/IDocumentFieldsAccess.hxx
index e3accd0d92..81a1a11f92 100644
--- a/sw/inc/IDocumentFieldsAccess.hxx
+++ b/sw/inc/IDocumentFieldsAccess.hxx
@@ -91,8 +91,8 @@ namespace com { namespace sun { namespace star { namespace uno { class Any; } }
        @param rVal             the value
        @param nMId
 
-       @retval TRUE            putting of value was successful
-       @retval FALSE           else
+       @retval sal_True            putting of value was successful
+       @retval sal_False           else
     */
     virtual bool PutValueToField(const SwPosition & rPos, const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich) = 0;
 
@@ -107,8 +107,8 @@ namespace com { namespace sun { namespace star { namespace uno { class Any; } }
         @param pMsgHnt
         @param bUpdateTblFlds TRUE: update table fields, too.
 
-        @retval TRUE             update was successful
-        @retval FALSE            else
+        @retval sal_True             update was successful
+        @retval sal_False            else
     */
     virtual bool UpdateFld(SwTxtFld * rDstFmtFld, SwField & rSrcFld, SwMsgPoolItem * pMsgHnt, bool bUpdateTblFlds) = 0;
 
diff --git a/sw/inc/IDocumentRedlineAccess.hxx b/sw/inc/IDocumentRedlineAccess.hxx
index 9ff3de0ea5..f019e7b0b6 100644
--- a/sw/inc/IDocumentRedlineAccess.hxx
+++ b/sw/inc/IDocumentRedlineAccess.hxx
@@ -134,7 +134,7 @@ public:
     /** Query if redlining is on.
 
         @returns
-        </TRUE> if redlining is on </FALSE> otherwise
+        <TRUE/> if redlining is on <FALSE/> otherwise
     */
     virtual bool IsRedlineOn() const = 0;
 
diff --git a/sw/inc/cmdid.h b/sw/inc/cmdid.h
index 589d6f130a..29fbd5f282 100644
--- a/sw/inc/cmdid.h
+++ b/sw/inc/cmdid.h
@@ -1170,7 +1170,7 @@ Achtung: Ab sofort sind in diesem File keine C++-Kommentare (//) mehr
 
 #define FN_PARAM_SHADOWCURSOR   		(FN_PARAM2+8) /* Fuer ShadowCursor Optionen */
 
-#define FN_PARAM_ACT_NUMLEVEL   		(FN_PARAM2+9) /* BYTE-Item mit aktuellen NumLevel */
+#define FN_PARAM_ACT_NUMLEVEL   		(FN_PARAM2+9) /* sal_uInt8-Item mit aktuellen NumLevel */
 
 #define FN_PARAM_9 						(FN_PARAM2+10)
 #define FN_PARAM_10                     (FN_PARAM2+11)
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 3d74b3a263..495cacf85f 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -1985,8 +1985,8 @@ public:
 
         @param sListId    list Id of the list whose level has to be marked/unmarked
         @param nListLevel level to mark
-        @param bValue     - TRUE  mark the level
-                          - FALSE unmark the level
+        @param bValue     - sal_True  mark the level
+                          - sal_False unmark the level
     */
     void MarkListLevel( const String& sListId,
                         const int nListLevel,
@@ -1999,8 +1999,8 @@ public:
 
         @param rList      list whose level has to be marked/unmarked
         @param nListLevel level to mark
-        @param bValue     - TRUE  mark the level
-                          - FALSE unmark the level
+        @param bValue     - sal_True  mark the level
+                          - sal_False unmark the level
      */
     void MarkListLevel( SwList& rList,
                         const int nListLevel,
diff --git a/sw/inc/flddropdown.hxx b/sw/inc/flddropdown.hxx
index adfc240e55..76010fd2fb 100644
--- a/sw/inc/flddropdown.hxx
+++ b/sw/inc/flddropdown.hxx
@@ -220,8 +220,8 @@ public:
 
        @param rItem the item to be set
 
-       @retval TRUE the selected item was successfully set
-       @retval TRUE failure (empty selection)
+       @retval sal_True the selected item was successfully set
+       @retval sal_True failure (empty selection)
     */
     sal_Bool SetSelectedItem(const String & rItem);
 
diff --git a/sw/inc/ndtxt.hxx b/sw/inc/ndtxt.hxx
index 9e06a0a872..df92e03cc3 100644
--- a/sw/inc/ndtxt.hxx
+++ b/sw/inc/ndtxt.hxx
@@ -460,8 +460,8 @@ public:
           - it has a SwNodeNum and it has a numbering rule and the according
             SwNumFmt defines a numbering type that is an enumeration.
 
-       @retval TRUE      this text node may be numbered
-       @retval FALSE     else
+       @retval sal_True      this text node may be numbered
+       @retval sal_False     else
      */
     //sal_Bool MayBeNumbered() const;
 
@@ -503,8 +503,8 @@ public:
        @param the first line indent of this text node taking the
                numbering into account (return parameter)
 
-       @retval TRUE   this node has SwNodeNum and has numbering rule
-       @retval FALSE  else
+       @retval sal_True   this node has SwNodeNum and has numbering rule
+       @retval sal_False  else
      */
     sal_Bool GetFirstLineOfsWithNum( short& rFirstOffset ) const;
 
@@ -533,8 +533,8 @@ public:
         numbering rule and the numbering format specified for the
         level of the SwNodeNum is of an enumeration type.
 
-        @retval TRUE    This text node has a number.
-        @retval FALSE   else
+        @retval sal_True    This text node has a number.
+        @retval sal_False   else
      */
     sal_Bool HasNumber() const;
 
@@ -545,8 +545,8 @@ public:
         numbering rule and the numbering format specified for the
         level of the SwNodeNum is of a bullet type.
 
-        @retval TRUE    This text node has a bullet.
-        @retval FALSE   else
+        @retval sal_True    This text node has a bullet.
+        @retval sal_False   else
      */
     sal_Bool HasBullet() const;
 
@@ -559,8 +559,8 @@ public:
         ATTENTION: Returns sal_True even if the SwNumFmt has type
         SVX_NUM_NUMBER_NONE.
 
-        @retval TRUE      This node is numbered.
-        @retval FALSE     else
+        @retval sal_True      This node is numbered.
+        @retval sal_False     else
      */
     sal_Bool IsNumbered() const;
 
diff --git a/sw/inc/node.hxx b/sw/inc/node.hxx
index 6bee1de461..61e20549be 100644
--- a/sw/inc/node.hxx
+++ b/sw/inc/node.hxx
@@ -181,8 +181,8 @@ public:
     /**
        Checks if this node is in redlines.
 
-       @retval TRUE       this node is in redlines
-       @retval FALSE      else
+       @retval sal_True       this node is in redlines
+       @retval sal_False      else
      */
     sal_Bool IsInRedlines() const;
 
diff --git a/sw/inc/tox.hxx b/sw/inc/tox.hxx
index 7873d93613..1a6e437b39 100644
--- a/sw/inc/tox.hxx
+++ b/sw/inc/tox.hxx
@@ -256,8 +256,8 @@ struct SW_DLLPUBLIC SwFormToken
     @param _eType  the type to check for
     @param rToken  the token to check
 
-    @retval TRUE   the token has the given type
-    @retval FALSE  else
+    @retval sal_True   the token has the given type
+    @retval sal_False  else
 */
 struct SwFormTokenEqualToFormTokenType
 {
diff --git a/sw/inc/undobj.hxx b/sw/inc/undobj.hxx
index 9944cfbd5c..654fd2e794 100644
--- a/sw/inc/undobj.hxx
+++ b/sw/inc/undobj.hxx
@@ -69,7 +69,7 @@ protected:
     void RemoveIdxFromRange( SwPaM& rPam, sal_Bool bMoveNext );
     void RemoveIdxRel( sal_uLong, const SwPosition& );
 
-    static BOOL CanRedlineGroup( SwRedlineSaveDatas& rCurr,
+    static sal_Bool CanRedlineGroup( SwRedlineSaveDatas& rCurr,
                                 const SwRedlineSaveDatas& rCheck,
                                 sal_Bool bCurrIsEnd );
 
@@ -81,7 +81,7 @@ protected:
     */
     virtual SwRewriter GetRewriter() const;
 
-    // return type is USHORT because this overrides SfxUndoAction::GetId()
+    // return type is sal_uInt16 because this overrides SfxUndoAction::GetId()
     virtual sal_uInt16 GetId() const { return static_cast<sal_uInt16>(m_nId); }
 
     // the 4 methods that derived classes have to override
@@ -99,7 +99,7 @@ private:
     virtual void UndoWithContext(SfxUndoContext &);
     virtual void RedoWithContext(SfxUndoContext &);
     virtual void Repeat(SfxRepeatTarget &);
-    virtual BOOL CanRepeat(SfxRepeatTarget &) const;
+    virtual sal_Bool CanRepeat(SfxRepeatTarget &) const;
 
 public:
     SwUndo(SwUndoId const nId);
diff --git a/sw/source/core/doc/docfly.cxx b/sw/source/core/doc/docfly.cxx
index 4d26a7c433..e3fabf9346 100644
--- a/sw/source/core/doc/docfly.cxx
+++ b/sw/source/core/doc/docfly.cxx
@@ -392,7 +392,7 @@ sal_Int8 SwDoc::SetFlyFrmAnchor( SwFrmFmt& rFmt, SfxItemSet& rSet, sal_Bool bNew
 
 static bool
 lcl_SetFlyFrmAttr(SwDoc & rDoc,
-        sal_Int8 (SwDoc::*pSetFlyFrmAnchor)(SwFrmFmt &, SfxItemSet &, BOOL),
+        sal_Int8 (SwDoc::*pSetFlyFrmAnchor)(SwFrmFmt &, SfxItemSet &, sal_Bool),
         SwFrmFmt & rFlyFmt, SfxItemSet & rSet)
 {
     // #i32968# Inserting columns in the frame causes MakeFrmFmt to put two
@@ -403,8 +403,8 @@ lcl_SetFlyFrmAttr(SwDoc & rDoc,
     //desselben einer Spezialmethode. Sie Returnt sal_True wenn der Fly neu
     //erzeugt werden muss (z.B. weil ein Wechsel des FlyTyps vorliegt).
     sal_Int8 const nMakeFrms =
-        (SFX_ITEM_SET == rSet.GetItemState( RES_ANCHOR, FALSE ))
-             ?  (rDoc.*pSetFlyFrmAnchor)( rFlyFmt, rSet, FALSE )
+        (SFX_ITEM_SET == rSet.GetItemState( RES_ANCHOR, sal_False ))
+             ?  (rDoc.*pSetFlyFrmAnchor)( rFlyFmt, rSet, sal_False )
              :  DONTMAKEFRMS;
 
     const SfxPoolItem* pItem;
@@ -450,10 +450,10 @@ lcl_SetFlyFrmAttr(SwDoc & rDoc,
     return aTmpSet.Count() || MAKEFRMS == nMakeFrms;
 }
 
-BOOL SwDoc::SetFlyFrmAttr( SwFrmFmt& rFlyFmt, SfxItemSet& rSet )
+sal_Bool SwDoc::SetFlyFrmAttr( SwFrmFmt& rFlyFmt, SfxItemSet& rSet )
 {
     if( !rSet.Count() )
-        return FALSE;
+        return sal_False;
 
     ::std::auto_ptr<SwUndoFmtAttrHelper> pSaveUndo;
 
diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx
index 026dd3c5ef..6b9987b510 100644
--- a/sw/source/core/doc/docfmt.cxx
+++ b/sw/source/core/doc/docfmt.cxx
@@ -1504,7 +1504,7 @@ sal_uInt16 SwDoc::GetTblFrmFmtCount(sal_Bool bUsed) const
         for ( sal_uInt16 i = nCount; i; )
 =======
         SwAutoFmtGetDocNode aGetHt( &GetNodes() );
-        for ( USHORT i = nCount; i; )
+        for ( sal_uInt16 i = nCount; i; )
 >>>>>>> other
         {
             if((*pTblFrmFmtTbl)[--i]->GetInfo( aGetHt ))
@@ -1528,7 +1528,7 @@ SwFrmFmt& SwDoc::GetTblFrmFmt(sal_uInt16 nFmt, sal_Bool bUsed ) const
         for ( sal_uInt16 i = 0; i <= nFmt; i++ )
 =======
         SwAutoFmtGetDocNode aGetHt( &GetNodes() );
-        for ( USHORT i = 0; i <= nFmt; i++ )
+        for ( sal_uInt16 i = 0; i <= nFmt; i++ )
 >>>>>>> other
         {
             while ( (*pTblFrmFmtTbl)[ i + nRemoved]->GetInfo( aGetHt ))
diff --git a/sw/source/core/doc/doclay.cxx b/sw/source/core/doc/doclay.cxx
index 5b5f6d80e2..f5fa0eb910 100644
--- a/sw/source/core/doc/doclay.cxx
+++ b/sw/source/core/doc/doclay.cxx
@@ -891,7 +891,7 @@ if( GetIDocumentUndoRedo().DoesUndo() )
                 SwPaM* pTmp = (SwPaM*)&rPam;
                 sal_Bool bOldFlag = mbCopyIsMove;
                 bool const bOldUndo = GetIDocumentUndoRedo().DoesUndo();
-                mbCopyIsMove = TRUE;
+                mbCopyIsMove = sal_True;
                 GetIDocumentUndoRedo().DoUndo(false);
                 do {
                     if( pTmp->HasMark() &&
@@ -1538,7 +1538,7 @@ SwFlyFrmFmt *
 SwDoc::InsertLabel(
         SwLabelType const eType, String const& rTxt, String const& rSeparator,
         String const& rNumberingSeparator,
-        sal_Bool const bBefore, sal_uInt16 const nId, ULONG const nNdIdx,
+        sal_Bool const bBefore, sal_uInt16 const nId, sal_uLong const nNdIdx,
         String const& rCharacterStyle,
         sal_Bool const bCpyBrd )
 {
diff --git a/sw/source/core/doc/poolfmt.cxx b/sw/source/core/doc/poolfmt.cxx
index b6dcbfa203..b54c1fea5b 100644
--- a/sw/source/core/doc/poolfmt.cxx
+++ b/sw/source/core/doc/poolfmt.cxx
@@ -1169,10 +1169,10 @@ SwFmt* SwDoc::GetFmtFromPool( sal_uInt16 nId )
             switch (nId & (COLL_GET_RANGE_BITS + POOLGRP_NOCOLLID) )
             {
                 case POOLGRP_CHARFMT:
-                    pNewFmt = _MakeCharFmt(aNm, pDeriveFmt, FALSE, TRUE);
+                    pNewFmt = _MakeCharFmt(aNm, pDeriveFmt, sal_False, sal_True);
                 break;
                 case POOLGRP_FRAMEFMT:
-                    pNewFmt = _MakeFrmFmt(aNm, pDeriveFmt, FALSE, TRUE);
+                    pNewFmt = _MakeFrmFmt(aNm, pDeriveFmt, sal_False, sal_True);
                 break;
                 default:
                 break;
diff --git a/sw/source/core/docnode/ndcopy.cxx b/sw/source/core/docnode/ndcopy.cxx
index 61bf32b859..ec09c92dbe 100644
--- a/sw/source/core/docnode/ndcopy.cxx
+++ b/sw/source/core/docnode/ndcopy.cxx
@@ -1282,7 +1282,7 @@ bool SwDoc::CopyImpl( SwPaM& rPam, SwPosition& rPos,
     // falls Undo eingeschaltet ist, so speicher den eingefuegten Bereich
     if (pDoc->GetIDocumentUndoRedo().DoesUndo())
     {
-        pUndo->SetInsertRange( aCpyPam, TRUE, bStartIsTxtNode );
+        pUndo->SetInsertRange( aCpyPam, sal_True, bStartIsTxtNode );
     }
 
     if( pCpyRange )
diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index 4534df2269..8cf42490b6 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -395,7 +395,7 @@ const SwTable* SwDoc::InsertTable( const SwInsertTableOptions& rInsTblOpts,
     if( GetIDocumentUndoRedo().DoesUndo() )
     {
         GetIDocumentUndoRedo().AppendUndo(
-            new SwUndoInsTbl( rPos, nCols, nRows, static_cast<USHORT>(eAdjust),
+            new SwUndoInsTbl( rPos, nCols, nRows, static_cast<sal_uInt16>(eAdjust),
                                       rInsTblOpts, pTAFmt, pColArr,
                                       aTblName));
     }
@@ -698,7 +698,7 @@ const SwTable* SwDoc::TextToTable( const SwInsertTableOptions& rInsTblOpts,
     {
         GetIDocumentUndoRedo().StartUndo( UNDO_TEXTTOTABLE, NULL );
         pUndo = new SwUndoTxtToTbl( aOriginal, rInsTblOpts, cCh,
-                    static_cast<USHORT>(eAdjust), pTAFmt );
+                    static_cast<sal_uInt16>(eAdjust), pTAFmt );
         GetIDocumentUndoRedo().AppendUndo( pUndo );
 
         // das Splitten vom TextNode nicht in die Undohistory aufnehmen
@@ -2243,7 +2243,7 @@ sal_Bool SwDoc::DeleteRowCol( const SwSelBoxes& rBoxes, bool bColumn )
             if (pUndo)
                 pUndo->ReNewBoxes( aSelBoxes );
         }
-        bRet = rTable.DeleteSel( this, aSelBoxes, 0, pUndo, TRUE, TRUE );
+        bRet = rTable.DeleteSel( this, aSelBoxes, 0, pUndo, sal_True, sal_True );
         if (bRet)
         {
             SetModified();
@@ -3045,7 +3045,7 @@ void SwDoc::SetTabCols(SwTable& rTab, const SwTabCols &rNew, const SwTabCols &rO
     if (GetIDocumentUndoRedo().DoesUndo())
     {
         GetIDocumentUndoRedo().AppendUndo(
-            new SwUndoAttrTbl( *rTab.GetTableNode(), TRUE ));
+            new SwUndoAttrTbl( *rTab.GetTableNode(), sal_True ));
     }
     rTab.SetTabCols( rNew, rOld, pStart, bCurRowOnly );
       ::ClearFEShellTabCols();
@@ -4368,7 +4368,7 @@ sal_Bool SwDoc::InsCopyOfTbl( SwPosition& rInsPos, const SwSelBoxes& rBoxes,
         {
             ::sw::UndoGuard const undoGuard(GetIDocumentUndoRedo());
             bRet = pSrcTblNd->GetTable().MakeCopy( this, rInsPos, rBoxes,
-                                                TRUE, bCpyName );
+                                                sal_True, bCpyName );
         }
 
         if( pUndo )
diff --git a/sw/source/core/docnode/nodes.cxx b/sw/source/core/docnode/nodes.cxx
index 0d2b858754..51846efffc 100644
--- a/sw/source/core/docnode/nodes.cxx
+++ b/sw/source/core/docnode/nodes.cxx
@@ -313,7 +313,7 @@ void SwNodes::ChgNode( SwNodeIndex& rDelPos, sal_uLong nSz,
                         // this looks fishy if pDestDoc != 0
                         bool const bToUndo = !pDestDoc &&
                             GetDoc()->GetIDocumentUndoRedo().IsUndoNodes(rNds);
-                        for( USHORT i = pHts->Count(); i; )
+                        for( sal_uInt16 i = pHts->Count(); i; )
                         {
                             sal_uInt16 nDelMsg = 0;
                             SwTxtAttr * const pAttr = pHts->GetTextHint( --i );
@@ -1883,7 +1883,7 @@ void SwNodes::MoveRange( SwPaM & rPam, SwPosition & rPos, SwNodes& rNodes )
             pInsDoc->DoUndo( bIsUndo );
             bCopyCollFmt = sal_False;
 =======
-            bCopyCollFmt = FALSE;
+            bCopyCollFmt = sal_False;
 >>>>>>> other
         }
 
diff --git a/sw/source/core/edit/editsh.cxx b/sw/source/core/edit/editsh.cxx
index 2a9407051d..c08b48836e 100644
--- a/sw/source/core/edit/editsh.cxx
+++ b/sw/source/core/edit/editsh.cxx
@@ -755,7 +755,7 @@ sal_Bool SwEditShell::InsertURL( const SwFmtINetFmt& rFmt, const String& rStr, s
         return sal_False;
     StartAllAction();
     GetDoc()->GetIDocumentUndoRedo().StartUndo( UNDO_UI_INSERT_URLTXT, NULL);
-    BOOL bInsTxt = sal_True;
+    sal_Bool bInsTxt = sal_True;
 
     if( rStr.Len() )
     {
diff --git a/sw/source/core/edit/edundo.cxx b/sw/source/core/edit/edundo.cxx
index 62130f69a1..8428510940 100644
--- a/sw/source/core/edit/edundo.cxx
+++ b/sw/source/core/edit/edundo.cxx
@@ -102,7 +102,7 @@ SwEditShell::HandleUndoRedoContext(::sw::UndoRedoContext & rContext)
     }
 }
 
-bool SwEditShell::Undo(USHORT const nCount)
+bool SwEditShell::Undo(sal_uInt16 const nCount)
 >>>>>>> other
 {
     SET_CURR_SHELL( this );
@@ -113,7 +113,7 @@ bool SwEditShell::Undo(USHORT const nCount)
     sal_Bool bSaveDoesUndo = GetDoc()->DoesUndo();
 =======
     ::sw::UndoGuard const undoGuard(GetDoc()->GetIDocumentUndoRedo());
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
 >>>>>>> other
 
 <<<<<<< local
@@ -172,7 +172,7 @@ bool SwEditShell::Undo(USHORT const nCount)
         }
 =======
         try {
-            for (USHORT i = 0; i < nCount; ++i)
+            for (sal_uInt16 i = 0; i < nCount; ++i)
             {
                 bRet = GetDoc()->GetIDocumentUndoRedo().Undo()
                     || bRet;
@@ -231,7 +231,7 @@ bool SwEditShell::Undo(USHORT const nCount)
 <<<<<<< local
 sal_uInt16 SwEditShell::Redo( sal_uInt16 nCnt )
 =======
-bool SwEditShell::Redo(USHORT const nCount)
+bool SwEditShell::Redo(sal_uInt16 const nCount)
 >>>>>>> other
 {
     SET_CURR_SHELL( this );
@@ -314,7 +314,7 @@ bool SwEditShell::Redo(USHORT const nCount)
             GoNextCrsr();					// Redo zur alten Undo-Position !!
 =======
         try {
-            for (USHORT i = 0; i < nCount; ++i)
+            for (sal_uInt16 i = 0; i < nCount; ++i)
             {
                 bRet = GetDoc()->GetIDocumentUndoRedo().Redo()
                     || bRet;
@@ -347,7 +347,7 @@ bool SwEditShell::Redo(USHORT const nCount)
 <<<<<<< local
 sal_uInt16 SwEditShell::Repeat( sal_uInt16 nCount )
 =======
-bool SwEditShell::Repeat(USHORT const nCount)
+bool SwEditShell::Repeat(sal_uInt16 const nCount)
 >>>>>>> other
 {
     SET_CURR_SHELL( this );
diff --git a/sw/source/core/inc/UndoAttribute.hxx b/sw/source/core/inc/UndoAttribute.hxx
index 975e372029..84423605b5 100644
--- a/sw/source/core/inc/UndoAttribute.hxx
+++ b/sw/source/core/inc/UndoAttribute.hxx
@@ -58,7 +58,7 @@ class SwUndoAttr : public SwUndo, private SwUndRng
     const ::std::auto_ptr<SwHistory> m_pHistory;    // History for Undo
     ::std::auto_ptr<SwRedlineData> m_pRedlineData;  // Redlining
     ::std::auto_ptr<SwRedlineSaveDatas> m_pRedlineSaveData;
-    ULONG m_nNodeIndex;                             // Offset: for Redlining
+    sal_uLong m_nNodeIndex;                             // Offset: for Redlining
     const SetAttrMode m_nInsertFlags;               // insert flags
 
     void RemoveIdx( SwDoc& rDoc );
@@ -73,7 +73,7 @@ public:
     virtual void RedoImpl( ::sw::UndoRedoContext & );
     virtual void RepeatImpl( ::sw::RepeatContext & );
 
-    void SaveRedlineData( const SwPaM& rPam, BOOL bInsCntnt );
+    void SaveRedlineData( const SwPaM& rPam, sal_Bool bInsCntnt );
 
     SwHistory& GetHistory() { return *m_pHistory; }
 
@@ -83,11 +83,11 @@ class SwUndoResetAttr : public SwUndo, private SwUndRng
 {
     const ::std::auto_ptr<SwHistory> m_pHistory;
     SvUShortsSort m_Ids;
-    const USHORT m_nFormatId;             // Format-Id for Redo
+    const sal_uInt16 m_nFormatId;             // Format-Id for Redo
 
 public:
-    SwUndoResetAttr( const SwPaM&, USHORT nFmtId );
-    SwUndoResetAttr( const SwPosition&, USHORT nFmtId );
+    SwUndoResetAttr( const SwPaM&, sal_uInt16 nFmtId );
+    SwUndoResetAttr( const SwPosition&, sal_uInt16 nFmtId );
 
     virtual ~SwUndoResetAttr();
 
@@ -106,8 +106,8 @@ class SwUndoFmtAttr : public SwUndo
     friend class SwUndoDefaultAttr;
     SwFmt * m_pFmt;
     ::std::auto_ptr<SfxItemSet> m_pOldSet;    // old attributes
-    ULONG m_nNodeIndex;
-    const USHORT m_nFmtWhich;
+    sal_uLong m_nNodeIndex;
+    const sal_uInt16 m_nFmtWhich;
     const bool m_bSaveDrawPt;
 
     bool IsFmtInDoc( SwDoc* );   //is the attribute format still in the Doc?
@@ -154,7 +154,7 @@ class SwUndoFmtResetAttr : public SwUndo
 {
     public:
         SwUndoFmtResetAttr( SwFmt& rChangedFormat,
-                            const USHORT nWhichId );
+                            const sal_uInt16 nWhichId );
         ~SwUndoFmtResetAttr();
 
         virtual void UndoImpl( ::sw::UndoRedoContext & );
@@ -164,7 +164,7 @@ class SwUndoFmtResetAttr : public SwUndo
         // format at which a certain attribute is reset.
         SwFmt * const m_pChangedFormat;
         // which ID of the reset attribute
-        const USHORT m_nWhichId;
+        const sal_uInt16 m_nWhichId;
         // old attribute which has been reset - needed for undo.
         ::std::auto_ptr<SfxPoolItem> m_pOldItem;
 };
@@ -172,7 +172,7 @@ class SwUndoFmtResetAttr : public SwUndo
 
 class SwUndoDontExpandFmt : public SwUndo
 {
-    const ULONG m_nNodeIndex;
+    const sal_uLong m_nNodeIndex;
     const xub_StrLen m_nContentIndex;
 
 public:
@@ -206,7 +206,7 @@ class SwUndoMoveLeftMargin : public SwUndo, private SwUndRng
     const bool m_bModulus;
 
 public:
-    SwUndoMoveLeftMargin( const SwPaM&, BOOL bRight, BOOL bModulus );
+    SwUndoMoveLeftMargin( const SwPaM&, sal_Bool bRight, sal_Bool bModulus );
 
     virtual ~SwUndoMoveLeftMargin();
 
@@ -243,12 +243,12 @@ class SwUndoChangeFootNote : public SwUndo, private SwUndRng
 {
     const ::std::auto_ptr<SwHistory> m_pHistory;
     const String m_Text;
-    const USHORT m_nNumber;
+    const sal_uInt16 m_nNumber;
     const bool m_bEndNote;
 
 public:
     SwUndoChangeFootNote( const SwPaM& rRange, const String& rTxt,
-                          USHORT nNum, bool bIsEndNote );
+                          sal_uInt16 nNum, bool bIsEndNote );
     virtual ~SwUndoChangeFootNote();
 
     virtual void UndoImpl( ::sw::UndoRedoContext & );
diff --git a/sw/source/core/inc/UndoCore.hxx b/sw/source/core/inc/UndoCore.hxx
index ce91ef0580..41e89dcdd5 100644
--- a/sw/source/core/inc/UndoCore.hxx
+++ b/sw/source/core/inc/UndoCore.hxx
@@ -171,14 +171,14 @@ class SwUndoSetFlyFmt : public SwUndo, public SwClient
     SwFrmFmt* pOldFmt;                  // die alte Fly Vorlage
     SwFrmFmt* pNewFmt;                  // die neue Fly Vorlage
     SfxItemSet* pItemSet;               // die zurueck-/ gesetzten Attribute
-    ULONG nOldNode, nNewNode;
+    sal_uLong nOldNode, nNewNode;
     xub_StrLen nOldCntnt, nNewCntnt;
-    USHORT nOldAnchorTyp, nNewAnchorTyp;
-    BOOL bAnchorChgd;
+    sal_uInt16 nOldAnchorTyp, nNewAnchorTyp;
+    sal_Bool bAnchorChgd;
 
-    void PutAttr( USHORT nWhich, const SfxPoolItem* pItem );
+    void PutAttr( sal_uInt16 nWhich, const SfxPoolItem* pItem );
     void Modify( SfxPoolItem*, SfxPoolItem* );
-    void GetAnchor( SwFmtAnchor& rAnhor, ULONG nNode, xub_StrLen nCntnt );
+    void GetAnchor( SwFmtAnchor& rAnhor, sal_uLong nNode, xub_StrLen nCntnt );
 
 public:
     SwUndoSetFlyFmt( SwFrmFmt& rFlyFmt, SwFrmFmt& rNewFrmFmt );
diff --git a/sw/source/core/inc/UndoDelete.hxx b/sw/source/core/inc/UndoDelete.hxx
index e8be65ef11..7bdfb79c63 100644
--- a/sw/source/core/inc/UndoDelete.hxx
+++ b/sw/source/core/inc/UndoDelete.hxx
@@ -55,26 +55,26 @@ class SwUndoDelete
 
     String sTableName;
 
-    ULONG nNode;
-    ULONG nNdDiff;           // difference of Nodes before/after Delete
-    ULONG nSectDiff;         // diff. of Nodes before/after Move w/ SectionNodes
-    ULONG nReplaceDummy;     // diff. to a temporary dummy object
-    USHORT nSetPos;
-
-    BOOL bGroup : 1;         // TRUE: is already Grouped; see CanGrouping()
-    BOOL bBackSp : 1;        // TRUE: if Grouped and preceding content deleted
-    BOOL bJoinNext: 1;       // TRUE: if range is selected forwards
-    BOOL bTblDelLastNd : 1;  // TRUE: TextNode following Table inserted/deleted
-    BOOL bDelFullPara : 1;   // TRUE: entire Nodes were deleted
-    BOOL bResetPgDesc : 1;   // TRUE: reset PgDsc on following node
-    BOOL bResetPgBrk : 1;    // TRUE: reset PgBreak on following node
-    BOOL bFromTableCopy : 1; // TRUE: called by SwUndoTblCpyTbl
-
-    BOOL SaveCntnt( const SwPosition* pStt, const SwPosition* pEnd,
+    sal_uLong nNode;
+    sal_uLong nNdDiff;           // difference of Nodes before/after Delete
+    sal_uLong nSectDiff;         // diff. of Nodes before/after Move w/ SectionNodes
+    sal_uLong nReplaceDummy;     // diff. to a temporary dummy object
+    sal_uInt16 nSetPos;
+
+    sal_Bool bGroup : 1;         // TRUE: is already Grouped; see CanGrouping()
+    sal_Bool bBackSp : 1;        // TRUE: if Grouped and preceding content deleted
+    sal_Bool bJoinNext: 1;       // TRUE: if range is selected forwards
+    sal_Bool bTblDelLastNd : 1;  // TRUE: TextNode following Table inserted/deleted
+    sal_Bool bDelFullPara : 1;   // TRUE: entire Nodes were deleted
+    sal_Bool bResetPgDesc : 1;   // TRUE: reset PgDsc on following node
+    sal_Bool bResetPgBrk : 1;    // TRUE: reset PgBreak on following node
+    sal_Bool bFromTableCopy : 1; // TRUE: called by SwUndoTblCpyTbl
+
+    sal_Bool SaveCntnt( const SwPosition* pStt, const SwPosition* pEnd,
                     SwTxtNode* pSttTxtNd, SwTxtNode* pEndTxtNd );
 public:
     SwUndoDelete( SwPaM&,
-            BOOL bFullPara = FALSE, BOOL bCalledByTblCpy = FALSE );
+            sal_Bool bFullPara = sal_False, sal_Bool bCalledByTblCpy = sal_False );
     virtual ~SwUndoDelete();
 
     virtual void UndoImpl( ::sw::UndoRedoContext & );
@@ -95,18 +95,18 @@ public:
     */
     virtual SwRewriter GetRewriter() const;
 
-    BOOL CanGrouping( SwDoc*, const SwPaM& );
+    sal_Bool CanGrouping( SwDoc*, const SwPaM& );
 
-    void SetTblDelLastNd()      { bTblDelLastNd = TRUE; }
+    void SetTblDelLastNd()      { bTblDelLastNd = sal_True; }
 
     // for PageDesc/PageBreak Attributes of a table
-    void SetPgBrkFlags( BOOL bPageBreak, BOOL bPageDesc )
+    void SetPgBrkFlags( sal_Bool bPageBreak, sal_Bool bPageDesc )
         { bResetPgDesc = bPageDesc; bResetPgBrk = bPageBreak; }
 
     void SetTableName(const String & rName);
 
     // SwUndoTblCpyTbl needs this information:
-    BOOL IsDelFullPara() const { return bDelFullPara; }
+    sal_Bool IsDelFullPara() const { return bDelFullPara; }
 
     DECL_FIXEDMEMPOOL_NEWDEL(SwUndoDelete)
 };
diff --git a/sw/source/core/inc/UndoDraw.hxx b/sw/source/core/inc/UndoDraw.hxx
index 1407266279..9d490901c0 100644
--- a/sw/source/core/inc/UndoDraw.hxx
+++ b/sw/source/core/inc/UndoDraw.hxx
@@ -64,18 +64,18 @@ public:
 class SwUndoDrawGroup : public SwUndo
 {
     SwUndoGroupObjImpl* pObjArr;
-    USHORT nSize;
-    BOOL bDelFmt;
+    sal_uInt16 nSize;
+    sal_Bool bDelFmt;
 
 public:
-    SwUndoDrawGroup( USHORT nCnt );
+    SwUndoDrawGroup( sal_uInt16 nCnt );
 
     virtual ~SwUndoDrawGroup();
 
     virtual void UndoImpl( ::sw::UndoRedoContext & );
     virtual void RedoImpl( ::sw::UndoRedoContext & );
 
-    void AddObj( USHORT nPos, SwDrawFrmFmt*, SdrObject* );
+    void AddObj( sal_uInt16 nPos, SwDrawFrmFmt*, SdrObject* );
     void SetGroupFmt( SwDrawFrmFmt* );
 };
 
@@ -94,8 +94,8 @@ public:
 class SwUndoDrawUnGroup : public SwUndo
 {
     SwUndoGroupObjImpl* pObjArr;
-    USHORT nSize;
-    BOOL bDelFmt;
+    sal_uInt16 nSize;
+    sal_Bool bDelFmt;
 
 public:
     SwUndoDrawUnGroup( SdrObjGroup* );
@@ -105,7 +105,7 @@ public:
     virtual void UndoImpl( ::sw::UndoRedoContext & );
     virtual void RedoImpl( ::sw::UndoRedoContext & );
 
-    void AddObj( USHORT nPos, SwDrawFrmFmt* );
+    void AddObj( sal_uInt16 nPos, SwDrawFrmFmt* );
 };
 
 // --> OD 2006-11-01 #130889#
@@ -132,18 +132,18 @@ class SwUndoDrawDelete : public SwUndo
 {
     SwUndoGroupObjImpl* pObjArr;
     SdrMarkList* pMarkLst;  // MarkList for all selected SdrObjects
-    USHORT nSize;
-    BOOL bDelFmt;
+    sal_uInt16 nSize;
+    sal_Bool bDelFmt;
 
 public:
-    SwUndoDrawDelete( USHORT nCnt );
+    SwUndoDrawDelete( sal_uInt16 nCnt );
 
     virtual ~SwUndoDrawDelete();
 
     virtual void UndoImpl( ::sw::UndoRedoContext & );
     virtual void RedoImpl( ::sw::UndoRedoContext & );
 
-    void AddObj( USHORT nPos, SwDrawFrmFmt*, const SdrMark& );
+    void AddObj( sal_uInt16 nPos, SwDrawFrmFmt*, const SdrMark& );
 };
 
 #endif // SW_UNDO_DRAW_HXX
diff --git a/sw/source/core/inc/UndoInsert.hxx b/sw/source/core/inc/UndoInsert.hxx
index 085ce702fc..a39ba329fd 100644
--- a/sw/source/core/inc/UndoInsert.hxx
+++ b/sw/source/core/inc/UndoInsert.hxx
@@ -47,16 +47,16 @@ class SwUndoInsert: public SwUndo, private SwUndoSaveCntnt
     SwPosition *pPos;                   // Inhalt fuers Redo
     String *pTxt, *pUndoTxt;
     SwRedlineData* pRedlData;
-    ULONG nNode;
+    sal_uLong nNode;
     xub_StrLen nCntnt, nLen;
-    BOOL bIsWordDelim : 1;
-    BOOL bIsAppend : 1;
+    sal_Bool bIsWordDelim : 1;
+    sal_Bool bIsAppend : 1;
 
     const IDocumentContentOperations::InsertFlags m_nInsertFlags;
 
     friend class SwDoc;     // eigentlich nur SwDoc::Insert( String )
-    BOOL CanGrouping( sal_Unicode cIns );
-    BOOL CanGrouping( const SwPosition& rPos );
+    sal_Bool CanGrouping( sal_Unicode cIns );
+    sal_Bool CanGrouping( const SwPosition& rPos );
 
     SwDoc * pDoc;
 
@@ -66,7 +66,7 @@ class SwUndoInsert: public SwUndo, private SwUndoSaveCntnt
 public:
     SwUndoInsert( const SwNodeIndex& rNode, xub_StrLen nCntnt, xub_StrLen nLen,
                   const IDocumentContentOperations::InsertFlags nInsertFlags,
-                  BOOL bWDelim = TRUE );
+                  sal_Bool bWDelim = sal_True );
     SwUndoInsert( const SwNodeIndex& rNode );
     virtual ~SwUndoInsert();
 
@@ -96,7 +96,7 @@ public:
 //--------------------------------------------------------------------
 
 SwRewriter SW_DLLPRIVATE
-MakeUndoReplaceRewriter(ULONG const ocurrences,
+MakeUndoReplaceRewriter(sal_uLong const ocurrences,
     ::rtl::OUString const& sOld, ::rtl::OUString const& sNew);
 
 class SwUndoReplace
@@ -147,8 +147,8 @@ class SwUndoReRead : public SwUndo
 {
     Graphic *pGrf;
     String *pNm, *pFltr;
-    ULONG nPos;
-    USHORT nMirr;
+    sal_uLong nPos;
+    sal_uInt16 nMirr;
 
     void SaveGraphicData( const SwGrfNode& );
     void SetAndSave( ::sw::UndoRedoContext & );
@@ -175,7 +175,7 @@ class SwUndoInsertLabel : public SwUndo
         struct {
             // fuer Tabelle/TextRahmen
             SwUndoDelete* pUndoInsNd;
-            ULONG nNode;
+            sal_uLong nNode;
         } NODE;
     };
 
@@ -186,12 +186,12 @@ class SwUndoInsertLabel : public SwUndo
     String sNumberSeparator;
     String sCharacterStyle;
     // OD 2004-04-15 #i26791# - re-store of drawing object position no longer needed
-    USHORT nFldId;
+    sal_uInt16 nFldId;
     SwLabelType eType;
-    BYTE nLayerId;              // fuer Zeichen-Objekte
-    BOOL bBefore        :1;
-    BOOL bUndoKeep      :1;
-    BOOL bCpyBrd        :1;
+    sal_uInt8 nLayerId;              // fuer Zeichen-Objekte
+    sal_Bool bBefore        :1;
+    sal_Bool bUndoKeep      :1;
+    sal_Bool bCpyBrd        :1;
 
 public:
     SwUndoInsertLabel( const SwLabelType eTyp, const String &rText,
@@ -199,9 +199,9 @@ public:
                         const String& rSeparator,
     // <--
                         const String& rNumberSeparator, //#i61007# order of captions
-                        const BOOL bBefore, const USHORT nId,
+                        const sal_Bool bBefore, const sal_uInt16 nId,
                         const String& rCharacterStyle,
-                        const BOOL bCpyBrd );
+                        const sal_Bool bCpyBrd );
     virtual ~SwUndoInsertLabel();
 
     virtual void UndoImpl( ::sw::UndoRedoContext & );
@@ -223,12 +223,12 @@ public:
      */
     virtual SwRewriter GetRewriter() const;
 
-    void SetNodePos( ULONG nNd )
+    void SetNodePos( sal_uLong nNd )
         { if( LTYPE_OBJECT != eType ) NODE.nNode = nNd; }
 
-    void SetUndoKeep()  { bUndoKeep = TRUE; }
+    void SetUndoKeep()  { bUndoKeep = sal_True; }
     void SetFlys( SwFrmFmt& rOldFly, SfxItemSet& rChgSet, SwFrmFmt& rNewFly );
-    void SetDrawObj( BYTE nLayerId );
+    void SetDrawObj( sal_uInt8 nLayerId );
 };
 
 #endif // SW_UNDO_INSERT_HXX
diff --git a/sw/source/core/inc/UndoNumbering.hxx b/sw/source/core/inc/UndoNumbering.hxx
index 462bd7fae3..8680dcaa3e 100644
--- a/sw/source/core/inc/UndoNumbering.hxx
+++ b/sw/source/core/inc/UndoNumbering.hxx
@@ -49,10 +49,10 @@ class SwUndoInsNum : public SwUndo, private SwUndRng
 {
     SwNumRule aNumRule;
     SwHistory* pHistory;
-    ULONG nSttSet;
+    sal_uLong nSttSet;
     SwNumRule* pOldNumRule;
     String sReplaceRule;
-    USHORT nLRSavePos;
+    sal_uInt16 nLRSavePos;
 public:
     SwUndoInsNum( const SwPaM& rPam, const SwNumRule& rRule );
     SwUndoInsNum( const SwNumRule& rOldRule, const SwNumRule& rNewRule,
@@ -69,7 +69,7 @@ public:
     virtual SwRewriter GetRewriter() const;
 
     SwHistory* GetHistory(); // will be created if necessary
-    void SetSttNum( ULONG nNdIdx ) { nSttSet = nNdIdx; }
+    void SetSttNum( sal_uLong nNdIdx ) { nSttSet = nNdIdx; }
     void SaveOldNumRule( const SwNumRule& rOld );
 
     void SetLRSpaceEndPos();
@@ -91,23 +91,23 @@ public:
     virtual void RedoImpl( ::sw::UndoRedoContext & );
     virtual void RepeatImpl( ::sw::RepeatContext & );
 
-    void AddNode( const SwTxtNode& rNd, BOOL bResetLRSpace );
+    void AddNode( const SwTxtNode& rNd, sal_Bool bResetLRSpace );
     SwHistory* GetHistory() { return pHistory; }
 
 };
 
 class SwUndoMoveNum : public SwUndo, private SwUndRng
 {
-    ULONG nNewStt;
+    sal_uLong nNewStt;
     long nOffset;
 public:
-    SwUndoMoveNum( const SwPaM& rPam, long nOffset, BOOL bIsOutlMv = FALSE );
+    SwUndoMoveNum( const SwPaM& rPam, long nOffset, sal_Bool bIsOutlMv = sal_False );
 
     virtual void UndoImpl( ::sw::UndoRedoContext & );
     virtual void RedoImpl( ::sw::UndoRedoContext & );
     virtual void RepeatImpl( ::sw::RepeatContext & );
 
-    void SetStartNode( ULONG nValue ) { nNewStt = nValue; }
+    void SetStartNode( sal_uLong nValue ) { nNewStt = nValue; }
 };
 
 class SwUndoNumUpDown : public SwUndo, private SwUndRng
@@ -123,12 +123,12 @@ public:
 
 class SwUndoNumOrNoNum : public SwUndo
 {
-    ULONG nIdx;
-    BOOL mbNewNum, mbOldNum;
+    sal_uLong nIdx;
+    sal_Bool mbNewNum, mbOldNum;
 
 public:
-    SwUndoNumOrNoNum( const SwNodeIndex& rIdx, BOOL mbOldNum,
-                      BOOL mbNewNum );
+    SwUndoNumOrNoNum( const SwNodeIndex& rIdx, sal_Bool mbOldNum,
+                      sal_Bool mbNewNum );
 
     virtual void UndoImpl( ::sw::UndoRedoContext & );
     virtual void RedoImpl( ::sw::UndoRedoContext & );
@@ -137,13 +137,13 @@ public:
 
 class SwUndoNumRuleStart : public SwUndo
 {
-    ULONG nIdx;
-    USHORT nOldStt, nNewStt;
-    BOOL bSetSttValue : 1;
-    BOOL bFlag : 1;
+    sal_uLong nIdx;
+    sal_uInt16 nOldStt, nNewStt;
+    sal_Bool bSetSttValue : 1;
+    sal_Bool bFlag : 1;
 public:
-    SwUndoNumRuleStart( const SwPosition& rPos, BOOL bDelete );
-    SwUndoNumRuleStart( const SwPosition& rPos, USHORT nStt );
+    SwUndoNumRuleStart( const SwPosition& rPos, sal_Bool bDelete );
+    SwUndoNumRuleStart( const SwPosition& rPos, sal_uInt16 nStt );
 
     virtual void UndoImpl( ::sw::UndoRedoContext & );
     virtual void RedoImpl( ::sw::UndoRedoContext & );
diff --git a/sw/source/core/inc/UndoOverwrite.hxx b/sw/source/core/inc/UndoOverwrite.hxx
index c144ab6518..151de9b344 100644
--- a/sw/source/core/inc/UndoOverwrite.hxx
+++ b/sw/source/core/inc/UndoOverwrite.hxx
@@ -45,10 +45,10 @@ class SwUndoOverwrite: public SwUndo, private SwUndoSaveCntnt
 {
     String aDelStr, aInsStr;
     SwRedlineSaveDatas* pRedlSaveData;
-    ULONG nSttNode;
+    sal_uLong nSttNode;
     xub_StrLen nSttCntnt;
-    BOOL bInsChar : 1;  // no Overwrite, but Insert
-    BOOL bGroup : 1;    // TRUE: is already grouped; evaluated in CanGrouping()
+    sal_Bool bInsChar : 1;  // no Overwrite, but Insert
+    sal_Bool bGroup : 1;    // TRUE: is already grouped; evaluated in CanGrouping()
 
 public:
     SwUndoOverwrite( SwDoc*, SwPosition&, sal_Unicode cIns );
@@ -73,7 +73,7 @@ public:
      */
     virtual SwRewriter GetRewriter() const;
 
-    BOOL CanGrouping( SwDoc*, SwPosition&, sal_Unicode cIns );
+    sal_Bool CanGrouping( SwDoc*, SwPosition&, sal_Unicode cIns );
 };
 
 //--------------------------------------------------------------------
@@ -98,7 +98,7 @@ public:
 
     void AddChanges( SwTxtNode& rTNd, xub_StrLen nStart, xub_StrLen nLen,
                      ::com::sun::star::uno::Sequence <sal_Int32>& rOffsets );
-    BOOL HasData() const { return aChanges.size() > 0; }
+    sal_Bool HasData() const { return aChanges.size() > 0; }
 };
 
 #endif // SW_UNDO_OVERWRITE_HXX
diff --git a/sw/source/core/inc/UndoRedline.hxx b/sw/source/core/inc/UndoRedline.hxx
index 520b20b2b4..57b0df0867 100644
--- a/sw/source/core/inc/UndoRedline.hxx
+++ b/sw/source/core/inc/UndoRedline.hxx
@@ -45,7 +45,7 @@ protected:
     SwRedlineData* pRedlData;
     SwRedlineSaveDatas* pRedlSaveData;
     SwUndoId nUserId;
-    BOOL bHiddenRedlines;
+    sal_Bool bHiddenRedlines;
 
     virtual void UndoRedlineImpl(SwDoc & rDoc, SwPaM & rPam);
     virtual void RedoRedlineImpl(SwDoc & rDoc, SwPaM & rPam);
@@ -59,14 +59,14 @@ public:
     virtual void RedoImpl( ::sw::UndoRedoContext & );
 
     SwUndoId GetUserId() const { return nUserId; }
-    USHORT GetRedlSaveCount() const;
+    sal_uInt16 GetRedlSaveCount() const;
 };
 
 class SwUndoRedlineDelete : public SwUndoRedline
 {
-    BOOL bCanGroup : 1;
-    BOOL bIsDelim : 1;
-    BOOL bIsBackspace : 1;
+    sal_Bool bCanGroup : 1;
+    sal_Bool bIsDelim : 1;
+    sal_Bool bIsBackspace : 1;
 
     virtual void UndoRedlineImpl(SwDoc & rDoc, SwPaM & rPam);
     virtual void RedoRedlineImpl(SwDoc & rDoc, SwPaM & rPam);
@@ -74,7 +74,7 @@ class SwUndoRedlineDelete : public SwUndoRedline
 public:
     SwUndoRedlineDelete( const SwPaM& rRange, SwUndoId nUserId = UNDO_EMPTY );
 
-    BOOL CanGrouping( const SwUndoRedlineDelete& rPrev );
+    sal_Bool CanGrouping( const SwUndoRedlineDelete& rPrev );
 
     // SwUndoTblCpyTbl needs this information:
     long NodeDiff() const { return nSttNode - nEndNode; }
@@ -84,7 +84,7 @@ public:
 class SwUndoRedlineSort : public SwUndoRedline
 {
     SwSortOptions* pOpt;
-    ULONG nSaveEndNode, nOffset;
+    sal_uLong nSaveEndNode, nOffset;
     xub_StrLen nSaveEndCntnt;
 
     virtual void UndoRedlineImpl(SwDoc & rDoc, SwPaM & rPam);
@@ -130,9 +130,9 @@ class SwUndoCompDoc : public SwUndo, public SwUndRng
     SwRedlineData* pRedlData;
     SwUndoDelete* pUnDel, *pUnDel2;
     SwRedlineSaveDatas* pRedlSaveData;
-    BOOL bInsert;
+    sal_Bool bInsert;
 public:
-    SwUndoCompDoc( const SwPaM& rRg, BOOL bIns );
+    SwUndoCompDoc( const SwPaM& rRg, sal_Bool bIns );
     SwUndoCompDoc( const SwRedline& rRedl );
 
     virtual ~SwUndoCompDoc();
diff --git a/sw/source/core/inc/UndoSection.hxx b/sw/source/core/inc/UndoSection.hxx
index a93715f2f1..bc6c8dd9fb 100644
--- a/sw/source/core/inc/UndoSection.hxx
+++ b/sw/source/core/inc/UndoSection.hxx
@@ -52,12 +52,12 @@ private:
     const ::std::auto_ptr<SfxItemSet> m_pAttrSet;
     ::std::auto_ptr<SwHistory> m_pHistory;
     ::std::auto_ptr<SwRedlineData> m_pRedlData;
-    ULONG m_nSectionNodePos;
+    sal_uLong m_nSectionNodePos;
     bool m_bSplitAtStart : 1;
     bool m_bSplitAtEnd : 1;
     bool m_bUpdateFtn : 1;
 
-    void Join( SwDoc& rDoc, ULONG nNode );
+    void Join( SwDoc& rDoc, sal_uLong nNode );
 
 public:
     SwUndoInsSection(SwPaM const&, SwSectionData const&,
@@ -69,7 +69,7 @@ public:
     virtual void RedoImpl( ::sw::UndoRedoContext & );
     virtual void RepeatImpl( ::sw::RepeatContext & );
 
-    void SetSectNdPos(ULONG const nPos)     { m_nSectionNodePos = nPos; }
+    void SetSectNdPos(sal_uLong const nPos)     { m_nSectionNodePos = nPos; }
     void SaveSplitNode(SwTxtNode *const pTxtNd, bool const bAtStart);
     void SetUpdtFtnFlag(bool const bFlag)   { m_bUpdateFtn = bFlag; }
 };
diff --git a/sw/source/core/inc/UndoSort.hxx b/sw/source/core/inc/UndoSort.hxx
index b89ae502f7..b1cab7246a 100644
--- a/sw/source/core/inc/UndoSort.hxx
+++ b/sw/source/core/inc/UndoSort.hxx
@@ -44,8 +44,8 @@ struct SwSortUndoElement
 {
     union {
         struct {
-            ULONG nKenn;
-            ULONG nSource, nTarget;
+            sal_uLong nKenn;
+            sal_uLong nSource, nTarget;
         } TXT;
         struct {
             String *pSource, *pTarget;
@@ -57,7 +57,7 @@ struct SwSortUndoElement
         SORT_TXT_TBL.TBL.pSource = new String( aS );
         SORT_TXT_TBL.TBL.pTarget = new String( aT );
     }
-    SwSortUndoElement( ULONG nS, ULONG nT )
+    SwSortUndoElement( sal_uLong nS, sal_uLong nT )
     {
         SORT_TXT_TBL.TXT.nSource = nS;
         SORT_TXT_TBL.TXT.nTarget = nT;
@@ -75,12 +75,12 @@ class SwUndoSort : public SwUndo, private SwUndRng
     SwSortList      aSortList;
     SwUndoAttrTbl*  pUndoTblAttr;
     SwRedlineData*  pRedlData;
-    ULONG           nTblNd;
+    sal_uLong           nTblNd;
 
 public:
     SwUndoSort( const SwPaM&, const SwSortOptions& );
-    SwUndoSort( ULONG nStt, ULONG nEnd, const SwTableNode&,
-                const SwSortOptions&, BOOL bSaveTable );
+    SwUndoSort( sal_uLong nStt, sal_uLong nEnd, const SwTableNode&,
+                const SwSortOptions&, sal_Bool bSaveTable );
 
     virtual ~SwUndoSort();
 
@@ -89,7 +89,7 @@ public:
     virtual void RepeatImpl( ::sw::RepeatContext & );
 
     void Insert( const String& rOrgPos, const String& rNewPos );
-    void Insert( ULONG nOrgPos, ULONG nNewPos );
+    void Insert( sal_uLong nOrgPos, sal_uLong nNewPos );
 
 };
 
diff --git a/sw/source/core/inc/UndoSplitMove.hxx b/sw/source/core/inc/UndoSplitMove.hxx
index 3f6966a871..f58e71517f 100644
--- a/sw/source/core/inc/UndoSplitMove.hxx
+++ b/sw/source/core/inc/UndoSplitMove.hxx
@@ -35,13 +35,13 @@ class SwUndoSplitNode: public SwUndo
 {
     SwHistory* pHistory;
     SwRedlineData* pRedlData;
-    ULONG nNode;
+    sal_uLong nNode;
     xub_StrLen nCntnt;
-    BOOL bTblFlag : 1;
-    BOOL bChkTblStt : 1;
+    sal_Bool bTblFlag : 1;
+    sal_Bool bChkTblStt : 1;
 
 public:
-    SwUndoSplitNode( SwDoc* pDoc, const SwPosition& rPos, BOOL bChkTbl );
+    SwUndoSplitNode( SwDoc* pDoc, const SwPosition& rPos, sal_Bool bChkTbl );
 
     virtual ~SwUndoSplitNode();
 
@@ -49,7 +49,7 @@ public:
     virtual void RedoImpl( ::sw::UndoRedoContext & );
     virtual void RepeatImpl( ::sw::RepeatContext & );
 
-    void SetTblFlag()       { bTblFlag = TRUE; }
+    void SetTblFlag()       { bTblFlag = sal_True; }
 };
 
 
@@ -58,12 +58,12 @@ class SwUndoMove : public SwUndo, private SwUndRng, private SwUndoSaveCntnt
     // nDest.. - destination range of move (after move!)
     // nIns..  - source Position of move (after move!)
     // nMv..   - destination position of move (before move!); for REDO
-    ULONG nDestSttNode, nDestEndNode, nInsPosNode, nMvDestNode;
+    sal_uLong nDestSttNode, nDestEndNode, nInsPosNode, nMvDestNode;
     xub_StrLen nDestSttCntnt, nDestEndCntnt, nInsPosCntnt, nMvDestCntnt;
 
-    USHORT nFtnStt; // StartPos of Footnotes in History
+    sal_uInt16 nFtnStt; // StartPos of Footnotes in History
 
-    BOOL bJoinNext : 1,
+    sal_Bool bJoinNext : 1,
          bJoinPrev : 1,
          bMoveRange : 1;
 
@@ -79,13 +79,13 @@ public:
     virtual void RedoImpl( ::sw::UndoRedoContext & );
 
     /// set the destination range after the move
-    void SetDestRange( const SwPaM&, const SwPosition&, BOOL, BOOL );
+    void SetDestRange( const SwPaM&, const SwPosition&, sal_Bool, sal_Bool );
     void SetDestRange( const SwNodeIndex& rStt, const SwNodeIndex& rEnd,
                         const SwNodeIndex& rInsPos );
 
-    BOOL IsMoveRange() const        { return bMoveRange; }
-    ULONG GetEndNode() const        { return nEndNode; }
-    ULONG GetDestSttNode() const    { return nDestSttNode; }
+    sal_Bool IsMoveRange() const        { return bMoveRange; }
+    sal_uLong GetEndNode() const        { return nEndNode; }
+    sal_uLong GetDestSttNode() const    { return nDestSttNode; }
     xub_StrLen GetDestSttCntnt() const  { return nDestSttCntnt; }
 
     void SetMoveRedlines( bool b )       { bMoveRedlines = b; }
diff --git a/sw/source/core/inc/UndoTable.hxx b/sw/source/core/inc/UndoTable.hxx
index 87246417b5..40032e9dfa 100644
--- a/sw/source/core/inc/UndoTable.hxx
+++ b/sw/source/core/inc/UndoTable.hxx
@@ -69,13 +69,13 @@ class SwUndoInsTbl : public SwUndo
     SvUShorts* pColWidth;
     SwRedlineData*  pRedlData;
     SwTableAutoFmt* pAutoFmt;
-    ULONG nSttNode;
-    USHORT nRows, nCols;
-    USHORT nAdjust;
+    sal_uLong nSttNode;
+    sal_uInt16 nRows, nCols;
+    sal_uInt16 nAdjust;
 
 public:
-    SwUndoInsTbl( const SwPosition&, USHORT nCols, USHORT nRows,
-                    USHORT eAdjust, const SwInsertTableOptions& rInsTblOpts,
+    SwUndoInsTbl( const SwPosition&, sal_uInt16 nCols, sal_uInt16 nRows,
+                    sal_uInt16 eAdjust, const SwInsertTableOptions& rInsTblOpts,
                     const SwTableAutoFmt* pTAFmt, const SvUShorts* pColArr,
                   const String & rName);
 
@@ -97,12 +97,12 @@ class SwUndoTxtToTbl : public SwUndo, public SwUndRng
     SwTableAutoFmt* pAutoFmt;
     SwHistory* pHistory;
     sal_Unicode cTrenner;
-    USHORT nAdjust;
-    BOOL bSplitEnd : 1;
+    sal_uInt16 nAdjust;
+    sal_Bool bSplitEnd : 1;
 
 public:
     SwUndoTxtToTbl( const SwPaM&, const SwInsertTableOptions&, sal_Unicode,
-                    USHORT,
+                    sal_uInt16,
                     const SwTableAutoFmt* pAFmt );
 
     virtual ~SwUndoTxtToTbl();
@@ -123,11 +123,11 @@ class SwUndoTblToTxt : public SwUndo
     _SaveTable* pTblSave;
     SwTblToTxtSaves* pBoxSaves;
     SwHistory* pHistory;
-    ULONG nSttNd, nEndNd;
-    USHORT nAdjust;
+    sal_uLong nSttNd, nEndNd;
+    sal_uInt16 nAdjust;
     sal_Unicode cTrenner;
-    USHORT nHdlnRpt;
-    BOOL bCheckNumFmt : 1;
+    sal_uInt16 nHdlnRpt;
+    sal_Bool bCheckNumFmt : 1;
 
 public:
     SwUndoTblToTxt( const SwTable& rTbl, sal_Unicode cCh );
@@ -139,17 +139,17 @@ public:
     virtual void RepeatImpl( ::sw::RepeatContext & );
 
     void SetRange( const SwNodeRange& );
-    void AddBoxPos( SwDoc& rDoc, ULONG nNdIdx, ULONG nEndIdx,
+    void AddBoxPos( SwDoc& rDoc, sal_uLong nNdIdx, sal_uLong nEndIdx,
                     xub_StrLen nCntntIdx = STRING_MAXLEN);
 };
 
 class SwUndoAttrTbl : public SwUndo
 {
-    ULONG nSttNode;
+    sal_uLong nSttNode;
     _SaveTable* pSaveTbl;
-    BOOL bClearTabCol : 1;
+    sal_Bool bClearTabCol : 1;
 public:
-    SwUndoAttrTbl( const SwTableNode& rTblNd, BOOL bClearTabCols = FALSE );
+    SwUndoAttrTbl( const SwTableNode& rTblNd, sal_Bool bClearTabCols = sal_False );
 
     virtual ~SwUndoAttrTbl();
 
@@ -161,10 +161,10 @@ class SwUndoTblNumFmt;
 
 class SwUndoTblAutoFmt : public SwUndo
 {
-    ULONG nSttNode;
+    sal_uLong nSttNode;
     _SaveTable* pSaveTbl;
     ::std::vector< ::boost::shared_ptr<SwUndoTblNumFmt> > m_Undos;
-    BOOL bSaveCntntAttr;
+    sal_Bool bSaveCntntAttr;
 
     void UndoRedo(bool const bUndo, ::sw::UndoRedoContext & rContext);
 
@@ -190,16 +190,16 @@ class SwUndoTblNdsChg : public SwUndo
     } Ptrs;
     SvBools aMvBoxes;       // for SplitRow (split Nodes of Box)
     long nMin, nMax;        // for redo of delete column
-    ULONG nSttNode, nCurrBox;
-    USHORT nCount, nRelDiff, nAbsDiff, nSetColType;
-    BOOL bFlag;
-    BOOL bSameHeight;                   // only used for SplitRow
+    sal_uLong nSttNode, nCurrBox;
+    sal_uInt16 nCount, nRelDiff, nAbsDiff, nSetColType;
+    sal_Bool bFlag;
+    sal_Bool bSameHeight;                   // only used for SplitRow
 public:
     SwUndoTblNdsChg( SwUndoId UndoId,
                     const SwSelBoxes& rBoxes,
                     const SwTableNode& rTblNd,
                     long nMn, long nMx,
-                    USHORT nCnt, BOOL bFlg, BOOL bSameHeight );
+                    sal_uInt16 nCnt, sal_Bool bFlg, sal_Bool bSameHeight );
 
     // for SetColWidth
     SwUndoTblNdsChg( SwUndoId UndoId, const SwSelBoxes& rBoxes,
@@ -217,21 +217,21 @@ public:
     void ReNewBoxes( const SwSelBoxes& rBoxes );
 
 
-    void SetColWidthParam( ULONG nBoxIdx, USHORT nMode, USHORT nType,
+    void SetColWidthParam( sal_uLong nBoxIdx, sal_uInt16 nMode, sal_uInt16 nType,
                             SwTwips nAbsDif, SwTwips nRelDif )
     {
         nCurrBox = nBoxIdx;
         nCount = nMode;
         nSetColType = nType;
-        nAbsDiff = (USHORT)nAbsDif;
-        nRelDiff = (USHORT)nRelDif;
+        nAbsDiff = (sal_uInt16)nAbsDif;
+        nRelDiff = (sal_uInt16)nRelDif;
     }
 
 };
 
 class SwUndoTblMerge : public SwUndo, private SwUndRng
 {
-    ULONG nTblNode;
+    sal_uLong nTblNode;
     _SaveTable* pSaveTbl;
     SvULongs aBoxes, aNewSttNds;
     SwUndoMoves* pMoves;
@@ -249,7 +249,7 @@ public:
 
     void SetSelBoxes( const SwSelBoxes& rBoxes );
 
-    void AddNewBox( ULONG nSttNdIdx )
+    void AddNewBox( sal_uLong nSttNdIdx )
         { aNewSttNds.Insert( nSttNdIdx, aNewSttNds.Count() ); }
 
     void SaveCollection( const SwTableBox& rBox );
@@ -263,14 +263,14 @@ class SwUndoTblNumFmt : public SwUndo
     SwHistory* pHistory;
     String aStr, aNewFml;
 
-    ULONG nFmtIdx, nNewFmtIdx;
+    sal_uLong nFmtIdx, nNewFmtIdx;
     double fNum, fNewNum;
-    ULONG nNode;
-    ULONG nNdPos;
+    sal_uLong nNode;
+    sal_uLong nNdPos;
 
-    BOOL bNewFmt : 1;
-    BOOL bNewFml : 1;
-    BOOL bNewValue : 1;
+    sal_Bool bNewFmt : 1;
+    sal_Bool bNewFml : 1;
+    sal_Bool bNewValue : 1;
 
 public:
     SwUndoTblNumFmt( const SwTableBox& rBox, const SfxItemSet* pNewSet = 0 );
@@ -280,7 +280,7 @@ public:
     virtual void UndoImpl( ::sw::UndoRedoContext & );
     virtual void RedoImpl( ::sw::UndoRedoContext & );
 
-    void SetNumFmt( ULONG nNewNumFmtIdx, const double& rNewNumber )
+    void SetNumFmt( sal_uLong nNewNumFmtIdx, const double& rNewNumber )
             { nFmtIdx = nNewNumFmtIdx; fNum = rNewNumber; }
     void SetBox( const SwTableBox& rBox );
 };
@@ -304,18 +304,18 @@ public:
     virtual void UndoImpl( ::sw::UndoRedoContext & );
     virtual void RedoImpl( ::sw::UndoRedoContext & );
 
-    void AddBoxBefore( const SwTableBox& rBox, BOOL bDelCntnt );
+    void AddBoxBefore( const SwTableBox& rBox, sal_Bool bDelCntnt );
     void AddBoxAfter( const SwTableBox& rBox, const SwNodeIndex& rIdx,
-                BOOL bDelCntnt );
+                sal_Bool bDelCntnt );
 
-    BOOL IsEmpty() const;
-    BOOL InsertRow( SwTable& rTbl, const SwSelBoxes& rBoxes, USHORT nCnt );
+    sal_Bool IsEmpty() const;
+    sal_Bool InsertRow( SwTable& rTbl, const SwSelBoxes& rBoxes, sal_uInt16 nCnt );
 };
 
 class SwUndoCpyTbl : public SwUndo
 {
     SwUndoDelete* pDel;
-    ULONG nTblNode;
+    sal_uLong nTblNode;
 public:
     SwUndoCpyTbl();
 
@@ -324,20 +324,20 @@ public:
     virtual void UndoImpl( ::sw::UndoRedoContext & );
     virtual void RedoImpl( ::sw::UndoRedoContext & );
 
-    void SetTableSttIdx( ULONG nIdx )           { nTblNode = nIdx; }
+    void SetTableSttIdx( sal_uLong nIdx )           { nTblNode = nIdx; }
 };
 
 class SwUndoSplitTbl : public SwUndo
 {
-    ULONG nTblNode, nOffset;
+    sal_uLong nTblNode, nOffset;
     SwSaveRowSpan* mpSaveRowSpan; // stores row span values at the splitting row
     _SaveTable* pSavTbl;
     SwHistory* pHistory;
-    USHORT nMode, nFmlEnd;
-    BOOL bCalcNewSize;
+    sal_uInt16 nMode, nFmlEnd;
+    sal_Bool bCalcNewSize;
 public:
     SwUndoSplitTbl( const SwTableNode& rTblNd, SwSaveRowSpan* pRowSp,
-            USHORT nMode, BOOL bCalcNewSize );
+            sal_uInt16 nMode, sal_Bool bCalcNewSize );
 
     virtual ~SwUndoSplitTbl();
 
@@ -345,7 +345,7 @@ public:
     virtual void RedoImpl( ::sw::UndoRedoContext & );
     virtual void RepeatImpl( ::sw::RepeatContext & );
 
-    void SetTblNodeOffset( ULONG nIdx )     { nOffset = nIdx - nTblNode; }
+    void SetTblNodeOffset( sal_uLong nIdx )     { nOffset = nIdx - nTblNode; }
     SwHistory* GetHistory()                 { return pHistory; }
     void SaveFormula( SwHistory& rHistory );
 };
@@ -353,14 +353,14 @@ public:
 class SwUndoMergeTbl : public SwUndo
 {
     String aName;
-    ULONG nTblNode;
+    sal_uLong nTblNode;
     _SaveTable* pSavTbl, *pSavHdl;
     SwHistory* pHistory;
-    USHORT nMode;
-    BOOL bWithPrev;
+    sal_uInt16 nMode;
+    sal_Bool bWithPrev;
 public:
     SwUndoMergeTbl( const SwTableNode& rTblNd, const SwTableNode& rDelTblNd,
-                    BOOL bWithPrev, USHORT nMode );
+                    sal_Bool bWithPrev, sal_uInt16 nMode );
 
     virtual ~SwUndoMergeTbl();
 
@@ -376,11 +376,11 @@ public:
 
 class SwUndoTblHeadline : public SwUndo
 {
-    ULONG nTblNd;
-    USHORT nOldHeadline;
-    USHORT nNewHeadline;
+    sal_uLong nTblNd;
+    sal_uInt16 nOldHeadline;
+    sal_uInt16 nNewHeadline;
 public:
-    SwUndoTblHeadline( const SwTable&, USHORT nOldHdl,  USHORT nNewHdl );
+    SwUndoTblHeadline( const SwTable&, sal_uInt16 nOldHdl,  sal_uInt16 nNewHdl );
 
     virtual void UndoImpl( ::sw::UndoRedoContext & );
     virtual void RedoImpl( ::sw::UndoRedoContext & );
diff --git a/sw/source/core/inc/viewimp.hxx b/sw/source/core/inc/viewimp.hxx
index 1b635c1f06..c7389af86b 100644
--- a/sw/source/core/inc/viewimp.hxx
+++ b/sw/source/core/inc/viewimp.hxx
@@ -116,8 +116,8 @@ class SwViewImp
     /**
        Returns if printer shall be stopped.
 
-       @retval TRUE The printer shall be stopped.
-       @retval FALSE else
+       @retval sal_True The printer shall be stopped.
+       @retval sal_False else
     */
     sal_Bool IsStopPrt() { return bStopPrt; }
 
diff --git a/sw/source/core/txtnode/txtedt.cxx b/sw/source/core/txtnode/txtedt.cxx
index 05df624f82..62b961e9e7 100644
--- a/sw/source/core/txtnode/txtedt.cxx
+++ b/sw/source/core/txtnode/txtedt.cxx
@@ -806,7 +806,7 @@ sal_Bool SwScanner::NextWord()
             ASSERT( aBound.endPos >= nBegin, "Unexpected aBound result" )
 
             // restrict boundaries to script boundaries and nEndPos
-            const USHORT nCurrScript = pBreakIt->GetBreakIter()->getScriptType( rText, nBegin );
+            const sal_uInt16 nCurrScript = pBreakIt->GetBreakIter()->getScriptType( rText, nBegin );
             XubString aTmpWord = rText.Copy( nBegin, static_cast<xub_StrLen>(aBound.endPos - nBegin) );
             const sal_Int32 nScriptEnd = nBegin +
                 pBreakIt->GetBreakIter()->endOfScript( aTmpWord, 0, nCurrScript );
@@ -829,7 +829,7 @@ sal_Bool SwScanner::NextWord()
         }
         else
         {
-            const USHORT nCurrScript = pBreakIt->GetBreakIter()->getScriptType( rText, aBound.startPos );
+            const sal_uInt16 nCurrScript = pBreakIt->GetBreakIter()->getScriptType( rText, aBound.startPos );
             XubString aTmpWord = rText.Copy( static_cast<xub_StrLen>(aBound.startPos),
                                              static_cast<xub_StrLen>(aBound.endPos - aBound.startPos) );
             const sal_Int32 nScriptEnd = aBound.startPos +
diff --git a/sw/source/core/undo/SwUndoPageDesc.cxx b/sw/source/core/undo/SwUndoPageDesc.cxx
index 540d0ec107..6074fdffd0 100644
--- a/sw/source/core/undo/SwUndoPageDesc.cxx
+++ b/sw/source/core/undo/SwUndoPageDesc.cxx
@@ -376,13 +376,13 @@ void SwUndoPageDescCreate::UndoImpl(::sw::UndoRedoContext &)
     }
     // <- #116530#
 
-    pDoc->DelPageDesc(aNew.GetName(), TRUE);
+    pDoc->DelPageDesc(aNew.GetName(), sal_True);
 }
 
 void SwUndoPageDescCreate::DoImpl()
 {
     SwPageDesc aPageDesc = aNew;
-    pDoc->MakePageDesc(aNew.GetName(), &aPageDesc, FALSE, TRUE); // #116530#
+    pDoc->MakePageDesc(aNew.GetName(), &aPageDesc, sal_False, sal_True); // #116530#
 }
 
 void SwUndoPageDescCreate::RedoImpl(::sw::UndoRedoContext &)
@@ -423,12 +423,12 @@ SwUndoPageDescDelete::~SwUndoPageDescDelete()
 void SwUndoPageDescDelete::UndoImpl(::sw::UndoRedoContext &)
 {
     SwPageDesc aPageDesc = aOld;
-    pDoc->MakePageDesc(aOld.GetName(), &aPageDesc, FALSE, TRUE); // #116530#
+    pDoc->MakePageDesc(aOld.GetName(), &aPageDesc, sal_False, sal_True); // #116530#
 }
 
 void SwUndoPageDescDelete::DoImpl()
 {
-    pDoc->DelPageDesc(aOld.GetName(), TRUE); // #116530#
+    pDoc->DelPageDesc(aOld.GetName(), sal_True); // #116530#
 }
 
 void SwUndoPageDescDelete::RedoImpl(::sw::UndoRedoContext &)
diff --git a/sw/source/core/undo/docundo.cxx b/sw/source/core/undo/docundo.cxx
index 864ef067e2..44370d8a61 100644
--- a/sw/source/core/undo/docundo.cxx
+++ b/sw/source/core/undo/docundo.cxx
@@ -306,7 +306,7 @@ UndoManager::GetLastUndoInfo(
     }
     if (o_pId)
     {
-        USHORT const nId(pAction->GetId());
+        sal_uInt16 const nId(pAction->GetId());
         *o_pId = static_cast<SwUndoId>(nId);
     }
 
@@ -319,8 +319,8 @@ SwUndoComments_t UndoManager::GetUndoComments() const
             "GetUndoComments() called while in list action?");
 
     SwUndoComments_t ret;
-    USHORT const nUndoCount(SfxUndoManager::GetUndoActionCount(TopLevel));
-    for (USHORT n = 0; n < nUndoCount; ++n)
+    sal_uInt16 const nUndoCount(SfxUndoManager::GetUndoActionCount(TopLevel));
+    for (sal_uInt16 n = 0; n < nUndoCount; ++n)
     {
         ::rtl::OUString const comment(
                 SfxUndoManager::GetUndoActionComment(n, TopLevel));
@@ -355,8 +355,8 @@ SwUndoComments_t UndoManager::GetRedoComments() const
             "GetRedoComments() called while in list action?");
 
     SwUndoComments_t ret;
-    USHORT const nRedoCount(SfxUndoManager::GetRedoActionCount(TopLevel));
-    for (USHORT n = 0; n < nRedoCount; ++n)
+    sal_uInt16 const nRedoCount(SfxUndoManager::GetRedoActionCount(TopLevel));
+    for (sal_uInt16 n = 0; n < nRedoCount; ++n)
     {
         ::rtl::OUString const comment(
                 SfxUndoManager::GetRedoActionComment(n, TopLevel));
@@ -552,7 +552,7 @@ UndoManager::Repeat(::sw::RepeatContext & rContext,
 
     ::rtl::OUString const comment(pRepeatAction->GetComment());
     ::rtl::OUString const rcomment(pRepeatAction->GetRepeatComment(rContext));
-    USHORT const nId(pRepeatAction->GetId());
+    sal_uInt16 const nId(pRepeatAction->GetId());
     if (DoesUndo())
     {
         EnterListAction(comment, rcomment, nId);
@@ -560,7 +560,7 @@ UndoManager::Repeat(::sw::RepeatContext & rContext,
 
     SwPaM *const pFirstCursor(& rContext.GetRepeatPaM());
     do {    // iterate over ring
-        for (USHORT nRptCnt = nRepeatCount; nRptCnt > 0; --nRptCnt)
+        for (sal_uInt16 nRptCnt = nRepeatCount; nRptCnt > 0; --nRptCnt)
         {
             pRepeatAction->Repeat(rContext);
         }
diff --git a/sw/source/core/undo/unattr.cxx b/sw/source/core/undo/unattr.cxx
index 3ff8ae36df..f52ca10961 100644
--- a/sw/source/core/undo/unattr.cxx
+++ b/sw/source/core/undo/unattr.cxx
@@ -717,10 +717,10 @@ void SwUndoResetAttr::RedoImpl(::sw::UndoRedoContext & rContext)
         rDoc.RstTxtAttrs(rPam);
         break;
     case RES_TXTFMTCOLL:
-        rDoc.ResetAttrs(rPam, FALSE, pIdArr );
+        rDoc.ResetAttrs(rPam, sal_False, pIdArr );
         break;
     case RES_CONDTXTFMTCOLL:
-        rDoc.ResetAttrs(rPam, TRUE, pIdArr );
+        rDoc.ResetAttrs(rPam, sal_True, pIdArr );
 
         break;
     case RES_TXTATR_TOXMARK:
diff --git a/sw/source/core/undo/undel.cxx b/sw/source/core/undo/undel.cxx
index 3ee6e6ac2c..d52d5121c4 100644
--- a/sw/source/core/undo/undel.cxx
+++ b/sw/source/core/undo/undel.cxx
@@ -253,7 +253,7 @@ SwUndoDelete::SwUndoDelete( SwPaM& rPam, sal_Bool bFullPara, sal_Bool bCalledByT
                     SwPosition aSplitPos( *pEndTxtNd );
                     ::sw::UndoGuard const ug(pDoc->GetIDocumentUndoRedo());
                     pDoc->SplitNode( aSplitPos, false );
-                    rDocNds._MoveNodes( aMvRg, rDocNds, aRg.aEnd, TRUE );
+                    rDocNds._MoveNodes( aMvRg, rDocNds, aRg.aEnd, sal_True );
                     aRg.aEnd--;
                 }
                 else
@@ -277,7 +277,7 @@ SwUndoDelete::SwUndoDelete( SwPaM& rPam, sal_Bool bFullPara, sal_Bool bCalledByT
                     SwPosition aSplitPos( *pSttTxtNd );
                     ::sw::UndoGuard const ug(pDoc->GetIDocumentUndoRedo());
                     pDoc->SplitNode( aSplitPos, false );
-                    rDocNds._MoveNodes( aMvRg, rDocNds, aRg.aStart, TRUE );
+                    rDocNds._MoveNodes( aMvRg, rDocNds, aRg.aStart, sal_True );
                     aRg.aStart--;
                 }
             }
diff --git a/sw/source/core/undo/undobj.cxx b/sw/source/core/undo/undobj.cxx
index 86c6f5d184..88fceefe76 100644
--- a/sw/source/core/undo/undobj.cxx
+++ b/sw/source/core/undo/undobj.cxx
@@ -273,7 +273,7 @@ void SwUndo::Repeat(SfxRepeatTarget & rContext)
     RepeatImpl(*pRepeatContext);
 }
 
-BOOL SwUndo::CanRepeat(SfxRepeatTarget & rContext) const
+sal_Bool SwUndo::CanRepeat(SfxRepeatTarget & rContext) const
 {
     ::sw::RepeatContext *const pRepeatContext(
             dynamic_cast< ::sw::RepeatContext * >(& rContext));
diff --git a/sw/source/core/undo/unins.cxx b/sw/source/core/undo/unins.cxx
index 26523bf7c2..fece6a38ad 100644
--- a/sw/source/core/undo/unins.cxx
+++ b/sw/source/core/undo/unins.cxx
@@ -483,7 +483,7 @@ class SwUndoReplace::Impl
 {
     ::rtl::OUString m_sOld;
     ::rtl::OUString m_sIns;
-    ULONG m_nSttNd, m_nEndNd, m_nOffset;
+    sal_uLong m_nSttNd, m_nEndNd, m_nOffset;
     xub_StrLen m_nSttCnt, m_nEndCnt, m_nSetPos, m_nSelEnd;
     bool m_bSplitNext : 1;
     bool m_bRegExp : 1;
@@ -529,7 +529,7 @@ void SwUndoReplace::RedoImpl(::sw::UndoRedoContext & rContext)
 }
 
 SwRewriter
-MakeUndoReplaceRewriter(ULONG const occurrences,
+MakeUndoReplaceRewriter(sal_uLong const occurrences,
         ::rtl::OUString const& sOld, ::rtl::OUString const& sNew)
 {
     SwRewriter aResult;
@@ -666,10 +666,10 @@ void SwUndoReplace::Impl::UndoImpl(::sw::UndoRedoContext & rContext)
         pDoc->SetAutoCorrExceptWord( 0 );
     }
 
-    SwIndex aIdx( pNd, USHORT( m_nSttCnt ) );
+    SwIndex aIdx( pNd, sal_uInt16( m_nSttCnt ) );
     if( m_nSttNd == m_nEndNd )
     {
-        pNd->EraseText( aIdx, USHORT( m_sIns.getLength() ) );
+        pNd->EraseText( aIdx, sal_uInt16( m_sIns.getLength() ) );
     }
     else
     {
@@ -978,7 +978,7 @@ void SwUndoInsertLabel::RedoImpl(::sw::UndoRedoContext & rContext)
             SwTableNode *pNd = rDoc.GetNodes()[
                         rDoc.GetNodes()[NODE.nNode-1]->StartOfSectionIndex()]->GetTableNode();
             if ( pNd )
-                pNd->GetTable().GetFrmFmt()->SetFmtAttr( SvxFmtKeepItem(TRUE, RES_KEEP) );
+                pNd->GetTable().GetFrmFmt()->SetFmtAttr( SvxFmtKeepItem(sal_True, RES_KEEP) );
         }
         NODE.pUndoInsNd->UndoImpl(rContext);
         delete NODE.pUndoInsNd, NODE.pUndoInsNd = 0;
diff --git a/sw/source/core/undo/unnum.cxx b/sw/source/core/undo/unnum.cxx
index 68c1b6eb1d..5dcaa71ddd 100644
--- a/sw/source/core/undo/unnum.cxx
+++ b/sw/source/core/undo/unnum.cxx
@@ -312,7 +312,7 @@ void SwUndoMoveNum::RepeatImpl(::sw::RepeatContext & rContext)
     }
     else
     {
-        rDoc.MoveParagraph(rContext.GetRepeatPaM(), nOffset, FALSE);
+        rDoc.MoveParagraph(rContext.GetRepeatPaM(), nOffset, sal_False);
     }
 }
 
diff --git a/sw/source/core/undo/unredln.cxx b/sw/source/core/undo/unredln.cxx
index b27f0ee263..1229d1a88d 100644
--- a/sw/source/core/undo/unredln.cxx
+++ b/sw/source/core/undo/unredln.cxx
@@ -93,7 +93,7 @@ SwUndoRedline::~SwUndoRedline()
     delete pRedlSaveData;
 }
 
-USHORT SwUndoRedline::GetRedlSaveCount() const
+sal_uInt16 SwUndoRedline::GetRedlSaveCount() const
 {
     return pRedlSaveData ? pRedlSaveData->Count() : 0;
 }
@@ -133,7 +133,7 @@ void SwUndoRedline::RedoImpl(::sw::UndoRedoContext & rContext)
     if( pRedlSaveData && bHiddenRedlines )
     {
         sal_uLong nEndExtra = pDoc->GetNodes().GetEndOfExtras().GetIndex();
-        FillSaveData(rPam, *pRedlSaveData, FALSE,
+        FillSaveData(rPam, *pRedlSaveData, sal_False,
                         UNDO_REJECT_REDLINE != nUserId );
 
         nEndExtra -= pDoc->GetNodes().GetEndOfExtras().GetIndex();
diff --git a/sw/source/core/undo/unsort.cxx b/sw/source/core/undo/unsort.cxx
index 2c02347b23..cd8ce4e435 100644
--- a/sw/source/core/undo/unsort.cxx
+++ b/sw/source/core/undo/unsort.cxx
@@ -70,7 +70,7 @@ SwUndoSort::SwUndoSort(const SwPaM& rRg, const SwSortOptions& rOpt)
     pSortOpt = new SwSortOptions(rOpt);
 }
 
-SwUndoSort::SwUndoSort( ULONG nStt, ULONG nEnd, const SwTableNode& rTblNd,
+SwUndoSort::SwUndoSort( sal_uLong nStt, sal_uLong nEnd, const SwTableNode& rTblNd,
                         const SwSortOptions& rOpt, sal_Bool bSaveTable )
     : SwUndo(UNDO_SORT_TBL), pUndoTblAttr( 0 ), pRedlData( 0 )
 {
diff --git a/sw/source/core/undo/untblk.cxx b/sw/source/core/undo/untblk.cxx
index 186295b5a6..c9a6bd590c 100644
--- a/sw/source/core/undo/untblk.cxx
+++ b/sw/source/core/undo/untblk.cxx
@@ -46,7 +46,7 @@
 SwUndoInserts::SwUndoInserts( SwUndoId nUndoId, const SwPaM& rPam )
     : SwUndo( nUndoId ), SwUndRng( rPam ),
     pTxtFmtColl( 0 ), pLastNdColl(0), pFrmFmts( 0 ), pRedlData( 0 ),
-    bSttWasTxtNd( TRUE ), nNdDiff( 0 ), pPos( 0 ), nSetPos( 0 )
+    bSttWasTxtNd( sal_True ), nNdDiff( 0 ), pPos( 0 ), nSetPos( 0 )
 {
     pHistory = new SwHistory;
     SwDoc* pDoc = (SwDoc*)rPam.GetDoc();
@@ -214,7 +214,7 @@ void SwUndoInserts::UndoImpl(::sw::UndoRedoContext & rContext)
 
     if (m_FlyUndos.size())
     {
-        ULONG nTmp = pPam->GetPoint()->nNode.GetIndex();
+        sal_uLong nTmp = pPam->GetPoint()->nNode.GetIndex();
         for (size_t n = m_FlyUndos.size(); 0 < n; --n)
         {
             m_FlyUndos[ n-1 ]->UndoImpl(rContext);
diff --git a/sw/source/filter/ww1/fltshell.cxx b/sw/source/filter/ww1/fltshell.cxx
index 3639917643..5592d5ec8e 100644
--- a/sw/source/filter/ww1/fltshell.cxx
+++ b/sw/source/filter/ww1/fltshell.cxx
@@ -368,7 +368,7 @@ static void MakeBookRegionOrPoint(SwFltStackEntry* pEntry, SwDoc* pDoc,
                     SwPaM& rRegion, sal_Bool bCheck )
 {
     if (pEntry->MakeRegion(pDoc, rRegion, bCheck )){
-//		BOOL b1 = rNds[rRegion.GetPoint()->nNode]->FindTableNode() != 0;
+//		sal_Bool b1 = rNds[rRegion.GetPoint()->nNode]->FindTableNode() != 0;
 //		const SwStartNode* p1 =	rNds[rRegion.GetPoint()->nNode]->FindTableBoxStartNode();
 //		const SwStartNode* p2 = rNds[rRegion.GetMark()->nNode]->FindTableBoxStartNode();
         if (rRegion.GetPoint()->nNode.GetNode().FindTableBoxStartNode()