bool improvements

Change-Id: Ib65a1e987ad6511e90fd66a36c0105593a1df27c

33 files changed, 89 insertions, 90 deletions

diff --git a/sw/inc/authfld.hxx b/sw/inc/authfld.hxx
index 202a8534f099..55ed5b77edee 100644
--- a/sw/inc/authfld.hxx
+++ b/sw/inc/authfld.hxx
@@ -46,10 +46,10 @@ public:
 struct SwTOXSortKey
 {
     ToxAuthorityField   eField;
-    sal_Bool                bSortAscending;
+    bool                bSortAscending;
     SwTOXSortKey() :
         eField(AUTH_FIELD_END),
-        bSortAscending(sal_True){}
+        bSortAscending(true){}
 };
 
 class SwAuthorityField;
diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx
index 4bcbf35262ca..978d6b6c642d 100644
--- a/sw/inc/crsrsh.hxx
+++ b/sw/inc/crsrsh.hxx
@@ -587,7 +587,7 @@ public:
     inline const SwTableNode* IsCrsrInTbl( sal_Bool bIsPtInTbl = sal_True ) const;
 
     inline Point& GetCrsrDocPos( sal_Bool bPoint = sal_True ) const;
-    inline sal_Bool IsCrsrPtAtEnd() const;
+    inline bool IsCrsrPtAtEnd() const;
 
     inline const  SwPaM* GetTblCrs() const;
     inline        SwPaM* GetTblCrs();
@@ -897,7 +897,7 @@ inline const SwTableNode* SwCrsrShell::IsCrsrInTbl( sal_Bool bIsPtInTbl ) const
     return m_pCurCrsr->GetNode( bIsPtInTbl )->FindTableNode();
 }
 
-inline sal_Bool SwCrsrShell::IsCrsrPtAtEnd() const
+inline bool SwCrsrShell::IsCrsrPtAtEnd() const
 {
     return m_pCurCrsr->End() == m_pCurCrsr->GetPoint();
 }
diff --git a/sw/inc/htmltbl.hxx b/sw/inc/htmltbl.hxx
index ce63e6b86c2b..b7bb4fb6eb31 100644
--- a/sw/inc/htmltbl.hxx
+++ b/sw/inc/htmltbl.hxx
@@ -303,7 +303,7 @@ public:
     bool HasColsOption() const { return bColsOption; }
     bool HasColTags() const { return bColTags; }
 
-    sal_Bool IsTopTable() const  { return pSwTable != 0; }
+    bool IsTopTable() const  { return pSwTable != 0; }
 
     void SetMustResize( sal_Bool bSet ) { bMustResize = bSet; }
     void SetMustNotResize( sal_Bool bSet ) { bMustNotResize = bSet; }
diff --git a/sw/inc/pvprtdat.hxx b/sw/inc/pvprtdat.hxx
index 96ee15e7002b..8e4bd15d8c07 100644
--- a/sw/inc/pvprtdat.hxx
+++ b/sw/inc/pvprtdat.hxx
@@ -60,7 +60,7 @@ public:
     sal_uInt8 GetCol() const                { return nCol; }
     void SetCol( sal_uInt8 n )              { nCol = n; }
 
-    sal_Bool GetLandscape() const           { return bLandscape; }
+    bool GetLandscape() const               { return bLandscape; }
     void SetLandscape( sal_Bool b )         { bLandscape = b; }
 };
 
diff --git a/sw/inc/swmodule.hxx b/sw/inc/swmodule.hxx
index 62e8ed697407..1e34fb961306 100644
--- a/sw/inc/swmodule.hxx
+++ b/sw/inc/swmodule.hxx
@@ -145,15 +145,15 @@ public:
     const SwViewOption* GetViewOption(sal_Bool bWeb);
     void                ApplyUsrPref(const SwViewOption &, SwView*,
                                      sal_uInt16 nDest = VIEWOPT_DEST_VIEW );
-    void ApplyUserMetric( FieldUnit eMetric, sal_Bool bWeb );
-    void ApplyRulerMetric( FieldUnit eMetric, sal_Bool bHorizontal, sal_Bool bWeb );
+    void ApplyUserMetric( FieldUnit eMetric, bool bWeb );
+    void ApplyRulerMetric( FieldUnit eMetric, sal_Bool bHorizontal, bool bWeb );
     void ApplyFldUpdateFlags(SwFldUpdateFlags eFldFlags);
     void ApplyLinkMode(sal_Int32 nNewLinkMode);
 
     // Default page mode for text grid.
     void ApplyDefaultPageMode(sal_Bool bIsSquaredPageMode);
 
-    void ApplyUserCharUnit(sal_Bool bApplyChar, sal_Bool bWeb);  // apply_char_unit
+    void ApplyUserCharUnit(sal_Bool bApplyChar, bool bWeb);  // apply_char_unit
 
     // Create ConfigItems.
     SwModuleOptions*    GetModuleConfig()       { return pModuleConfig;}
