diff options
| author | Matteo Casalin <matteo.casalin@gmx.com> | 2012-11-04 11:38:23 +0100 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-11-05 03:52:25 +0000 |
| commit | efda195ac9a5f52c7df9dba1ace6c53b8da0f260 (patch) | |
| tree | e1884e910fa8b541b88df4614dd343e233e34099 /sw | |
| parent | c2e91c7d8cb027f3f8f06130e3d6552a0c6750ab (diff) | |
sal_Bool to bool
Change-Id: I8a4890c6b0e466417387a09259e32dff57c640d6
Reviewed-on: https://gerrit.libreoffice.org/979
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/inc/txatritr.hxx | 14 | ||||
| -rw-r--r-- | sw/source/core/txtnode/txatritr.cxx | 18 |
2 files changed, 16 insertions, 16 deletions
diff --git a/sw/inc/txatritr.hxx b/sw/inc/txatritr.hxx index fd2c2fec1d4b..05ed48fb3dbf 100644 --- a/sw/inc/txatritr.hxx +++ b/sw/inc/txatritr.hxx @@ -36,13 +36,13 @@ class SwScriptIterator const String& rText; xub_StrLen nChgPos; sal_uInt16 nCurScript; - sal_Bool bForward; + bool bForward; public: SwScriptIterator( const String& rStr, xub_StrLen nStart = 0, - sal_Bool bFrwrd = sal_True ); + bool bFrwrd = true ); - sal_Bool Next(); + bool Next(); sal_uInt16 GetCurrScript() const { return nCurScript; } xub_StrLen GetScriptChgPos() const { return nChgPos; } @@ -58,16 +58,16 @@ class SwTxtAttrIterator const SfxPoolItem *pParaItem, *pCurItem; xub_StrLen nChgPos; sal_uInt16 nAttrPos, nWhichId; - sal_Bool bIsUseGetWhichOfScript; + bool bIsUseGetWhichOfScript; void AddToStack( const SwTxtAttr& rAttr ); void SearchNextChg(); public: SwTxtAttrIterator( const SwTxtNode& rTxtNd, sal_uInt16 nWhichId, - xub_StrLen nStart = 0, sal_Bool bUseGetWhichOfScript = sal_True ); + xub_StrLen nStart = 0, bool bUseGetWhichOfScript = true ); - sal_Bool Next(); + bool Next(); const SfxPoolItem& GetAttr() const { return *pCurItem; } xub_StrLen GetChgPos() const { return nChgPos; } @@ -79,7 +79,7 @@ class SwLanguageIterator : public SwTxtAttrIterator public: SwLanguageIterator( const SwTxtNode& rTxtNode, xub_StrLen nStart = 0, sal_uInt16 nWhich = RES_CHRATR_LANGUAGE, - sal_Bool bUseGetWhichOfScript = sal_True ) + bool bUseGetWhichOfScript = true ) : SwTxtAttrIterator( rTxtNode, nWhich, nStart, bUseGetWhichOfScript ) {} diff --git a/sw/source/core/txtnode/txatritr.cxx b/sw/source/core/txtnode/txatritr.cxx index 53912958df97..cdb40b77c954 100644 --- a/sw/source/core/txtnode/txatritr.cxx +++ b/sw/source/core/txtnode/txatritr.cxx @@ -32,7 +32,7 @@ using namespace ::com::sun::star::i18n; -SwScriptIterator::SwScriptIterator( const String& rStr, xub_StrLen nStt, sal_Bool bFrwrd ) +SwScriptIterator::SwScriptIterator( const String& rStr, xub_StrLen nStt, bool bFrwrd ) : rText( rStr ), nChgPos( rStr.Len() ), nCurScript( ScriptType::WEAK ), @@ -65,9 +65,9 @@ SwScriptIterator::SwScriptIterator( const String& rStr, xub_StrLen nStt, sal_Boo } } -sal_Bool SwScriptIterator::Next() +bool SwScriptIterator::Next() { - sal_Bool bRet = sal_False; + bool bRet = false; if( pBreakIt->GetBreakIter().is() ) { if ( bForward && nChgPos < rText.Len() ) @@ -75,7 +75,7 @@ sal_Bool SwScriptIterator::Next() nCurScript = pBreakIt->GetBreakIter()->getScriptType( rText, nChgPos ); nChgPos = (xub_StrLen)pBreakIt->GetBreakIter()->endOfScript( rText, nChgPos, nCurScript ); - bRet = sal_True; + bRet = true; } else if ( ! bForward && nChgPos ) { @@ -83,7 +83,7 @@ sal_Bool SwScriptIterator::Next() nCurScript = pBreakIt->GetBreakIter()->getScriptType( rText, nChgPos ); nChgPos = (xub_StrLen)pBreakIt->GetBreakIter()->beginOfScript( rText, nChgPos, nCurScript ); - bRet = sal_True; + bRet = true; } } else @@ -95,7 +95,7 @@ sal_Bool SwScriptIterator::Next() SwTxtAttrIterator::SwTxtAttrIterator( const SwTxtNode& rTNd, sal_uInt16 nWhchId, xub_StrLen nStt, - sal_Bool bUseGetWhichOfScript ) + bool bUseGetWhichOfScript ) : aSIter( rTNd.GetTxt(), nStt ), rTxtNd( rTNd ), pParaItem( 0 ), nChgPos( nStt ), nAttrPos( 0 ), nWhichId( nWhchId ), bIsUseGetWhichOfScript( bUseGetWhichOfScript ) @@ -103,12 +103,12 @@ SwTxtAttrIterator::SwTxtAttrIterator( const SwTxtNode& rTNd, sal_uInt16 nWhchId, SearchNextChg(); } -sal_Bool SwTxtAttrIterator::Next() +bool SwTxtAttrIterator::Next() { - sal_Bool bRet = sal_False; + bool bRet = false; if( nChgPos < aSIter.GetText().Len() ) { - bRet = sal_True; + bRet = true; if( !aStack.empty() ) { do { |