diff options
author | Oliver Bolte <obo@openoffice.org> | 2004-06-04 09:14:45 +0000 |
---|---|---|
committer | Oliver Bolte <obo@openoffice.org> | 2004-06-04 09:14:45 +0000 |
commit | f8dd1001ed77d65d5e0c5aeeccae197ef4dca8d1 (patch) | |
tree | 29eb3600b92e8a1ff88382a72eb08120329e6bb9 /sc/inc/scextopt.hxx | |
parent | 9996247f18c1e99974c77b8c259866e6fbb03385 (diff) |
INTEGRATION: CWS rowlimit (1.6.202); FILE MERGED
2004/03/25 20:28:42 er 1.6.202.7: #i1967# use ValidCol,ValidRow,ValidTab
2004/03/19 16:19:55 er 1.6.202.6: #i1967# type correctness (pass SCTAB to ScExtDocOptions::SetExtTabOptions()/GetExtTabOptions())
2004/03/15 17:41:22 er 1.6.202.5: RESYNC: (1.7-1.8); FILE MERGED
2004/01/16 17:39:47 er 1.6.202.4: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2004/01/12 17:15:07 er 1.6.202.3: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2003/12/12 12:44:36 er 1.6.202.2: RESYNC: (1.6-1.7); FILE MERGED
2003/11/28 19:47:26 er 1.6.202.1: #i1967# move ScAddress, ScRange from global.hxx to address.hxx
Diffstat (limited to 'sc/inc/scextopt.hxx')
-rw-r--r-- | sc/inc/scextopt.hxx | 31 |
1 files changed, 21 insertions, 10 deletions
diff --git a/sc/inc/scextopt.hxx b/sc/inc/scextopt.hxx index f358f0af88d0..62967eaee76d 100644 --- a/sc/inc/scextopt.hxx +++ b/sc/inc/scextopt.hxx @@ -2,9 +2,9 @@ * * $RCSfile: scextopt.hxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: rt $ $Date: 2004-03-02 09:31:11 $ + * last change: $Author: obo $ $Date: 2004-06-04 10:14:45 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -73,7 +73,18 @@ #include <tools/string.hxx> #endif +#ifndef SC_ADDRESS_HXX +#include "address.hxx" +#endif +/****************************************************************************** + * + * ATTENTION: + * All col/row/tab members here are dedicated UINT16/INT16 types for alien + * binary file import/export. May have to be casted/converted when used in Calc + * context. + * + *****************************************************************************/ class ColRowSettings; @@ -168,11 +179,11 @@ public: ScExtDocOptions& operator =( const ScExtDocOptions& rCpy ); - void SetExtTabOptions( UINT16 nTabNum, ScExtTabOptions* pTabOpt ); + void SetExtTabOptions( SCTAB nTabNum, ScExtTabOptions* pTabOpt ); void SetGridCol( const Color& rColor ); void SetActTab( UINT16 nTab ); - void SetOleSize( USHORT nFirstCol, USHORT nFirstRow, USHORT nLastCol, USHORT nLastRow ); + void SetOleSize( SCCOL nFirstCol, SCROW nFirstRow, SCCOL nLastCol, SCROW nLastRow ); void SetCursor( UINT16 nCol, UINT16 nRow ); void SetZoom( UINT16 nZaehler, UINT16 nNenner ); inline void SetChanged( BOOL bChg ) { bChanged = bChg; } @@ -180,8 +191,8 @@ public: void Add( const ColRowSettings& rCRS ); - inline const ScExtTabOptions* GetExtTabOptions( const UINT16 nTabNum ) const; - inline ScExtTabOptions* GetExtTabOptions( const UINT16 nTabNum ); + inline const ScExtTabOptions* GetExtTabOptions( const SCTAB nTabNum ) const; + inline ScExtTabOptions* GetExtTabOptions( const SCTAB nTabNum ); inline const ScRange* GetOleSize() const { return pOleSize; } inline const String* GetCodename( void ) const; // for Workbook globals @@ -227,15 +238,15 @@ inline const String* CodenameList::Act( void ) const -inline const ScExtTabOptions* ScExtDocOptions::GetExtTabOptions( const UINT16 nTab ) const +inline const ScExtTabOptions* ScExtDocOptions::GetExtTabOptions( const SCTAB nTab ) const { - return (nTab <= MAXTAB) ? ppExtTabOpts[ nTab ] : NULL; + return ValidTab(nTab) ? ppExtTabOpts[ nTab ] : NULL; } -inline ScExtTabOptions* ScExtDocOptions::GetExtTabOptions( const UINT16 nTab ) +inline ScExtTabOptions* ScExtDocOptions::GetExtTabOptions( const SCTAB nTab ) { - return (nTab <= MAXTAB) ? ppExtTabOpts[ nTab ] : NULL; + return ValidTab(nTab) ? ppExtTabOpts[ nTab ] : NULL; } |