sal_Bool to bool

Change-Id: I7472b6fad91fc349dc4cea2b490cb6cb7796fd34

sw/source/core/text/porfly.cxx

@@ -65,7 +65,7 @@ bool SwFlyPortion::Format( SwTxtFormatInfo &rInf )
     // resetting
     rInf.SetFly( 0 );
     rInf.Width( rInf.RealWidth() );
-    rInf.GetParaPortion()->SetFly( sal_True );
+    rInf.GetParaPortion()->SetFly( true );
 
     // trailing blank:
     if( rInf.GetIdx() < rInf.GetTxt().getLength() &&  1 < rInf.GetIdx()
@@ -130,7 +130,7 @@ bool SwFlyCntPortion::Format( SwTxtFormatInfo &rInf )
         }
     }
 
-    rInf.GetParaPortion()->SetFly( sal_True );
+    rInf.GetParaPortion()->SetFly( true );
     return bFull;
 }
 
@@ -262,8 +262,8 @@ SwFlyCntPortion::SwFlyCntPortion( const SwTxtFrm& rFrm,
                                   long nFlyAsc, long nFlyDesc,
                                   objectpositioning::AsCharFlags nFlags ) :
     pContact( pFly ),
-    bDraw( sal_False ),
-    bMax( sal_False ),
+    bDraw( false ),
+    bMax( false ),
     nAlign( 0 )
 {
     OSL_ENSURE( pFly, "SwFlyCntPortion::SwFlyCntPortion: no SwFlyInCntFrm!" );
@@ -280,8 +280,8 @@ SwFlyCntPortion::SwFlyCntPortion( const SwTxtFrm& rFrm,
                                   long nFlyAsc, long nFlyDesc,
                                   objectpositioning::AsCharFlags nFlags ) :
     pContact( pDrawContact ),
-    bDraw( sal_True ),
-    bMax( sal_False ),
+    bDraw( true ),
+    bMax( false ),
     nAlign( 0 )
 {
     OSL_ENSURE( pDrawContact, "SwFlyCntPortion::SwFlyCntPortion: no SwDrawContact!" );

sw/source/core/text/porfly.hxx

@@ -54,8 +54,8 @@ class SwFlyCntPortion : public SwLinePortion
 {
     void *pContact; // bDraw ? DrawContact : FlyInCntFrm
     Point aRef;     // Relatively to this point we calculate the AbsPos
-    sal_Bool bDraw : 1;  // DrawContact?
-    sal_Bool bMax : 1;   // Line adjustment and height == line height
+    bool bDraw : 1;  // DrawContact?
+    bool bMax : 1;   // Line adjustment and height == line height
     sal_uInt8 nAlign : 3; // Line adjustment? No, above, middle, bottom
     virtual sal_Int32 GetCrsrOfst( const KSHORT nOfst ) const;
 
@@ -77,11 +77,11 @@ public:
     inline SwDrawContact *GetDrawContact() { return (SwDrawContact*)pContact; }
     inline const SwDrawContact* GetDrawContact() const
         { return (SwDrawContact*)pContact; }
-    inline sal_Bool IsDraw() const { return bDraw; }
-    inline sal_Bool IsMax() const { return bMax; }
+    inline bool IsDraw() const { return bDraw; }
+    inline bool IsMax() const { return bMax; }
     inline sal_uInt8 GetAlign() const { return nAlign; }
     inline void SetAlign( sal_uInt8 nNew ) { nAlign = nNew; }
-    inline void SetMax( sal_Bool bNew ) { bMax = bNew; }
+    inline void SetMax( bool bNew ) { bMax = bNew; }
     // OD 29.07.2003 #110978# - use new datatype for parameter <nFlags>
     void SetBase( const SwTxtFrm& rFrm, const Point &rBase,
                   long nLnAscent, long nLnDescent,

sw/source/core/text/porhyph.hxx

@@ -69,7 +69,7 @@ public:
 
 class SwSoftHyphPortion : public SwHyphPortion
 {
-    sal_Bool    bExpand;
+    bool    bExpand;
     KSHORT  nViewWidth;
     KSHORT  nHyphWidth;
 
@@ -80,8 +80,8 @@ public:
     virtual void Paint( const SwTxtPaintInfo &rInf ) const;
     virtual bool Format( SwTxtFormatInfo &rInf );
     virtual void FormatEOL( SwTxtFormatInfo &rInf );
-    inline void SetExpand( const sal_Bool bNew ) { bExpand = bNew; }
-    sal_Bool IsExpand() const { return bExpand; }
+    inline void SetExpand( const bool bNew ) { bExpand = bNew; }
+    bool IsExpand() const { return bExpand; }
 
     virtual KSHORT GetViewWidth( const SwTxtSizeInfo &rInf ) const;
 

sw/source/core/text/porlay.cxx

@@ -450,7 +450,7 @@ void SwLineLayout::CalcLine( SwTxtFormatter &rLine, SwTxtFormatInfo &rInf )
                         if( pPos->IsFlyCntPortion() &&
                             ((SwFlyCntPortion*)pPos)->GetAlign() )
                         {
-                            ((SwFlyCntPortion*)pPos)->SetMax( sal_False );
+                            ((SwFlyCntPortion*)pPos)->SetMax( false );
                             if( !pFlyCnt || pPos->Height() > pFlyCnt->Height() )
                                 pFlyCnt = (SwFlyCntPortion*)pPos;
                         }
@@ -490,7 +490,7 @@ void SwLineLayout::CalcLine( SwTxtFormatter &rLine, SwTxtFormatInfo &rInf )
             {
                 if( pFlyCnt->Height() == Height() )
                 {
-                    pFlyCnt->SetMax( sal_True );
+                    pFlyCnt->SetMax( true );
                     if( Height() > nMaxDescent + nAscent )
                     {
                         if( 3 == pFlyCnt->GetAlign() ) // Bottom

sw/source/core/text/txthyph.cxx

@@ -431,7 +431,7 @@ void SwHyphStrPortion::HandlePortion( SwPortionHandler& rPH ) const
 SwLinePortion *SwSoftHyphPortion::Compress() { return this; }
 
 SwSoftHyphPortion::SwSoftHyphPortion() :
-    bExpand(sal_False), nViewWidth(0), nHyphWidth(0)
+    bExpand(false), nViewWidth(0), nHyphWidth(0)
 {
     SetLen(1);
     SetWhichPor( POR_SOFTHYPH );
@@ -533,9 +533,9 @@ bool SwSoftHyphPortion::Format( SwTxtFormatInfo &rInf )
     }
 
     rInf.SetSoftHyphPos(0);
-    SetExpand( sal_True );
+    SetExpand( true );
     bFull = SwHyphPortion::Format( rInf );
-    SetExpand( sal_False );
+    SetExpand( false );
     if( !bFull )
     {
         // default-maessig besitzen wir keine Breite, aber eine Hoehe
@@ -554,7 +554,7 @@ void SwSoftHyphPortion::FormatEOL( SwTxtFormatInfo &rInf )
 {
     if( !IsExpand() )
     {
-        SetExpand( sal_True );
+        SetExpand( true );
         if( rInf.GetLast() == this )
             rInf.SetLast( FindPrevPortion( rInf.GetRoot() ) );