sal_Bool to bool

Change-Id: Ie4aac09e9aa7232c61cfdcda7b2bffd5002036a7

sw/source/filter/ascii/ascatr.cxx

@@ -54,7 +54,7 @@ public:
     void NextPos()      { nAktSwPos = SearchNext( nAktSwPos + 1 ); }
 
     xub_StrLen WhereNext() const        { return nAktSwPos; }
-    sal_Bool OutAttr( xub_StrLen nSwPos );
+    bool OutAttr( xub_StrLen nSwPos );
 };
 
 
@@ -93,9 +93,9 @@ xub_StrLen SwASC_AttrIter::SearchNext( xub_StrLen nStartPos )
 }
 
 
-sal_Bool SwASC_AttrIter::OutAttr( xub_StrLen nSwPos )
+bool SwASC_AttrIter::OutAttr( xub_StrLen nSwPos )
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     const SwpHints* pTxtAttrs = rNd.GetpSwpHints();
     if( pTxtAttrs )
     {
@@ -105,7 +105,7 @@ sal_Bool SwASC_AttrIter::OutAttr( xub_StrLen nSwPos )
             const SwTxtAttr* pHt = (*pTxtAttrs)[i];
             if ( pHt->HasDummyChar() && nSwPos == *pHt->GetStart() )
             {
-                bRet = sal_True;
+                bRet = true;
                 String sOut;
                 switch( pHt->Which() )
                 {
@@ -149,7 +149,7 @@ static Writer& OutASC_SwTxtNode( Writer& rWrt, SwCntntNode& rNode )
 
     xub_StrLen nStrPos = rWrt.pCurPam->GetPoint()->nContent.GetIndex();
     xub_StrLen nNodeEnde = rNd.Len(), nEnde = nNodeEnde;
-    sal_Bool bLastNd =  rWrt.pCurPam->GetPoint()->nNode == rWrt.pCurPam->GetMark()->nNode;
+    bool bLastNd =  rWrt.pCurPam->GetPoint()->nNode == rWrt.pCurPam->GetMark()->nNode;
     if( bLastNd )
         nEnde = rWrt.pCurPam->GetMark()->nContent.GetIndex();
 

sw/source/filter/ascii/wrtasc.cxx

@@ -111,7 +111,7 @@ sal_uLong SwASCWriter::WriteStream()
 
     SwPaM* pPam = pOrigPam;
 
-    sal_Bool bWriteSttTag = bUCS2_WithStartChar &&
+    bool bWriteSttTag = bUCS2_WithStartChar &&
         (RTL_TEXTENCODING_UCS2 == GetAsciiOptions().GetCharSet() ||
         RTL_TEXTENCODING_UTF8 == GetAsciiOptions().GetCharSet());
 
@@ -120,7 +120,7 @@ sal_uLong SwASCWriter::WriteStream()
 
     // Output all areas of the pam into the ASC file
     do {
-        sal_Bool bTstFly = sal_True;
+        bool bTstFly = true;
         while( pCurPam->GetPoint()->nNode.GetIndex() < pCurPam->GetMark()->nNode.GetIndex() ||
               (pCurPam->GetPoint()->nNode.GetIndex() == pCurPam->GetMark()->nNode.GetIndex() &&
                pCurPam->GetPoint()->nContent.GetIndex() <= pCurPam->GetMark()->nContent.GetIndex()) )
@@ -175,11 +175,11 @@ sal_uLong SwASCWriter::WriteStream()
                                 break;
 
                         }
-                        bWriteSttTag = sal_False;
+                        bWriteSttTag = false;
                     }
                     Out( aASCNodeFnTab, *pNd, *this );
                 }
-                bTstFly = sal_False;        // Testing once is enough
+                bTstFly = false;        // Testing once is enough
             }
 
             if( !pCurPam->Move( fnMoveForward, fnGoNode ) )

sw/source/filter/basflt/fltini.cxx

