diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-04-13 11:23:10 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-04-13 11:23:10 +0000 |
| commit | b117df9c6a99e9169d0b6662b6081c7829781cda (patch) | |
| tree | 7265350c9d1b032b81a611eab9429335822f2078 /sc/inc/global.hxx | |
| parent | 2d19f14eb229587b2fc76707416518f6a6c363ca (diff) | |
INTEGRATION: CWS pagefields (1.25.38); FILE MERGED
2004/03/30 15:14:33 sab 1.25.38.4: RESYNC: (1.26-1.29); FILE MERGED
2004/03/03 10:33:03 sab 1.25.38.3: RESYNC: (1.25-1.26); FILE MERGED
2004/02/27 14:44:16 sab 1.25.38.2: #i22164#; add SCCOLROW
2004/02/26 17:17:29 dr 1.25.38.1: #i22164# add page fields to DP layout dialog
Diffstat (limited to 'sc/inc/global.hxx')
| -rw-r--r-- | sc/inc/global.hxx | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/sc/inc/global.hxx b/sc/inc/global.hxx index b721821af7e3..6516cf44474a 100644 --- a/sc/inc/global.hxx +++ b/sc/inc/global.hxx @@ -2,9 +2,9 @@ * * $RCSfile: global.hxx,v $ * - * $Revision: 1.29 $ + * $Revision: 1.30 $ * - * last change: $Author: obo $ $Date: 2004-03-19 16:04:14 $ + * last change: $Author: hr $ $Date: 2004-04-13 12:23:10 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -80,6 +80,7 @@ class Color; typedef USHORT SCROW; typedef USHORT SCCOL; typedef USHORT SCTAB; +typedef USHORT SCCOLROW; // short typedefs // Use in all new code instead of short nCol, short nRow, short nTab @@ -172,7 +173,8 @@ struct LabelData; #define MAXSUBTOTAL 3 #define MAXQUERY 8 -#define PIVOT_MAXFIELD 8 +#define PIVOT_MAXFIELD 8 +#define PIVOT_MAXPAGEFIELD 10 #define SC_START_INDEX_DB_COLL 50000 // Oberhalb dieser Grenze liegen @@ -1616,9 +1618,11 @@ struct ScPivotParam USHORT nTab; LabelData** ppLabelArr; USHORT nLabels; + PivotField aPageArr[PIVOT_MAXPAGEFIELD]; PivotField aColArr[PIVOT_MAXFIELD]; PivotField aRowArr[PIVOT_MAXFIELD]; PivotField aDataArr[PIVOT_MAXFIELD]; + USHORT nPageCount; USHORT nColCount; USHORT nRowCount; USHORT nDataCount; @@ -1638,9 +1642,11 @@ struct ScPivotParam void ClearPivotArrays(); void SetLabelData ( LabelData** ppLabArr, USHORT nLab ); - void SetPivotArrays ( const PivotField* pColArr, + void SetPivotArrays ( const PivotField* pPageArr, + const PivotField* pColArr, const PivotField* pRowArr, const PivotField* pDataArr, + USHORT nPageCnt, USHORT nColCnt, USHORT nRowCnt, USHORT nDataCnt ); |