sal_Bool to bool

Change-Id: If63bfcfe4e16dd9232f3ef6fa29fadd0a6d01653

2 files changed, 10 insertions, 11 deletions

diff --git a/sw/source/core/inc/txmsrt.hxx b/sw/source/core/inc/txmsrt.hxx
index ed11c7e2d30d..bd8300c21896 100644
--- a/sw/source/core/inc/txmsrt.hxx
+++ b/sw/source/core/inc/txmsrt.hxx
@@ -46,9 +46,9 @@ struct SwTOXSource
 {
     const SwCntntNode* pNd;
     sal_Int32 nPos;
-    sal_Bool bMainEntry;
+    bool bMainEntry;
 
-    SwTOXSource( const SwCntntNode* pNode, sal_Int32 n, sal_Bool bMain )
+    SwTOXSource( const SwCntntNode* pNode, sal_Int32 n, bool bMain )
         : pNd(pNode), nPos(n), bMainEntry(bMain)
     {
     }
@@ -109,10 +109,10 @@ public:
     OUString GetIndexKey( const TextAndReading& rTaR,
                         const ::com::sun::star::lang::Locale& rLcl ) const;
 
-    OUString GetFollowingText( sal_Bool bMorePages ) const;
+    OUString GetFollowingText( bool bMorePages ) const;
 
     OUString ToUpper( const OUString& rStr, sal_Int32 nPos ) const;
-    inline sal_Bool IsNumeric( const OUString& rStr ) const;
+    inline bool IsNumeric( const OUString& rStr ) const;
 };
 
 /*--------------------------------------------------------------------
@@ -152,7 +152,7 @@ struct SwTOXSortTabBase
     inline const ::com::sun::star::lang::Locale& GetLocale() const;
 
 private:
-    sal_Bool bValidTxt;
+    bool bValidTxt;
     TextAndReading m_aSort;
 
     virtual TextAndReading GetText_Impl() const = 0;
@@ -164,7 +164,7 @@ inline TextAndReading SwTOXSortTabBase::GetTxt() const
     {
         SwTOXSortTabBase* pThis = (SwTOXSortTabBase*)this;
         pThis->m_aSort = pThis->GetText_Impl();
-        pThis->bValidTxt = sal_True;
+        pThis->bValidTxt = true;
     }
     return m_aSort;
 }
diff --git a/sw/source/core/tox/txmsrt.cxx b/sw/source/core/tox/txmsrt.cxx
index 36701c0d79aa..13dd345d3b4d 100644
--- a/sw/source/core/tox/txmsrt.cxx
+++ b/sw/source/core/tox/txmsrt.cxx
@@ -104,7 +104,7 @@ OUString SwTOXInternational::ToUpper( const OUString& rStr, sal_Int32 nPos ) con
     return pCharClass->uppercase( rStr, nPos, 1 );
 }
 
-inline sal_Bool SwTOXInternational::IsNumeric( const OUString& rStr ) const
+inline bool SwTOXInternational::IsNumeric( const OUString& rStr ) const
 {
     return pCharClass->isNumeric( rStr );
 }
@@ -124,7 +124,7 @@ OUString SwTOXInternational::GetIndexKey( const TextAndReading& rTaR,
     return pIndexWrapper->GetIndexKey( rTaR.sText, rTaR.sReading, rLocale );
 }
 
-OUString SwTOXInternational::GetFollowingText( sal_Bool bMorePages ) const
+OUString SwTOXInternational::GetFollowingText( bool bMorePages ) const
 {
     return pIndexWrapper->GetFollowingText( bMorePages );
 }
@@ -138,7 +138,7 @@ SwTOXSortTabBase::SwTOXSortTabBase( TOXSortType nTyp, const SwCntntNode* pNd,
                                     const SwTOXInternational* pInter,
                                     const lang::Locale* pLocale )
     : pTOXNd( 0 ), pTxtMark( pMark ), pTOXIntl( pInter ),
-    nPos( 0 ), nCntPos( 0 ), nType( static_cast<sal_uInt16>(nTyp) ), bValidTxt( sal_False )
+    nPos( 0 ), nCntPos( 0 ), nType( static_cast<sal_uInt16>(nTyp) ), bValidTxt( false )
 {
     if ( pLocale )
         aLocale = *pLocale;
@@ -148,8 +148,7 @@ SwTOXSortTabBase::SwTOXSortTabBase( TOXSortType nTyp, const SwCntntNode* pNd,
         sal_Int32 n = 0;
         if( pTxtMark )
             n = *pTxtMark->GetStart();
-        SwTOXSource aTmp( pNd, n,
-                    pTxtMark ? pTxtMark->GetTOXMark().IsMainEntry() : sal_False );
+        SwTOXSource aTmp( pNd, n, pTxtMark && pTxtMark->GetTOXMark().IsMainEntry() );
         aTOXSources.push_back(aTmp);
 
         nPos = pNd->GetIndex();