sal_Bool to bool

Change-Id: Ibbf9e257fff19ab6305bd401a1746e6d0bcb47fd

sw/inc/shellio.hxx

@@ -396,7 +396,7 @@ protected:
     sal_Bool CopyNextPam( SwPaM ** );
 
     void PutNumFmtFontsInAttrPool();
-    void PutEditEngFontsInAttrPool( sal_Bool bIncl_CJK_CTL = sal_True );
+    void PutEditEngFontsInAttrPool( bool bIncl_CJK_CTL = true );
 
     virtual sal_uLong WriteStream() = 0;
     void                SetBaseURL( const String& rURL ) { sBaseURL = rURL; }

sw/source/filter/inc/fltshell.hxx

@@ -349,7 +349,7 @@ public:
     virtual const SfxPoolItem& GetNodeOrStyAttr(sal_uInt16 nWhich) = 0;
 
     virtual const SfxPoolItem& GetCellAttr(sal_uInt16 nWhich);
-    virtual sal_Bool BeginTable();
+    virtual bool BeginTable();
     virtual void NextTableCell();
     virtual void NextTableRow();
     virtual void SetTableWidth(SwTwips nW);
@@ -361,10 +361,10 @@ public:
     virtual void DeleteCell(sal_uInt16 nCell);
     virtual void EndTable();
 
-    virtual sal_Bool IsInFly() = 0;
+    virtual bool IsInFly() = 0;
     virtual void SetFlyFrmAttr(const SfxPoolItem& rAttr) = 0;
     virtual const SfxPoolItem& GetFlyFrmAttr(sal_uInt16 nWhich) = 0;