@@ -354,7 +354,7 @@ void CalculateFlySize(SfxItemSet& rFlySet, const SwNodeIndex& rAnchor,
                                                                         GetCntntIdx();
                 if( pSttNd )
                 {
-                        sal_Bool bOnlyOneNode = sal_True;
+                        bool bOnlyOneNode = true;
                         sal_uLong nMinFrm = 0;
                         sal_uLong nMaxFrm = 0;
                         SwTxtNode* pFirstTxtNd = 0;
@@ -370,7 +370,7 @@ void CalculateFlySize(SfxItemSet& rFlySet, const SwNodeIndex& rAnchor,
                                         else if( pFirstTxtNd != pTxtNd )
                                         {
                                                 // forget it
-                                                bOnlyOneNode = sal_False;
+                                                bOnlyOneNode = false;
                                                 break;
                                         }
 

sw/source/filter/basflt/iodetect.cxx

@@ -125,7 +125,7 @@ const SfxFilter* SwIoSystem::GetFilterOfFormat(const String& rFmtNm,
         if( pCnt || pFltCnt == &aCntSwWeb )
             break;
         pFltCnt = &aCntSwWeb;
-    } while( sal_True );
+    } while( true );
     return 0;
 }
 
@@ -302,7 +302,7 @@ const SfxFilter* SwIoSystem::GetFileFilter(const String& rFileName,
         // templates should not get precedence over "normal" filters (#i35508, #i33168)
         const SfxFilter* pTemplateFilter = 0;
         const SfxFilter* pOldFilter = pFCntnr->GetFilter4FilterName( rPrefFltName );
-        sal_Bool bLookForTemplate = pOldFilter && pOldFilter->IsOwnTemplateFormat();
+        bool bLookForTemplate = pOldFilter && pOldFilter->IsOwnTemplateFormat();
         if ( pMedium->IsStorage() )
         {
             com::sun::star::uno::Reference < com::sun::star::embed::XStorage > xStor = pMedium->GetStorage();

sw/source/filter/basflt/shellio.cxx

@@ -115,13 +115,13 @@ sal_uLong SwReader::Read( const Reader& rOptions )
 
     sal_Bool bReadPageDescs = sal_False;
     bool const bDocUndo = pDoc->GetIDocumentUndoRedo().DoesUndo();
-    sal_Bool bSaveUndo = bDocUndo && pCrsr;
+    bool bSaveUndo = bDocUndo && pCrsr;
     if( bSaveUndo )
     {
         // das Einlesen von Seitenvorlagen ist nicht Undofaehig!
         if( 0 != ( bReadPageDescs = po->aOpt.IsPageDescs() ) )
         {
-            bSaveUndo = sal_False;
+            bSaveUndo = false;
             pDoc->GetIDocumentUndoRedo().DelAllUndoObj();
         }
         else
@@ -142,7 +142,7 @@ sal_uLong SwReader::Read( const Reader& rOptions )
     // only read templates? then ignore multi selection!
     sal_Bool bFmtsOnly = po->aOpt.IsFmtsOnly();
 
-    while( sal_True )
+    while( true )
     {
         if( bSaveUndo )
             pUndo = new SwUndoInsDoc( *pPam );
@@ -472,7 +472,7 @@ SwDoc* Reader::GetTemplateDoc()
         String aFileName = aTDir.GetMainURL( INetURLObject::NO_DECODE );
         OSL_ENSURE( !aTDir.HasError(), "No absolute path for template name!" );
         DateTime aCurrDateTime( DateTime::SYSTEM );
-        sal_Bool bLoad = sal_False;
+        bool bLoad = false;
 
         // Wenn das Template schon mal geladen wurde, nur einmal pro
         // Minute nachschauen, ob es geaendert wurde.
@@ -485,7 +485,7 @@ SwDoc* Reader::GetTemplateDoc()
                             &aTstDate, &aTstTime ) &&
                 ( !pTemplate || aDStamp != aTstDate || aTStamp != aTstTime ))
             {
-                bLoad = sal_True;
+                bLoad = true;
                 aDStamp = aTstDate;
                 aTStamp = aTstTime;
             }

sw/source/filter/html/htmlcss1.cxx

@@ -655,7 +655,7 @@ static CSS1SelectorType GetTokenAndClass( const CSS1Selector *pSelector,
     return eType;
 }
 
-extern sal_Bool swhtml_css1atr_equalFontItems( const SfxPoolItem& r1, const SfxPoolItem& r2 );
+extern bool swhtml_css1atr_equalFontItems( const SfxPoolItem& r1, const SfxPoolItem& r2 );
 
 static void RemoveScriptItems( SfxItemSet& rItemSet, sal_uInt16 nScript,
                                const SfxItemSet *pParentItemSet = 0 )

sw/source/filter/html/htmlfldw.cxx

@@ -60,7 +60,7 @@ const sal_Char *SwHTMLWriter::GetNumFormat( sal_uInt16 nFmt )
     return pFmtStr;
 }
 
-extern sal_Bool swhtml_css1atr_equalFontItems( const SfxPoolItem& r1, const SfxPoolItem& r2 );
+extern bool swhtml_css1atr_equalFontItems( const SfxPoolItem& r1, const SfxPoolItem& r2 );
 static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pFld,
                                  const SwTxtNode& rTxtNd, xub_StrLen nFldPos )
 {

sw/source/filter/html/swhtml.cxx

@@ -2048,7 +2048,7 @@ void SwHTMLParser::NextToken( int nToken )
 }
 
 
-extern sal_Bool swhtml_css1atr_equalFontItems( const SfxPoolItem& r1, const SfxPoolItem& r2 );
+extern bool swhtml_css1atr_equalFontItems( const SfxPoolItem& r1, const SfxPoolItem& r2 );
 
 static void lcl_swhtml_getItemInfo( const _HTMLAttr& rAttr,
                                  sal_Bool& rScriptDependent, sal_Bool& rFont,