diff options
author | Takeshi Abe <tabe@fixedpoint.jp> | 2012-11-04 02:02:46 +0900 |
---|---|---|
committer | Takeshi Abe <tabe@fixedpoint.jp> | 2012-11-04 12:09:56 +0900 |
commit | f2d4303a0e93c9b541e3e9efd3f2dd2d756db209 (patch) | |
tree | 3b74adc877a8896ce22178cc8be5ae4949db5389 | |
parent | 445e66f775c828fa10960142f9a9013e8cdc1110 (diff) |
sal_Bool to bool
Change-Id: I51b096bab5f5c12a9c4c6633aa3150c50e9ffa47
-rw-r--r-- | sw/source/core/doc/docredln.cxx | 100 | ||||
-rw-r--r-- | sw/source/core/doc/docruby.cxx | 16 | ||||
-rw-r--r-- | sw/source/core/doc/docsort.cxx | 6 | ||||
-rw-r--r-- | sw/source/core/doc/doctxm.cxx | 16 | ||||
-rw-r--r-- | sw/source/core/doc/ftnidx.cxx | 6 | ||||
-rw-r--r-- | sw/source/core/doc/gctable.cxx | 36 | ||||
-rw-r--r-- | sw/source/core/doc/notxtfrm.cxx | 24 | ||||
-rw-r--r-- | sw/source/core/doc/number.cxx | 6 | ||||
-rw-r--r-- | sw/source/core/doc/poolfmt.cxx | 110 | ||||
-rw-r--r-- | sw/source/core/doc/tblcpy.cxx | 4 |
10 files changed, 162 insertions, 162 deletions
diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx index 743fff315ee9..0b3996997137 100644 --- a/sw/source/core/doc/docredln.cxx +++ b/sw/source/core/doc/docredln.cxx @@ -364,9 +364,9 @@ bool SwDoc::AppendRedline( SwRedline* pNewRedl, bool bCallDelete ) ( pNewRedl->GetContentIdx() == NULL ) ) { // Do not insert empty redlines delete pNewRedl; - return sal_False; + return false; } - sal_Bool bCompress = sal_False; + bool bCompress = false; sal_uInt16 n = 0; // look up the first Redline for the starting position if( !GetRedline( *pStt, &n ) && n ) @@ -466,7 +466,7 @@ bool SwDoc::AppendRedline( SwRedline* pNewRedl, bool bCallDelete ) if( bDelete ) { delete pNewRedl, pNewRedl = 0; - bCompress = sal_True; + bCompress = true; } } else if( POS_INSIDE == eCmpPos ) @@ -666,7 +666,7 @@ bool SwDoc::AppendRedline( SwRedline* pNewRedl, bool bCallDelete ) case POS_INSIDE: case POS_EQUAL: delete pNewRedl, pNewRedl = 0; - bCompress = sal_True; + bCompress = true; break; case POS_OVERLAP_BEFORE: @@ -755,7 +755,7 @@ bool SwDoc::AppendRedline( SwRedline* pNewRedl, bool bCallDelete ) switch( eCmpPos ) { case POS_EQUAL: - bCompress = sal_True; + bCompress = true; pRedlineTbl->DeleteAndDestroy( n ); bDec = true; // no break! @@ -782,7 +782,7 @@ bool SwDoc::AppendRedline( SwRedline* pNewRedl, bool bCallDelete ) else DeleteAndJoin( *pNewRedl ); - bCompress = sal_True; + bCompress = true; } delete pNewRedl, pNewRedl = 0; break; @@ -879,7 +879,7 @@ bool SwDoc::AppendRedline( SwRedline* pNewRedl, bool bCallDelete ) delete pNewRedl, pNewRedl = 0; if( IsHideChanges( eRedlineMode )) pRedl->Hide(); - bCompress = sal_True; + bCompress = true; } break; @@ -929,7 +929,7 @@ bool SwDoc::AppendRedline( SwRedline* pNewRedl, bool bCallDelete ) pNew->SetEnd( *pRStt ); pNewRedl->SetStart( *pREnd, pStt ); } - bCompress = sal_True; + bCompress = true; } break; @@ -1295,7 +1295,7 @@ void SwDoc::CompressRedlines() bool SwDoc::SplitRedline( const SwPaM& rRange ) { - sal_Bool bChg = sal_False; + bool bChg = false; sal_uInt16 n = 0; const SwPosition* pStt = rRange.Start(), * pEnd = pStt == rRange.GetPoint() ? rRange.GetMark() @@ -1310,7 +1310,7 @@ bool SwDoc::SplitRedline( const SwPaM& rRange ) if( *pTStt <= *pStt && *pStt <= *pTEnd && *pTStt <= *pEnd && *pEnd <= *pTEnd ) { - bChg = sal_True; + bChg = true; int nn = 0; if( *pStt == *pTStt ) nn += 1; @@ -1362,7 +1362,7 @@ bool SwDoc::DeleteRedline( const SwPaM& rRange, bool bSaveInUndo, !rRange.HasMark() || *rRange.GetMark() == *rRange.GetPoint() ) return sal_False; - sal_Bool bChg = sal_False; + bool bChg = false; if (bSaveInUndo && GetIDocumentUndoRedo().DoesUndo()) { @@ -1395,7 +1395,7 @@ bool SwDoc::DeleteRedline( const SwPaM& rRange, bool bSaveInUndo, case POS_OUTSIDE: pRedl->InvalidateRange(); pRedlineTbl->DeleteAndDestroy( n-- ); - bChg = sal_True; + bChg = true; break; case POS_OVERLAP_BEFORE: @@ -1593,7 +1593,7 @@ static sal_Bool lcl_AcceptRedline( SwRedlineTbl& rArr, sal_uInt16& rPos, case nsRedlineType_t::REDLINE_INSERT: case nsRedlineType_t::REDLINE_FORMAT: { - sal_Bool bCheck = sal_False, bReplace = sal_False; + bool bCheck = false, bReplace = false; switch( eCmp ) { case POS_INSIDE: @@ -1609,18 +1609,18 @@ static sal_Bool lcl_AcceptRedline( SwRedlineTbl& rArr, sal_uInt16& rPos, rArr.Insert( pNew ); ++rPos; } pRedl->SetEnd( *pSttRng, pREnd ); - bCheck = sal_True; + bCheck = true; } break; case POS_OVERLAP_BEFORE: pRedl->SetStart( *pEndRng, pRStt ); - bReplace = sal_True; + bReplace = true; break; case POS_OVERLAP_BEHIND: pRedl->SetEnd( *pSttRng, pREnd ); - bCheck = sal_True; + bCheck = true; break; case POS_OUTSIDE: @@ -1644,7 +1644,7 @@ static sal_Bool lcl_AcceptRedline( SwRedlineTbl& rArr, sal_uInt16& rPos, { SwDoc& rDoc = *pRedl->GetDoc(); const SwPosition *pDelStt = 0, *pDelEnd = 0; - sal_Bool bDelRedl = sal_False; + bool bDelRedl = false; switch( eCmp ) { case POS_INSIDE: @@ -1674,7 +1674,7 @@ static sal_Bool lcl_AcceptRedline( SwRedlineTbl& rArr, sal_uInt16& rPos, case POS_EQUAL: { rArr.Remove( rPos-- ); - bDelRedl = sal_True; + bDelRedl = true; if( bCallDelete ) { pDelStt = pRedl->Start(); @@ -1753,7 +1753,7 @@ static sal_Bool lcl_RejectRedline( SwRedlineTbl& rArr, sal_uInt16& rPos, { SwDoc& rDoc = *pRedl->GetDoc(); const SwPosition *pDelStt = 0, *pDelEnd = 0; - sal_Bool bDelRedl = sal_False; + bool bDelRedl = false; switch( eCmp ) { case POS_INSIDE: @@ -1783,7 +1783,7 @@ static sal_Bool lcl_RejectRedline( SwRedlineTbl& rArr, sal_uInt16& rPos, { // delete the range again rArr.Remove( rPos-- ); - bDelRedl = sal_True; + bDelRedl = true; if( bCallDelete ) { pDelStt = pRedl->Start(); @@ -1831,7 +1831,7 @@ static sal_Bool lcl_RejectRedline( SwRedlineTbl& rArr, sal_uInt16& rPos, case nsRedlineType_t::REDLINE_DELETE: { SwRedline* pNew = 0; - sal_Bool bCheck = sal_False, bReplace = sal_False; + bool bCheck = false, bReplace = false; switch( eCmp ) { @@ -1845,7 +1845,7 @@ static sal_Bool lcl_RejectRedline( SwRedlineTbl& rArr, sal_uInt16& rPos, if( *pSttRng == *pRStt ) { pRedl->SetStart( *pEndRng, pRStt ); - bReplace = sal_True; + bReplace = true; if( pNew ) pNew->SetEnd( *pEndRng ); } @@ -1862,7 +1862,7 @@ static sal_Bool lcl_RejectRedline( SwRedlineTbl& rArr, sal_uInt16& rPos, } pRedl->SetEnd( *pSttRng, pREnd ); - bCheck = sal_True; + bCheck = true; if( pNew ) pNew->SetStart( *pSttRng ); } @@ -1876,7 +1876,7 @@ static sal_Bool lcl_RejectRedline( SwRedlineTbl& rArr, sal_uInt16& rPos, pNew->PopData(); } pRedl->SetStart( *pEndRng, pRStt ); - bReplace = sal_True; + bReplace = true; if( pNew ) pNew->SetEnd( *pEndRng ); break; @@ -1888,7 +1888,7 @@ static sal_Bool lcl_RejectRedline( SwRedlineTbl& rArr, sal_uInt16& rPos, pNew->PopData(); } pRedl->SetEnd( *pSttRng, pREnd ); - bCheck = sal_True; + bCheck = true; if( pNew ) pNew->SetStart( *pSttRng ); break; @@ -1936,7 +1936,7 @@ static sal_Bool lcl_RejectRedline( SwRedlineTbl& rArr, sal_uInt16& rPos, static const SwRedline* lcl_FindCurrRedline( const SwPosition& rSttPos, sal_uInt16& rPos, - sal_Bool bNext = sal_True ) + bool bNext = true ) { const SwRedline* pFnd = 0; const SwRedlineTbl& rArr = rSttPos.nNode.GetNode().GetDoc()->GetRedlineTbl(); @@ -1973,7 +1973,7 @@ static int lcl_AcceptRejectRedl( Fn_AcceptReject fn_AcceptReject, const SwPosition* pStt = rPam.Start(), * pEnd = pStt == rPam.GetPoint() ? rPam.GetMark() : rPam.GetPoint(); - const SwRedline* pFnd = lcl_FindCurrRedline( *pStt, n, sal_True ); + const SwRedline* pFnd = lcl_FindCurrRedline( *pStt, n, true ); if( pFnd && // Is new a part of it? ( *pFnd->Start() != *pStt || *pFnd->End() > *pEnd )) { @@ -2273,12 +2273,12 @@ const SwRedline* SwDoc::SelNextRedline( SwPaM& rPam ) const SwPosition& rSttPos = *rPam.GetPoint(); SwPosition aSavePos( rSttPos ); - sal_Bool bRestart; + bool bRestart; // If the starting positon points to the last valid ContentNode, // we take the next Redline in any case. sal_uInt16 n = 0; - const SwRedline* pFnd = lcl_FindCurrRedline( rSttPos, n, sal_True ); + const SwRedline* pFnd = lcl_FindCurrRedline( rSttPos, n, true ); if( pFnd ) { const SwPosition* pEnd = pFnd->End(); @@ -2295,7 +2295,7 @@ const SwRedline* SwDoc::SelNextRedline( SwPaM& rPam ) const } do { - bRestart = sal_False; + bRestart = false; for( ; !pFnd && n < pRedlineTbl->size(); ++n ) { @@ -2367,7 +2367,7 @@ const SwRedline* SwDoc::SelNextRedline( SwPaM& rPam ) const { if( n < pRedlineTbl->size() ) { - bRestart = sal_True; + bRestart = true; *rPam.GetPoint() = *pSaveFnd->End(); } else @@ -2390,12 +2390,12 @@ const SwRedline* SwDoc::SelPrevRedline( SwPaM& rPam ) const SwPosition& rSttPos = *rPam.GetPoint(); SwPosition aSavePos( rSttPos ); - sal_Bool bRestart; + bool bRestart; // If the starting positon points to the last valid ContentNode, // we take the previous Redline in any case. sal_uInt16 n = 0; - const SwRedline* pFnd = lcl_FindCurrRedline( rSttPos, n, sal_False ); + const SwRedline* pFnd = lcl_FindCurrRedline( rSttPos, n, false ); if( pFnd ) { const SwPosition* pStt = pFnd->Start(); @@ -2412,7 +2412,7 @@ const SwRedline* SwDoc::SelPrevRedline( SwPaM& rPam ) const } do { - bRestart = sal_False; + bRestart = false; while( !pFnd && 0 < n ) { @@ -2486,7 +2486,7 @@ const SwRedline* SwDoc::SelPrevRedline( SwPaM& rPam ) const { if( n ) { - bRestart = sal_True; + bRestart = true; *rPam.GetPoint() = *pSaveFnd->Start(); } else @@ -2505,16 +2505,16 @@ const SwRedline* SwDoc::SelPrevRedline( SwPaM& rPam ) const // Set comment at the Redline bool SwDoc::SetRedlineComment( const SwPaM& rPaM, const String& rS ) { - sal_Bool bRet = sal_False; + bool bRet = false; const SwPosition* pStt = rPaM.Start(), * pEnd = pStt == rPaM.GetPoint() ? rPaM.GetMark() : rPaM.GetPoint(); sal_uInt16 n = 0; - if( lcl_FindCurrRedline( *pStt, n, sal_True ) ) + if( lcl_FindCurrRedline( *pStt, n, true ) ) { for( ; n < pRedlineTbl->size(); ++n ) { - bRet = sal_True; + bRet = true; SwRedline* pTmp = (*pRedlineTbl)[ n ]; if( pStt != pEnd && *pTmp->Start() > *pEnd ) break; @@ -3519,19 +3519,19 @@ void SwRedline::DelCopyOfSection() const SwRedlineTbl& rTbl = pDoc->GetRedlineTbl(); sal_uInt16 n = rTbl.GetPos( this ); OSL_ENSURE( n != USHRT_MAX, "How strange. We don't exist!" ); - for( sal_Bool bBreak = sal_False; !bBreak && n > 0; ) + for( bool bBreak = false; !bBreak && n > 0; ) { --n; - bBreak = sal_True; + bBreak = true; if( rTbl[ n ]->GetBound(sal_True) == *aPam.GetPoint() ) { rTbl[ n ]->GetBound(sal_True) = *pEnd; - bBreak = sal_False; + bBreak = false; } if( rTbl[ n ]->GetBound(sal_False) == *aPam.GetPoint() ) { rTbl[ n ]->GetBound(sal_False) = *pEnd; - bBreak = sal_False; + bBreak = false; } } @@ -3567,36 +3567,36 @@ void SwRedline::MoveFromSection() std::vector<SwPosition*> aBeforeArr, aBehindArr; sal_uInt16 nMyPos = rTbl.GetPos( this ); OSL_ENSURE( this, "this is not in the array?" ); - sal_Bool bBreak = sal_False; + bool bBreak = false; sal_uInt16 n; for( n = nMyPos+1; !bBreak && n < rTbl.size(); ++n ) { - bBreak = sal_True; + bBreak = true; if( rTbl[ n ]->GetBound(sal_True) == *GetPoint() ) { aBehindArr.push_back( &rTbl[ n ]->GetBound(sal_True) ); - bBreak = sal_False; + bBreak = false; } if( rTbl[ n ]->GetBound(sal_False) == *GetPoint() ) { aBehindArr.push_back( &rTbl[ n ]->GetBound(sal_False) ); - bBreak = sal_False; + bBreak = false; } } - for( bBreak = sal_False, n = nMyPos; !bBreak && n ; ) + for( bBreak = false, n = nMyPos; !bBreak && n ; ) { --n; - bBreak = sal_True; + bBreak = true; if( rTbl[ n ]->GetBound(sal_True) == *GetPoint() ) { aBeforeArr.push_back( &rTbl[ n ]->GetBound(sal_True) ); - bBreak = sal_False; + bBreak = false; } if( rTbl[ n ]->GetBound(sal_False) == *GetPoint() ) { aBeforeArr.push_back( &rTbl[ n ]->GetBound(sal_False) ); - bBreak = sal_False; + bBreak = false; } } diff --git a/sw/source/core/doc/docruby.cxx b/sw/source/core/doc/docruby.cxx index fc4b0faaaf37..98f2fd8f0735 100644 --- a/sw/source/core/doc/docruby.cxx +++ b/sw/source/core/doc/docruby.cxx @@ -62,7 +62,7 @@ sal_uInt16 SwDoc::FillRubyList( const SwPaM& rPam, SwRubyList& rList, { const SwPaM *_pStartCrsr = (SwPaM*)rPam.GetNext(), *__pStartCrsr = _pStartCrsr; - sal_Bool bCheckEmpty = &rPam != _pStartCrsr; + bool bCheckEmpty = &rPam != _pStartCrsr; do { const SwPosition* pStt = _pStartCrsr->Start(), * pEnd = pStt == _pStartCrsr->GetPoint() @@ -114,7 +114,7 @@ sal_uInt16 SwDoc::SetRubyList( const SwPaM& rPam, const SwRubyList& rList, const SwPaM *_pStartCrsr = (SwPaM*)rPam.GetNext(), *__pStartCrsr = _pStartCrsr; - sal_Bool bCheckEmpty = &rPam != _pStartCrsr; + bool bCheckEmpty = &rPam != _pStartCrsr; do { const SwPosition* pStt = _pStartCrsr->Start(), * pEnd = pStt == _pStartCrsr->GetPoint() @@ -254,7 +254,7 @@ sal_Bool SwDoc::_SelectNextRubyChars( SwPaM& rPam, SwRubyListEntry& rEntry, sal_ } } - sal_Bool bAlphaNum = sal_False; + bool bAlphaNum = false; long nWordEnd = nEnd; CharClass& rCC = GetAppCharClass(); while( nStart < nEnd ) @@ -274,14 +274,14 @@ sal_Bool SwDoc::_SelectNextRubyChars( SwPaM& rPam, SwRubyListEntry& rEntry, sal_ } sal_Int32 nChType = rCC.getType( *pTxt, nStart ); - sal_Bool bIgnoreChar = sal_False, bIsAlphaNum = sal_False, bChkNxtWrd = sal_False; + bool bIgnoreChar = false, bIsAlphaNum = false, bChkNxtWrd = false; switch( nChType ) { case UnicodeType::UPPERCASE_LETTER: case UnicodeType::LOWERCASE_LETTER: case UnicodeType::TITLECASE_LETTER: case UnicodeType::DECIMAL_DIGIT_NUMBER: - bChkNxtWrd = bIsAlphaNum = sal_True; + bChkNxtWrd = bIsAlphaNum = true; break; case UnicodeType::SPACE_SEPARATOR: @@ -289,15 +289,15 @@ sal_Bool SwDoc::_SelectNextRubyChars( SwPaM& rPam, SwRubyListEntry& rEntry, sal_ /*??*/ case UnicodeType::PRIVATE_USE: case UnicodeType::START_PUNCTUATION: case UnicodeType::END_PUNCTUATION: - bIgnoreChar = sal_True; + bIgnoreChar = true; break; case UnicodeType::OTHER_LETTER: - bChkNxtWrd = sal_True; + bChkNxtWrd = true; default: - bIsAlphaNum = sal_False; + bIsAlphaNum = false; break; } diff --git a/sw/source/core/doc/docsort.cxx b/sw/source/core/doc/docsort.cxx index 79a3aaa8f820..3e4cf761dcc4 100644 --- a/sw/source/core/doc/docsort.cxx +++ b/sw/source/core/doc/docsort.cxx @@ -755,7 +755,7 @@ void MoveCell(SwDoc* pDoc, const SwTableBox* pSource, const SwTableBox* pTar, pNd = pDoc->GetNodes().GoNext( &aTar ); // next ContentNode sal_uLong nCount = pNd->EndOfSectionIndex() - pNd->StartOfSectionIndex(); - sal_Bool bDelFirst = sal_False; + bool bDelFirst = false; if( nCount == 2 ) { OSL_ENSURE( pNd->GetCntntNode(), "No ContentNode"); @@ -919,7 +919,7 @@ sal_uInt16 FlatFndBox::GetRowCount(const _FndBox& rBox) --------------------------------------------------------------------*/ void FlatFndBox::FillFlat(const _FndBox& rBox, sal_Bool bLastBox) { - sal_Bool bModRow = sal_False; + bool bModRow = false; const _FndLines& rLines = rBox.GetLines(); // Iterate over Lines @@ -958,7 +958,7 @@ void FlatFndBox::FillFlat(const _FndBox& rBox, sal_Bool bLastBox) *(ppItemSets + nOff ) = pSet; } - bModRow = sal_True; + bModRow = true; } else { diff --git a/sw/source/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx index 180db6130c81..cd78923bedb6 100644 --- a/sw/source/core/doc/doctxm.cxx +++ b/sw/source/core/doc/doctxm.cxx @@ -1430,7 +1430,7 @@ void SwTOXBaseSection::UpdateCntnt( SwTOXElement eMyType, case nsSwTOXElement::TOX_OLE: if( pNd->IsOLENode() ) { - sal_Bool bInclude = sal_True; + bool bInclude = true; if(TOX_OBJECTS == SwTOXBase::GetType()) { SwOLENode* pOLENode = pNd->GetOLENode(); @@ -1447,7 +1447,7 @@ void SwTOXBaseSection::UpdateCntnt( SwTOXElement eMyType, else { OSL_FAIL("OLE Object no loaded?"); - bInclude = sal_False; + bInclude = false; } } @@ -1649,7 +1649,7 @@ void SwTOXBaseSection::GenerateText( sal_uInt16 nArrayIdx, const SwPageDesc* pPageDesc = ((SwFmtPageDesc&)pTOXNd-> SwCntntNode::GetAttr( RES_PAGEDESC )).GetPageDesc(); - sal_Bool bCallFindRect = sal_True; + bool bCallFindRect = true; long nRightMargin; if( pPageDesc ) { @@ -1657,7 +1657,7 @@ void SwTOXBaseSection::GenerateText( sal_uInt16 nArrayIdx, if( !pFrm || 0 == ( pFrm = pFrm->FindPageFrm() ) || pPageDesc != ((SwPageFrm*)pFrm)->GetPageDesc() ) // we have to go via the PageDesc here - bCallFindRect = sal_False; + bCallFindRect = false; } SwRect aNdRect; @@ -1966,12 +1966,12 @@ void SwTOXBaseSection::UpdatePageNum() Description: Replace the PageNumber place holders --------------------------------------------------------------------*/ // search for the page no in the array of main entry page numbers -static sal_Bool lcl_HasMainEntry( const std::vector<sal_uInt16>* pMainEntryNums, sal_uInt16 nToFind ) +static bool lcl_HasMainEntry( const std::vector<sal_uInt16>* pMainEntryNums, sal_uInt16 nToFind ) { for(sal_uInt16 i = 0; pMainEntryNums && i < pMainEntryNums->size(); ++i) if(nToFind == (*pMainEntryNums)[i]) - return sal_True; - return sal_False; + return true; + return false; } void SwTOXBaseSection::_UpdatePageNum( SwTxtNode* pNd, @@ -2035,7 +2035,7 @@ void SwTOXBaseSection::_UpdatePageNum( SwTxtNode* pNd, // Add up all following // break up if main entry starts or ends and // insert a char style index - sal_Bool bMainEntryChanges = lcl_HasMainEntry(pMainEntryNums, nOld) + bool bMainEntryChanges = lcl_HasMainEntry(pMainEntryNums, nOld) != lcl_HasMainEntry(pMainEntryNums, rNums[i]); if(nOld == rNums[i]-1 && !bMainEntryChanges && diff --git a/sw/source/core/doc/ftnidx.cxx b/sw/source/core/doc/ftnidx.cxx index 50e7bdec8bd8..6b60f6d9b00f 100644 --- a/sw/source/core/doc/ftnidx.cxx +++ b/sw/source/core/doc/ftnidx.cxx @@ -121,7 +121,7 @@ void SwFtnIdxs::UpdateFtn( const SwNodeIndex& rStt ) SwUpdFtnEndNtAtEnd aNumArr; // unless we have per-document numbering, only look at endnotes here - const sal_Bool bEndNoteOnly = FTNNUM_DOC != rFtnInfo.eNum; + const bool bEndNoteOnly = FTNNUM_DOC != rFtnInfo.eNum; sal_uInt16 nPos, nFtnNo = 1, nEndNo = 1; sal_uLong nUpdNdIdx = rStt.GetIndex(); @@ -225,8 +225,8 @@ void SwFtnIdxs::UpdateAllFtn() } - // We use sal_Bool here, so that we also iterate through the Endnotes with a chapter setting. - const sal_Bool bEndNoteOnly = FTNNUM_DOC != rFtnInfo.eNum; + // We use bool here, so that we also iterate through the Endnotes with a chapter setting. + const bool bEndNoteOnly = FTNNUM_DOC != rFtnInfo.eNum; sal_uInt16 nFtnNo = 0, nEndNo = 0; for( sal_uInt16 nPos = 0; nPos < size(); ++nPos ) { diff --git a/sw/source/core/doc/gctable.cxx b/sw/source/core/doc/gctable.cxx index a039c706833a..3bd51109fa6e 100644 --- a/sw/source/core/doc/gctable.cxx +++ b/sw/source/core/doc/gctable.cxx @@ -35,7 +35,7 @@ using namespace ::editeng; -inline const SvxBorderLine* GetLineTB( const SvxBoxItem* pBox, sal_Bool bTop ) +inline const SvxBorderLine* GetLineTB( const SvxBoxItem* pBox, bool bTop ) { return bTop ? pBox->GetTop() : pBox->GetBottom(); } @@ -104,7 +104,7 @@ static void lcl_GCBorder_GetLastBox_B( const SwTableBox* pBox, SwTableBoxes* pPa // Find the "end" of the passed BorderLine. Returns the "Layout"Pos! static sal_uInt16 lcl_FindEndPosOfBorder( const SwCollectTblLineBoxes& rCollTLB, - const SvxBorderLine& rBrdLn, sal_uInt16& rStt, sal_Bool bTop ) + const SvxBorderLine& rBrdLn, sal_uInt16& rStt, bool bTop ) { sal_uInt16 nPos, nLastPos = 0; for( sal_uInt16 nEnd = rCollTLB.Count(); rStt < nEnd; ++rStt ) @@ -123,7 +123,7 @@ static sal_uInt16 lcl_FindEndPosOfBorder( const SwCollectTblLineBoxes& rCollTLB, } static inline const SvxBorderLine* lcl_GCBorder_GetBorder( const SwTableBox& rBox, - sal_Bool bTop, + bool bTop, const SfxPoolItem** ppItem ) { return SFX_ITEM_SET == rBox.GetFrmFmt()->GetItemState( RES_BOX, sal_True, ppItem ) @@ -132,7 +132,7 @@ static inline const SvxBorderLine* lcl_GCBorder_GetBorder( const SwTableBox& rBo } static void lcl_GCBorder_DelBorder( const SwCollectTblLineBoxes& rCollTLB, - sal_uInt16& rStt, sal_Bool bTop, + sal_uInt16& rStt, bool bTop, const SvxBorderLine& rLine, const SfxPoolItem* pItem, sal_uInt16 nEndPos, @@ -166,7 +166,7 @@ static void lcl_GCBorder_DelBorder( const SwCollectTblLineBoxes& rCollTLB, pLn = lcl_GCBorder_GetBorder( *pBox, bTop, &pItem ); - } while( sal_True ); + } while( true ); } static void lcl_GC_Box_Border( const SwTableBox* pBox, _SwGCLineBorder* pPara ); @@ -234,23 +234,23 @@ void sw_GC_Line_Border( const SwTableLine* pLine, _SwGCLineBorder* pGCPara ) *pTopBox = &aTop.GetBox( nSttTop++, &nTopPos ); const SfxPoolItem *pBtmItem = 0, *pTopItem = 0; const SvxBorderLine *pBtmLine(0), *pTopLine(0); - sal_Bool bGetTopItem = sal_True, bGetBtmItem = sal_True; + bool bGetTopItem = true, bGetBtmItem = true; do { if( bGetBtmItem ) - pBtmLine = lcl_GCBorder_GetBorder( *pBtmBox, sal_False, &pBtmItem ); + pBtmLine = lcl_GCBorder_GetBorder( *pBtmBox, false, &pBtmItem ); if( bGetTopItem ) - pTopLine = lcl_GCBorder_GetBorder( *pTopBox, sal_True, &pTopItem ); + pTopLine = lcl_GCBorder_GetBorder( *pTopBox, true, &pTopItem ); if( pTopLine && pBtmLine && *pTopLine == *pBtmLine ) { // We can remove one, but which one? sal_uInt16 nSavSttBtm = nSttBtm, nSavSttTop = nSttTop; sal_uInt16 nBtmEndPos = ::lcl_FindEndPosOfBorder( aBottom, - *pTopLine, nSttBtm, sal_False ); + *pTopLine, nSttBtm, false ); if( !nBtmEndPos ) nBtmEndPos = nBtmPos; sal_uInt16 nTopEndPos = ::lcl_FindEndPosOfBorder( aTop, - *pTopLine, nSttTop, sal_True ); + *pTopLine, nSttTop, true ); if( !nTopEndPos ) nTopEndPos = nTopPos; @@ -259,7 +259,7 @@ void sw_GC_Line_Border( const SwTableLine* pLine, _SwGCLineBorder* pGCPara ) // Delete the TopBorders until BottomEndPos nSttTop = nSavSttTop; if( nTopPos <= nBtmEndPos ) - lcl_GCBorder_DelBorder( aTop, --nSttTop, sal_True, + lcl_GCBorder_DelBorder( aTop, --nSttTop, true, *pBtmLine, pTopItem, nBtmEndPos, pGCPara->pShareFmts ); else @@ -270,7 +270,7 @@ void sw_GC_Line_Border( const SwTableLine* pLine, _SwGCLineBorder* pGCPara ) // Else delete the BottomBorders until TopEndPos nSttBtm = nSavSttBtm; if( nBtmPos <= nTopEndPos ) - lcl_GCBorder_DelBorder( aBottom, --nSttBtm, sal_False, + lcl_GCBorder_DelBorder( aBottom, --nSttBtm, false, *pTopLine, pBtmItem, nTopEndPos, pGCPara->pShareFmts ); else @@ -286,26 +286,26 @@ void sw_GC_Line_Border( const SwTableLine* pLine, _SwGCLineBorder* pGCPara ) pBtmBox = &aBottom.GetBox( nSttBtm++, &nBtmPos ); pTopBox = &aTop.GetBox( nSttTop++, &nTopPos ); - bGetTopItem = bGetBtmItem = sal_True; + bGetTopItem = bGetBtmItem = true; } else if( nTopPos < nBtmPos ) { if( nSttTop >= nEndTop ) break; pTopBox = &aTop.GetBox( nSttTop++, &nTopPos ); - bGetTopItem = sal_True; - bGetBtmItem = sal_False; + bGetTopItem = true; + bGetBtmItem = false; } else { if( nSttBtm >= nEndBtm ) break; pBtmBox = &aBottom.GetBox( nSttBtm++, &nBtmPos ); - bGetTopItem = sal_False; - bGetBtmItem = sal_True; + bGetTopItem = false; + bGetBtmItem = true; } - } while( sal_True ); + } while( true ); } for( SwTableBoxes::const_iterator it = pLine->GetTabBoxes().begin(); diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx index c4f0ad5b6cb6..a3ae6922aefc 100644 --- a/sw/source/core/doc/notxtfrm.cxx +++ b/sw/source/core/doc/notxtfrm.cxx @@ -267,7 +267,7 @@ void SwNoTxtFrm::Paint(SwRect const& rRect, SwPrintData const*const) const OutputDevice *pOut = pSh->GetOut(); pOut->Push(); - sal_Bool bClip = sal_True; + bool bClip = true; PolyPolygon aPoly; SwNoTxtNode& rNoTNd = *(SwNoTxtNode*)GetNode(); @@ -284,7 +284,7 @@ void SwNoTxtFrm::Paint(SwRect const& rRect, SwPrintData const*const) const ) { pOut->SetClipRegion( aPoly ); - bClip = sal_False; + bClip = false; } SwRect aOrigPaint( rRect ); @@ -636,7 +636,7 @@ void SwNoTxtFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) SwCntntFrm::Modify( pOld, pNew ); } - sal_Bool bComplete = sal_True; + bool bComplete = true; switch( nWhich ) { @@ -646,7 +646,7 @@ void SwNoTxtFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) case RES_GRF_REREAD_AND_INCACHE: if( ND_GRFNODE == GetNode()->GetNodeType() ) { - bComplete = sal_False; + bComplete = false; SwGrfNode* pNd = (SwGrfNode*) GetNode(); ViewShell *pVSh = 0; @@ -701,7 +701,7 @@ void SwNoTxtFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) case RES_LINKED_GRAPHIC_STREAM_ARRIVED: if ( GetNode()->GetNodeType() == ND_GRFNODE ) { - bComplete = sal_False; + bComplete = false; SwGrfNode* pNd = (SwGrfNode*) GetNode(); CLEARCACHE( pNd ) @@ -824,7 +824,7 @@ void SwNoTxtFrm::PaintPicture( OutputDevice* pOut, const SwRect &rGrfArea ) cons pOut->SetAntialiasing( nFormerAntialiasingAtOutput | ANTIALIASING_ENABLE_B2DDRAW ); } - sal_Bool bForceSwap = sal_False, bContinue = sal_True; + bool bForceSwap = false, bContinue = true; GraphicObject& rGrfObj = pGrfNd->GetGrfObj(); GraphicAttr aGrfAttr; @@ -857,7 +857,7 @@ void SwNoTxtFrm::PaintPicture( OutputDevice* pOut, const SwRect &rGrfArea ) cons if ( !aTxt.Len() ) GetRealURL( *pGrfNd, aTxt ); ::lcl_PaintReplacement( aAlignedGrfArea, aTxt, *pShell, this, sal_False ); - bContinue = sal_False; + bContinue = false; } else if( rGrfObj.IsCached( pOut, aAlignedGrfArea.Pos(), aAlignedGrfArea.SSize(), &aGrfAttr )) @@ -865,17 +865,17 @@ void SwNoTxtFrm::PaintPicture( OutputDevice* pOut, const SwRect &rGrfArea ) cons rGrfObj.DrawWithPDFHandling( *pOut, aAlignedGrfArea.Pos(), aAlignedGrfArea.SSize(), &aGrfAttr ); - bContinue = sal_False; + bContinue = false; } } if( bContinue ) { const sal_Bool bSwapped = rGrfObj.IsSwappedOut(); - const sal_Bool bSwappedIn = 0 != pGrfNd->SwapIn( bPrn ); + const bool bSwappedIn = 0 != pGrfNd->SwapIn( bPrn ); if( bSwappedIn && rGrfObj.GetGraphic().IsSupportedGraphic()) { - const sal_Bool bAnimate = rGrfObj.IsAnimated() && + const bool bAnimate = rGrfObj.IsAnimated() && !pShell->IsPreView() && !pShell->GetAccessibilityOptions()->IsStopAnimatedGraphics() && // #i9684# Stop animation during printing/pdf export @@ -932,7 +932,7 @@ void SwNoTxtFrm::PaintPicture( OutputDevice* pOut, const SwRect &rGrfArea ) cons // When printing, we must not collect the graphics if( bSwapped && bPrn ) - bForceSwap = sal_True; + bForceSwap = true; } if( bForceSwap ) @@ -971,7 +971,7 @@ void SwNoTxtFrm::PaintPicture( OutputDevice* pOut, const SwRect &rGrfArea ) cons // We do not have a printer in the BrowseMode and thus no JobSetup, so we create one ... const JobSetup* pJobSetup = pOLENd->getIDocumentDeviceAccess()->getJobsetup(); - sal_Bool bDummyJobSetup = 0 == pJobSetup; + bool bDummyJobSetup = 0 == pJobSetup; if( bDummyJobSetup ) pJobSetup = new JobSetup(); diff --git a/sw/source/core/doc/number.cxx b/sw/source/core/doc/number.cxx index 5a97789e931e..aa23a2167412 100644 --- a/sw/source/core/doc/number.cxx +++ b/sw/source/core/doc/number.cxx @@ -353,7 +353,7 @@ sal_Int16 SwNumFmt::GetVertOrient() const void SwNumFmt::UpdateNumNodes( SwDoc* pDoc ) { sal_Bool bDocIsModified = pDoc->IsModified(); - sal_Bool bFnd = sal_False; + bool bFnd = false; const SwNumRule* pRule; for( sal_uInt16 n = pDoc->GetNumRuleTbl().size(); !bFnd && n; ) { @@ -368,7 +368,7 @@ void SwNumFmt::UpdateNumNodes( SwDoc* pDoc ) { lcl_SetRuleChgd( *(*aIter), i ); } - bFnd = sal_True; + bFnd = true; break; } } @@ -749,7 +749,7 @@ String SwNumRule::MakeRefNumString( const SwNodeNum& rNodeNum, if ( rNodeNum.GetLevelInListTree() >= 0 ) { - sal_Bool bOldHadPrefix = sal_True; + bool bOldHadPrefix = true; bool bFirstIteration = true; ::rtl::OUString sOldPrefix; diff --git a/sw/source/core/doc/poolfmt.cxx b/sw/source/core/doc/poolfmt.cxx index ddb31d000cbf..03ea2f86b443 100644 --- a/sw/source/core/doc/poolfmt.cxx +++ b/sw/source/core/doc/poolfmt.cxx @@ -198,7 +198,7 @@ static void lcl_SetDfltFont( sal_uInt16 nLatinFntType, sal_uInt16 nCJKFntType, static void lcl_SetHeadline( SwDoc* pDoc, SwTxtFmtColl* pColl, SfxItemSet& rSet, - sal_uInt16 nOutLvlBits, sal_uInt8 nLevel, sal_Bool bItalic ) + sal_uInt16 nOutLvlBits, sal_uInt8 nLevel, bool bItalic ) { SetAllScriptItem( rSet, SvxWeightItem( WEIGHT_BOLD, RES_CHRATR_WEIGHT ) ); SvxFontHeightItem aHItem(240, 100, RES_CHRATR_FONTSIZE); @@ -257,7 +257,7 @@ static void lcl_SetHeadline( SwDoc* pDoc, SwTxtFmtColl* pColl, static void lcl_SetRegister( SwDoc* pDoc, SfxItemSet& rSet, sal_uInt16 nFact, - sal_Bool bHeader, sal_Bool bTab ) + bool bHeader, bool bTab ) { SvxLRSpaceItem aLR( RES_LR_SPACE ); sal_uInt16 nLeft = nFact ? GetMetricVal( CM_05 ) * nFact : 0; @@ -508,34 +508,34 @@ SwTxtFmtColl* SwDoc::GetTxtCollFromPool( sal_uInt16 nId, bool bRegardLanguage ) break; case RES_POOLCOLL_HEADLINE1: // Headinline 1 - lcl_SetHeadline( this, pNewColl, aSet, nOutLvlBits, 0, sal_False ); + lcl_SetHeadline( this, pNewColl, aSet, nOutLvlBits, 0, false ); break; case RES_POOLCOLL_HEADLINE2: // Headinline 2 - lcl_SetHeadline( this, pNewColl, aSet, nOutLvlBits, 1, sal_True ); + lcl_SetHeadline( this, pNewColl, aSet, nOutLvlBits, 1, true ); break; case RES_POOLCOLL_HEADLINE3: // Headinline 3 - lcl_SetHeadline( this, pNewColl, aSet, nOutLvlBits, 2, sal_False ); + lcl_SetHeadline( this, pNewColl, aSet, nOutLvlBits, 2, false ); break; case RES_POOLCOLL_HEADLINE4: // Headinline 4 - lcl_SetHeadline( this, pNewColl, aSet, nOutLvlBits, 3, sal_True ); + lcl_SetHeadline( this, pNewColl, aSet, nOutLvlBits, 3, true ); break; case RES_POOLCOLL_HEADLINE5: // Headinline 5 - lcl_SetHeadline( this, pNewColl, aSet, nOutLvlBits, 4, sal_False ); + lcl_SetHeadline( this, pNewColl, aSet, nOutLvlBits, 4, false ); break; case RES_POOLCOLL_HEADLINE6: // Headinline 6 - lcl_SetHeadline( this, pNewColl, aSet, nOutLvlBits, 5, sal_False ); + lcl_SetHeadline( this, pNewColl, aSet, nOutLvlBits, 5, false ); break; case RES_POOLCOLL_HEADLINE7: // Headinline 7 - lcl_SetHeadline( this, pNewColl, aSet, nOutLvlBits, 6, sal_False ); + lcl_SetHeadline( this, pNewColl, aSet, nOutLvlBits, 6, false ); break; case RES_POOLCOLL_HEADLINE8: // Headinline 8 - lcl_SetHeadline( this, pNewColl, aSet, nOutLvlBits, 7, sal_False ); + lcl_SetHeadline( this, pNewColl, aSet, nOutLvlBits, 7, false ); break; case RES_POOLCOLL_HEADLINE9: // Headinline 9 - lcl_SetHeadline( this, pNewColl, aSet, nOutLvlBits, 8, sal_False ); + lcl_SetHeadline( this, pNewColl, aSet, nOutLvlBits, 8, false ); break; case RES_POOLCOLL_HEADLINE10: // Headinline 10 - lcl_SetHeadline( this, pNewColl, aSet, nOutLvlBits, 9, sal_False ); + lcl_SetHeadline( this, pNewColl, aSet, nOutLvlBits, 9, false ); break; @@ -627,108 +627,108 @@ SwTxtFmtColl* SwDoc::GetTxtCollFromPool( sal_uInt16 nId, bool bRegardLanguage ) // User defined indexes: case RES_POOLCOLL_TOX_USERH: // Header - lcl_SetRegister( this, aSet, 0, sal_True, sal_False ); + lcl_SetRegister( this, aSet, 0, true, false ); { SwFmtLineNumber aLN; aLN.SetCountLines( sal_False ); aSet.Put( aLN ); } break; case RES_POOLCOLL_TOX_USER1: // 1. Level - lcl_SetRegister( this, aSet, 0, sal_False, sal_True ); + lcl_SetRegister( this, aSet, 0, false, true ); break; case RES_POOLCOLL_TOX_USER2: // 2. Level - lcl_SetRegister( this, aSet, 1, sal_False, sal_True ); + lcl_SetRegister( this, aSet, 1, false, true ); break; case RES_POOLCOLL_TOX_USER3: // 3. Level - lcl_SetRegister( this, aSet, 2, sal_False, sal_True ); + lcl_SetRegister( this, aSet, 2, false, true ); break; case RES_POOLCOLL_TOX_USER4: // 4. Level - lcl_SetRegister( this, aSet, 3, sal_False, sal_True ); + lcl_SetRegister( this, aSet, 3, false, true ); break; case RES_POOLCOLL_TOX_USER5: // 5. Level - lcl_SetRegister( this, aSet, 4, sal_False, sal_True ); + lcl_SetRegister( this, aSet, 4, false, true ); break; case RES_POOLCOLL_TOX_USER6: // 6. Level - lcl_SetRegister( this, aSet, 5, sal_False, sal_True ); + lcl_SetRegister( this, aSet, 5, false, true ); break; case RES_POOLCOLL_TOX_USER7: // 7. Level - lcl_SetRegister( this, aSet, 6, sal_False, sal_True ); + lcl_SetRegister( this, aSet, 6, false, true ); break; case RES_POOLCOLL_TOX_USER8: // 8. Level - lcl_SetRegister( this, aSet, 7, sal_False, sal_True ); + lcl_SetRegister( this, aSet, 7, false, true ); break; case RES_POOLCOLL_TOX_USER9: // 9. Level - lcl_SetRegister( this, aSet, 8, sal_False, sal_True ); + lcl_SetRegister( this, aSet, 8, false, true ); break; case RES_POOLCOLL_TOX_USER10: // 10. Level - lcl_SetRegister( this, aSet, 9, sal_False, sal_True ); + lcl_SetRegister( this, aSet, 9, false, true ); break; // Index case RES_POOLCOLL_TOX_IDXH: // Header - lcl_SetRegister( this, aSet, 0, sal_True, sal_False ); + lcl_SetRegister( this, aSet, 0, true, false ); { SwFmtLineNumber aLN; aLN.SetCountLines( sal_False ); aSet.Put( aLN ); } break; case RES_POOLCOLL_TOX_IDX1: // 1. Level - lcl_SetRegister( this, aSet, 0, sal_False, sal_False ); + lcl_SetRegister( this, aSet, 0, false, false ); break; case RES_POOLCOLL_TOX_IDX2: // 2. Level - lcl_SetRegister( this, aSet, 1, sal_False, sal_False ); + lcl_SetRegister( this, aSet, 1, false, false ); break; case RES_POOLCOLL_TOX_IDX3: // 3. Level - lcl_SetRegister( this, aSet, 2, sal_False, sal_False ); + lcl_SetRegister( this, aSet, 2, false, false ); break; case RES_POOLCOLL_TOX_IDXBREAK: // Trenner - lcl_SetRegister( this, aSet, 0, sal_False, sal_False ); + lcl_SetRegister( this, aSet, 0, false, false ); break; // Table of Content case RES_POOLCOLL_TOX_CNTNTH: // Header - lcl_SetRegister( this, aSet, 0, sal_True, sal_False ); + lcl_SetRegister( this, aSet, 0, true, false ); { SwFmtLineNumber aLN; aLN.SetCountLines( sal_False ); aSet.Put( aLN ); } break; case RES_POOLCOLL_TOX_CNTNT1: // 1. Level - lcl_SetRegister( this, aSet, 0, sal_False, sal_True ); + lcl_SetRegister( this, aSet, 0, false, true ); break; case RES_POOLCOLL_TOX_CNTNT2: // 2. Level - lcl_SetRegister( this, aSet, 1, sal_False, sal_True ); + lcl_SetRegister( this, aSet, 1, false, true ); break; case RES_POOLCOLL_TOX_CNTNT3: // 3. Level - lcl_SetRegister( this, aSet, 2, sal_False, sal_True ); + lcl_SetRegister( this, aSet, 2, false, true ); break; case RES_POOLCOLL_TOX_CNTNT4: // 4. Level - lcl_SetRegister( this, aSet, 3, sal_False, sal_True ); + lcl_SetRegister( this, aSet, 3, false, true ); break; case RES_POOLCOLL_TOX_CNTNT5: // 5. Level - lcl_SetRegister( this, aSet, 4, sal_False, sal_True ); + lcl_SetRegister( this, aSet, 4, false, true ); break; case RES_POOLCOLL_TOX_CNTNT6: // 6. Level - lcl_SetRegister( this, aSet, 5, sal_False, sal_True ); + lcl_SetRegister( this, aSet, 5, false, true ); break; case RES_POOLCOLL_TOX_CNTNT7: // 7. Level - lcl_SetRegister( this, aSet, 6, sal_False, sal_True ); + lcl_SetRegister( this, aSet, 6, false, true ); break; case RES_POOLCOLL_TOX_CNTNT8: // 8. Level - lcl_SetRegister( this, aSet, 7, sal_False, sal_True ); + lcl_SetRegister( this, aSet, 7, false, true ); break; case RES_POOLCOLL_TOX_CNTNT9: // 9. Level - lcl_SetRegister( this, aSet, 8, sal_False, sal_True ); + lcl_SetRegister( this, aSet, 8, false, true ); break; case RES_POOLCOLL_TOX_CNTNT10: // 10. Level - lcl_SetRegister( this, aSet, 9, sal_False, sal_True ); + lcl_SetRegister( this, aSet, 9, false, true ); break; case RES_POOLCOLL_TOX_ILLUSH: case RES_POOLCOLL_TOX_OBJECTH: case RES_POOLCOLL_TOX_TABLESH: case RES_POOLCOLL_TOX_AUTHORITIESH: - lcl_SetRegister( this, aSet, 0, sal_True, sal_False ); + lcl_SetRegister( this, aSet, 0, true, false ); { SwFmtLineNumber aLN; aLN.SetCountLines( sal_False ); aSet.Put( aLN ); @@ -738,7 +738,7 @@ SwTxtFmtColl* SwDoc::GetTxtCollFromPool( sal_uInt16 nId, bool bRegardLanguage ) case RES_POOLCOLL_TOX_OBJECT1: case RES_POOLCOLL_TOX_TABLES1: case RES_POOLCOLL_TOX_AUTHORITIES1: - lcl_SetRegister( this, aSet, 0, sal_False, sal_True ); + lcl_SetRegister( this, aSet, 0, false, true ); break; @@ -1062,16 +1062,16 @@ bool SwDoc::IsPoolTxtCollUsed( sal_uInt16 nId ) const "Wrong AutoFormat Id" ); SwTxtFmtColl* pNewColl = 0; - sal_Bool bFnd = sal_False; + bool bFnd = false; for( sal_uInt16 n = 0; !bFnd && n < pTxtFmtCollTbl->size(); ++n ) { pNewColl = (*pTxtFmtCollTbl)[ n ]; if( nId == pNewColl->GetPoolFmtId() ) - bFnd = sal_True; + bFnd = true; } if( !bFnd || !pNewColl->GetDepends() ) - return sal_False; + return false; SwAutoFmtGetDocNode aGetHt( &GetNodes() ); return !pNewColl->GetInfo( aGetHt ); @@ -1374,7 +1374,7 @@ bool SwDoc::IsPoolFmtUsed( sal_uInt16 nId ) const SwFmt *pNewFmt = 0; const SwFmtsBase* pArray[ 2 ]; sal_uInt16 nArrCnt = 1; - sal_Bool bFnd = sal_True; + bool bFnd = true; if( RES_POOLCHR_BEGIN <= nId && nId < RES_POOLCHR_END ) { @@ -1389,17 +1389,17 @@ bool SwDoc::IsPoolFmtUsed( sal_uInt16 nId ) const else { OSL_FAIL( "invalid Id" ); - bFnd = sal_False; + bFnd = false; } if( bFnd ) { - bFnd = sal_False; + bFnd = false; while( nArrCnt-- && !bFnd ) for( sal_uInt16 n = 0; !bFnd && n < (*pArray[nArrCnt]).GetFmtCount(); ++n ) if( nId == ( pNewFmt = (*pArray[ nArrCnt ] ).GetFmt( n ) )-> GetPoolFmtId() ) - bFnd = sal_True; + bFnd = true; } // Not found or no dependecies? @@ -1411,7 +1411,7 @@ bool SwDoc::IsPoolFmtUsed( sal_uInt16 nId ) const bFnd = !pNewFmt->GetInfo( aGetHt ); } else - bFnd = sal_False; + bFnd = false; return bFnd; } @@ -1477,7 +1477,7 @@ SwPageDesc* SwDoc::GetPageDescFromPool( sal_uInt16 nId, bool bRegardLanguage ) aUL.SetLower( (sal_uInt16)aLR.GetLeft() ); SwAttrSet aSet( GetAttrPool(), aPgFrmFmtSetRange ); - sal_Bool bSetLeft = sal_True; + bool bSetLeft = true; switch( nId ) { @@ -1510,7 +1510,7 @@ SwPageDesc* SwDoc::GetPageDescFromPool( sal_uInt16 nId, bool bRegardLanguage ) lcl_GetStdPgSize( this, aSet ); aSet.Put( aLR ); aSet.Put( aUL ); - bSetLeft = sal_False; + bSetLeft = false; if( pNewPgDsc ) { pNewPgDsc->SetUseOn( nsUseOnPage::PD_LEFT ); @@ -1525,7 +1525,7 @@ SwPageDesc* SwDoc::GetPageDescFromPool( sal_uInt16 nId, bool bRegardLanguage ) lcl_GetStdPgSize( this, aSet ); aSet.Put( aLR ); aSet.Put( aUL ); - bSetLeft = sal_False; + bSetLeft = false; if( pNewPgDsc ) { pNewPgDsc->SetUseOn( nsUseOnPage::PD_RIGHT ); @@ -2276,17 +2276,17 @@ bool SwDoc::IsPoolPageDescUsed( sal_uInt16 nId ) const OSL_ENSURE( RES_POOLPAGE_BEGIN <= nId && nId < RES_POOLPAGE_END, "Wrong AutoFormat Id" ); SwPageDesc *pNewPgDsc = 0; - sal_Bool bFnd = sal_False; + bool bFnd = false; for( sal_uInt16 n = 0; !bFnd && n < aPageDescs.size(); ++n ) { pNewPgDsc = aPageDescs[ n ]; if( nId == pNewPgDsc->GetPoolFmtId() ) - bFnd = sal_True; + bFnd = true; } // Not found or no dependencies? if( !bFnd || !pNewPgDsc->GetDepends() ) // ?????? - return sal_False; + return false; // Check if we have dependent ContentNodes in the Nodes array // (also indirect ones for derived Formats) diff --git a/sw/source/core/doc/tblcpy.cxx b/sw/source/core/doc/tblcpy.cxx index 88228b2350f5..9083b127cf4d 100644 --- a/sw/source/core/doc/tblcpy.cxx +++ b/sw/source/core/doc/tblcpy.cxx @@ -554,7 +554,7 @@ static void lcl_CpyBox( const SwTable& rCpyTbl, const SwTableBox* pCpyBox, while( pLine->GetUpper() ) pLine = pLine->GetUpper()->GetUpper(); - sal_Bool bReplaceColl = sal_True; + bool bReplaceColl = true; if( bDelCntnt && !bUndoRedline ) { // Delete the Fly first, then the corresponding Nodes @@ -598,7 +598,7 @@ static void lcl_CpyBox( const SwTable& rCpyTbl, const SwTableBox* pCpyBox, if( pCNd && RES_POOLCOLL_TABLE_HDLN != pCNd->GetFmtColl()->GetPoolFmtId() ) - bReplaceColl = sal_False; + bReplaceColl = false; } pDoc->GetNodes().Delete( aInsIdx, aEndNdIdx.GetIndex() - aInsIdx.GetIndex() ); |