diff options
author | Oliver Bolte <obo@openoffice.org> | 2004-06-04 09:02:15 +0000 |
---|---|---|
committer | Oliver Bolte <obo@openoffice.org> | 2004-06-04 09:02:15 +0000 |
commit | 13764a9a18d99bd96bc6334218e6def2d1eb3baa (patch) | |
tree | 0d02caff5c273e4073f166a546535bdb40a42351 | |
parent | 1dbb3cad8a2c4664fb34f488d766d904545a5987 (diff) |
INTEGRATION: CWS rowlimit (1.1.1.1.346); FILE MERGED
2004/01/12 17:14:50 er 1.1.1.1.346.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
-rw-r--r-- | sc/inc/bigrange.hxx | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/sc/inc/bigrange.hxx b/sc/inc/bigrange.hxx index 70dae769d..699772736 100644 --- a/sc/inc/bigrange.hxx +++ b/sc/inc/bigrange.hxx @@ -2,9 +2,9 @@ * * $RCSfile: bigrange.hxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:44:48 $ + * last change: $Author: obo $ $Date: 2004-06-04 10:02:15 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -163,28 +163,30 @@ inline BOOL ScBigAddress::IsValid( const ScDocument* pDoc ) const inline ScAddress ScBigAddress::MakeAddress() const { - USHORT nColA, nRowA, nTabA; + SCCOL nColA; + SCROW nRowA; + SCTAB nTabA; if ( nCol < 0 ) nColA = 0; else if ( nCol > MAXCOL ) nColA = MAXCOL; else - nColA = (USHORT) nCol; + nColA = (SCCOL) nCol; if ( nRow < 0 ) nRowA = 0; else if ( nRow > MAXROW ) nRowA = MAXROW; else - nRowA = (USHORT) nRow; + nRowA = (SCROW) nRow; if ( nTab < 0 ) nTabA = 0; else if ( nTab > MAXTAB ) nTabA = MAXTAB; else - nTabA = (USHORT) nTab; + nTabA = (SCTAB) nTab; return ScAddress( nColA, nRowA, nTabA ); } |