diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-04-19 13:04:55 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-04-19 13:04:55 +0000 |
| commit | 71d1d7fffe0ae298c03c8b3e523869fd958dfe11 (patch) | |
| tree | 7d78642dda8dbe5006de5272a8d114c6606ce8d4 /sc/source/ui/dbgui/csvruler.cxx | |
| parent | b9274de6147260e605195dd6eb44418c4fd4c441 (diff) | |
INTEGRATION: CWS sixtyfour05 (1.10.150); FILE MERGED
2006/04/10 16:22:00 kendy 1.10.150.1: #i63758#
Min()/Max() has to have both arguments of the same type
Diffstat (limited to 'sc/source/ui/dbgui/csvruler.cxx')
| -rw-r--r-- | sc/source/ui/dbgui/csvruler.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sc/source/ui/dbgui/csvruler.cxx b/sc/source/ui/dbgui/csvruler.cxx index 84e8379ccffa..4e4a312b6c02 100644 --- a/sc/source/ui/dbgui/csvruler.cxx +++ b/sc/source/ui/dbgui/csvruler.cxx @@ -4,9 +4,9 @@ * * $RCSfile: csvruler.cxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: rt $ $Date: 2005-09-08 20:32:14 $ + * last change: $Author: hr $ $Date: 2006-04-19 14:04:55 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -205,7 +205,7 @@ sal_Int32 ScCsvRuler::GetNoScrollPos( sal_Int32 nPos ) const else if( nNewPos > GetLastVisPos() - CSV_SCROLL_DIST - 1L ) { sal_Int32 nScroll = (GetFirstVisPos() < GetMaxPosOffset()) ? CSV_SCROLL_DIST : 0; - nNewPos = Min( nNewPos, GetLastVisPos() - nScroll - 1L ); + nNewPos = Min( nNewPos, GetLastVisPos() - nScroll - sal_Int32( 1 ) ); } } return nNewPos; @@ -348,7 +348,7 @@ void ScCsvRuler::MouseMove( const MouseEvent& rMEvt ) if( IsTracking() ) { // on mouse tracking: keep position valid - nPos = Max( Min( nPos, GetPosCount() - 1L ), 1L ); + nPos = Max( Min( nPos, GetPosCount() - sal_Int32( 1 ) ), sal_Int32( 1 ) ); MoveMouseTracking( nPos ); } else @@ -487,7 +487,7 @@ void ScCsvRuler::ImplDrawArea( sal_Int32 nPosX, sal_Int32 nWidth ) aRect = maActiveRect; aRect.Left() = Max( GetFirstX(), nPosX ); - aRect.Right() = Min( Min( GetX( GetPosCount() ), GetLastX() ), nPosX + nWidth - 1L ); + aRect.Right() = Min( Min( GetX( GetPosCount() ), GetLastX() ), nPosX + nWidth - sal_Int32( 1 ) ); if( aRect.Left() <= aRect.Right() ) { maBackgrDev.SetFillColor( maActiveColor ); |