diff options
| author | Oliver Bolte <obo@openoffice.org> | 2004-06-04 09:01:45 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2004-06-04 09:01:45 +0000 |
| commit | 7ec84ae021dbf55b41acc38eb2bb1dd451407bf5 (patch) | |
| tree | 1338bc0a5a78cfc1dc6cd023911007e7c1a46d3b | |
| parent | b8947e815958f5e08149a75ff8fe9ca6bd19c17c (diff) | |
INTEGRATION: CWS rowlimit (1.2.334); FILE MERGED
2004/04/29 16:14:41 er 1.2.334.3: RESYNC: (1.2-1.3); FILE MERGED
2004/01/16 17:39:42 er 1.2.334.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2003/11/28 19:47:16 er 1.2.334.1: #i1967# move ScAddress, ScRange from global.hxx to address.hxx
| -rw-r--r-- | sc/inc/attrib.hxx | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/sc/inc/attrib.hxx b/sc/inc/attrib.hxx index 0799b2932613..da84845d0d19 100644 --- a/sc/inc/attrib.hxx +++ b/sc/inc/attrib.hxx @@ -2,9 +2,9 @@ * * $RCSfile: attrib.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: obo $ $Date: 2004-03-19 16:03:26 $ + * last change: $Author: obo $ $Date: 2004-06-04 10:01:45 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -78,6 +78,10 @@ #include "global.hxx" #endif +#ifndef SC_ADDRESS_HXX +#include "address.hxx" +#endif + //------------------------------------------------------------------------ // Flags fuer durch Merge verdeckte Zellen @@ -100,12 +104,12 @@ BOOL HasPriority( const SvxBorderLine* pThis, const SvxBorderLine* pOther ); class ScMergeAttr: public SfxPoolItem { - INT16 nColMerge; - INT16 nRowMerge; + SCsCOL nColMerge; + SCsROW nRowMerge; public: TYPEINFO(); ScMergeAttr(); - ScMergeAttr( INT16 nCol, INT16 nRow = 0); + ScMergeAttr( SCsCOL nCol, SCsROW nRow = 0); ScMergeAttr( const ScMergeAttr& ); ~ScMergeAttr(); @@ -116,8 +120,8 @@ public: virtual SfxPoolItem* Create( SvStream& rStream, USHORT nVer ) const; virtual SvStream& Store( SvStream& rStream, USHORT nVer ) const; - INT16 GetColMerge() const {return nColMerge; } - INT16 GetRowMerge() const {return nRowMerge; } + SCsCOL GetColMerge() const {return nColMerge; } + SCsROW GetRowMerge() const {return nRowMerge; } BOOL IsMerged() const { return nColMerge>1 || nRowMerge>1; } @@ -300,7 +304,7 @@ public: public: USHORT nCount; - USHORT* pTabArr; + SCTAB* pTabArr; }; inline ScTableListItem::ScTableListItem( const USHORT nWhich ) |