diff --git a/sw/source/core/inc/UndoInsert.hxx b/sw/source/core/inc/UndoInsert.hxx
index 997b589a9e18..b9a3b999c47c 100644
--- a/sw/source/core/inc/UndoInsert.hxx
+++ b/sw/source/core/inc/UndoInsert.hxx
@@ -39,7 +39,7 @@ class SwUndoInsert: public SwUndo, private SwUndoSaveCntnt
     SwRedlineData* pRedlData;
     sal_uLong nNode;
     sal_Int32 nCntnt, nLen;
-    sal_Bool bIsWordDelim : 1;
+    bool bIsWordDelim : 1;
     sal_Bool bIsAppend : 1;
     sal_Bool m_bWithRsid : 1;
 
diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx
index 721deee3ab72..77fe0cf85e35 100644
--- a/sw/source/core/inc/frame.hxx
+++ b/sw/source/core/inc/frame.hxx
@@ -182,15 +182,15 @@ typedef SwRectFnCollection* SwRectFn;
 
 // Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
 extern SwRectFn fnRectHori, fnRectVert, fnRectB2T, fnRectVL2R, fnRectVertL2R;
-#define SWRECTFN( pFrm )    sal_Bool bVert = pFrm->IsVertical(); \
-                            sal_Bool bRev = pFrm->IsReverse(); \
-                            sal_Bool bVertL2R = pFrm->IsVertLR(); \
+#define SWRECTFN( pFrm )    bool bVert = pFrm->IsVertical(); \
+                            bool bRev = pFrm->IsReverse(); \
+                            bool bVertL2R = pFrm->IsVertLR(); \
                             SwRectFn fnRect = bVert ? \
                                 ( bRev ? fnRectVL2R : ( bVertL2R ? fnRectVertL2R : fnRectVert ) ): \
                                 ( bRev ? fnRectB2T : fnRectHori );
-#define SWRECTFNX( pFrm )   sal_Bool bVertX = pFrm->IsVertical(); \
-                            sal_Bool bRevX = pFrm->IsReverse(); \
-                            sal_Bool bVertL2RX = pFrm->IsVertLR(); \
+#define SWRECTFNX( pFrm )   bool bVertX = pFrm->IsVertical(); \
+                            bool bRevX = pFrm->IsReverse(); \
+                            bool bVertL2RX = pFrm->IsVertLR(); \
                             SwRectFn fnRectX = bVertX ? \
                                 ( bRevX ? fnRectVL2R : ( bVertL2RX ? fnRectVertL2R : fnRectVert ) ): \
                                 ( bRevX ? fnRectB2T : fnRectHori );
@@ -202,9 +202,9 @@ extern SwRectFn fnRectHori, fnRectVert, fnRectB2T, fnRectVL2R, fnRectVertL2R;
                                 fnRect = bVert ? \
                                     ( bRev ? fnRectVL2R : ( bVertL2R ? fnRectVertL2R : fnRectVert ) ): \
                                     ( bRev ? fnRectB2T : fnRectHori ); }
-#define SWRECTFN2( pFrm )   sal_Bool bVert = pFrm->IsVertical(); \
-                sal_Bool bVertL2R = pFrm->IsVertLR(); \
-                            sal_Bool bNeighb = pFrm->IsNeighbourFrm(); \
+#define SWRECTFN2( pFrm )   bool bVert = pFrm->IsVertical(); \
+                bool bVertL2R = pFrm->IsVertLR(); \
+                            bool bNeighb = pFrm->IsNeighbourFrm(); \
                             SwRectFn fnRect = bVert == bNeighb ? \
                                 fnRectHori : ( bVertL2R ? fnRectVertL2R : fnRectVert );
 //End of SCMS
@@ -545,9 +545,9 @@ public:
 
     bool IsInBalancedSection() const;
 
-    inline sal_Bool IsReverse() const { return mbReverse; }
+    inline bool IsReverse() const { return mbReverse; }
     inline void SetReverse( sal_Bool bNew ){ mbReverse = bNew ? 1 : 0; }
-    inline sal_Bool IsVertical() const;
+    inline bool IsVertical() const;
     //Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
     inline sal_Bool IsVertLR() const;
     inline sal_Bool GetVerticalFlag() const;
@@ -556,7 +556,7 @@ public:
     inline void SetbVertLR( sal_Bool bNew ) { mbVertLR = bNew ? 1 : 0; }
     inline void SetDerivedVert( sal_Bool bNew ){ mbDerivedVert = bNew ? 1 : 0; }
     inline void SetInvalidVert( sal_Bool bNew) { mbInvalidVert = bNew ? 1 : 0; }
-    inline sal_Bool IsRightToLeft() const;
+    inline bool IsRightToLeft() const;
     inline sal_Bool GetRightToLeftFlag() const;
     inline void SetRightToLeft( sal_Bool bNew ){ mbRightToLeft = bNew ? 1 : 0; }
     inline void SetDerivedR2L( sal_Bool bNew ) { mbDerivedR2L  = bNew ? 1 : 0; }
@@ -868,8 +868,8 @@ public:
     void MakeUpperPos( const SwFrm*, const SwFrm*, sal_Bool );
     void MakeLeftPos( const SwFrm*, const SwFrm*, sal_Bool );
     void MakeRightPos( const SwFrm*, const SwFrm*, sal_Bool );
