sal_Bool to bool

Change-Id: I5f09b1832fa453299c4f8a455d2f3499225550a1

3 files changed, 11 insertions, 13 deletions

diff --git a/sw/source/core/edit/editsh.cxx b/sw/source/core/edit/editsh.cxx
index 9e1d9f22e273..370c94a7253c 100644
--- a/sw/source/core/edit/editsh.cxx
+++ b/sw/source/core/edit/editsh.cxx
@@ -128,8 +128,7 @@ void SwEditShell::Insert2(const OUString &rStr, const bool bForceExpandHints )
             if ( nPrevPos )
                 --nPrevPos;
 
-            SwScriptInfo* pSI = SwScriptInfo::GetScriptInfo( ((SwTxtNode&)rNode),
-                                                              sal_True );
+            SwScriptInfo* pSI = SwScriptInfo::GetScriptInfo( ((SwTxtNode&)rNode), true );
 
             sal_uInt8 nLevel = 0;
             if ( ! pSI )
diff --git a/sw/source/core/inc/scriptinfo.hxx b/sw/source/core/inc/scriptinfo.hxx
index cebbfdda5e54..03aef3c9da80 100644
--- a/sw/source/core/inc/scriptinfo.hxx
+++ b/sw/source/core/inc/scriptinfo.hxx
@@ -91,7 +91,7 @@ public:
     ~SwScriptInfo();
 
     // determines script changes
-    void InitScriptInfo( const SwTxtNode& rNode, sal_Bool bRTL );
+    void InitScriptInfo( const SwTxtNode& rNode, bool bRTL );
     void InitScriptInfo( const SwTxtNode& rNode );
 
     // set/get position from which data is invalid
@@ -361,7 +361,7 @@ public:
                                long nSpaceAdd = 0 );
 
     static SwScriptInfo* GetScriptInfo( const SwTxtNode& rNode,
-                                        sal_Bool bAllowInvalid = sal_False );
+                                        bool bAllowInvalid = false );
 
     static sal_uInt8 WhichFont(sal_Int32 nIdx, const OUString* pTxt, const SwScriptInfo* pSI);
 };
diff --git a/sw/source/core/text/porlay.cxx b/sw/source/core/text/porlay.cxx
index 46b16234253c..7d85900b7f34 100644
--- a/sw/source/core/text/porlay.cxx
+++ b/sw/source/core/text/porlay.cxx
@@ -293,7 +293,7 @@ void SwLineLayout::CalcLine( SwTxtFormatter &rLine, SwTxtFormatInfo &rInf )
     bool bOnlyPostIts = true;
     SetHanging( false );
 
-    sal_Bool bTmpDummy = ( 0 == GetLen() );
+    bool bTmpDummy = !GetLen();
     SwFlyCntPortion* pFlyCnt = 0;
     if( bTmpDummy )
     {
@@ -316,7 +316,7 @@ void SwLineLayout::CalcLine( SwTxtFormatter &rLine, SwTxtFormatInfo &rInf )
         {
             SetLen( pPortion->GetLen() );
             if( GetLen() )
-                bTmpDummy = sal_False;
+                bTmpDummy = false;
         }
         else
         {
@@ -464,7 +464,7 @@ void SwLineLayout::CalcLine( SwTxtFormatter &rLine, SwTxtFormatInfo &rInf )
                     }
                 }
                 else if( pPos->GetLen() )
-                    bTmpDummy = sal_False;
+                    bTmpDummy = false;
 
                 if( !HasCntnt() && !pPos->InNumberGrp() )
                 {
@@ -479,8 +479,7 @@ void SwLineLayout::CalcLine( SwTxtFormatter &rLine, SwTxtFormatInfo &rInf )
                         SetCntnt();
                 }
 
-                bTmpDummy = bTmpDummy && !HasCntnt() &&
-                            ( !pPos->Width() || pPos->IsFlyPortion() );
+                bTmpDummy &= !HasCntnt() && ( !pPos->Width() || pPos->IsFlyPortion() );
 
                 pLast = pPos;
                 pPos = pPos->GetPortion();
@@ -582,7 +581,7 @@ void SwLineLayout::MaxAscentDescent( SwTwips& _orAscent,
             SwTwips nPortionDesc = static_cast<SwTwips>(pTmpPortion->Height()) -
                                    nPortionAsc;
 
-            const sal_Bool bFlyCmp = pTmpPortion->IsFlyCntPortion() ?
+            const bool bFlyCmp = pTmpPortion->IsFlyCntPortion() ?
                                      static_cast<const SwFlyCntPortion*>(pTmpPortion)->IsMax() :
                                      !( pTmpPortion == _pDontConsiderPortion );
 
@@ -672,7 +671,7 @@ void SwScriptInfo::InitScriptInfo( const SwTxtNode& rNode )
     InitScriptInfo( rNode, nDefaultDir == UBIDI_RTL );
 }
 
-void SwScriptInfo::InitScriptInfo( const SwTxtNode& rNode, sal_Bool bRTL )
+void SwScriptInfo::InitScriptInfo( const SwTxtNode& rNode, bool bRTL )
 {
     if( !g_pBreakIt->GetBreakIter().is() )
         return;
@@ -2056,7 +2055,7 @@ sal_Int32 SwScriptInfo::ThaiJustify( const OUString& rTxt, sal_Int32* pKernArray
 }
 
 SwScriptInfo* SwScriptInfo::GetScriptInfo( const SwTxtNode& rTNd,
-                                           sal_Bool bAllowInvalid )
+                                           bool bAllowInvalid )
 {
     SwIterator<SwTxtFrm,SwTxtNode> aIter( rTNd );
     SwScriptInfo* pScriptInfo = 0;
@@ -2181,7 +2180,7 @@ void SwScriptInfo::selectHiddenTextProperty(const SwTxtNode& rNode, MultiSelecti
         || (rNode.GetTxt().getLength() == rHiddenMulti.GetTotalRange().Len()));
 
     const SfxPoolItem* pItem = 0;
-    if( SFX_ITEM_SET == rNode.GetSwAttrSet().GetItemState( RES_CHRATR_HIDDEN, sal_True, &pItem ) &&
+    if( SFX_ITEM_SET == rNode.GetSwAttrSet().GetItemState( RES_CHRATR_HIDDEN, true, &pItem ) &&
         ((SvxCharHiddenItem*)pItem)->GetValue() )
     {
         rHiddenMulti.SelectAll();