sal_Bool to bool

Change-Id: Ie04d9314f66bcda8e1c7939248af79a15fbdaaeb

14 files changed, 67 insertions, 68 deletions

diff --git a/sw/inc/undobj.hxx b/sw/inc/undobj.hxx
index 19889a9ee44f..1dcd5caa1882 100644
--- a/sw/inc/undobj.hxx
+++ b/sw/inc/undobj.hxx
@@ -57,12 +57,12 @@ protected:
     mutable OUString * pComment;
 
     void RemoveIdxFromSection( SwDoc&, sal_uLong nSttIdx, sal_uLong* pEndIdx = 0 );
-    void RemoveIdxFromRange( SwPaM& rPam, sal_Bool bMoveNext );
+    void RemoveIdxFromRange( SwPaM& rPam, bool bMoveNext );
     void RemoveIdxRel( sal_uLong, const SwPosition& );
 
-    static sal_Bool CanRedlineGroup( SwRedlineSaveDatas& rCurr,
+    static bool CanRedlineGroup( SwRedlineSaveDatas& rCurr,
                                 const SwRedlineSaveDatas& rCheck,
-                                sal_Bool bCurrIsEnd );
+                                bool bCurrIsEnd );
 
     /**
        Returns the rewriter for this object.
@@ -114,11 +114,11 @@ public:
     bool IsDelBox() const;
 
     // Save and set Redline data.
-    static sal_Bool FillSaveData( const SwPaM& rRange, SwRedlineSaveDatas& rSData,
-                            sal_Bool bDelRange = sal_True );
-    static sal_Bool FillSaveDataForFmt( const SwPaM& , SwRedlineSaveDatas& );
+    static bool FillSaveData( const SwPaM& rRange, SwRedlineSaveDatas& rSData,
+                              bool bDelRange = true );
+    static bool FillSaveDataForFmt( const SwPaM& , SwRedlineSaveDatas& );
     static void SetSaveData( SwDoc& rDoc, const SwRedlineSaveDatas& rSData );
-    static sal_Bool HasHiddenRedlines( const SwRedlineSaveDatas& rSData );
+    static bool HasHiddenRedlines( const SwRedlineSaveDatas& rSData );
 };
 
 typedef sal_uInt16 DelCntntType;
@@ -161,8 +161,8 @@ protected:
     // a range can be spanned for Undo/Redo. (In this case the SPoint
     // is before the manipulated range!!)
     // The flag indicates if there is content before the SPoint.
-    sal_Bool MovePtBackward( SwPaM& rPam );
-    void MovePtForward( SwPaM& rPam, sal_Bool bMvBkwrd );
+    bool MovePtBackward( SwPaM& rPam );
+    void MovePtForward( SwPaM& rPam, bool bMvBkwrd );
 
     // Before moving stuff into UndoNodes-Array care has to be taken that
     // the content-bearing attributes are removed from the nodes-array.
@@ -211,7 +211,7 @@ public:
     SwUndRng( const SwPaM& );
 
     void SetValues( const SwPaM& rPam );
-    void SetPaM( SwPaM&, sal_Bool bCorrToCntnt = sal_False ) const;
+    void SetPaM( SwPaM&, bool bCorrToCntnt = false ) const;
     SwPaM & AddUndoRedoPaM(
         ::sw::UndoRedoContext &, bool const bCorrToCntnt = false) const;
 };
@@ -225,7 +225,7 @@ class SwUndoInserts : public SwUndo, public SwUndRng, private SwUndoSaveCntnt
     std::vector<SwFrmFmt*>* pFrmFmts;
     ::std::vector< ::boost::shared_ptr<SwUndoInsLayFmt> > m_FlyUndos;
     SwRedlineData* pRedlData;
-    sal_Bool bSttWasTxtNd;
+    bool bSttWasTxtNd;
 protected:
     sal_uLong nNdDiff;
     /// start of Content in UndoNodes for Redo
@@ -241,8 +241,8 @@ public:
     virtual void RepeatImpl( ::sw::RepeatContext & );
 
     // Set destination range after reading.
-    void SetInsertRange( const SwPaM&, sal_Bool bScanFlys = sal_True,
-                        sal_Bool bSttWasTxtNd = sal_True );
+    void SetInsertRange( const SwPaM&, bool bScanFlys = true,
+                         bool bSttWasTxtNd = true );
 };
 
 class SwUndoInsDoc : public SwUndoInserts
@@ -264,7 +264,7 @@ protected:
     sal_uLong nNdPgPos;
     sal_Int32 nCntPos;         // Page at/in paragraph.
     sal_uInt16 nRndId;
-    sal_Bool bDelFmt;           // Delete saved format.
+    bool bDelFmt;           // Delete saved format.
 
     void InsFly(::sw::UndoRedoContext & rContext, bool bShowSel = true);
     void DelFly( SwDoc* );
@@ -298,7 +298,7 @@ public:
 
 class SwUndoDelLayFmt : public SwUndoFlyBase
 {
-    sal_Bool bShowSelFrm;
+    bool bShowSelFrm;
 public:
     SwUndoDelLayFmt( SwFrmFmt* pFormat );
 
@@ -307,7 +307,7 @@ public:
 
     void RedoForRollback();
 
-    void ChgShowSel( sal_Bool bNew ) { bShowSelFrm = bNew; }
+    void ChgShowSel( bool bNew ) { bShowSelFrm = bNew; }
 
     virtual SwRewriter GetRewriter() const;
 
diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index b982138fa6b1..b31918f5e6cb 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -2565,7 +2565,7 @@ void SwDoc::AppendUndoForInsertFromDB( const SwPaM& rPam, sal_Bool bIsTable )
     else if( rPam.HasMark() )
     {
         SwUndoCpyDoc* pUndo = new SwUndoCpyDoc( rPam );
-        pUndo->SetInsertRange( rPam, sal_False );
+        pUndo->SetInsertRange( rPam, false );
         GetIDocumentUndoRedo().AppendUndo( pUndo );
     }
 }
diff --git a/sw/source/core/docnode/ndcopy.cxx b/sw/source/core/docnode/ndcopy.cxx
index 2f0e37361ce6..4ec8d2ce63a0 100644
--- a/sw/source/core/docnode/ndcopy.cxx
+++ b/sw/source/core/docnode/ndcopy.cxx
@@ -912,7 +912,7 @@ bool SwDoc::CopyImpl( SwPaM& rPam, SwPosition& rPos,
                         ( (pDestTxtNd && !pDestTxtNd->GetTxt().getLength()) ||
                           ( !bOneNode && !rPos.nContent.GetIndex() ) );
     bool bCopyBookmarks = true;
-    sal_Bool bStartIsTxtNode = 0 != pSttTxtNd;
+    bool bStartIsTxtNode = 0 != pSttTxtNd;
 
     // #i104585# copy outline num rule to clipboard (for ASCII filter)
     if (pDoc->IsClipBoard() && GetOutlineNumRule())
@@ -1094,7 +1094,7 @@ bool SwDoc::CopyImpl( SwPaM& rPam, SwPosition& rPos,
             else if( rPos.nContent.GetIndex() )
             {   // Insertion in the middle of a text node, it has to be split
                 // (and joined from undo)
-                bStartIsTxtNode = sal_True;
+                bStartIsTxtNode = true;
 
                 const sal_Int32 nCntntEnd = pEnd->nContent.GetIndex();
                 {
@@ -1151,7 +1151,7 @@ bool SwDoc::CopyImpl( SwPaM& rPam, SwPosition& rPos,
                 // will ensure that this node will be deleted during Undo
                 // using JoinNext.
                 OSL_ENSURE( !bStartIsTxtNode, "Oops, undo may be instable now." );
-                bStartIsTxtNode = sal_True;
+                bStartIsTxtNode = true;
             }
 
             // Save numrule at destination
@@ -1294,7 +1294,7 @@ bool SwDoc::CopyImpl( SwPaM& rPam, SwPosition& rPos,
     // If Undo is enabled, store the inserted area
     if (pDoc->GetIDocumentUndoRedo().DoesUndo())
     {
-        pUndo->SetInsertRange( *pCopyPam, sal_True, bStartIsTxtNode );
+        pUndo->SetInsertRange( *pCopyPam, true, bStartIsTxtNode );
     }
 
     if( pCpyRange )
diff --git a/sw/source/core/inc/UndoCore.hxx b/sw/source/core/inc/UndoCore.hxx
index bb37fc7c6c48..5f85dda679b0 100644
--- a/sw/source/core/inc/UndoCore.hxx
+++ b/sw/source/core/inc/UndoCore.hxx
@@ -159,7 +159,7 @@ class SwUndoSetFlyFmt : public SwUndo, public SwClient
     sal_uLong nOldNode, nNewNode;
     sal_Int32 nOldCntnt, nNewCntnt;
     sal_uInt16 nOldAnchorTyp, nNewAnchorTyp;
-    sal_Bool bAnchorChgd;
+    bool bAnchorChgd;
 
     void PutAttr( sal_uInt16 nWhich, const SfxPoolItem* pItem );
     void Modify( const SfxPoolItem*, const SfxPoolItem* );
diff --git a/sw/source/core/undo/rolbck.cxx b/sw/source/core/undo/rolbck.cxx
index d7d8140e8ad8..cca8bf049b6d 100644
--- a/sw/source/core/undo/rolbck.cxx
+++ b/sw/source/core/undo/rolbck.cxx
@@ -543,7 +543,7 @@ SwHistoryTxtFlyCnt::SwHistoryTxtFlyCnt( SwFrmFmt* const pFlyFmt )
     , m_pUndo( new SwUndoDelLayFmt( pFlyFmt ) )
 {
     OSL_ENSURE( pFlyFmt, "SwHistoryTxtFlyCnt: no Format" );
-    m_pUndo->ChgShowSel( sal_False );
+    m_pUndo->ChgShowSel( false );
 }
 
 SwHistoryTxtFlyCnt::~SwHistoryTxtFlyCnt()
diff --git a/sw/source/core/undo/undel.cxx b/sw/source/core/undo/undel.cxx
index c69a31aca569..1091d1fece11 100644
--- a/sw/source/core/undo/undel.cxx
+++ b/sw/source/core/undo/undel.cxx
@@ -483,7 +483,7 @@ sal_Bool SwUndoDelete::CanGrouping( SwDoc* pDoc, const SwPaM& rDelPam )
 
     {
         SwRedlineSaveDatas* pTmpSav = new SwRedlineSaveDatas;
-        if( !FillSaveData( rDelPam, *pTmpSav, sal_False ))
+        if( !FillSaveData( rDelPam, *pTmpSav, false ))
             delete pTmpSav, pTmpSav = 0;
 
         bool bOk = ( !pRedlSaveData && !pTmpSav ) ||
@@ -956,7 +956,7 @@ void SwUndoDelete::RedoImpl(::sw::UndoRedoContext & rContext)
 
     if( pRedlSaveData )
     {
-        bool bSuccess = FillSaveData(rPam, *pRedlSaveData, sal_True);
+        const bool bSuccess = FillSaveData(rPam, *pRedlSaveData, true);
         OSL_ENSURE(bSuccess,
             "SwUndoDelete::Redo: used to have redline data, but now none?");
         if (!bSuccess)
@@ -968,7 +968,7 @@ void SwUndoDelete::RedoImpl(::sw::UndoRedoContext & rContext)
     if( !bDelFullPara )
     {
         SwUndRng aTmpRng( rPam );
-        RemoveIdxFromRange( rPam, sal_False );
+        RemoveIdxFromRange( rPam, false );
         aTmpRng.SetPaM( rPam );
 
         if( !bJoinNext )           // then restore selection from bottom to top
diff --git a/sw/source/core/undo/undobj.cxx b/sw/source/core/undo/undobj.cxx
index 35cd84f1de0f..7baec1c8647f 100644
--- a/sw/source/core/undo/undobj.cxx
+++ b/sw/source/core/undo/undobj.cxx
@@ -47,7 +47,6 @@ public:
         const SwPosition& rSttPos,
         const SwPosition& rEndPos,
         SwRangeRedline& rRedl );
-
     ~SwRedlineSaveData();
 
     void RedlineToDoc( SwPaM& rPam );
@@ -92,7 +91,7 @@ void SwUndRng::SetValues( const SwPaM& rPam )
     nSttCntnt = pStt->nContent.GetIndex();
 }
 
-void SwUndRng::SetPaM( SwPaM & rPam, sal_Bool bCorrToCntnt ) const
+void SwUndRng::SetPaM( SwPaM & rPam, bool bCorrToCntnt ) const
 {
     rPam.DeleteMark();
     rPam.GetPoint()->nNode = nSttNode;
@@ -138,7 +137,7 @@ void SwUndo::RemoveIdxFromSection( SwDoc& rDoc, sal_uLong nSttIdx,
     rDoc.CorrAbs( aIdx, aEndIdx, aPos, sal_True );
 }
 
-void SwUndo::RemoveIdxFromRange( SwPaM& rPam, sal_Bool bMoveNext )
+void SwUndo::RemoveIdxFromRange( SwPaM& rPam, bool bMoveNext )
 {
     const SwPosition* pEnd = rPam.End();
     if( bMoveNext )
@@ -431,20 +430,20 @@ void SwUndoSaveCntnt::MoveFromUndoNds( SwDoc& rDoc, sal_uLong nNodeIdx,
 // can span an area for a Undo/Redo. (The Point is then positioned in front of
 // the area to manipulate!)
 // The flag indicates if there is still content in front of Point.
-sal_Bool SwUndoSaveCntnt::MovePtBackward( SwPaM& rPam )
+bool SwUndoSaveCntnt::MovePtBackward( SwPaM& rPam )
 {
     rPam.SetMark();
     if( rPam.Move( fnMoveBackward ))
-        return sal_True;
+        return true;
 
     // If there is no content onwards, set Point simply to the previous position
     // (Node and Content, so that Content will be detached!)
     rPam.GetPoint()->nNode--;
     rPam.GetPoint()->nContent.Assign( 0, 0 );
-    return sal_False;
+    return false;
 }
 
-void SwUndoSaveCntnt::MovePtForward( SwPaM& rPam, sal_Bool bMvBkwrd )
+void SwUndoSaveCntnt::MovePtForward( SwPaM& rPam, bool bMvBkwrd )
 {
     // Was there content before this position?
     if( bMvBkwrd )
@@ -848,7 +847,7 @@ void SwUndoSaveSection::SaveSection(
     }
 
     pRedlSaveData = new SwRedlineSaveDatas;
-    if( !SwUndo::FillSaveData( aPam, *pRedlSaveData, sal_True ))
+    if( !SwUndo::FillSaveData( aPam, *pRedlSaveData, true ))
         delete pRedlSaveData, pRedlSaveData = 0;
 
     nStartPos = rRange.aStart.GetIndex();
@@ -994,10 +993,10 @@ void SwRedlineSaveData::RedlineToDoc( SwPaM& rPam )
     rDoc.SetRedlineMode_intern( eOld );
 }
 
-sal_Bool SwUndo::FillSaveData(
+bool SwUndo::FillSaveData(
     const SwPaM& rRange,
     SwRedlineSaveDatas& rSData,
-    sal_Bool bDelRange )
+    bool bDelRange )
 {
     rSData.DeleteAndDestroyAll();
 
@@ -1026,7 +1025,7 @@ sal_Bool SwUndo::FillSaveData(
     return !rSData.empty();
 }
 
-sal_Bool SwUndo::FillSaveDataForFmt(
+bool SwUndo::FillSaveDataForFmt(
     const SwPaM& rRange,
     SwRedlineSaveDatas& rSData )
 {
@@ -1075,23 +1074,23 @@ void SwUndo::SetSaveData( SwDoc& rDoc, const SwRedlineSaveDatas& rSData )
     rDoc.SetRedlineMode_intern( eOld );
 }
 
-sal_Bool SwUndo::HasHiddenRedlines( const SwRedlineSaveDatas& rSData )
+bool SwUndo::HasHiddenRedlines( const SwRedlineSaveDatas& rSData )
 {
     for( sal_uInt16 n = rSData.size(); n; )
         if( rSData[ --n ]->GetMvSttIdx() )
-            return sal_True;
-    return sal_False;
+            return true;
+    return false;
 }
 
-sal_Bool SwUndo::CanRedlineGroup( SwRedlineSaveDatas& rCurr,
-                        const SwRedlineSaveDatas& rCheck, sal_Bool bCurrIsEnd )
+bool SwUndo::CanRedlineGroup( SwRedlineSaveDatas& rCurr,
+                        const SwRedlineSaveDatas& rCheck, bool bCurrIsEnd )
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     sal_uInt16 n;
 
     if( rCurr.size() == rCheck.size() )
     {
-        bRet = sal_True;
+        bRet = true;
         for( n = 0; n < rCurr.size(); ++n )
         {
             const SwRedlineSaveData& rSet = *rCurr[ n ];
@@ -1102,7 +1101,7 @@ sal_Bool SwUndo::CanRedlineGroup( SwRedlineSaveDatas& rCurr,
                              : rSet.nEndCntnt != rGet.nSttCntnt ) ||
                 !rGet.CanCombine( rSet ) )
             {
-                bRet = sal_False;
+                bRet = false;
                 break;
             }
         }
diff --git a/sw/source/core/undo/undobj1.cxx b/sw/source/core/undo/undobj1.cxx
index 68d27ceb3fd2..ca00c4178850 100644
--- a/sw/source/core/undo/undobj1.cxx
+++ b/sw/source/core/undo/undobj1.cxx
@@ -142,12 +142,12 @@ void SwUndoFlyBase::InsFly(::sw::UndoRedoContext & rContext, bool bShowSelFrm)
     case FLY_AT_PAGE:
         break;
     }
-    bDelFmt =  sal_False;
+    bDelFmt =  false;
 }
 
 void SwUndoFlyBase::DelFly( SwDoc* pDoc )
 {
-    bDelFmt = sal_True;                 // delete Format in DTOR
+    bDelFmt = true;                 // delete Format in DTOR
     pFrmFmt->DelFrms();                 // destroy Frms
 
     // all Uno objects should now log themselves off
@@ -225,7 +225,7 @@ SwUndoInsLayFmt::SwUndoInsLayFmt( SwFrmFmt* pFormat, sal_uLong nNodeIdx, sal_Int
 {
     const SwFmtAnchor& rAnchor = pFrmFmt->GetAnchor();
     nRndId = static_cast<sal_uInt16>(rAnchor.GetAnchorId());
-    bDelFmt = sal_False;
+    bDelFmt = false;
     switch( nRndId )
     {
     case FLY_AT_PAGE:
@@ -391,7 +391,7 @@ lcl_GetSwUndoId(SwFrmFmt *const pFrmFmt)
 
 SwUndoDelLayFmt::SwUndoDelLayFmt( SwFrmFmt* pFormat )
     : SwUndoFlyBase( pFormat, lcl_GetSwUndoId(pFormat) )
-    , bShowSelFrm( sal_True )
+    , bShowSelFrm( true )
 {
     SwDoc* pDoc = pFormat->GetDoc();
     DelFly( pDoc );
@@ -456,7 +456,7 @@ SwUndoSetFlyFmt::SwUndoSetFlyFmt( SwFrmFmt& rFlyFmt, SwFrmFmt& rNewFrmFmt )
                                 rFlyFmt.GetAttrSet().GetRanges() )),
     nOldNode( 0 ), nNewNode( 0 ),
     nOldCntnt( 0 ), nNewCntnt( 0 ),
-    nOldAnchorTyp( 0 ), nNewAnchorTyp( 0 ), bAnchorChgd( sal_False )
+    nOldAnchorTyp( 0 ), nNewAnchorTyp( 0 ), bAnchorChgd( false )
 {
 }
 
@@ -633,7 +633,7 @@ void SwUndoSetFlyFmt::PutAttr( sal_uInt16 nWhich, const SfxPoolItem* pItem )
             // only keep the first change
             OSL_ENSURE( !bAnchorChgd, "multiple changes of an anchor are not allowed!" );
 
-            bAnchorChgd = sal_True;
+            bAnchorChgd = true;
 
             const SwFmtAnchor* pAnchor = (SwFmtAnchor*)pItem;
             switch( nOldAnchorTyp = static_cast<sal_uInt16>(pAnchor->GetAnchorId()) )
diff --git a/sw/source/core/undo/unins.cxx b/sw/source/core/undo/unins.cxx
index 0a14799c5ca5..31db7c87e47a 100644
--- a/sw/source/core/undo/unins.cxx
+++ b/sw/source/core/undo/unins.cxx
@@ -256,7 +256,7 @@ void SwUndoInsert::UndoImpl(::sw::UndoRedoContext & rContext)
                         aPaM.GetPoint()->nContent.GetIndex(),
                         aPaM.GetMark()->nContent.GetIndex());
                 }
-                RemoveIdxFromRange( aPaM, sal_False );
+                RemoveIdxFromRange( aPaM, false );
                 pTxt = new OUString( pTxtNode->GetTxt().copy(nCntnt-nLen, nLen) );
                 pTxtNode->EraseText( aPaM.GetPoint()->nContent, nLen );
             }
@@ -265,7 +265,7 @@ void SwUndoInsert::UndoImpl(::sw::UndoRedoContext & rContext)
                 aPaM.Move(fnMoveBackward);
                 if( IDocumentRedlineAccess::IsRedlineOn( GetRedlineMode() ))
                     pTmpDoc->DeleteRedline( aPaM, true, USHRT_MAX );
-                RemoveIdxFromRange( aPaM, sal_False );
+                RemoveIdxFromRange( aPaM, false );
             }
 
             nNd = aPaM.GetPoint()->nNode.GetIndex();
@@ -329,7 +329,7 @@ void SwUndoInsert::RedoImpl(::sw::UndoRedoContext & rContext)
 
         if( nLen )
         {
-            sal_Bool bMvBkwrd = MovePtBackward( *pPam );
+            const bool bMvBkwrd = MovePtBackward( *pPam );
 
             if( pTxt )
             {
diff --git a/sw/source/core/undo/unmove.cxx b/sw/source/core/undo/unmove.cxx
index 29b53c069c55..45ad54cd232a 100644
--- a/sw/source/core/undo/unmove.cxx
+++ b/sw/source/core/undo/unmove.cxx
@@ -197,7 +197,7 @@ void SwUndoMove::UndoImpl(::sw::UndoRedoContext & rContext)
             // #i17764# if redlines are to be moved, we may not remove them
             // before pDoc->Move gets a chance to handle them
             if( ! bMoveRedlines )
-                RemoveIdxFromRange( aPam, sal_False );
+                RemoveIdxFromRange( aPam, false );
 
             SwPosition aPos( *pDoc->GetNodes()[ nInsPosNode] );
             SwCntntNode* pCNd = aPos.nNode.GetNode().GetCntntNode();
@@ -286,7 +286,7 @@ void SwUndoMove::RedoImpl(::sw::UndoRedoContext & rContext)
                                         nMvDestCntnt ));
 
         DelFtn( aPam );
-        RemoveIdxFromRange( aPam, sal_False );
+        RemoveIdxFromRange( aPam, false );
 
         aIdx = aPam.Start()->nNode;
         sal_Bool bJoinTxt = aIdx.GetNode().IsTxtNode();
diff --git a/sw/source/core/undo/unovwr.cxx b/sw/source/core/undo/unovwr.cxx
index 364813215923..8ef86d5e2222 100644
--- a/sw/source/core/undo/unovwr.cxx
+++ b/sw/source/core/undo/unovwr.cxx
@@ -49,7 +49,7 @@ SwUndoOverwrite::SwUndoOverwrite( SwDoc* pDoc, SwPosition& rPos,
         SwPaM aPam( rPos.nNode, rPos.nContent.GetIndex(),
                     rPos.nNode, rPos.nContent.GetIndex()+1 );
         pRedlSaveData = new SwRedlineSaveDatas;
-        if( !FillSaveData( aPam, *pRedlSaveData, sal_False ))
+        if( !FillSaveData( aPam, *pRedlSaveData, false ))
             delete pRedlSaveData, pRedlSaveData = 0;
     }
 
@@ -125,7 +125,7 @@ sal_Bool SwUndoOverwrite::CanGrouping( SwDoc* pDoc, SwPosition& rPos,
         SwPaM aPam( rPos.nNode, rPos.nContent.GetIndex(),
                     rPos.nNode, rPos.nContent.GetIndex()+1 );
 
-        if( !FillSaveData( aPam, *pTmpSav, sal_False ))
+        if( !FillSaveData( aPam, *pTmpSav, false ))
             delete pTmpSav, pTmpSav = 0;
 
         bool bOk = ( !pRedlSaveData && !pTmpSav ) ||
diff --git a/sw/source/core/undo/unredln.cxx b/sw/source/core/undo/unredln.cxx
index 465fd68db20b..86f0ec88c153 100644
--- a/sw/source/core/undo/unredln.cxx
+++ b/sw/source/core/undo/unredln.cxx
@@ -58,7 +58,7 @@ SwUndoRedline::SwUndoRedline( SwUndoId nUsrId, const SwPaM& rRange )
     sal_uLong nEndExtra = rDoc.GetNodes().GetEndOfExtras().GetIndex();
 
     mpRedlSaveData = new SwRedlineSaveDatas;
-    if( !FillSaveData( rRange, *mpRedlSaveData, sal_False ))
+    if( !FillSaveData( rRange, *mpRedlSaveData, false ))
         delete mpRedlSaveData, mpRedlSaveData = 0;
     else
     {
@@ -116,7 +116,7 @@ void SwUndoRedline::RedoImpl(::sw::UndoRedoContext & rContext)
     if( mpRedlSaveData && mbHiddenRedlines )
     {
         sal_uLong nEndExtra = pDoc->GetNodes().GetEndOfExtras().GetIndex();
-        FillSaveData(rPam, *mpRedlSaveData, sal_False );
+        FillSaveData(rPam, *mpRedlSaveData, false );
 
         nEndExtra -= pDoc->GetNodes().GetEndOfExtras().GetIndex();
         nSttNode -= nEndExtra;
@@ -379,7 +379,7 @@ SwUndoCompDoc::SwUndoCompDoc( const SwRangeRedline& rRedl )
     }
 
     pRedlSaveData = new SwRedlineSaveDatas;
-    if( !FillSaveData( rRedl, *pRedlSaveData, sal_False ))
+    if( !FillSaveData( rRedl, *pRedlSaveData, false ))
         delete pRedlSaveData, pRedlSaveData = 0;
 }
 
diff --git a/sw/source/core/undo/untblk.cxx b/sw/source/core/undo/untblk.cxx
index b7bbbc706bf7..df6233437ee2 100644
--- a/sw/source/core/undo/untblk.cxx
+++ b/sw/source/core/undo/untblk.cxx
@@ -34,7 +34,7 @@
 SwUndoInserts::SwUndoInserts( SwUndoId nUndoId, const SwPaM& rPam )
     : SwUndo( nUndoId ), SwUndRng( rPam ),
     pTxtFmtColl( 0 ), pLastNdColl(0), pFrmFmts( 0 ), pRedlData( 0 ),
-    bSttWasTxtNd( sal_True ), nNdDiff( 0 ), nSetPos( 0 )
+    bSttWasTxtNd( true ), nNdDiff( 0 ), nSetPos( 0 )
 {
     pHistory = new SwHistory;
     SwDoc* pDoc = (SwDoc*)rPam.GetDoc();
@@ -76,8 +76,8 @@ SwUndoInserts::SwUndoInserts( SwUndoId nUndoId, const SwPaM& rPam )
 }
 
 // set destination after reading input
-void SwUndoInserts::SetInsertRange( const SwPaM& rPam, sal_Bool bScanFlys,
-                                    sal_Bool bSttIsTxtNd )
+void SwUndoInserts::SetInsertRange( const SwPaM& rPam, bool bScanFlys,
+                                    bool bSttIsTxtNd )
 {
     const SwPosition* pTmpPos = rPam.End();
     nEndNode = pTmpPos->nNode.GetIndex();
@@ -95,7 +95,7 @@ void SwUndoInserts::SetInsertRange( const SwPaM& rPam, sal_Bool bScanFlys,
         if( !bSttIsTxtNd )      // if a table selection is added ...
         {
             ++nSttNode;         // ... than the CopyPam is not fully correct
-            bSttWasTxtNd = sal_False;
+            bSttWasTxtNd = false;
         }
     }
 
@@ -166,7 +166,7 @@ void SwUndoInserts::UndoImpl(::sw::UndoRedoContext & rContext)
                 pLastNdColl = pTxtNd->GetTxtColl();
         }
 
-        RemoveIdxFromRange( *pPam, sal_False );
+        RemoveIdxFromRange( *pPam, false );
         SetPaM(*pPam);
 
         // are there Footnotes or CntntFlyFrames in text?
@@ -256,7 +256,7 @@ void SwUndoInserts::RedoImpl(::sw::UndoRedoContext & rContext)
     // retrieve start position for rollback
     if( ( nSttNode != nEndNode || nSttCntnt != nEndCntnt ) && m_pUndoNodeIndex)
     {
-        sal_Bool bMvBkwrd = MovePtBackward( *pPam );
+        const bool bMvBkwrd = MovePtBackward( *pPam );
 
         // re-insert content again (first detach m_pUndoNodeIndex!)
         sal_uLong const nMvNd = m_pUndoNodeIndex->GetIndex();
diff --git a/sw/source/filter/basflt/shellio.cxx b/sw/source/filter/basflt/shellio.cxx
index 0d2b4431476c..5f1f937dc57e 100644
--- a/sw/source/filter/basflt/shellio.cxx
+++ b/sw/source/filter/basflt/shellio.cxx
@@ -307,7 +307,7 @@ sal_uLong SwReader::Read( const Reader& rOptions )
         if( bSaveUndo )
         {
             pDoc->SetRedlineMode_intern( eOld );
-            pUndo->SetInsertRange( *pUndoPam, sal_False );
+            pUndo->SetInsertRange( *pUndoPam, false );
             // UGLY: temp. enable undo
             pDoc->GetIDocumentUndoRedo().DoUndo(true);
             pDoc->GetIDocumentUndoRedo().AppendUndo( pUndo );