-    inline sal_Bool IsNeighbourFrm() const
-        { return GetType() & FRM_NEIGHBOUR ? sal_True : sal_False; }
+    inline bool IsNeighbourFrm() const
+        { return (GetType() & FRM_NEIGHBOUR) != 0; }
 
     // #i65250#
     inline sal_uInt32 GetFrmId() const { return mnFrmId; }
@@ -926,7 +926,7 @@ inline sal_Bool SwFrm::IsInSct() const
         ((SwFrm*)this)->SetInfFlags();
     return mbInfSct;
 }
-sal_Bool SwFrm::IsVertical() const
+bool SwFrm::IsVertical() const
 {
     if( mbInvalidVert )
         ((SwFrm*)this)->SetDirFlags( sal_True );
@@ -942,7 +942,7 @@ sal_Bool SwFrm::GetVerticalFlag() const
 {
     return mbVertical != 0;
 }
-inline sal_Bool SwFrm::IsRightToLeft() const
+inline bool SwFrm::IsRightToLeft() const
 {
     if( mbInvalidR2L )
         ((SwFrm*)this)->SetDirFlags( sal_False );
diff --git a/sw/source/core/layout/calcmove.cxx b/sw/source/core/layout/calcmove.cxx
index fce2a3ba3797..fed131697854 100644
--- a/sw/source/core/layout/calcmove.cxx
+++ b/sw/source/core/layout/calcmove.cxx
@@ -823,7 +823,7 @@ void SwLayoutFrm::MakeAll()
 
     // takes care of the notification in the dtor
     const SwLayNotify aNotify( this );
-    sal_Bool bVert = IsVertical();
+    bool bVert = IsVertical();
     //Badaa: 2008-04-18 * Support for Classical Mongolian Script (SCMS) joint with Jiayanmin
     SwRectFn fnRect = ( IsNeighbourFrm() == bVert )? fnRectHori : ( IsVertLR() ? fnRectVertL2R : fnRectVert );
 
diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index d8e0de48d2de..4bb672a0c4a5 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -3349,8 +3349,8 @@ public:
 
 SwShortCut::SwShortCut( const SwFrm& rFrm, const SwRect& rRect )
 {
-    sal_Bool bVert = rFrm.IsVertical();
-    sal_Bool bR2L = rFrm.IsRightToLeft();
+    bool bVert = rFrm.IsVertical();
+    bool bR2L = rFrm.IsRightToLeft();
     if( rFrm.IsNeighbourFrm() && bVert == bR2L )
     {
         if( bVert )
diff --git a/sw/source/core/layout/ssfrm.cxx b/sw/source/core/layout/ssfrm.cxx
index e44893be92b9..1169bd384a47 100644
--- a/sw/source/core/layout/ssfrm.cxx
+++ b/sw/source/core/layout/ssfrm.cxx
@@ -213,9 +213,9 @@ const sal_uInt16 nMinVertCellHeight = 1135;
 
 void SwFrm::CheckDirChange()
 {
-    sal_Bool bOldVert = GetVerticalFlag();
-    sal_Bool bOldRev = IsReverse();
-    sal_Bool bOldR2L = GetRightToLeftFlag();
+    bool bOldVert = GetVerticalFlag();
+    bool bOldRev = IsReverse();
+    bool bOldR2L = GetRightToLeftFlag();
     SetInvalidVert( sal_True );
     SetInvalidR2L( sal_True );
     bool bChg = bOldR2L != IsRightToLeft();
diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index 9d3275ef8926..500765d3172e 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -4029,7 +4029,7 @@ static SwTwips lcl_CalcMinRowHeight( const SwRowFrm* _pRow,
         // <-- NEW TABLES
 
         // Do not consider rotated cells:
-        if ( ( 0 != pLow->IsVertical() ) == ( 0 != bVert ) && nTmp > nHeight )
+        if ( pLow->IsVertical() == bVert && nTmp > nHeight )
             nHeight = nTmp;
 
         pLow = static_cast<const SwCellFrm*>(pLow->GetNext());
diff --git a/sw/source/core/layout/trvlfrm.cxx b/sw/source/core/layout/trvlfrm.cxx
index af9904188a52..afcbe7351731 100644
--- a/sw/source/core/layout/trvlfrm.cxx
+++ b/sw/source/core/layout/trvlfrm.cxx
@@ -789,7 +789,7 @@ static sal_Bool lcl_UpDown( SwPaM *pPam, const SwCntntFrm *pStart,
         // (is this really necessary?)
         if ( !pTable->GetUpper()->IsInTab() )
         {
-            const sal_Bool bRTL = pTable->IsRightToLeft();
+            const bool bRTL = pTable->IsRightToLeft();
             const long nPrtLeft = bRTL ?
                                 (pTable->*fnRect->fnGetPrtRight)() :
                                 (pTable->*fnRect->fnGetPrtLeft)();
diff --git a/sw/source/core/layout/wsfrm.cxx b/sw/source/core/layout/wsfrm.cxx
index 3f7cff0a0547..d7f6895903b3 100644
--- a/sw/source/core/layout/wsfrm.cxx
+++ b/sw/source/core/layout/wsfrm.cxx
@@ -1238,7 +1238,7 @@ SwTwips SwFrm::Grow( SwTwips nDist, sal_Bool bTst, sal_Bool bInfo )
                 const SwTabFrm* pTab = FindTabFrm();
 
                 // NEW TABLES
-                if ( ( 0 != pTab->IsVertical() ) != ( 0 != IsVertical() ) ||
+                if ( pTab->IsVertical() != IsVertical() ||
                      pThisCell->GetLayoutRowSpan() < 1 )
                     return 0;
             }
@@ -1281,7 +1281,7 @@ SwTwips SwFrm::Shrink( SwTwips nDist, sal_Bool bTst, sal_Bool bInfo )
                 const SwTabFrm* pTab = FindTabFrm();
 
                 // NEW TABLES
-                if ( ( 0 != pTab->IsVertical() ) != ( 0 != IsVertical() ) ||
+                if ( pTab->IsVertical() != IsVertical() ||
                      pThisCell->GetLayoutRowSpan() < 1 )
                     return 0;
             }
diff --git a/sw/source/core/text/pormulti.hxx b/sw/source/core/text/pormulti.hxx
index 86c64e5909b0..fda3fbbd44a7 100644
--- a/sw/source/core/text/pormulti.hxx
+++ b/sw/source/core/text/pormulti.hxx
@@ -125,7 +125,7 @@ public:
     inline sal_Bool IsDouble() const { return bDouble; }
     inline bool IsRuby() const { return bRuby; }
     inline sal_Bool IsBidi() const { return bBidi; }
-    inline sal_Bool OnTop() const { return bTop; }
+    inline bool OnTop() const { return bTop; }
     void ActualizeTabulator();
 
     virtual void Paint( const SwTxtPaintInfo &rInf ) const;
diff --git a/sw/source/core/text/txtfrm.cxx b/sw/source/core/text/txtfrm.cxx
index 1e3dea64c4c5..3e18b95a497e 100644
--- a/sw/source/core/text/txtfrm.cxx
+++ b/sw/source/core/text/txtfrm.cxx
@@ -1591,7 +1591,7 @@ void SwTxtFrm::Prepare( const PrepareHint ePrep, const void* pVoid,
     // Test
             {
                 SetInvalidVert( sal_False );
-                sal_Bool bOld = IsVertical();
+                bool bOld = IsVertical();
                 SetInvalidVert( sal_True );
                 if( bOld != IsVertical() )
                     InvalidateRange( SwCharRange( GetOfst(), COMPLETE_STRING ) );
diff --git a/sw/source/core/txtnode/fntcache.cxx b/sw/source/core/txtnode/fntcache.cxx
index 28391bad97ed..92cce0af2eda 100644
--- a/sw/source/core/txtnode/fntcache.cxx
+++ b/sw/source/core/txtnode/fntcache.cxx
@@ -936,7 +936,7 @@ void SwFntObj::DrawText( SwDrawTextInfo &rInf )
     // line of the ExtendedAttributeSets will appear in the font color first
 
     const sal_Bool bSwitchH2V = rInf.GetFrm() && rInf.GetFrm()->IsVertical();
-    const sal_Bool bSwitchL2R = rInf.GetFrm() && rInf.GetFrm()->IsRightToLeft() &&
+    const bool bSwitchL2R = rInf.GetFrm() && rInf.GetFrm()->IsRightToLeft() &&
                             ! rInf.IsIgnoreFrmRTL();
     const sal_uLong nMode = rInf.GetOut().GetLayoutMode();
     const sal_Bool bBidiPor = ( bSwitchL2R !=
diff --git a/sw/source/core/txtnode/fntcap.cxx b/sw/source/core/txtnode/fntcap.cxx
index b92c482c301c..f9d9689c0182 100644
--- a/sw/source/core/txtnode/fntcap.cxx
+++ b/sw/source/core/txtnode/fntcap.cxx
@@ -313,7 +313,7 @@ void SwDoDrawCapital::DrawSpace( Point &rPos )
     long nDiff = rInf.GetPos().X() - rPos.X();
 
     Point aPos( rPos );
-    const sal_Bool bSwitchL2R = rInf.GetFrm()->IsRightToLeft() &&
+    const bool bSwitchL2R = rInf.GetFrm()->IsRightToLeft() &&
                           ! rInf.IsIgnoreFrmRTL();
 
 
diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index afe6dc34dfd5..18d5dff0da57 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -4382,7 +4382,7 @@ namespace {
                 const SfxBoolItem& aListIsRestartItem =
                                     dynamic_cast<const SfxBoolItem&>(pItem);
                 if ( aListIsRestartItem.GetValue() !=
-                                    (mrTxtNode.IsListRestart() ? sal_True : sal_False) )
+                                    mrTxtNode.IsListRestart() )
                 {
                     mbUpdateListRestart = true;
                 }
@@ -4408,7 +4408,7 @@ namespace {
                 const SfxBoolItem& aIsCountedInListItem =
                                     dynamic_cast<const SfxBoolItem&>(pItem);
                 if ( aIsCountedInListItem.GetValue() !=
-                                    (mrTxtNode.IsCountedInList() ? sal_True : sal_False) )
+                                    mrTxtNode.IsCountedInList() )
                 {
                     mbUpdateListCount = true;
                 }
@@ -4490,8 +4490,7 @@ namespace {
         {
             const SfxBoolItem* pListIsRestartItem =
                                 dynamic_cast<const SfxBoolItem*>(pItem);
-            if ( pListIsRestartItem->GetValue() !=
-                                    (mrTxtNode.IsListRestart() ? sal_True : sal_False) )
+            if ( pListIsRestartItem->GetValue() != mrTxtNode.IsListRestart() )
             {
                 mbUpdateListRestart = true;
             }
@@ -4515,7 +4514,7 @@ namespace {
             const SfxBoolItem* pIsCountedInListItem =
                                 dynamic_cast<const SfxBoolItem*>(pItem);
             if ( pIsCountedInListItem->GetValue() !=
-                                (mrTxtNode.IsCountedInList() ? sal_True : sal_False) )
+                                mrTxtNode.IsCountedInList() )
             {
                 mbUpdateListCount = true;
             }
diff --git a/sw/source/core/undo/unins.cxx b/sw/source/core/undo/unins.cxx
index 5979af163de2..33438afacd54 100644
--- a/sw/source/core/undo/unins.cxx
+++ b/sw/source/core/undo/unins.cxx
@@ -124,7 +124,7 @@ SwUndoInsert::SwUndoInsert( const SwNodeIndex& rNd, sal_Int32 nCnt,
 SwUndoInsert::SwUndoInsert( const SwNodeIndex& rNd )
     : SwUndo(UNDO_SPLITNODE), pTxt( 0 ),
         pRedlData( 0 ), nNode( rNd.GetIndex() ), nCntnt(0), nLen(1),
-        bIsWordDelim( sal_False ), bIsAppend( sal_True )
+        bIsWordDelim( false ), bIsAppend( sal_True )
     , m_bWithRsid(false)
     , m_nInsertFlags(IDocumentContentOperations::INS_EMPTYEXPAND)
 {
diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx
index 06bff4b81b9f..786d296801f4 100644
--- a/sw/source/filter/ww8/wrtww8.hxx
+++ b/sw/source/filter/ww8/wrtww8.hxx
@@ -519,26 +519,26 @@ public:
 
     sal_uInt8 nTxtTyp;
 
-    sal_uInt8 bStyDef : 1;           // should Style be written?
-    sal_uInt8 bBreakBefore : 1;      // Breaks are being written 2 times
-    sal_uInt8 bOutKF : 1;            // Header/Footer texts are being written
-    sal_uInt8 bOutFlyFrmAttrs : 1;   // Frame-attr of Flys are being written
-    sal_uInt8 bOutPageDescs : 1;     ///< PageDescs (section properties) are being written
-    sal_uInt8 bOutFirstPage : 1;     // write Attrset of FirstPageDesc
-    sal_uInt8 bOutTable : 1;         // table is being written
+    bool bStyDef : 1;           // should Style be written?
+    bool bBreakBefore : 1;      // Breaks are being written 2 times
+    bool bOutKF : 1;            // Header/Footer texts are being written
+    bool bOutFlyFrmAttrs : 1;   // Frame-attr of Flys are being written
+    bool bOutPageDescs : 1;     ///< PageDescs (section properties) are being written
+    bool bOutFirstPage : 1;     // write Attrset of FirstPageDesc
+    bool bOutTable : 1;         // table is being written
                                      // ( wird zB bei Flys in Tabelle zurueckgesetzt )
-    sal_uInt8 bOutGrf : 1;           // graphics are being written
-    sal_uInt8 bInWriteEscher : 1;    // in write textboxes
-    sal_uInt8 bStartTOX : 1;         // true: a TOX is startet
-    sal_uInt8 bInWriteTOX : 1;       // true: all content are in a TOX
-    sal_uInt8 bFtnAtTxtEnd : 1;      // true: all FTN at Textend
-    sal_uInt8 bEndAtTxtEnd : 1;      // true: all END at Textend
-    sal_uInt8 bHasHdr : 1;
-    sal_uInt8 bHasFtr : 1;
-    sal_uInt8 bSubstituteBullets : 1; // true: SubstituteBullet() gets called
-    sal_uInt8 bTabInTOC : 1; //true for TOC field flag 'w'
-
-    sal_uInt8 bHideTabLeaderAndPageNumbers : 1 ; // true: the 'z' field of TOC is set.
+    bool bOutGrf : 1;           // graphics are being written
+    bool bInWriteEscher : 1;    // in write textboxes
+    bool bStartTOX : 1;         // true: a TOX is startet
+    bool bInWriteTOX : 1;       // true: all content are in a TOX
+    bool bFtnAtTxtEnd : 1;      // true: all FTN at Textend
+    bool bEndAtTxtEnd : 1;      // true: all END at Textend
+    bool bHasHdr : 1;
+    bool bHasFtr : 1;
+    bool bSubstituteBullets : 1; // true: SubstituteBullet() gets called
+    bool bTabInTOC : 1; //true for TOC field flag 'w'
+
+    bool bHideTabLeaderAndPageNumbers : 1 ; // true: the 'z' field of TOC is set.
     bool mbExportModeRTF;
     bool mbOutOutlineOnly;   // export outline nodes, only (send outline to clipboard/presentation)
 
diff --git a/sw/source/ui/app/swmodul1.cxx b/sw/source/ui/app/swmodul1.cxx
index dfaf2892d369..73fe0a1beb80 100644
--- a/sw/source/ui/app/swmodul1.cxx
+++ b/sw/source/ui/app/swmodul1.cxx
@@ -207,7 +207,7 @@ void SwModule::ApplyUsrPref(const SwViewOption &rUsrPref, SwView* pActView,
     pPref->SetIdle(sal_True);
 }
 
-void SwModule::ApplyUserMetric( FieldUnit eMetric, sal_Bool bWeb )
+void SwModule::ApplyUserMetric( FieldUnit eMetric, bool bWeb )
 {
         SwMasterUsrPref* pPref;
         if(bWeb)
@@ -243,7 +243,7 @@ void SwModule::ApplyUserMetric( FieldUnit eMetric, sal_Bool bWeb )
         }
 }
 
-void SwModule::ApplyRulerMetric( FieldUnit eMetric, sal_Bool bHorizontal, sal_Bool bWeb )
+void SwModule::ApplyRulerMetric( FieldUnit eMetric, sal_Bool bHorizontal, bool bWeb )
 {
     SwMasterUsrPref* pPref;
     if(bWeb)
@@ -279,7 +279,7 @@ void SwModule::ApplyRulerMetric( FieldUnit eMetric, sal_Bool bHorizontal, sal_Bo
 }
 
 //set the usrpref 's char unit attribute and set rulers unit as char if the "apply char unit" is checked
-void SwModule::ApplyUserCharUnit(sal_Bool bApplyChar, sal_Bool bWeb)
+void SwModule::ApplyUserCharUnit(sal_Bool bApplyChar, bool bWeb)
 {
     SwMasterUsrPref* pPref;
     if(bWeb)
diff --git a/sw/source/ui/config/optcomp.cxx b/sw/source/ui/config/optcomp.cxx
index f793df09265b..7adb09ef5e08 100644
--- a/sw/source/ui/config/optcomp.cxx
+++ b/sw/source/ui/config/optcomp.cxx
@@ -375,17 +375,17 @@ sal_uLong SwCompatibilityOptPage::GetDocumentOptions() const
     {
         const IDocumentSettingAccess& rIDocumentSettingAccess = *m_pWrtShell->getIDocumentSettingAccess();
         nRet = convertBools2Ulong_Impl(
-                rIDocumentSettingAccess.get(IDocumentSettingAccess::USE_VIRTUAL_DEVICE) == sal_False,
-                rIDocumentSettingAccess.get(IDocumentSettingAccess::PARA_SPACE_MAX) != sal_False,
-                rIDocumentSettingAccess.get(IDocumentSettingAccess::PARA_SPACE_MAX_AT_PAGES) != sal_False,
-                rIDocumentSettingAccess.get(IDocumentSettingAccess::TAB_COMPAT) == sal_False,
-                rIDocumentSettingAccess.get(IDocumentSettingAccess::ADD_EXT_LEADING) == sal_False,
-                rIDocumentSettingAccess.get(IDocumentSettingAccess::OLD_LINE_SPACING) != sal_False,
-                rIDocumentSettingAccess.get(IDocumentSettingAccess::ADD_PARA_SPACING_TO_TABLE_CELLS) != sal_False,
-                rIDocumentSettingAccess.get(IDocumentSettingAccess::USE_FORMER_OBJECT_POS) != sal_False,
-                rIDocumentSettingAccess.get(IDocumentSettingAccess::USE_FORMER_TEXT_WRAPPING) != sal_False,
-                rIDocumentSettingAccess.get(IDocumentSettingAccess::CONSIDER_WRAP_ON_OBJECT_POSITION) != sal_False,
-                rIDocumentSettingAccess.get(IDocumentSettingAccess::DO_NOT_JUSTIFY_LINES_WITH_MANUAL_BREAK) != sal_True );
+                !rIDocumentSettingAccess.get(IDocumentSettingAccess::USE_VIRTUAL_DEVICE),
+                rIDocumentSettingAccess.get(IDocumentSettingAccess::PARA_SPACE_MAX),
+                rIDocumentSettingAccess.get(IDocumentSettingAccess::PARA_SPACE_MAX_AT_PAGES),
+                !rIDocumentSettingAccess.get(IDocumentSettingAccess::TAB_COMPAT),
+                !rIDocumentSettingAccess.get(IDocumentSettingAccess::ADD_EXT_LEADING),
+                rIDocumentSettingAccess.get(IDocumentSettingAccess::OLD_LINE_SPACING),
+                rIDocumentSettingAccess.get(IDocumentSettingAccess::ADD_PARA_SPACING_TO_TABLE_CELLS),
+                rIDocumentSettingAccess.get(IDocumentSettingAccess::USE_FORMER_OBJECT_POS),
+                rIDocumentSettingAccess.get(IDocumentSettingAccess::USE_FORMER_TEXT_WRAPPING),
+                rIDocumentSettingAccess.get(IDocumentSettingAccess::CONSIDER_WRAP_ON_OBJECT_POSITION),
+                !rIDocumentSettingAccess.get(IDocumentSettingAccess::DO_NOT_JUSTIFY_LINES_WITH_MANUAL_BREAK) );
     }
     return nRet;
 }
diff --git a/sw/source/ui/dbui/mmconfigitem.cxx b/sw/source/ui/dbui/mmconfigitem.cxx
index 89b15ee271e8..05fa5155ae9a 100644
--- a/sw/source/ui/dbui/mmconfigitem.cxx
+++ b/sw/source/ui/dbui/mmconfigitem.cxx
@@ -778,7 +778,7 @@ const Sequence< OUString> SwMailMergeConfigItem::GetAddressBlocks() const
     return m_pImpl->GetAddressBlocks();
 }
 
-sal_Bool SwMailMergeConfigItem::IsAddressBlock()const
+bool SwMailMergeConfigItem::IsAddressBlock()const
 {
     return m_pImpl->bIsAddressBlock && IsOutputToLetter();
 }
diff --git a/sw/source/ui/inc/mmconfigitem.hxx b/sw/source/ui/inc/mmconfigitem.hxx
index c07612ddf547..b5c751d3ae70 100644
--- a/sw/source/ui/inc/mmconfigitem.hxx
+++ b/sw/source/ui/inc/mmconfigitem.hxx
@@ -124,7 +124,7 @@ public:
     sal_Bool            IsOutputToLetter()const;
     void                SetOutputToLetter(sal_Bool bSet);
 
-    sal_Bool            IsAddressBlock()const;
+    bool                IsAddressBlock()const;
     void                SetAddressBlock(sal_Bool bSet);
 
     sal_Bool            IsHideEmptyParagraphs() const;
diff --git a/sw/source/ui/inc/wrtsh.hxx b/sw/source/ui/inc/wrtsh.hxx
index 894e9f560fc4..2b6dfd72248c 100644
--- a/sw/source/ui/inc/wrtsh.hxx
+++ b/sw/source/ui/inc/wrtsh.hxx
@@ -141,7 +141,7 @@ public:
     void    EnterBlockMode();
     void    LeaveBlockMode();
     bool    ToggleBlockMode();
-    sal_Bool    IsBlockMode() const { return bBlockMode; }
+    bool    IsBlockMode() const { return bBlockMode; }
 
     void    SetInsMode( sal_Bool bOn = sal_True );
     void    ToggleInsMode() { SetInsMode( !bIns ); }
diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx
index 50e958a5aa94..3744ef49c836 100644
--- a/sw/source/ui/misc/num.cxx
+++ b/sw/source/ui/misc/num.cxx
@@ -355,7 +355,7 @@ void SwNumPositionTabPage::InitControls()
         m_pIndentAtMF->SetText(aEmptyOUStr);
     }
 
-    if(sal_True == bSetDistEmpty)
+    if(bSetDistEmpty)
         m_pDistBorderMF->SetText(aEmptyOUStr);
 
     bInInintControl = sal_False;
diff --git a/sw/source/ui/table/chartins.cxx b/sw/source/ui/table/chartins.cxx
index a2654e21a1eb..eb9cb6c32ff9 100644
--- a/sw/source/ui/table/chartins.cxx
+++ b/sw/source/ui/table/chartins.cxx
@@ -165,7 +165,7 @@ void SwInsertChart(Window* pParent, SfxBindings* pBindings )
     }
 
     SwFlyFrmFmt *pFlyFrmFmt = 0;
-    xChartModel.set( SwTableFUNC( &rWrtShell, sal_False ).InsertChart( xDataProvider, (sal_True == xDataProvider.is()), aRangeString, &pFlyFrmFmt ));
+    xChartModel.set( SwTableFUNC( &rWrtShell, sal_False ).InsertChart( xDataProvider, xDataProvider.is(), aRangeString, &pFlyFrmFmt ));
 
     //open wizard
     //@todo get context from writer if that has one
diff --git a/sw/source/ui/vba/vbacolumns.cxx b/sw/source/ui/vba/vbacolumns.cxx
index 5bcf49b8b1d0..3344c8891e72 100644
--- a/sw/source/ui/vba/vbacolumns.cxx
+++ b/sw/source/ui/vba/vbacolumns.cxx
@@ -100,7 +100,7 @@ void SAL_CALL SwVbaColumns::Select(  ) throw (uno::RuntimeException)
 uno::Any SAL_CALL SwVbaColumns::Item( const uno::Any& Index1, const uno::Any& /*not processed in this base class*/ ) throw (uno::RuntimeException)
 {
     sal_Int32 nIndex = 0;
-    if( ( Index1 >>= nIndex ) == sal_True )
+    if( ( Index1 >>= nIndex ) )
     {
         if( nIndex <= 0 || nIndex > getCount() )
         {
diff --git a/sw/source/ui/vba/vbalistgalleries.cxx b/sw/source/ui/vba/vbalistgalleries.cxx
index ecb8852c84ca..87ea07c6a46a 100644
--- a/sw/source/ui/vba/vbalistgalleries.cxx
+++ b/sw/source/ui/vba/vbalistgalleries.cxx
@@ -55,7 +55,7 @@ SwVbaListGalleries::SwVbaListGalleries( const uno::Reference< XHelperInterface >
 uno::Any SAL_CALL SwVbaListGalleries::Item( const uno::Any& Index1, const uno::Any& /*not processed in this base class*/ ) throw (uno::RuntimeException)
 {
     sal_Int32 nIndex = 0;
-    if( ( Index1 >>= nIndex ) == sal_True )
+    if( ( Index1 >>= nIndex ) )
     {
         if( nIndex == word::WdListGalleryType::wdBulletGallery
             || nIndex == word::WdListGalleryType::wdNumberGallery
diff --git a/sw/source/ui/vba/vbalistlevels.cxx b/sw/source/ui/vba/vbalistlevels.cxx
index 9c2822f34fce..016d561214a5 100644
--- a/sw/source/ui/vba/vbalistlevels.cxx
+++ b/sw/source/ui/vba/vbalistlevels.cxx
@@ -60,7 +60,7 @@ SwVbaListLevels::SwVbaListLevels( const uno::Reference< XHelperInterface >& xPar
 uno::Any SAL_CALL SwVbaListLevels::Item( const uno::Any& Index1, const uno::Any& /*not processed in this base class*/ ) throw (uno::RuntimeException)
 {
     sal_Int32 nIndex = 0;
-    if( ( Index1 >>= nIndex ) == sal_False )
+    if( !( Index1 >>= nIndex ) )
         throw uno::RuntimeException();
     if( nIndex <=0 || nIndex > getCount() )
         throw  uno::RuntimeException("Index out of bounds", uno::Reference< uno::XInterface >() );
diff --git a/sw/source/ui/vba/vbalisttemplates.cxx b/sw/source/ui/vba/vbalisttemplates.cxx
index 00f3ee22bca3..d3ec908467b6 100644
--- a/sw/source/ui/vba/vbalisttemplates.cxx
+++ b/sw/source/ui/vba/vbalisttemplates.cxx
@@ -54,7 +54,7 @@ SwVbaListTemplates::SwVbaListTemplates( const uno::Reference< XHelperInterface >
 uno::Any SAL_CALL SwVbaListTemplates::Item( const uno::Any& Index1, const uno::Any& /*not processed in this base class*/ ) throw (uno::RuntimeException)
 {
     sal_Int32 nIndex = 0;
-    if( ( Index1 >>= nIndex ) == sal_False )
+    if( !( Index1 >>= nIndex ) )
         throw uno::RuntimeException();
     if( nIndex <=0 || nIndex > getCount() )
         throw  uno::RuntimeException("Index out of bounds", uno::Reference< uno::XInterface >() );
diff --git a/sw/source/ui/vba/vbarows.cxx b/sw/source/ui/vba/vbarows.cxx
index 9f728d6068b1..b87d19ed0196 100644
--- a/sw/source/ui/vba/vbarows.cxx
+++ b/sw/source/ui/vba/vbarows.cxx
@@ -319,7 +319,7 @@ void SAL_CALL SwVbaRows::Select(  ) throw (uno::RuntimeException)
 uno::Any SAL_CALL SwVbaRows::Item( const uno::Any& Index1, const uno::Any& /*not processed in this base class*/ ) throw (uno::RuntimeException)
 {
     sal_Int32 nIndex = 0;
-    if( ( Index1 >>= nIndex ) == sal_True )
+    if( ( Index1 >>= nIndex ) )
     {
         if( nIndex <= 0 || nIndex > getCount() )
         {
diff --git a/sw/source/ui/vba/vbaselection.cxx b/sw/source/ui/vba/vbaselection.cxx
index 676baf762c9f..3a10c07e9749 100644
--- a/sw/source/ui/vba/vbaselection.cxx
+++ b/sw/source/ui/vba/vbaselection.cxx
@@ -555,7 +555,7 @@ SwVbaSelection::TypeBackspace() throw ( uno::RuntimeException )
 uno::Reference< word::XRange > SAL_CALL SwVbaSelection::GoTo( const uno::Any& _what, const uno::Any& _which, const uno::Any& _count, const uno::Any& _name ) throw (uno::RuntimeException)
 {
     sal_Int32 nWhat = 0;
-    if( ( _what >>= nWhat ) != sal_True )
+    if( !( _what >>= nWhat ) )
          DebugHelper::exception(SbERR_BAD_ARGUMENT, OUString());
     switch( nWhat )
     {