diff options
Diffstat (limited to 'sc/source/ui/view/prevloc.cxx')
-rw-r--r-- | sc/source/ui/view/prevloc.cxx | 186 |
1 files changed, 93 insertions, 93 deletions
diff --git a/sc/source/ui/view/prevloc.cxx b/sc/source/ui/view/prevloc.cxx index fd36a1b2c1d0..fb72bedd0999 100644 --- a/sc/source/ui/view/prevloc.cxx +++ b/sc/source/ui/view/prevloc.cxx @@ -58,11 +58,11 @@ struct ScPreviewLocationEntry ScPreviewLocationType eType; Rectangle aPixelRect; ScRange aCellRange; - BOOL bRepeatCol; - BOOL bRepeatRow; + sal_Bool bRepeatCol; + sal_Bool bRepeatRow; ScPreviewLocationEntry( ScPreviewLocationType eNewType, const Rectangle& rPixel, const ScRange& rRange, - BOOL bRepCol, BOOL bRepRow ) : + sal_Bool bRepCol, sal_Bool bRepRow ) : eType( eNewType ), aPixelRect( rPixel ), aCellRange( rRange ), @@ -203,7 +203,7 @@ void ScPreviewLocationData::Clear() nDrawRanges = 0; } -void ScPreviewLocationData::AddCellRange( const Rectangle& rRect, const ScRange& rRange, BOOL bRepCol, BOOL bRepRow, +void ScPreviewLocationData::AddCellRange( const Rectangle& rRect, const ScRange& rRange, sal_Bool bRepCol, sal_Bool bRepRow, const MapMode& rDrawMap ) { Rectangle aPixelRect( pWindow->LogicToPixel( rRect ) ); @@ -228,23 +228,23 @@ void ScPreviewLocationData::AddCellRange( const Rectangle& rRect, const ScRange& } } -void ScPreviewLocationData::AddColHeaders( const Rectangle& rRect, SCCOL nStartCol, SCCOL nEndCol, BOOL bRepCol ) +void ScPreviewLocationData::AddColHeaders( const Rectangle& rRect, SCCOL nStartCol, SCCOL nEndCol, sal_Bool bRepCol ) { SCTAB nTab = 0; //! ? ScRange aRange( nStartCol, 0, nTab, nEndCol, 0, nTab ); Rectangle aPixelRect( pWindow->LogicToPixel( rRect ) ); - aEntries.Insert( new ScPreviewLocationEntry( SC_PLOC_COLHEADER, aPixelRect, aRange, bRepCol, FALSE ) ); + aEntries.Insert( new ScPreviewLocationEntry( SC_PLOC_COLHEADER, aPixelRect, aRange, bRepCol, sal_False ) ); } -void ScPreviewLocationData::AddRowHeaders( const Rectangle& rRect, SCROW nStartRow, SCROW nEndRow, BOOL bRepRow ) +void ScPreviewLocationData::AddRowHeaders( const Rectangle& rRect, SCROW nStartRow, SCROW nEndRow, sal_Bool bRepRow ) { SCTAB nTab = 0; //! ? ScRange aRange( 0, nStartRow, nTab, 0, nEndRow, nTab ); Rectangle aPixelRect( pWindow->LogicToPixel( rRect ) ); - aEntries.Insert( new ScPreviewLocationEntry( SC_PLOC_ROWHEADER, aPixelRect, aRange, FALSE, bRepRow ) ); + aEntries.Insert( new ScPreviewLocationEntry( SC_PLOC_ROWHEADER, aPixelRect, aRange, sal_False, bRepRow ) ); } -void ScPreviewLocationData::AddHeaderFooter( const Rectangle& rRect, BOOL bHeader, BOOL bLeft ) +void ScPreviewLocationData::AddHeaderFooter( const Rectangle& rRect, sal_Bool bHeader, sal_Bool bLeft ) { ScRange aRange; //! ? Rectangle aPixelRect( pWindow->LogicToPixel( rRect ) ); @@ -252,26 +252,26 @@ void ScPreviewLocationData::AddHeaderFooter( const Rectangle& rRect, BOOL bHeade ScPreviewLocationType eType = bHeader ? ( bLeft ? SC_PLOC_LEFTHEADER : SC_PLOC_RIGHTHEADER ) : ( bLeft ? SC_PLOC_LEFTFOOTER : SC_PLOC_RIGHTFOOTER ); - aEntries.Insert( new ScPreviewLocationEntry( eType, aPixelRect, aRange, FALSE, FALSE ) ); + aEntries.Insert( new ScPreviewLocationEntry( eType, aPixelRect, aRange, sal_False, sal_False ) ); } void ScPreviewLocationData::AddNoteMark( const Rectangle& rRect, const ScAddress& rPos ) { ScRange aRange( rPos ); Rectangle aPixelRect( pWindow->LogicToPixel( rRect ) ); - aEntries.Insert( new ScPreviewLocationEntry( SC_PLOC_NOTEMARK, aPixelRect, aRange, FALSE, FALSE ) ); + aEntries.Insert( new ScPreviewLocationEntry( SC_PLOC_NOTEMARK, aPixelRect, aRange, sal_False, sal_False ) ); } void ScPreviewLocationData::AddNoteText( const Rectangle& rRect, const ScAddress& rPos ) { ScRange aRange( rPos ); Rectangle aPixelRect( pWindow->LogicToPixel( rRect ) ); - aEntries.Insert( new ScPreviewLocationEntry( SC_PLOC_NOTETEXT, aPixelRect, aRange, FALSE, FALSE ) ); + aEntries.Insert( new ScPreviewLocationEntry( SC_PLOC_NOTETEXT, aPixelRect, aRange, sal_False, sal_False ) ); } //------------------------------------------------------------------ -void ScPreviewLocationData::GetDrawRange( USHORT nPos, Rectangle& rPixelRect, MapMode& rMapMode, sal_uInt8& rRangeId ) const +void ScPreviewLocationData::GetDrawRange( sal_uInt16 nPos, Rectangle& rPixelRect, MapMode& rMapMode, sal_uInt8& rRangeId ) const { DBG_ASSERT( nPos < nDrawRanges, "wrong position" ); if ( nPos < nDrawRanges ) @@ -284,8 +284,8 @@ void ScPreviewLocationData::GetDrawRange( USHORT nPos, Rectangle& rPixelRect, Ma ScPreviewLocationEntry* lcl_GetEntryByAddress( const List& rEntries, const ScAddress& rPos, ScPreviewLocationType eType ) { - ULONG nCount = rEntries.Count(); - for (ULONG nListPos=0; nListPos<nCount; nListPos++) + sal_uLong nCount = rEntries.Count(); + for (sal_uLong nListPos=0; nListPos<nCount; nListPos++) { ScPreviewLocationEntry* pEntry = (ScPreviewLocationEntry*)rEntries.GetObject(nListPos); if ( pEntry->eType == eType && pEntry->aCellRange.In( rPos ) ) @@ -307,7 +307,7 @@ ScPreviewLocationEntry* lcl_GetEntryByAddress( const List& rEntries, const ScAdd //UNUSED2008-05 SCCOL nEndCol = rRange.aEnd.Col(); //UNUSED2008-05 while ( nCol <= nEndCol && nPosX < aOffsetLogic.Width() ) //UNUSED2008-05 { -//UNUSED2008-05 USHORT nDocW = pDoc->GetColWidth( nCol, nTab ); +//UNUSED2008-05 sal_uInt16 nDocW = pDoc->GetColWidth( nCol, nTab ); //UNUSED2008-05 if (nDocW) //UNUSED2008-05 nPosX += (long) (nDocW * nScaleX); //UNUSED2008-05 ++nCol; @@ -316,12 +316,12 @@ ScPreviewLocationEntry* lcl_GetEntryByAddress( const List& rEntries, const ScAdd //UNUSED2008-05 --nCol; //UNUSED2008-05 //UNUSED2008-05 long nPosY = 0; -//UNUSED2008-05 ScCoupledCompressedArrayIterator< SCROW, BYTE, USHORT> aIter( +//UNUSED2008-05 ScCoupledCompressedArrayIterator< SCROW, sal_uInt8, sal_uInt16> aIter( //UNUSED2008-05 pDoc->GetRowFlagsArray( nTab), rRange.aStart.Row(), //UNUSED2008-05 rRange.aEnd.Row(), CR_HIDDEN, 0, pDoc->GetRowHeightArray( nTab)); //UNUSED2008-05 while ( aIter && nPosY < aOffsetLogic.Height() ) //UNUSED2008-05 { -//UNUSED2008-05 USHORT nDocH = *aIter; +//UNUSED2008-05 sal_uInt16 nDocH = *aIter; //UNUSED2008-05 if (nDocH) //UNUSED2008-05 nPosY += (long) (nDocH * nScaleY); //UNUSED2008-05 ++aIter; @@ -343,7 +343,7 @@ Rectangle ScPreviewLocationData::GetOffsetPixel( const ScAddress& rCellPos, cons SCCOL nEndCol = rCellPos.Col(); for (SCCOL nCol = rRange.aStart.Col(); nCol < nEndCol; nCol++) { - USHORT nDocW = pDoc->GetColWidth( nCol, nTab ); + sal_uInt16 nDocW = pDoc->GetColWidth( nCol, nTab ); if (nDocW) nPosX += (long) (nDocW * nScaleX); } @@ -362,7 +362,7 @@ Rectangle ScPreviewLocationData::GetOffsetPixel( const ScAddress& rCellPos, cons return Rectangle( Point( aOffsetPixel.Width(), aOffsetPixel.Height() ), aSizePixel ); } -BOOL ScPreviewLocationData::GetCellPosition( const ScAddress& rCellPos, Rectangle& rCellRect ) const +sal_Bool ScPreviewLocationData::GetCellPosition( const ScAddress& rCellPos, Rectangle& rCellRect ) const { ScPreviewLocationEntry* pEntry = lcl_GetEntryByAddress( aEntries, rCellPos, SC_PLOC_CELLRANGE ); if ( pEntry ) @@ -372,90 +372,90 @@ BOOL ScPreviewLocationData::GetCellPosition( const ScAddress& rCellPos, Rectangl aOffsetRect.Top() + pEntry->aPixelRect.Top(), aOffsetRect.Right() + pEntry->aPixelRect.Left(), aOffsetRect.Bottom() + pEntry->aPixelRect.Top() ); - return TRUE; + return sal_True; } - return FALSE; + return sal_False; } -BOOL ScPreviewLocationData::HasCellsInRange( const Rectangle& rVisiblePixel ) const +sal_Bool ScPreviewLocationData::HasCellsInRange( const Rectangle& rVisiblePixel ) const { - ULONG nCount = aEntries.Count(); - for (ULONG nListPos=0; nListPos<nCount; nListPos++) + sal_uLong nCount = aEntries.Count(); + for (sal_uLong nListPos=0; nListPos<nCount; nListPos++) { ScPreviewLocationEntry* pEntry = (ScPreviewLocationEntry*)aEntries.GetObject(nListPos); ScPreviewLocationType eType = pEntry->eType; if ( eType == SC_PLOC_CELLRANGE || eType == SC_PLOC_COLHEADER || eType == SC_PLOC_ROWHEADER ) if ( pEntry->aPixelRect.IsOver( rVisiblePixel ) ) - return TRUE; + return sal_True; } - return FALSE; + return sal_False; } -BOOL ScPreviewLocationData::GetHeaderPosition( Rectangle& rRect ) const +sal_Bool ScPreviewLocationData::GetHeaderPosition( Rectangle& rRect ) const { - ULONG nCount = aEntries.Count(); - for (ULONG nListPos=0; nListPos<nCount; nListPos++) + sal_uLong nCount = aEntries.Count(); + for (sal_uLong nListPos=0; nListPos<nCount; nListPos++) { ScPreviewLocationEntry* pEntry = (ScPreviewLocationEntry*)aEntries.GetObject(nListPos); if ( pEntry->eType == SC_PLOC_LEFTHEADER || pEntry->eType == SC_PLOC_RIGHTHEADER ) { rRect = pEntry->aPixelRect; - return TRUE; + return sal_True; } } - return FALSE; + return sal_False; } -BOOL ScPreviewLocationData::GetFooterPosition( Rectangle& rRect ) const +sal_Bool ScPreviewLocationData::GetFooterPosition( Rectangle& rRect ) const { - ULONG nCount = aEntries.Count(); - for (ULONG nListPos=0; nListPos<nCount; nListPos++) + sal_uLong nCount = aEntries.Count(); + for (sal_uLong nListPos=0; nListPos<nCount; nListPos++) { ScPreviewLocationEntry* pEntry = (ScPreviewLocationEntry*)aEntries.GetObject(nListPos); if ( pEntry->eType == SC_PLOC_LEFTFOOTER || pEntry->eType == SC_PLOC_RIGHTFOOTER ) { rRect = pEntry->aPixelRect; - return TRUE; + return sal_True; } } - return FALSE; + return sal_False; } -BOOL ScPreviewLocationData::IsHeaderLeft() const +sal_Bool ScPreviewLocationData::IsHeaderLeft() const { - ULONG nCount = aEntries.Count(); - for (ULONG nListPos=0; nListPos<nCount; nListPos++) + sal_uLong nCount = aEntries.Count(); + for (sal_uLong nListPos=0; nListPos<nCount; nListPos++) { ScPreviewLocationEntry* pEntry = (ScPreviewLocationEntry*)aEntries.GetObject(nListPos); if ( pEntry->eType == SC_PLOC_LEFTHEADER ) - return TRUE; + return sal_True; if ( pEntry->eType == SC_PLOC_RIGHTHEADER ) - return FALSE; + return sal_False; } - return FALSE; + return sal_False; } -BOOL ScPreviewLocationData::IsFooterLeft() const +sal_Bool ScPreviewLocationData::IsFooterLeft() const { - ULONG nCount = aEntries.Count(); - for (ULONG nListPos=0; nListPos<nCount; nListPos++) + sal_uLong nCount = aEntries.Count(); + for (sal_uLong nListPos=0; nListPos<nCount; nListPos++) { ScPreviewLocationEntry* pEntry = (ScPreviewLocationEntry*)aEntries.GetObject(nListPos); if ( pEntry->eType == SC_PLOC_LEFTFOOTER ) - return TRUE; + return sal_True; if ( pEntry->eType == SC_PLOC_RIGHTFOOTER ) - return FALSE; + return sal_False; } - return FALSE; + return sal_False; } -long ScPreviewLocationData::GetNoteCountInRange( const Rectangle& rVisiblePixel, BOOL bNoteMarks ) const +long ScPreviewLocationData::GetNoteCountInRange( const Rectangle& rVisiblePixel, sal_Bool bNoteMarks ) const { ScPreviewLocationType eType = bNoteMarks ? SC_PLOC_NOTEMARK : SC_PLOC_NOTETEXT; - ULONG nRet = 0; - ULONG nCount = aEntries.Count(); - for (ULONG nListPos=0; nListPos<nCount; nListPos++) + sal_uLong nRet = 0; + sal_uLong nCount = aEntries.Count(); + for (sal_uLong nListPos=0; nListPos<nCount; nListPos++) { ScPreviewLocationEntry* pEntry = (ScPreviewLocationEntry*)aEntries.GetObject(nListPos); if ( pEntry->eType == eType && pEntry->aPixelRect.IsOver( rVisiblePixel ) ) @@ -464,37 +464,37 @@ long ScPreviewLocationData::GetNoteCountInRange( const Rectangle& rVisiblePixel, return nRet; } -BOOL ScPreviewLocationData::GetNoteInRange( const Rectangle& rVisiblePixel, long nIndex, BOOL bNoteMarks, +sal_Bool ScPreviewLocationData::GetNoteInRange( const Rectangle& rVisiblePixel, long nIndex, sal_Bool bNoteMarks, ScAddress& rCellPos, Rectangle& rNoteRect ) const { ScPreviewLocationType eType = bNoteMarks ? SC_PLOC_NOTEMARK : SC_PLOC_NOTETEXT; - ULONG nPos = 0; - ULONG nCount = aEntries.Count(); - for (ULONG nListPos=0; nListPos<nCount; nListPos++) + sal_uLong nPos = 0; + sal_uLong nCount = aEntries.Count(); + for (sal_uLong nListPos=0; nListPos<nCount; nListPos++) { ScPreviewLocationEntry* pEntry = (ScPreviewLocationEntry*)aEntries.GetObject(nListPos); if ( pEntry->eType == eType && pEntry->aPixelRect.IsOver( rVisiblePixel ) ) { - if ( nPos == sal::static_int_cast<ULONG>(nIndex) ) + if ( nPos == sal::static_int_cast<sal_uLong>(nIndex) ) { rCellPos = pEntry->aCellRange.aStart; rNoteRect = pEntry->aPixelRect; - return TRUE; + return sal_True; } ++nPos; } } - return FALSE; + return sal_False; } -Rectangle ScPreviewLocationData::GetNoteInRangeOutputRect(const Rectangle& rVisiblePixel, BOOL bNoteMarks, const ScAddress& aCellPos) const +Rectangle ScPreviewLocationData::GetNoteInRangeOutputRect(const Rectangle& rVisiblePixel, sal_Bool bNoteMarks, const ScAddress& aCellPos) const { ScPreviewLocationType eType = bNoteMarks ? SC_PLOC_NOTEMARK : SC_PLOC_NOTETEXT; - ULONG nPos = 0; - ULONG nCount = aEntries.Count(); - for (ULONG nListPos=0; nListPos<nCount; nListPos++) + sal_uLong nPos = 0; + sal_uLong nCount = aEntries.Count(); + for (sal_uLong nListPos=0; nListPos<nCount; nListPos++) { ScPreviewLocationEntry* pEntry = (ScPreviewLocationEntry*)aEntries.GetObject(nListPos); if ( pEntry->eType == eType && pEntry->aPixelRect.IsOver( rVisiblePixel ) ) @@ -513,18 +513,18 @@ void ScPreviewLocationData::GetTableInfo( const Rectangle& rVisiblePixel, ScPrev const double nScaleY = HMM_PER_TWIPS; // from left to right: - BOOL bHasHeaderCol = FALSE; - BOOL bHasRepCols = FALSE; - BOOL bHasMainCols = FALSE; + sal_Bool bHasHeaderCol = sal_False; + sal_Bool bHasRepCols = sal_False; + sal_Bool bHasMainCols = sal_False; SCCOL nRepeatColStart = 0; SCCOL nRepeatColEnd = 0; SCCOL nMainColStart = 0; SCCOL nMainColEnd = 0; // from top to bottom: - BOOL bHasHeaderRow = FALSE; - BOOL bHasRepRows = FALSE; - BOOL bHasMainRows = FALSE; + sal_Bool bHasHeaderRow = sal_False; + sal_Bool bHasRepRows = sal_False; + sal_Bool bHasMainRows = sal_False; SCROW nRepeatRowStart = 0; SCROW nRepeatRowEnd = 0; SCROW nMainRowStart = 0; @@ -533,15 +533,15 @@ void ScPreviewLocationData::GetTableInfo( const Rectangle& rVisiblePixel, ScPrev Rectangle aHeaderRect, aRepeatRect, aMainRect; SCTAB nTab = 0; - ULONG nCount = aEntries.Count(); - for (ULONG nListPos=0; nListPos<nCount; nListPos++) + sal_uLong nCount = aEntries.Count(); + for (sal_uLong nListPos=0; nListPos<nCount; nListPos++) { ScPreviewLocationEntry* pEntry = (ScPreviewLocationEntry*)aEntries.GetObject(nListPos); if ( pEntry->eType == SC_PLOC_CELLRANGE ) { if ( pEntry->bRepeatCol ) { - bHasRepCols = TRUE; + bHasRepCols = sal_True; nRepeatColStart = pEntry->aCellRange.aStart.Col(); nRepeatColEnd = pEntry->aCellRange.aEnd.Col(); aRepeatRect.Left() = pEntry->aPixelRect.Left(); @@ -549,7 +549,7 @@ void ScPreviewLocationData::GetTableInfo( const Rectangle& rVisiblePixel, ScPrev } else { - bHasMainCols = TRUE; + bHasMainCols = sal_True; nMainColStart = pEntry->aCellRange.aStart.Col(); nMainColEnd = pEntry->aCellRange.aEnd.Col(); aMainRect.Left() = pEntry->aPixelRect.Left(); @@ -557,7 +557,7 @@ void ScPreviewLocationData::GetTableInfo( const Rectangle& rVisiblePixel, ScPrev } if ( pEntry->bRepeatRow ) { - bHasRepRows = TRUE; + bHasRepRows = sal_True; nRepeatRowStart = pEntry->aCellRange.aStart.Row(); nRepeatRowEnd = pEntry->aCellRange.aEnd.Row(); aRepeatRect.Top() = pEntry->aPixelRect.Top(); @@ -565,7 +565,7 @@ void ScPreviewLocationData::GetTableInfo( const Rectangle& rVisiblePixel, ScPrev } else { - bHasMainRows = TRUE; + bHasMainRows = sal_True; nMainRowStart = pEntry->aCellRange.aStart.Row(); nMainRowEnd = pEntry->aCellRange.aEnd.Row(); aMainRect.Top() = pEntry->aPixelRect.Top(); @@ -576,14 +576,14 @@ void ScPreviewLocationData::GetTableInfo( const Rectangle& rVisiblePixel, ScPrev else if ( pEntry->eType == SC_PLOC_ROWHEADER ) { // row headers result in an additional column - bHasHeaderCol = TRUE; + bHasHeaderCol = sal_True; aHeaderRect.Left() = pEntry->aPixelRect.Left(); aHeaderRect.Right() = pEntry->aPixelRect.Right(); } else if ( pEntry->eType == SC_PLOC_COLHEADER ) { // column headers result in an additional row - bHasHeaderRow = TRUE; + bHasHeaderRow = sal_True; aHeaderRect.Top() = pEntry->aPixelRect.Top(); aHeaderRect.Bottom() = pEntry->aPixelRect.Bottom(); } @@ -613,7 +613,7 @@ void ScPreviewLocationData::GetTableInfo( const Rectangle& rVisiblePixel, ScPrev if ( bHasHeaderCol ) { - pColInfo[nColPos].Set( TRUE, 0, aHeaderRect.Left(), aHeaderRect.Right() ); + pColInfo[nColPos].Set( sal_True, 0, aHeaderRect.Left(), aHeaderRect.Right() ); ++nColPos; } if ( bHasRepCols ) @@ -622,12 +622,12 @@ void ScPreviewLocationData::GetTableInfo( const Rectangle& rVisiblePixel, ScPrev for ( nCol=nRepeatColStart; nCol<=nRepeatColEnd; nCol++ ) if (!pDoc->ColHidden(nCol, nTab)) { - USHORT nDocW = pDoc->GetColWidth( nCol, nTab ); + sal_uInt16 nDocW = pDoc->GetColWidth( nCol, nTab ); long nNextX = nPosX + (long) (nDocW * nScaleX); long nPixelStart = pWindow->LogicToPixel( Size( nPosX, 0 ), aCellMapMode ).Width(); long nPixelEnd = pWindow->LogicToPixel( Size( nNextX, 0 ), aCellMapMode ).Width() - 1; - pColInfo[nColPos].Set( FALSE, nCol, + pColInfo[nColPos].Set( sal_False, nCol, aRepeatRect.Left() + nPixelStart, aRepeatRect.Left() + nPixelEnd ); @@ -641,12 +641,12 @@ void ScPreviewLocationData::GetTableInfo( const Rectangle& rVisiblePixel, ScPrev for ( nCol=nMainColStart; nCol<=nMainColEnd; nCol++ ) if (!pDoc->ColHidden(nCol, nTab)) { - USHORT nDocW = pDoc->GetColWidth( nCol, nTab ); + sal_uInt16 nDocW = pDoc->GetColWidth( nCol, nTab ); long nNextX = nPosX + (long) (nDocW * nScaleX); long nPixelStart = pWindow->LogicToPixel( Size( nPosX, 0 ), aCellMapMode ).Width(); long nPixelEnd = pWindow->LogicToPixel( Size( nNextX, 0 ), aCellMapMode ).Width() - 1; - pColInfo[nColPos].Set( FALSE, nCol, + pColInfo[nColPos].Set( sal_False, nCol, aMainRect.Left() + nPixelStart, aMainRect.Left() + nPixelEnd ); @@ -678,7 +678,7 @@ void ScPreviewLocationData::GetTableInfo( const Rectangle& rVisiblePixel, ScPrev if ( bHasHeaderRow ) { - pRowInfo[nRowPos].Set( TRUE, 0, aHeaderRect.Top(), aHeaderRect.Bottom() ); + pRowInfo[nRowPos].Set( sal_True, 0, aHeaderRect.Top(), aHeaderRect.Bottom() ); ++nRowPos; } if ( bHasRepRows ) @@ -689,12 +689,12 @@ void ScPreviewLocationData::GetTableInfo( const Rectangle& rVisiblePixel, ScPrev if (pDoc->RowHidden(nRow, nTab)) continue; - USHORT nDocH = pDoc->GetOriginalHeight( nRow, nTab ); + sal_uInt16 nDocH = pDoc->GetOriginalHeight( nRow, nTab ); long nNextY = nPosY + (long) (nDocH * nScaleY); long nPixelStart = pWindow->LogicToPixel( Size( 0, nPosY ), aCellMapMode ).Height(); long nPixelEnd = pWindow->LogicToPixel( Size( 0, nNextY ), aCellMapMode ).Height() - 1; - pRowInfo[nRowPos].Set( FALSE, nRow, + pRowInfo[nRowPos].Set( sal_False, nRow, aRepeatRect.Top() + nPixelStart, aRepeatRect.Top() + nPixelEnd ); @@ -710,12 +710,12 @@ void ScPreviewLocationData::GetTableInfo( const Rectangle& rVisiblePixel, ScPrev if (pDoc->RowHidden(nRow, nTab)) continue; - USHORT nDocH = pDoc->GetOriginalHeight( nRow, nTab ); + sal_uInt16 nDocH = pDoc->GetOriginalHeight( nRow, nTab ); long nNextY = nPosY + (long) (nDocH * nScaleY); long nPixelStart = pWindow->LogicToPixel( Size( 0, nPosY ), aCellMapMode ).Height(); long nPixelEnd = pWindow->LogicToPixel( Size( 0, nNextY ), aCellMapMode ).Height() - 1; - pRowInfo[nRowPos].Set( FALSE, nRow, + pRowInfo[nRowPos].Set( sal_False, nRow, aMainRect.Top() + nPixelStart, aMainRect.Top() + nPixelEnd ); @@ -774,19 +774,19 @@ Rectangle ScPreviewLocationData::GetCellOutputRect(const ScAddress& rCellPos) co // GetMainCellRange is used for links in PDF export -BOOL ScPreviewLocationData::GetMainCellRange( ScRange& rRange, Rectangle& rPixRect ) const +sal_Bool ScPreviewLocationData::GetMainCellRange( ScRange& rRange, Rectangle& rPixRect ) const { - ULONG nCount = aEntries.Count(); - for (ULONG nListPos=0; nListPos<nCount; nListPos++) + sal_uLong nCount = aEntries.Count(); + for (sal_uLong nListPos=0; nListPos<nCount; nListPos++) { ScPreviewLocationEntry* pEntry = (ScPreviewLocationEntry*)aEntries.GetObject(nListPos); if ( pEntry->eType == SC_PLOC_CELLRANGE && !pEntry->bRepeatCol && !pEntry->bRepeatRow ) { rRange = pEntry->aCellRange; rPixRect = pEntry->aPixelRect; - return TRUE; + return sal_True; } } - return FALSE; // not found + return sal_False; // not found } |