-    virtual sal_Bool BeginFly( RndStdIds eAnchor, sal_Bool bAbsolutePos,
+    virtual bool BeginFly( RndStdIds eAnchor, sal_Bool bAbsolutePos,
                                const SfxItemSet* pMoreAttrs = 0 );
     virtual void SetFlyAnchor( RndStdIds eAnchor );
     virtual void EndFly();
@@ -406,7 +406,7 @@ public:
 
     sal_Bool IsInTable();
     virtual const SfxPoolItem& GetCellAttr(sal_uInt16 nWhich);
-    virtual sal_Bool BeginTable();
+    virtual bool BeginTable();
     virtual void NextTableCell();
     virtual void NextTableRow();
     virtual void SetTableWidth(SwTwips nW);
@@ -419,10 +419,10 @@ public:
     virtual void EndTable();
 
     SwFrmFmt* MakeFly( RndStdIds eAnchor, SfxItemSet* pSet );
-    virtual sal_Bool IsInFly();
+    virtual bool IsInFly();
     virtual void SetFlyFrmAttr(const SfxPoolItem& rAttr);
     virtual const SfxPoolItem& GetFlyFrmAttr(sal_uInt16 nWhich);
-    virtual sal_Bool BeginFly( RndStdIds eAnchor, sal_Bool bAbsolutePos,
+    virtual bool BeginFly( RndStdIds eAnchor, sal_Bool bAbsolutePos,
                                const SfxItemSet* pMoreAttrs = 0 );
     virtual void EndFly();
 };
@@ -431,7 +431,7 @@ class SwFltFormatCollection : public SwFltOutBase
 {
     SwTxtFmtColl* pColl;
     SfxItemSet* pFlyAttrs;      // Simulation der Flys in Styles
-    sal_Bool bHasFly;
+    bool bHasFly;
 public:
     SwFltFormatCollection(SwDoc&, RES_POOL_COLLFMT_TYPE nType);
     SwFltFormatCollection(SwDoc&, const String& rName );
@@ -448,19 +448,19 @@ public:
 
 //  SwTxtFmtColl* Search(String, CharSet eSrc);
     SwTxtFmtColl* GetColl()         { return pColl; }
-    void SetHasFly()                { bHasFly = sal_True; }
+    void SetHasFly()                { bHasFly = true; }
     SfxItemSet* GetpFlyAttrs()      { return pFlyAttrs; }
 
     virtual SwFltOutBase& operator << (const SfxPoolItem& rItem);
     virtual const SfxPoolItem& GetAttr(sal_uInt16 nWhich);
     virtual const SfxPoolItem& GetNodeOrStyAttr(sal_uInt16 nWhich);
 
-    virtual sal_Bool IsInFly();
+    virtual bool IsInFly();
     virtual void SetFlyFrmAttr(const SfxPoolItem& rAttr);
     virtual const SfxPoolItem& GetFlyFrmAttr(sal_uInt16 nWhich);
-    virtual sal_Bool BeginFly( RndStdIds eAnchor, sal_Bool bAbsolutePos,
+    virtual bool BeginFly( RndStdIds eAnchor, sal_Bool bAbsolutePos,
                                const SfxItemSet* pMoreAttrs = 0 );
-    sal_Bool BeginStyleFly( SwFltOutDoc* pOutDoc );
+    bool BeginStyleFly( SwFltOutDoc* pOutDoc );
     virtual void EndFly();
 };
 
@@ -562,8 +562,8 @@ public:
         return ( pOut == pOutDoc ) ? pOutDoc->IsInTable() : 0; }
     const SfxPoolItem& GetCellAttr(sal_uInt16 nWhich) {
         return pOut->GetCellAttr(nWhich); }
-    sal_Bool BeginTable() {
-        sal_Bool b = pOut->BeginTable();
+    bool BeginTable() {
+        bool b = pOut->BeginTable();
         if(b) eSubMode = Table;
         return b; }
     void NextTableCell() {
@@ -589,8 +589,8 @@ public:
     void EndTable() {
         pOut->EndTable(); }
 // methoden zur verwaltung von Flys
-    sal_Bool IsInFly() { return pOut->IsInFly(); }
-    sal_Bool BeginFly( RndStdIds eAnchor = FLY_AT_PARA, sal_Bool bAbsolutePos = sal_False );
+    bool IsInFly() { return pOut->IsInFly(); }
+    bool BeginFly( RndStdIds eAnchor = FLY_AT_PARA, sal_Bool bAbsolutePos = sal_False );
     void SetFlyAnchor( RndStdIds eAnchor )
         { pOut->SetFlyAnchor( eAnchor ); }
     void SetFlyXPos( short nXPos, sal_Int16 eHRel = com::sun::star::text::RelOrientation::FRAME,
@@ -650,12 +650,12 @@ public:
     const SfxPoolItem& GetAttr(sal_uInt16 nWhich);
     const SfxPoolItem& GetFlyFrmAttr(sal_uInt16 nWhich);
     SwFieldType* GetSysFldType(sal_uInt16 eWhich);
-    sal_Bool GetWeightBold();
-    sal_Bool GetPostureItalic();
-    sal_Bool GetCrossedOut();
-    sal_Bool GetContour();
-    sal_Bool GetCaseKapitaelchen();
-    sal_Bool GetCaseVersalien();
+    bool GetWeightBold();
+    bool GetPostureItalic();
+    bool GetCrossedOut();
+    bool GetContour();
+    bool GetCaseKapitaelchen();
+    bool GetCaseVersalien();
 
     const String& GetBaseURL() const { return sBaseURL; }
 };

sw/source/filter/inc/wrtswtbl.hxx

@@ -106,7 +106,7 @@ class SW_DLLPUBLIC SwWriteTableRow
     const SvxBrushItem *pBackground;// Hintergrund
 
     long nPos;                  // End-Position (twips) der Zeile
-    sal_Bool mbUseLayoutHeights;
+    bool mbUseLayoutHeights;
 
     // Forbidden and not implemented.
     SwWriteTableRow();
@@ -125,7 +125,7 @@ public:
     bool bTopBorder : 1;            // Welche Umrandungen sind da?
     bool bBottomBorder : 1;
 
-    SwWriteTableRow( long nPos, sal_Bool bUseLayoutHeights );
+    SwWriteTableRow( long nPos, bool bUseLayoutHeights );
 
     SwWriteTableCell *AddCell( const SwTableBox *pBox,
                                  sal_uInt16 nRow, sal_uInt16 nCol,
@@ -250,15 +250,15 @@ protected:
     sal_uInt32 nTabWidth;              // Absolute/Relative Breite der Tabelle
 
     bool bRelWidths : 1;        // Breiten relativ ausgeben?
-    sal_Bool bUseLayoutHeights : 1; // Layout zur Hoehenbestimmung nehmen?
+    bool bUseLayoutHeights : 1; // Layout zur Hoehenbestimmung nehmen?
 #ifdef DBG_UTIL
-    sal_Bool m_bGetLineHeightCalled : 1;
+    bool m_bGetLineHeightCalled : 1;
 #endif
 
     bool bColsOption : 1;
     bool bColTags : 1;
-    sal_Bool bLayoutExport : 1;
-    sal_Bool bCollectBorderWidth : 1;
+    bool bLayoutExport : 1;
+    bool bCollectBorderWidth : 1;
 
     virtual sal_Bool ShouldExpandSub( const SwTableBox *pBox,
                                 sal_Bool bExpandedBefore, sal_uInt16 nDepth ) const;

sw/source/filter/writer/writer.cxx

@@ -361,7 +361,7 @@ void Writer::PutNumFmtFontsInAttrPool()
     const SwNumFmt* pFmt;
     const Font* pFont;
     const Font* pDefFont = &numfunc::GetDefBulletFont();
-    sal_Bool bCheck = sal_False;
+    bool bCheck = false;
 
     for( sal_uInt16 nGet = rListTbl.size(); nGet; )
         if( pDoc->IsUsed( *(pRule = rListTbl[ --nGet ] )))
@@ -378,7 +378,7 @@ void Writer::PutNumFmtFontsInAttrPool()
                             continue;
                     }
                     else if( *pFont == *pDefFont )
-                        bCheck = sal_True;
+                        bCheck = true;
 
                     _AddFontItem( rPool, SvxFontItem( pFont->GetFamily(),
                                 pFont->GetName(), pFont->GetStyleName(),
@@ -386,7 +386,7 @@ void Writer::PutNumFmtFontsInAttrPool()
                 }
 }
 
-void Writer::PutEditEngFontsInAttrPool( sal_Bool bIncl_CJK_CTL )
+void Writer::PutEditEngFontsInAttrPool( bool bIncl_CJK_CTL )
 {
     SfxItemPool& rPool = pDoc->GetAttrPool();
     if( rPool.GetSecondaryPool() )

sw/source/filter/writer/wrtswtbl.cxx

@@ -55,7 +55,7 @@ sal_Int16 SwWriteTableCell::GetVertOri() const
 
 //-----------------------------------------------------------------------
 
-SwWriteTableRow::SwWriteTableRow( long nPosition, sal_Bool bUseLayoutHeights )
+SwWriteTableRow::SwWriteTableRow( long nPosition, bool bUseLayoutHeights )
     : pBackground(0), nPos(nPosition), mbUseLayoutHeights(bUseLayoutHeights),
     nTopBorder(USHRT_MAX), nBottomBorder(USHRT_MAX), bTopBorder(true),
     bBottomBorder(true)
@@ -98,8 +98,8 @@ sal_uInt32 SwWriteTable::GetBoxWidth( const SwTableBox *pBox )
 long SwWriteTable::GetLineHeight( const SwTableLine *pLine )
 {
 #ifdef DBG_UTIL
-    sal_Bool bOldGetLineHeightCalled = m_bGetLineHeightCalled;
-    m_bGetLineHeightCalled = sal_True;
+    bool bOldGetLineHeightCalled = m_bGetLineHeightCalled;
+    m_bGetLineHeightCalled = true;
 #endif
 
     long nHeight = 0;
@@ -115,7 +115,7 @@ long SwWriteTable::GetLineHeight( const SwTableLine *pLine )
         // #i60390# - in some cases we still want to continue
         // to use the layout heights even if one of the rows has a height of 0
         // ('hidden' rows)
-        bUseLayoutHeights = bLayoutAvailable; /*sal_False;*/
+        bUseLayoutHeights = bLayoutAvailable;
 
 #ifdef DBG_UTIL
         SAL_WARN_IF( !bLayoutAvailable && bOldGetLineHeightCalled, "sw", "Layout ungueltig?" );

sw/source/filter/ww1/w1class.hxx

@@ -174,7 +174,7 @@ public:
     String GetText( sal_uLong ulOffset, sal_uLong nLen ) const;
 
     enum Consts { MinChar = 32 };
-    static sal_Bool IsChar( sal_Unicode c )     { return c >= MinChar; }
+    static bool IsChar( sal_Unicode c )     { return c >= MinChar; }
 };
 
 /////////////////////////////////////////////////////////////// DocText