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

Change-Id: I9869d9709f28b68ef7b518527175589d80644668

5 files changed, 19 insertions, 19 deletions

diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index 19dfa713e955..4d1be954f1f4 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -2066,7 +2066,7 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox )
 
         sal_Int32 nStart = 0, nLocalIndex = 0;
         Sequence< OUString > aChange;
-        sal_Bool bChanged = sal_False;
+        bool bChanged = false;
         for(sal_uInt16 i = 0; i < aModulesCLB.GetEntryCount(); i++)
         {
             SvTreeListEntry *pEntry = aModulesCLB.GetEntry(i);
@@ -2092,7 +2092,7 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox )
                 }
                 nLocalIndex = nStart = 0;
                 aChange.realloc(aModulesCLB.GetEntryCount());
-                bChanged = sal_False;
+                bChanged = false;
             }
             else
             {
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index 392ff4b7f7fb..73348d78f695 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -482,7 +482,7 @@ SfxTabPage* OfaSwAutoFmtOptionsPage::Create( Window* pParent,
 
 sal_Bool OfaSwAutoFmtOptionsPage::FillItemSet( SfxItemSet&  )
 {
-    sal_Bool bModified = sal_False;
+    bool bModified = false;
     SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect();
     SvxSwAutoFmtFlags *pOpt = &pAutoCorrect->GetSwFlags();
     long nFlags = pAutoCorrect->GetFlags();
@@ -1821,7 +1821,7 @@ sal_Bool OfaQuoteTabPage::FillItemSet( SfxItemSet&  )
         pAutoCorrect->SetAutoCorrFlag(ChgOrdinalNumber, m_pCheckLB->IsChecked(nPos++));
     }
 
-    sal_Bool bModified = sal_False;
+    bool bModified = false;
     if (m_pSwCheckLB->IsVisible())
     {
         SvxSwAutoFmtFlags *pOpt = &pAutoCorrect->GetSwFlags();
@@ -2163,7 +2163,7 @@ sal_Bool OfaAutoCompleteTabPage::FillItemSet( SfxItemSet& )
 
     if (m_pAutoCompleteList && nAutoCmpltListCnt != aLBEntries.GetEntryCount())
     {
-        bModified = sal_True;
+        bModified = true;
         pOpt->m_pAutoCompleteList = m_pAutoCompleteList;
     }
     if( bModified )
diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx
index 6b27019b1e9b..065bee0663a4 100644
--- a/cui/source/tabpages/grfpage.cxx
+++ b/cui/source/tabpages/grfpage.cxx
@@ -233,7 +233,7 @@ void SvxGrfCropPage::Reset( const SfxItemSet &rSet )
 sal_Bool SvxGrfCropPage::FillItemSet(SfxItemSet &rSet)
 {
     const SfxItemPool& rPool = *rSet.GetPool();
-    sal_Bool bModified = sal_False;
+    bool bModified = false;
     if( m_pWidthMF->GetSavedValue() != m_pWidthMF->GetText() ||
         m_pHeightMF->GetSavedValue() != m_pHeightMF->GetText() )
     {
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index 58130e2d5a61..5e5b40008646 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -141,9 +141,9 @@ static const sal_Unicode aBulletTypes[] =
 };
 
 // Is one of the masked formats set?
-static sal_Bool lcl_IsNumFmtSet(SvxNumRule* pNum, sal_uInt16 nLevelMask)
+static bool lcl_IsNumFmtSet(SvxNumRule* pNum, sal_uInt16 nLevelMask)
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     sal_uInt16 nMask = 1;
     for( sal_uInt16 i = 0; i < SVX_MAX_NUM && !bRet; i++ )
     {
@@ -1381,8 +1381,8 @@ void SvxNumOptionsTabPage::InitControls()
     bool bSamePrefix    = true;
     bool bSameSuffix    = true;
     bool bAllLevel      = true;
-    sal_Bool bSameCharFmt   = true;
-    sal_Bool bSameVOrient   = true;
+    bool bSameCharFmt   = true;
+    bool bSameVOrient   = true;
     bool bSameSize      = true;
     bool bSameBulColor  = true;
     bool bSameBulRelSize= true;
@@ -1694,7 +1694,7 @@ IMPL_LINK( SvxNumOptionsTabPage, NumberTypeSelectHdl_Impl, ListBox *, pBox )
 {
     OUString sSelectStyle;
     sal_Bool bShowOrient = sal_False;
-    sal_Bool bBmp = sal_False;
+    bool bBmp = false;
     OUString aEmptyStr;
     sal_uInt16 nMask = 1;
     for(sal_uInt16 i = 0; i < pActNum->GetLevelCount(); i++)
diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx
index 3fb49101039b..11157ca10499 100644
--- a/cui/source/tabpages/swpossizetabpage.cxx
+++ b/cui/source/tabpages/swpossizetabpage.cxx
@@ -730,11 +730,11 @@ sal_Bool SvxSwPosSizeTabPage::FillItemSet( SfxItemSet& rSet)
 {
     bool bAnchorChanged = false;
     short nAnchor = GetAnchorType(&bAnchorChanged);
-    sal_Bool bModified = sal_False;
+    bool bModified = false;
     if(bAnchorChanged)
     {
         rSet.Put(SfxInt16Item(SID_ATTR_TRANSFORM_ANCHOR, nAnchor));
-        bModified |= sal_True;
+        bModified = true;
     }
     if ( m_pPositionCB->GetState() != m_pPositionCB->GetSavedValue() )
     {
@@ -744,7 +744,7 @@ sal_Bool SvxSwPosSizeTabPage::FillItemSet( SfxItemSet& rSet)
             rSet.Put(
                 SfxBoolItem( GetWhich( SID_ATTR_TRANSFORM_PROTECT_POS ),
                 m_pPositionCB->GetState() == STATE_CHECK ? sal_True : sal_False ) );
-        bModified |= sal_True;
+        bModified = true;
     }
 
     if ( m_pSizeCB->GetState() != m_pSizeCB->GetSavedValue() )
@@ -755,7 +755,7 @@ sal_Bool SvxSwPosSizeTabPage::FillItemSet( SfxItemSet& rSet)
             rSet.Put(
                 SfxBoolItem( GetWhich( SID_ATTR_TRANSFORM_PROTECT_SIZE ),
                 m_pSizeCB->GetState() == STATE_CHECK ? sal_True : sal_False ) );
-        bModified |= sal_True;
+        bModified = true;
     }
 
     const SfxItemSet& rOldSet = GetItemSet();
@@ -782,7 +782,7 @@ sal_Bool SvxSwPosSizeTabPage::FillItemSet( SfxItemSet& rSet)
                 rSet.Put( SfxInt32Item( GetWhich( SID_ATTR_TRANSFORM_POS_X ), nHoriByPos ) );
                 rSet.Put( SfxInt32Item( GetWhich( SID_ATTR_TRANSFORM_POS_Y ), nVertByPos ) );
 
-                bModified |= sal_True;
+                bModified = true;
             }
         }
         else
@@ -811,7 +811,7 @@ sal_Bool SvxSwPosSizeTabPage::FillItemSet( SfxItemSet& rSet)
                     rSet.Put(SfxInt16Item(SID_ATTR_TRANSFORM_HORI_RELATION, nRel));
                     if(m_pHoriByMF->IsEnabled())
                         rSet.Put(SfxInt32Item(SID_ATTR_TRANSFORM_HORI_POSITION, nHoriByPos));
-                    bModified |= sal_True;
+                    bModified = true;
                 }
             }
             if(m_pHoriMirrorCB->IsEnabled() && m_pHoriMirrorCB->IsChecked() != m_pHoriMirrorCB->GetSavedValue())
@@ -846,7 +846,7 @@ sal_Bool SvxSwPosSizeTabPage::FillItemSet( SfxItemSet& rSet)
                     rSet.Put(SfxInt16Item(SID_ATTR_TRANSFORM_VERT_RELATION, nRel));
                     if(m_pVertByMF->IsEnabled())
                         rSet.Put(SfxInt32Item(SID_ATTR_TRANSFORM_VERT_POSITION, nVertByPos));
-                    bModified |= sal_True;
+                    bModified = true;
                 }
             }
 
@@ -876,7 +876,7 @@ sal_Bool SvxSwPosSizeTabPage::FillItemSet( SfxItemSet& rSet)
         //this item is required by SdrEditView::SetGeoAttrToMarked()
         rSet.Put( SfxAllEnumItem( GetWhich( SID_ATTR_TRANSFORM_SIZE_POINT ), RP_LT ) );
 
-        bModified |= sal_True;
+        bModified = true;
     }
 
     return bModified;