diff options
| author | Oliver Bolte <obo@openoffice.org> | 2004-06-04 09:07:54 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2004-06-04 09:07:54 +0000 |
| commit | 48caf7a887579582c1b6e46984510185b6697973 (patch) | |
| tree | 413499d89aa19c293edf9ea5d0afdc5dbd936c95 /sc/inc/dpobject.hxx | |
| parent | INTEGRATION: CWS rowlimit (1.15.56); FILE MERGED (diff) | |
| download | core-48caf7a887579582c1b6e46984510185b6697973.tar.gz core-48caf7a887579582c1b6e46984510185b6697973.zip | |
INTEGRATION: CWS rowlimit (1.2.338); FILE MERGED
2004/04/29 16:15:35 er 1.2.338.6: RESYNC: (1.2-1.3); FILE MERGED
2004/03/11 12:05:47 er 1.2.338.5: #i1967# type correctness
2004/03/07 11:39:33 jmarmion 1.2.338.4: #i1967# step 5 changes.
2004/02/24 20:20:20 er 1.2.338.3: #i1967# type correctness
2004/01/12 17:14:57 er 1.2.338.2: #i1967# SCCOL,SCROW,SCTAB replace USHORT; SCsCOL,SCsROW,SCsTAB replace short
2003/11/28 19:47:20 er 1.2.338.1: #i1967# move ScAddress, ScRange from global.hxx to address.hxx
Diffstat (limited to 'sc/inc/dpobject.hxx')
| -rw-r--r-- | sc/inc/dpobject.hxx | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/sc/inc/dpobject.hxx b/sc/inc/dpobject.hxx index d070db7a113b..58f052a743e2 100644 --- a/sc/inc/dpobject.hxx +++ b/sc/inc/dpobject.hxx @@ -2,9 +2,9 @@ * * $RCSfile: dpobject.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: hr $ $Date: 2004-04-13 12:22:02 $ + * last change: $Author: obo $ $Date: 2004-06-04 10:07:54 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -66,6 +66,10 @@ #include "global.hxx" #endif +#ifndef SC_ADDRESS_HXX +#include "address.hxx" +#endif + #ifndef SC_COLLECT_HXX #include "collect.hxx" #endif @@ -200,11 +204,11 @@ public: BOOL StoreNew(SvStream& rStream, ScMultipleWriteHeader& rHdr ) const; BOOL LoadNew(SvStream& rStream, ScMultipleReadHeader& rHdr ); BOOL FillOldParam(ScPivotParam& rParam, BOOL bForFile) const; - BOOL FillLabelData(ScPivotParam& rParam, BOOL* pShowAll, USHORT nShowAllMax) const; + BOOL FillLabelData(ScPivotParam& rParam, BOOL* pShowAll, SCSIZE nShowAllMax) const; void InitFromOldPivot(const ScPivot& rOld, ScDocument* pDoc, BOOL bSetSource); void UpdateReference( UpdateRefMode eUpdateRefMode, - const ScRange& r, short nDx, short nDy, short nDz ); + const ScRange& r, SCsCOL nDx, SCsROW nDy, SCsTAB nDz ); BOOL RefsEqual( const ScDPObject& r ) const; void WriteRefsTo( ScDPObject& r ) const; @@ -218,13 +222,13 @@ public: CreateSource( const ScDPServiceDesc& rDesc ); static void ConvertOrientation( ScDPSaveData& rSaveData, - PivotField* pFields, USHORT nCount, USHORT nOrient, - ScDocument* pDoc, USHORT nRow, USHORT nTab, + PivotField* pFields, SCSIZE nCount, USHORT nOrient, + ScDocument* pDoc, SCROW nRow, SCTAB nTab, const com::sun::star::uno::Reference< com::sun::star::sheet::XDimensionsSupplier>& xSource, BOOL bOldDefaults, - PivotField* pRefColFields = NULL, USHORT nRefColCount = 0, - PivotField* pRefRowFields = NULL, USHORT nRefRowCount = 0 ); + PivotField* pRefColFields = NULL, SCSIZE nRefColCount = 0, + PivotField* pRefRowFields = NULL, SCSIZE nRefRowCount = 0 ); }; @@ -249,7 +253,7 @@ public: void ConvertOldTables( ScPivotCollection& rOldColl ); void UpdateReference( UpdateRefMode eUpdateRefMode, - const ScRange& r, short nDx, short nDy, short nDz ); + const ScRange& r, SCsCOL nDx, SCsROW nDy, SCsTAB nDz ); BOOL RefsEqual( const ScDPCollection& r ) const; void WriteRefsTo( ScDPCollection& r ) const; |