diff options
Diffstat (limited to 'sc/source/core/data/markarr.cxx')
-rw-r--r-- | sc/source/core/data/markarr.cxx | 62 |
1 files changed, 31 insertions, 31 deletions
diff --git a/sc/source/core/data/markarr.cxx b/sc/source/core/data/markarr.cxx index aeca394437cd..d6258229c1e3 100644 --- a/sc/source/core/data/markarr.cxx +++ b/sc/source/core/data/markarr.cxx @@ -59,7 +59,7 @@ ScMarkArray::~ScMarkArray() //------------------------------------------------------------------------ -void ScMarkArray::Reset( BOOL bMarked ) +void ScMarkArray::Reset( sal_Bool bMarked ) { // always create pData here // (or have separate method to ensure pData) @@ -74,14 +74,14 @@ void ScMarkArray::Reset( BOOL bMarked ) //------------------------------------------------------------------------ -BOOL ScMarkArray::Search( SCROW nRow, SCSIZE& nIndex ) const +sal_Bool ScMarkArray::Search( SCROW nRow, SCSIZE& nIndex ) const { long nLo = 0; long nHi = static_cast<long>(nCount) - 1; long nStartRow = 0; long nEndRow = 0; long i = 0; - BOOL bFound = (nCount == 1); + sal_Bool bFound = (nCount == 1); if (pData) { while ( !bFound && nLo <= nHi ) @@ -98,11 +98,11 @@ BOOL ScMarkArray::Search( SCROW nRow, SCSIZE& nIndex ) const if (nStartRow >= (long) nRow) nHi = --i; else - bFound = TRUE; + bFound = sal_True; } } else - bFound = FALSE; + bFound = sal_False; if (bFound) nIndex=(SCSIZE)i; @@ -111,19 +111,19 @@ BOOL ScMarkArray::Search( SCROW nRow, SCSIZE& nIndex ) const return bFound; } -BOOL ScMarkArray::GetMark( SCROW nRow ) const +sal_Bool ScMarkArray::GetMark( SCROW nRow ) const { SCSIZE i; if (Search( nRow, i )) return pData[i].bMarked; else - return FALSE; + return sal_False; } //------------------------------------------------------------------------ -void ScMarkArray::SetMarkArea( SCROW nStartRow, SCROW nEndRow, BOOL bMarked ) +void ScMarkArray::SetMarkArea( SCROW nStartRow, SCROW nEndRow, sal_Bool bMarked ) { if (ValidRow(nStartRow) && ValidRow(nEndRow)) { @@ -134,7 +134,7 @@ void ScMarkArray::SetMarkArea( SCROW nStartRow, SCROW nEndRow, BOOL bMarked ) else { if (!pData) - Reset(FALSE); // create pData for further processing - could use special case handling! + Reset(sal_False); // create pData for further processing - could use special case handling! SCSIZE nNeeded = nCount + 2; if ( nLimit < nNeeded ) @@ -150,8 +150,8 @@ void ScMarkArray::SetMarkArea( SCROW nStartRow, SCROW nEndRow, BOOL bMarked ) SCSIZE ni; // number of entries in beginning SCSIZE nInsert; // insert position (MAXROW+1 := no insert) - BOOL bCombined = FALSE; - BOOL bSplit = FALSE; + sal_Bool bCombined = sal_False; + sal_Bool bSplit = sal_False; if ( nStartRow > 0 ) { // skip beginning @@ -166,7 +166,7 @@ void ScMarkArray::SetMarkArea( SCROW nStartRow, SCROW nEndRow, BOOL bMarked ) { // may be a split or a simple insert or just a shrink, // row adjustment is done further down if ( pData[ni].nRow > nEndRow ) - bSplit = TRUE; + bSplit = sal_True; ni++; nInsert = ni; } @@ -177,7 +177,7 @@ void ScMarkArray::SetMarkArea( SCROW nStartRow, SCROW nEndRow, BOOL bMarked ) { // combine pData[ni-1].nRow = nEndRow; nInsert = MAXROWCOUNT; - bCombined = TRUE; + bCombined = sal_True; } } else @@ -204,7 +204,7 @@ void ScMarkArray::SetMarkArea( SCROW nStartRow, SCROW nEndRow, BOOL bMarked ) pData[ni-1].nRow = nStartRow - 1; // shrink } nInsert = MAXROWCOUNT; - bCombined = TRUE; + bCombined = sal_True; } else if ( ni > 0 && ni == nInsert ) pData[ni-1].nRow = nStartRow - 1; // shrink @@ -253,10 +253,10 @@ void ScMarkArray::SetMarkArea( SCROW nStartRow, SCROW nEndRow, BOOL bMarked ) //UNUSED2009-05 void ScMarkArray::DeleteArea(SCROW nStartRow, SCROW nEndRow) //UNUSED2009-05 { -//UNUSED2009-05 SetMarkArea(nStartRow, nEndRow, FALSE); +//UNUSED2009-05 SetMarkArea(nStartRow, nEndRow, sal_False); //UNUSED2009-05 } -BOOL ScMarkArray::IsAllMarked( SCROW nStartRow, SCROW nEndRow ) const +sal_Bool ScMarkArray::IsAllMarked( SCROW nStartRow, SCROW nEndRow ) const { SCSIZE nStartIndex; SCSIZE nEndIndex; @@ -265,21 +265,21 @@ BOOL ScMarkArray::IsAllMarked( SCROW nStartRow, SCROW nEndRow ) const if (pData[nStartIndex].bMarked) if (Search( nEndRow, nEndIndex )) if (nEndIndex==nStartIndex) - return TRUE; + return sal_True; - return FALSE; + return sal_False; } -BOOL ScMarkArray::HasOneMark( SCROW& rStartRow, SCROW& rEndRow ) const +sal_Bool ScMarkArray::HasOneMark( SCROW& rStartRow, SCROW& rEndRow ) const { - BOOL bRet = FALSE; + sal_Bool bRet = sal_False; if ( nCount == 1 ) { if ( pData[0].bMarked ) { rStartRow = 0; rEndRow = MAXROW; - bRet = TRUE; + bRet = sal_True; } } else if ( nCount == 2 ) @@ -294,7 +294,7 @@ BOOL ScMarkArray::HasOneMark( SCROW& rStartRow, SCROW& rEndRow ) const rStartRow = pData[0].nRow + 1; rEndRow = MAXROW; } - bRet = TRUE; + bRet = sal_True; } else if ( nCount == 3 ) { @@ -302,7 +302,7 @@ BOOL ScMarkArray::HasOneMark( SCROW& rStartRow, SCROW& rEndRow ) const { rStartRow = pData[0].nRow + 1; rEndRow = pData[1].nRow; - bRet = TRUE; + bRet = sal_True; } } return bRet; @@ -323,10 +323,10 @@ void ScMarkArray::CopyMarksTo( ScMarkArray& rDestMarkArray ) const rDestMarkArray.nCount = rDestMarkArray.nLimit = nCount; } -SCsROW ScMarkArray::GetNextMarked( SCsROW nRow, BOOL bUp ) const +SCsROW ScMarkArray::GetNextMarked( SCsROW nRow, sal_Bool bUp ) const { if (!pData) - const_cast<ScMarkArray*>(this)->Reset(FALSE); // create pData for further processing + const_cast<ScMarkArray*>(this)->Reset(sal_False); // create pData for further processing SCsROW nRet = nRow; if (VALIDROW(nRow)) @@ -349,10 +349,10 @@ SCsROW ScMarkArray::GetNextMarked( SCsROW nRow, BOOL bUp ) const return nRet; } -SCROW ScMarkArray::GetMarkEnd( SCROW nRow, BOOL bUp ) const +SCROW ScMarkArray::GetMarkEnd( SCROW nRow, sal_Bool bUp ) const { if (!pData) - const_cast<ScMarkArray*>(this)->Reset(FALSE); // create pData for further processing + const_cast<ScMarkArray*>(this)->Reset(sal_False); // create pData for further processing SCROW nRet; SCSIZE nIndex; @@ -385,15 +385,15 @@ ScMarkArrayIter::~ScMarkArrayIter() { } -BOOL ScMarkArrayIter::Next( SCROW& rTop, SCROW& rBottom ) +sal_Bool ScMarkArrayIter::Next( SCROW& rTop, SCROW& rBottom ) { if ( nPos >= pArray->nCount ) - return FALSE; + return sal_False; while (!pArray->pData[nPos].bMarked) { ++nPos; if ( nPos >= pArray->nCount ) - return FALSE; + return sal_False; } rBottom = pArray->pData[nPos].nRow; if (nPos==0) @@ -401,7 +401,7 @@ BOOL ScMarkArrayIter::Next( SCROW& rTop, SCROW& rBottom ) else rTop = pArray->pData[nPos-1].nRow + 1; ++nPos; - return TRUE; + return sal_True; } |