diff options
| author | Oliver Bolte <obo@openoffice.org> | 2004-06-04 10:20:03 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2004-06-04 10:20:03 +0000 |
| commit | 8959a5fa3ce78e1928e1b334b31b8c15ec99c2f6 (patch) | |
| tree | 280811ade68fb571a1f514fc720db3f9c6b293f6 /sc/source/ui/dbgui/csvgrid.cxx | |
| parent | 7359769025644d74fbc88e986ebe36648ebcc3e3 (diff) | |
INTEGRATION: CWS rowlimit (1.18.16); FILE MERGED
2004/05/06 16:01:08 er 1.18.16.3: #i1967# type correctness
2004/03/11 17:47:40 er 1.18.16.2: #i1967# type correctness
2004/02/24 20:21:37 er 1.18.16.1: #i1967# type correctness
Diffstat (limited to 'sc/source/ui/dbgui/csvgrid.cxx')
| -rw-r--r-- | sc/source/ui/dbgui/csvgrid.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sc/source/ui/dbgui/csvgrid.cxx b/sc/source/ui/dbgui/csvgrid.cxx index fbb0edf27c08..b3880596aa96 100644 --- a/sc/source/ui/dbgui/csvgrid.cxx +++ b/sc/source/ui/dbgui/csvgrid.cxx @@ -2,9 +2,9 @@ * * $RCSfile: csvgrid.cxx,v $ * - * $Revision: 1.18 $ + * $Revision: 1.19 $ * - * last change: $Author: vg $ $Date: 2004-01-06 18:58:19 $ + * last change: $Author: obo $ $Date: 2004-06-04 11:20:03 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -586,7 +586,7 @@ void ScCsvGrid::FillColumnDataSep( ScAsciiOptions& rOptions ) const void ScCsvGrid::FillColumnDataFix( ScAsciiOptions& rOptions ) const { - sal_uInt32 nCount = Min( GetColumnCount(), MAXCOL + 1UL ); + sal_uInt32 nCount = Min( GetColumnCount(), static_cast<sal_uInt32>(MAXCOLCOUNT) ); ScCsvExpDataVec aDataVec( nCount + 1 ); for( sal_uInt32 nColIx = 0; nColIx < nCount; ++nColIx ) @@ -1167,8 +1167,8 @@ void ScCsvGrid::ImplDrawColumnBackgr( sal_uInt32 nColIndex ) // cell texts mpEditEngine->SetDefaultItem( SvxColorItem( maTextColor, EE_CHAR_COLOR ) ); - sal_Int32 nLineCount = Min( GetLastVisLine() - GetFirstVisLine() + 1UL, maTexts.size() ); - for( sal_Int32 nLine = 0; nLine < nLineCount; ++nLine ) + size_t nLineCount = ::std::min( static_cast<size_t>(GetLastVisLine() - GetFirstVisLine() + 1UL), maTexts.size() ); + for( size_t nLine = 0; nLine < nLineCount; ++nLine ) { StringVec& rStrVec = maTexts[ nLine ]; if( nColIndex < rStrVec.size() ) |