bool improvements (related to mixing bool/sal_Bool in &=, |=, ^=)

Change-Id: I9869d9709f28b68ef7b518527175589d80644668

26 files changed, 92 insertions, 92 deletions

diff --git a/sw/source/core/access/accportions.cxx b/sw/source/core/access/accportions.cxx
index fba412d6e787..996bc1ba0b96 100644
--- a/sw/source/core/access/accportions.cxx
+++ b/sw/source/core/access/accportions.cxx
@@ -708,7 +708,7 @@ void SwAccessiblePortionData::AdjustAndCheck(
     sal_Int32 nPos,
     size_t& nPortionNo,
     sal_Int32& nCorePos,
-    sal_Bool& bEdit) const
+    bool& bEdit) const
 {
     // find portion and get mode position
     nPortionNo = FindBreak( aAccessiblePositions, nPos );
@@ -726,7 +726,7 @@ sal_Bool SwAccessiblePortionData::GetEditableRange(
     sal_Int32 nStart, sal_Int32 nEnd,
     sal_Int32& nCoreStart, sal_Int32& nCoreEnd ) const
 {
-    sal_Bool bIsEditable = sal_True;
+    bool bIsEditable = true;
 
     // get start and end portions
     size_t nStartPortion, nEndPortion;
diff --git a/sw/source/core/access/accportions.hxx b/sw/source/core/access/accportions.hxx
index fe319690d499..ad09e8f66e5a 100644
--- a/sw/source/core/access/accportions.hxx
+++ b/sw/source/core/access/accportions.hxx
@@ -89,7 +89,7 @@ class SwAccessiblePortionData : public SwPortionHandler
 
     // helper method for GetEditableRange(...):
     void AdjustAndCheck( sal_Int32 nPos, size_t& nPortionNo,
-                         sal_Int32& nCorePos, sal_Bool& bEdit ) const;
+                         sal_Int32& nCorePos, bool& bEdit ) const;
 
 public:
     SwAccessiblePortionData( const SwTxtNode* pTxtNd,
diff --git a/sw/source/core/edit/edtab.cxx b/sw/source/core/edit/edtab.cxx
index 7672e74fba69..1972a454c34c 100644
--- a/sw/source/core/edit/edtab.cxx
+++ b/sw/source/core/edit/edtab.cxx
@@ -122,7 +122,7 @@ sal_Bool SwEditShell::TextToTable( const SwInsertTableOptions& rInsTblOpts,
                                const SwTableAutoFmt* pTAFmt )
 {
     SwWait aWait( *GetDoc()->GetDocShell(), true );
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     StartAllAction();
     FOREACHPAM_START(GetCrsr())
         if( PCURCRSR->HasMark() )
diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx
index ea7b644b1879..b9222fdf6ed5 100644
--- a/sw/source/core/layout/layact.cxx
+++ b/sw/source/core/layout/layact.cxx
@@ -2309,14 +2309,14 @@ SwLayIdle::SwLayIdle( SwRootFrm *pRt, SwViewImp *pI ) :
 
         // Further start/end actions only happen if there were paints started
         // somewhere or if the visibility of the CharRects has changed.
-        sal_Bool bActions = sal_False;
+        bool bActions = false;
         sal_uInt16 nBoolIdx = 0;
         do
         {
             --pSh->mnStartAction;
 
             if ( pSh->Imp()->GetRegion() )
-                bActions = sal_True;
+                bActions = true;
             else
             {
                 SwRect aTmp( pSh->VisArea() );
diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index 500765d3172e..5fd60d154d21 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -1575,7 +1575,7 @@ static sal_Bool lcl_InnerCalcLayout( SwFrm *pFrm,
 {
     // LONG_MAX == nBottom means we have to calculate all
     bool bAll = LONG_MAX == nBottom;
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     const SwFrm* pOldUp = pFrm->GetUpper();
     SWRECTFN( pFrm )
     do
diff --git a/sw/source/core/text/itrpaint.cxx b/sw/source/core/text/itrpaint.cxx
index af16121ee3c8..8654c939a207 100644
--- a/sw/source/core/text/itrpaint.cxx
+++ b/sw/source/core/text/itrpaint.cxx
@@ -285,7 +285,7 @@ void SwTxtPainter::DrawTextLine( const SwRect &rPaint, SwSaveClip &rClip,
         SeekStartAndChg( GetInfo() );
 
     sal_Bool bRest = pCurr->IsRest();
-    sal_Bool bFirst = sal_True;
+    bool bFirst = true;
 
     SwArrowPortion *pArrow = NULL;
     // Reference portion for the paragraph end portion
diff --git a/sw/source/core/text/pormulti.cxx b/sw/source/core/text/pormulti.cxx
index 1862eb54dc2e..0ca8077fa01b 100644
--- a/sw/source/core/text/pormulti.cxx
+++ b/sw/source/core/text/pormulti.cxx
@@ -1473,7 +1473,7 @@ void SwTxtPainter::PaintMultiPortion( const SwRect &rPaint,
         nOfst = nOldY - rMulti.GetAscent();
 
     sal_Bool bRest = pLay->IsRest();
-    sal_Bool bFirst = sal_True;
+    bool bFirst = true;
 
     OSL_ENSURE( 0 == GetInfo().GetUnderFnt() || rMulti.IsBidi(),
             " Only BiDi portions are allowed to use the common underlining font" );
diff --git a/sw/source/core/text/txtfly.cxx b/sw/source/core/text/txtfly.cxx
index ba5159390bed..8379f10b9350 100644
--- a/sw/source/core/text/txtfly.cxx
+++ b/sw/source/core/text/txtfly.cxx
@@ -710,7 +710,7 @@ sal_Bool SwTxtFly::GetTop( const SwAnchoredObject* _pAnchoredObj,
         // #i68520#
         // bEvade: consider pNew, if we are not inside a fly
         //         consider pNew, if pNew is lower of <mpCurrAnchoredObj>
-        sal_Bool bEvade = !mpCurrAnchoredObj ||
+        bool bEvade = !mpCurrAnchoredObj ||
                           Is_Lower_Of( dynamic_cast<const SwFlyFrm*>(mpCurrAnchoredObj), pNew);
 
         if ( !bEvade )
@@ -722,7 +722,7 @@ sal_Bool SwTxtFly::GetTop( const SwAnchoredObject* _pAnchoredObj,
             // If bTopRule is not set, we ignore the frame types.
             // We directly check the z-order
             if ( !bTopRule )
-                bEvade = sal_True;
+                bEvade = true;
             else
             {
                 // Within chained Flys we only avoid Lower
@@ -748,7 +748,7 @@ sal_Bool SwTxtFly::GetTop( const SwAnchoredObject* _pAnchoredObj,
                     {
                         if (FLY_AT_PAGE == rCurrA.GetAnchorId())
                         {
-                            bEvade = sal_True;
+                            bEvade = true;
                         }
                         else
                             return sal_False;
@@ -756,7 +756,7 @@ sal_Bool SwTxtFly::GetTop( const SwAnchoredObject* _pAnchoredObj,
                     else if (FLY_AT_PAGE == rCurrA.GetAnchorId())
                         return sal_False; // Page anchored ones only avoid page anchored ones
                     else if (FLY_AT_FLY == rNewA.GetAnchorId())
-                        bEvade = sal_True; // Non-page anchored ones avoid frame anchored ones
+                        bEvade = true; // Non-page anchored ones avoid frame anchored ones
                     else if( FLY_AT_FLY == rCurrA.GetAnchorId() )
                         return sal_False; // Frame anchored ones do not avoid paragraph anchored ones
                     // #i57062#
@@ -778,7 +778,7 @@ sal_Bool SwTxtFly::GetTop( const SwAnchoredObject* _pAnchoredObj,
                 // #i68520#
                 SwRect aTmp( _pAnchoredObj->GetObjRectWithSpaces() );
                 if ( !aTmp.IsOver( mpCurrAnchoredObj->GetObjRectWithSpaces() ) )
-                    bEvade = sal_False;
+                    bEvade = false;
             }
         }
 
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index 434619df6787..1ab9890f6780 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -596,7 +596,7 @@ void SwHTMLParser::Continue( int nToken )
 
     bSetModEnabled = sal_False;
     if( pDoc->GetDocShell() &&
-        0 != (bSetModEnabled = pDoc->GetDocShell()->IsEnableSetModified()) )
+        (bSetModEnabled = pDoc->GetDocShell()->IsEnableSetModified()) )
     {
         pDoc->GetDocShell()->EnableSetModified( sal_False );
     }
diff --git a/sw/source/filter/html/swhtml.hxx b/sw/source/filter/html/swhtml.hxx
index 6a2304d4701d..4a88b6f284ce 100644
--- a/sw/source/filter/html/swhtml.hxx
+++ b/sw/source/filter/html/swhtml.hxx
@@ -73,9 +73,9 @@ class _HTMLAttr
 
     SwNodeIndex nSttPara, nEndPara;
     sal_Int32 nSttCntnt, nEndCntnt;
-    sal_Bool bInsAtStart : 1;
-    sal_Bool bLikePara : 1; // Attribut ueber dem gesamten Absatz setzen
-    sal_Bool bValid : 1;    // ist das Attribut gueltig?
+    bool bInsAtStart : 1;
+    bool bLikePara : 1; // Attribut ueber dem gesamten Absatz setzen
+    bool bValid : 1;    // ist das Attribut gueltig?
 
     SfxPoolItem* pItem;
     sal_uInt16 nCount;      // Anzahl noch zu schliessender Attrs mit einem Wert
@@ -214,15 +214,15 @@ class _HTMLAttrContext
 
     SwHTMLAppendMode eAppend;
 
-    sal_Bool    bLRSpaceChanged : 1;// linker/rechtr Rand, Einzug veraendert?
-    sal_Bool    bULSpaceChanged : 1;// oberer/unterer Rand veraendert?
-    sal_Bool    bDfltTxtFmtColl : 1;// nTxtFmtColl ist nur ein default
-    sal_Bool    bSpansSection : 1;  // Der Kontext spannt eine SwSection auf
-    sal_Bool    bPopStack : 1;      // Oberhalb liegende Stack-Elemente entf.
-    sal_Bool    bFinishPREListingXMP : 1;
-    sal_Bool    bRestartPRE : 1;
-    sal_Bool    bRestartXMP : 1;
-    sal_Bool    bRestartListing : 1;
+    bool    bLRSpaceChanged : 1;// linker/rechtr Rand, Einzug veraendert?
+    bool    bULSpaceChanged : 1;// oberer/unterer Rand veraendert?
+    bool    bDfltTxtFmtColl : 1;// nTxtFmtColl ist nur ein default
+    bool    bSpansSection : 1;  // Der Kontext spannt eine SwSection auf
+    bool    bPopStack : 1;      // Oberhalb liegende Stack-Elemente entf.
+    bool    bFinishPREListingXMP : 1;
+    bool    bRestartPRE : 1;
+    bool    bRestartXMP : 1;
+    bool    bRestartListing : 1;
 
 public:
     void ClearSaveDocContext();
@@ -431,46 +431,46 @@ class SwHTMLParser : public SfxHTMLParser, public SwClient
     SvxAdjust   eParaAdjust;    // Ausrichtung des aktuellen Absatz
     HTMLScriptLanguage eScriptLang; // die aktuelle Script-Language
 
-    sal_Bool bOldIsHTMLMode : 1;    // War's mal ein HTML-Dokument?
+    bool bOldIsHTMLMode : 1;    // War's mal ein HTML-Dokument?
 
-    sal_Bool bDocInitalized : 1;    // Dokument bzw. Shell wurden initialisiert
+    bool bDocInitalized : 1;    // Dokument bzw. Shell wurden initialisiert
                                 // Flag um doppeltes init durch Rekursion
                                 // zu verhindern.
-    sal_Bool bViewCreated : 1;      // die View wurde schon erzeugt (asynchron)
-    sal_Bool bSetCrsr : 1;          // Crsr wieder auf den Anfang setzen
-    sal_Bool bSetModEnabled : 1;
+    bool bViewCreated : 1;      // die View wurde schon erzeugt (asynchron)
+    bool bSetCrsr : 1;          // Crsr wieder auf den Anfang setzen
+    bool bSetModEnabled : 1;
 
-    sal_Bool bInFloatingFrame : 1;  // Wir sind in einen Floating ::com::sun::star::frame::Frame
-    sal_Bool bInField : 1;
-    sal_Bool bKeepUnknown : 1;      // unbekannte/nicht unterstuetze Tokens beh.
+    bool bInFloatingFrame : 1;  // Wir sind in einen Floating ::com::sun::star::frame::Frame
+    bool bInField : 1;
+    bool bKeepUnknown : 1;      // unbekannte/nicht unterstuetze Tokens beh.
     // 8
-    sal_Bool bCallNextToken : 1;    // In Tabellen: NextToken in jedem Fall rufen
-    sal_Bool bIgnoreRawData : 1;    // Inhalt eines Scripts/Styles ignorieren.
-    sal_Bool bLBEntrySelected : 1;  // Ist der aktuelle Listbox-Eintrag selekt.
-    sal_Bool bTAIgnoreNewPara : 1;  // naechstes LF in TextArea ignorieren?
-    sal_Bool bFixMarqueeWidth : 1;  // Groesse einer Laufschrift anpassen?
-    sal_Bool bFixMarqueeHeight : 1;
-
-    sal_Bool bUpperSpace : 1;       // obererer Absatz-Abstand wird benoetigt
-    sal_Bool bNoParSpace : 1;
+    bool bCallNextToken : 1;    // In Tabellen: NextToken in jedem Fall rufen
+    bool bIgnoreRawData : 1;    // Inhalt eines Scripts/Styles ignorieren.
+    bool bLBEntrySelected : 1;  // Ist der aktuelle Listbox-Eintrag selekt.
+    bool bTAIgnoreNewPara : 1;  // naechstes LF in TextArea ignorieren?
+    bool bFixMarqueeWidth : 1;  // Groesse einer Laufschrift anpassen?
+    bool bFixMarqueeHeight : 1;
+
+    bool bUpperSpace : 1;       // obererer Absatz-Abstand wird benoetigt
+    bool bNoParSpace : 1;
     // 16
 
-    sal_Bool bAnyStarBasic : 1;     // gibt es ueberhaupt ein StarBasic-Modul
-    sal_Bool bInNoEmbed : 1;        // Wir sind in einem NOEMBED-Bereich
+    bool bAnyStarBasic : 1;     // gibt es ueberhaupt ein StarBasic-Modul
+    bool bInNoEmbed : 1;        // Wir sind in einem NOEMBED-Bereich
 
-    sal_Bool bInTitle : 1;          // Wir sind im Titel
+    bool bInTitle : 1;          // Wir sind im Titel
 
-    sal_Bool bChkJumpMark : 1;      // springe ggfs. zu einem vorgegebenem Mark
-    sal_Bool bUpdateDocStat : 1;
-    sal_Bool bFixSelectWidth : 1;   // Breite eines Selects neu setzen?
-    sal_Bool bFixSelectHeight : 1;  // Breite eines Selects neu setzen?
-    sal_Bool bTextArea : 1;
+    bool bChkJumpMark : 1;      // springe ggfs. zu einem vorgegebenem Mark
+    bool bUpdateDocStat : 1;
+    bool bFixSelectWidth : 1;   // Breite eines Selects neu setzen?
+    bool bFixSelectHeight : 1;  // Breite eines Selects neu setzen?
+    bool bTextArea : 1;
     // 24
-    sal_Bool bSelect : 1;
-    sal_Bool bInFootEndNoteAnchor : 1;
-    sal_Bool bInFootEndNoteSymbol : 1;
-    sal_Bool bIgnoreHTMLComments : 1;
-    sal_Bool bRemoveHidden : 1; // the filter implementation might set the hidden flag
+    bool bSelect : 1;
+    bool bInFootEndNoteAnchor : 1;
+    bool bInFootEndNoteSymbol : 1;
+    bool bIgnoreHTMLComments : 1;
+    bool bRemoveHidden : 1; // the filter implementation might set the hidden flag
 
     /// the names corresponding to the DOCINFO field subtypes INFO[1-4]
     OUString m_InfoNames[4];
diff --git a/sw/source/filter/xml/xmlfmt.cxx b/sw/source/filter/xml/xmlfmt.cxx
index 6d57f12336ec..f0bca134e4f9 100644
--- a/sw/source/filter/xml/xmlfmt.cxx
+++ b/sw/source/filter/xml/xmlfmt.cxx
@@ -136,7 +136,7 @@ SwXMLConditionParser_Impl::SwXMLConditionParser_Impl( const OUString& rInp ) :
     OUString sFunc;
     bool bHasSub = false;
     sal_uInt32 nSub = 0;
-    sal_Bool bOK = SkipWS() && MatchName( sFunc ) && SkipWS() &&
+    bool bOK = SkipWS() && MatchName( sFunc ) && SkipWS() &&
                MatchChar( '(' ) && SkipWS() && MatchChar( ')' ) && SkipWS();
     if( bOK && MatchChar( '=' ) )
     {
diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx
index fd941ce57822..4077b8898a3f 100644
--- a/sw/source/filter/xml/xmltbli.cxx
+++ b/sw/source/filter/xml/xmltbli.cxx
@@ -2271,9 +2271,9 @@ SwTableLine *SwXMLTableContext::MakeTableLine( SwTableBox *pUpper,
             // Can be split after current HTML table column?
             // If yes, can the created region still be split to
             // rows if the next column is added to it?
-            sal_Bool bSplit = sal_True;
-            sal_Bool bHoriSplitMayContinue = sal_False;
-            sal_Bool bHoriSplitPossible = sal_False;
+            bool bSplit = true;
+            bool bHoriSplitMayContinue = false;
+            bool bHoriSplitPossible = false;
 
             if ( bHasSubTables )
             {
@@ -2283,7 +2283,7 @@ SwTableLine *SwXMLTableContext::MakeTableLine( SwTableBox *pUpper,
                     SwXMLTableCell_Impl *pCell = GetCell(nRow,nCol);
                     // Could the table fragment be splitted horizontally behind
                     // the current line?
-                    sal_Bool bHoriSplit = (*pRows)[(sal_uInt16)nRow].IsSplitable() &&
+                    bool bHoriSplit = (*pRows)[(sal_uInt16)nRow].IsSplitable() &&
                                       nRow+1UL < nBottomRow &&
                                       1UL == pCell->GetRowSpan();
                     (*pRows)[(sal_uInt16)nRow].SetSplitable( bHoriSplit );
diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx
index d7efd5391f70..3f76347d0999 100644
--- a/sw/source/ui/config/optpage.cxx
+++ b/sw/source/ui/config/optpage.cxx
@@ -1356,13 +1356,13 @@ sal_Bool SwShdwCrsrOptionsTabPage::FillItemSet( SfxItemSet& rSet )
         eMode = FILL_SPACE;
     aOpt.SetMode( eMode );
 
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     const SfxPoolItem* pItem = 0;
     if( SFX_ITEM_SET != rSet.GetItemState( FN_PARAM_SHADOWCURSOR, sal_False, &pItem )
         ||  ((SwShadowCursorItem&)*pItem) != aOpt )
     {
         rSet.Put( aOpt );
-        bRet = sal_True;
+        bRet = true;
     }
 
     if (m_pWrtShell) {
@@ -1374,7 +1374,7 @@ sal_Bool SwShdwCrsrOptionsTabPage::FillItemSet( SfxItemSet& rSet )
     if( m_pCrsrInProtCB->IsChecked() != m_pCrsrInProtCB->GetSavedValue())
     {
         rSet.Put(SfxBoolItem(FN_PARAM_CRSR_IN_PROTECTED, m_pCrsrInProtCB->IsChecked()));
-        bRet |= sal_True;
+        bRet = true;
     }
 
     const SwDocDisplayItem* pOldAttr = (const SwDocDisplayItem*)
diff --git a/sw/source/ui/fldui/flddb.cxx b/sw/source/ui/fldui/flddb.cxx
index f47713474fcd..4dc390a91686 100644
--- a/sw/source/ui/fldui/flddb.cxx
+++ b/sw/source/ui/fldui/flddb.cxx
@@ -391,7 +391,7 @@ IMPL_LINK( SwFldDBPage, NumSelectHdl, NumFormatListBox *, pLB )
 
 void SwFldDBPage::CheckInsert()
 {
-    sal_Bool bInsert = sal_True;
+    bool bInsert = true;
     sal_uInt16 nTypeId = (sal_uInt16)(sal_uLong)m_pTypeLB->GetEntryData(GetTypeSel());
 
     SvTreeListEntry* pEntry = m_pDatabaseTLB->GetCurEntry();
@@ -406,7 +406,7 @@ void SwFldDBPage::CheckInsert()
         bInsert &= pEntry != 0;
     }
     else
-        bInsert = sal_False;
+        bInsert = false;
 
     if (nTypeId == TYP_DBNUMSETFLD)
     {
diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx
index 7679f6a4c230..63c489b9f5b3 100644
--- a/sw/source/ui/frmdlg/frmpage.cxx
+++ b/sw/source/ui/frmdlg/frmpage.cxx
@@ -1024,7 +1024,7 @@ void SwFrmPage::Reset( const SfxItemSet &rSet )
  --------------------------------------------------------------------*/
 sal_Bool SwFrmPage::FillItemSet(SfxItemSet &rSet)
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     SwWrtShell* pSh = bFormat ? ::GetActiveWrtShell()
                         : getFrmDlgParentShell();
     OSL_ENSURE( pSh , "shell not found");
@@ -1059,7 +1059,7 @@ sal_Bool SwFrmPage::FillItemSet(SfxItemSet &rSet)
         aHoriOrient.SetRelationOrient( eRel );
         aHoriOrient.SetPosToggle(m_pMirrorPagesCB->IsChecked());
 
-        sal_Bool bMod = m_pAtHorzPosED->GetText() != m_pAtHorzPosED->GetSavedValue();
+        bool bMod = m_pAtHorzPosED->GetText() != m_pAtHorzPosED->GetSavedValue();
         bMod |= m_pMirrorPagesCB->GetState() != m_pMirrorPagesCB->GetSavedValue();
 
         if ( eHOri == text::HoriOrientation::NONE &&
@@ -3019,7 +3019,7 @@ void SwFrmAddPage::Reset(const SfxItemSet &rSet )
 
 sal_Bool SwFrmAddPage::FillItemSet(SfxItemSet &rSet)
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     if (pNameED->GetText() != pNameED->GetSavedValue())
         bRet |= 0 != rSet.Put(SfxStringItem(FN_SET_FRM_NAME, pNameED->GetText()));
     if (pAltNameED->GetText()  != pAltNameED->GetSavedValue())
diff --git a/sw/source/ui/frmdlg/wrap.cxx b/sw/source/ui/frmdlg/wrap.cxx
index a48715008a83..c32f02b598f2 100644
--- a/sw/source/ui/frmdlg/wrap.cxx
+++ b/sw/source/ui/frmdlg/wrap.cxx
@@ -270,7 +270,7 @@ void SwWrapTabPage::Reset(const SfxItemSet &rSet)
  --------------------------------------------------------------------*/
 sal_Bool SwWrapTabPage::FillItemSet(SfxItemSet &rSet)
 {
-    sal_Bool bModified = sal_False;
+    bool bModified = false;
     const SfxPoolItem* pOldItem;
 
     const SwFmtSurround& rOldSur = (const SwFmtSurround&)GetItemSet().Get(RES_SURROUND);
@@ -313,7 +313,7 @@ sal_Bool SwWrapTabPage::FillItemSet(SfxItemSet &rSet)
                 aSur != *pOldItem )
     {
         rSet.Put(aSur);
-        bModified = sal_True;
+        bModified = true;
     }
 
     if (!bDrawMode)
@@ -322,7 +322,7 @@ sal_Bool SwWrapTabPage::FillItemSet(SfxItemSet &rSet)
                     aOp != *pOldItem )
         {
             rSet.Put(aOp);
-            bModified = sal_True;
+            bModified = true;
         }
     }
 
@@ -339,7 +339,7 @@ sal_Bool SwWrapTabPage::FillItemSet(SfxItemSet &rSet)
                 aUL != *pOldItem )
         {
             rSet.Put( aUL, RES_UL_SPACE );
-            bModified = sal_True;
+            bModified = true;
         }
     }
 
@@ -356,7 +356,7 @@ sal_Bool SwWrapTabPage::FillItemSet(SfxItemSet &rSet)
                 aLR != *pOldItem )
         {
             rSet.Put(aLR, RES_LR_SPACE);
-            bModified = sal_True;
+            bModified = true;
         }
     }
 
@@ -599,7 +599,7 @@ IMPL_LINK( SwWrapTabPage, RangeModifyHdl, MetricField *, pEdit )
 
 IMPL_LINK( SwWrapTabPage, WrapTypeHdl, RadioButton *, pBtn )
 {
-    sal_Bool bWrapThrough = (pBtn == m_pWrapThroughRB);
+    bool bWrapThrough = (pBtn == m_pWrapThroughRB);
     m_pWrapTransparentCB->Enable( bWrapThrough && !bHtmlMode );
     bWrapThrough |= ( nAnchorId == FLY_AS_CHAR );
     m_pWrapOutlineCB->Enable( !bWrapThrough && pBtn != m_pNoWrapRB);
diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx
index 22d7f7004eb2..dec1c52727c7 100644
--- a/sw/source/ui/misc/glossary.cxx
+++ b/sw/source/ui/misc/glossary.cxx
@@ -368,7 +368,7 @@ IMPL_LINK( SwGlossaryDlg, NameModify, Edit *, pEdit )
         //ShortNameEdit
         if(!bNotFound)
         {
-            sal_Bool bEnable = !bNotFound;
+            bool bEnable = !bNotFound;
             bEnable &= !bIsDocReadOnly;
             m_pInsertBtn->Enable(bEnable);
         }
diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx
index 6cde196f6737..8c019a245d06 100644
--- a/sw/source/ui/misc/outline.cxx
+++ b/sw/source/ui/misc/outline.cxx
@@ -443,12 +443,12 @@ void    SwOutlineSettingsTabPage::Update()
     m_pCollBox->Enable(USHRT_MAX != nActLevel);
     if(USHRT_MAX == nActLevel)
     {
-        sal_Bool bSamePrefix = sal_True;
-        sal_Bool bSameSuffix = sal_True;
-        sal_Bool bSameType = sal_True;
-        sal_Bool bSameComplete = sal_True;
-        sal_Bool bSameStart = sal_True;
-        sal_Bool bSameCharFmt = sal_True;
+        bool bSamePrefix = true;
+        bool bSameSuffix = true;
+        bool bSameType = true;
+        bool bSameComplete = true;
+        bool bSameStart = true;
+        bool bSameCharFmt = true;
 
         const SwNumFmt* aNumFmtArr[MAXLEVEL];
         const SwCharFmt* pFirstFmt = 0;
diff --git a/sw/source/ui/misc/redlndlg.cxx b/sw/source/ui/misc/redlndlg.cxx
index 8a119663082f..a54e192f6139 100644
--- a/sw/source/ui/misc/redlndlg.cxx
+++ b/sw/source/ui/misc/redlndlg.cxx
@@ -259,7 +259,7 @@ void SwRedlineAcceptDlg::InitAuthors()
 
     bOnlyFormatedRedlines = sal_True;
     bHasReadonlySel = sal_False;
-    sal_Bool bIsNotFormated = sal_False;
+    bool bIsNotFormated = false;
     sal_uInt16 i;
 
     // determine authors
@@ -924,7 +924,7 @@ IMPL_LINK_NOARG(SwRedlineAcceptDlg, GotoHdl)
     SwWrtShell* pSh = ::GetActiveView()->GetWrtShellPtr();
     aSelectTimer.Stop();
 
-    sal_Bool bIsNotFormated = sal_False;
+    bool bIsNotFormated = false;
     bool bSel = false;
 
     //#98883# don't select redlines while the dialog is not focussed
diff --git a/sw/source/ui/shells/drawsh.cxx b/sw/source/ui/shells/drawsh.cxx
index c3d31208af54..307789139a97 100644
--- a/sw/source/ui/shells/drawsh.cxx
+++ b/sw/source/ui/shells/drawsh.cxx
@@ -281,7 +281,7 @@ void SwDrawShell::GetState(SfxItemSet& rSet)
     SdrView* pSdrView = rSh.GetDrawViewWithValidMarkList();
     SfxWhichIter aIter( rSet );
     sal_uInt16 nWhich = aIter.FirstWhich();
-    sal_Bool bProtected = rSh.IsSelObjProtected(FLYPROTECT_CONTENT);
+    bool bProtected = rSh.IsSelObjProtected(FLYPROTECT_CONTENT);
 
     if (!bProtected)    // Check the parent
         bProtected |= rSh.IsSelObjProtected( FLYPROTECT_CONTENT|FLYPROTECT_PARENT ) != 0;
diff --git a/sw/source/ui/shells/drwbassh.cxx b/sw/source/ui/shells/drwbassh.cxx
index ecee1ed97b29..e4f7c781658c 100644
--- a/sw/source/ui/shells/drwbassh.cxx
+++ b/sw/source/ui/shells/drwbassh.cxx
@@ -645,7 +645,7 @@ void SwDrawBaseShell::GetState(SfxItemSet& rSet)
     SdrView* pSdrView = rSh.GetDrawViewWithValidMarkList();
     SfxWhichIter aIter( rSet );
     sal_uInt16 nWhich = aIter.FirstWhich();
-    sal_Bool bProtected = rSh.IsSelObjProtected(FLYPROTECT_CONTENT);
+    bool bProtected = rSh.IsSelObjProtected(FLYPROTECT_CONTENT);
 
     if (!bProtected)    // Look in the parent
         bProtected |= rSh.IsSelObjProtected( FLYPROTECT_CONTENT|FLYPROTECT_PARENT ) != 0;
diff --git a/sw/source/ui/shells/tabsh.cxx b/sw/source/ui/shells/tabsh.cxx
index 4152393812ab..1ad2ad926407 100644
--- a/sw/source/ui/shells/tabsh.cxx
+++ b/sw/source/ui/shells/tabsh.cxx
@@ -278,7 +278,7 @@ void ItemSetToTableParam( const SfxItemSet& rSet,
     bool bBorder = ( SFX_ITEM_SET == rSet.GetItemState( RES_BOX ) ||
             SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_BORDER_INNER ) );
     pItem = 0;
-    sal_Bool bBackground = SFX_ITEM_SET == rSet.GetItemState( RES_BACKGROUND, sal_False, &pItem );
+    bool bBackground = SFX_ITEM_SET == rSet.GetItemState( RES_BACKGROUND, sal_False, &pItem );
     const SfxPoolItem* pRowItem = 0, *pTableItem = 0;
     bBackground |= SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_BRUSH_ROW, sal_False, &pRowItem );
     bBackground |= SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_BRUSH_TABLE, sal_False, &pTableItem );
diff --git a/sw/source/ui/shells/textsh.cxx b/sw/source/ui/shells/textsh.cxx
index efc5ae3a32b8..d2bbceef4606 100644
--- a/sw/source/ui/shells/textsh.cxx
+++ b/sw/source/ui/shells/textsh.cxx
@@ -475,7 +475,7 @@ void SwTextShell::ExecInsert(SfxRequest &rReq)
     case FN_INSERT_FRAME_INTERACT:
     {
         sal_uInt16 nCols = 1;
-        sal_Bool bModifier1 = rReq.GetModifier() == KEY_MOD1;
+        bool bModifier1 = rReq.GetModifier() == KEY_MOD1;
         if(pArgs)
         {
             if(FN_INSERT_FRAME_INTERACT_NOCOL != nSlot &&
diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx
index 46901353c322..8e191e5f6429 100644
--- a/sw/source/ui/table/tabledlg.cxx
+++ b/sw/source/ui/table/tabledlg.cxx
@@ -1349,7 +1349,7 @@ SfxTabPage*   SwTextFlowPage::Create( Window* pParent,
 
 sal_Bool  SwTextFlowPage::FillItemSet( SfxItemSet& rSet )
 {
-    sal_Bool bModified = sal_False;
+    bool bModified = false;
 
     // Repeat Heading
     if(m_pHeadLineCB->IsChecked() != m_pHeadLineCB->GetSavedValue() ||
diff --git a/sw/source/ui/uiview/formatclipboard.cxx b/sw/source/ui/uiview/formatclipboard.cxx
index 108f9d32763c..f383d23ca07b 100644
--- a/sw/source/ui/uiview/formatclipboard.cxx
+++ b/sw/source/ui/uiview/formatclipboard.cxx
@@ -141,7 +141,7 @@ void lcl_setTableAttributes( const SfxItemSet& rSet, SwWrtShell &rSh )
     const SfxPoolItem* pItem = 0;
     bool bBorder = ( SFX_ITEM_SET == rSet.GetItemState( RES_BOX ) ||
             SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_BORDER_INNER ) );
-    sal_Bool bBackground = SFX_ITEM_SET == rSet.GetItemState( RES_BACKGROUND, sal_False, &pItem );
+    bool bBackground = SFX_ITEM_SET == rSet.GetItemState( RES_BACKGROUND, sal_False, &pItem );
     const SfxPoolItem* pRowItem = 0, *pTableItem = 0;
     bBackground |= SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_BRUSH_ROW, sal_False, &pRowItem );
     bBackground |= SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_BRUSH_TABLE, sal_False, &pTableItem );
diff --git a/sw/source/ui/wrtsh/select.cxx b/sw/source/ui/wrtsh/select.cxx
index d18ffdad6f88..56660aa03052 100644
--- a/sw/source/ui/wrtsh/select.cxx
+++ b/sw/source/ui/wrtsh/select.cxx
@@ -147,7 +147,7 @@ long SwWrtShell::SelAll()
                 pEndPos = new SwPosition( *pTmpCrsr->GetMark() );
             }
             Push();
-            sal_Bool bIsFullSel = !MoveSection( fnSectionCurr, fnSectionStart);
+            bool bIsFullSel = !MoveSection( fnSectionCurr, fnSectionStart);
             SwapPam();
             bIsFullSel &= !MoveSection( fnSectionCurr, fnSectionEnd);
             Pop(sal_False);