diff options
| author | Oliver Bolte <obo@openoffice.org> | 2004-06-04 09:15:54 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2004-06-04 09:15:54 +0000 |
| commit | 2d04ec4666570dc34440cd8853a627d81d8e49ac (patch) | |
| tree | 652f74fe3b417402a718ce370b47a836ced2ae11 /sc/inc/sortparam.hxx | |
| parent | fe02df902d6fb04654776dda9ad302ef51fbac33 (diff) | |
INTEGRATION: CWS rowlimit (1.1.338); FILE MERGED
2004/02/24 20:20:21 er 1.1.338.3: #i1967# type correctness
2004/01/16 17:39:48 er 1.1.338.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:15:07 er 1.1.338.1: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
Diffstat (limited to 'sc/inc/sortparam.hxx')
| -rw-r--r-- | sc/inc/sortparam.hxx | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/sc/inc/sortparam.hxx b/sc/inc/sortparam.hxx index 9953a9c9ca07..2b0c2f159b40 100644 --- a/sc/inc/sortparam.hxx +++ b/sc/inc/sortparam.hxx @@ -2,9 +2,9 @@ * * $RCSfile: sortparam.hxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: er $ $Date: 2001-03-12 16:41:44 $ + * last change: $Author: obo $ $Date: 2004-06-04 10:15:54 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -62,6 +62,10 @@ #ifndef SC_SORTPARAM_HXX #define SC_SORTPARAM_HXX +#ifndef SC_ADDRESS_HXX +#include "address.hxx" +#endif + #ifndef _STRING_HXX #include <tools/string.hxx> #endif @@ -81,10 +85,10 @@ struct ScQueryParam; struct ScSortParam { - USHORT nCol1; - USHORT nRow1; - USHORT nCol2; - USHORT nRow2; + SCCOL nCol1; + SCROW nRow1; + SCCOL nCol2; + SCROW nRow2; BOOL bHasHeader; BOOL bByRow; BOOL bCaseSens; @@ -92,11 +96,11 @@ struct ScSortParam USHORT nUserIndex; BOOL bIncludePattern; BOOL bInplace; - USHORT nDestTab; - USHORT nDestCol; - USHORT nDestRow; + SCTAB nDestTab; + SCCOL nDestCol; + SCROW nDestRow; BOOL bDoSort[MAXSORT]; - USHORT nField[MAXSORT]; + SCCOLROW nField[MAXSORT]; BOOL bAscending[MAXSORT]; ::com::sun::star::lang::Locale aCollatorLocale; String aCollatorAlgorithm; @@ -106,7 +110,7 @@ struct ScSortParam /// SubTotals sort ScSortParam( const ScSubTotalParam& rSub, const ScSortParam& rOld ); /// TopTen sort - ScSortParam( const ScQueryParam&, USHORT nCol ); + ScSortParam( const ScQueryParam&, SCCOL nCol ); ScSortParam& operator= ( const ScSortParam& r ); BOOL operator== ( const ScSortParam& rOther ) const; |