diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2003-04-08 15:28:01 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2003-04-08 15:28:01 +0000 |
| commit | 80cda7bf460a69af639fd09520881cbe34929134 (patch) | |
| tree | 121e59500636ec3a2735e016355f8d152749a51e | |
| parent | 15a4a5b8504e0c2c02ee37cdfd3fd60bc5f7192c (diff) | |
INTEGRATION: CWS calc06 (1.17.2.1.42); FILE MERGED
2003/03/31 15:42:52 sab 1.17.2.1.42.2: RESYNC: (1.17.2.1-1.17.2.2); FILE MERGED
2003/03/24 15:51:36 jmarmion 1.17.2.1.42.1: #i11776# apply outlines after autofilter
| -rw-r--r-- | sc/source/filter/inc/imp_op.hxx | 27 |
1 files changed, 22 insertions, 5 deletions
diff --git a/sc/source/filter/inc/imp_op.hxx b/sc/source/filter/inc/imp_op.hxx index fd0d5b94423b..7db942049677 100644 --- a/sc/source/filter/inc/imp_op.hxx +++ b/sc/source/filter/inc/imp_op.hxx @@ -2,9 +2,9 @@ * * $RCSfile: imp_op.hxx,v $ * - * $Revision: 1.20 $ + * $Revision: 1.21 $ * - * last change: $Author: hr $ $Date: 2003-03-26 18:05:04 $ + * last change: $Author: rt $ $Date: 2003-04-08 16:28:01 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -96,6 +96,7 @@ #include "excdefs.hxx" #endif + class SfxItemSet; class SvStream; @@ -152,8 +153,22 @@ struct ExcelChartData ~ExcelChartData(); }; +class OutlineDataBuffer +{ +private: + OutlineBuffer* pColOutlineBuff; + OutlineBuffer* pRowOutlineBuff; + ColRowSettings* pColRowBuff; + UINT16 nTab; +public: + OutlineDataBuffer(RootData& rRootData, UINT16 nTab); + inline ColRowSettings* GetColRowBuff() const { return pColRowBuff ; } + inline OutlineBuffer* GetColOutline() const { return pColOutlineBuff; } + inline OutlineBuffer* GetRowOutline() const { return pRowOutlineBuff; } + void Apply(ScDocument* pD); +}; class ImportExcel : private XclImpRootData, public ImportTyp, public XclImpRoot { @@ -178,10 +193,13 @@ protected: SfxItemSet* pStyleSheetItemSet; // aktuelle Seitenvorlage - OutlineBuffer aColOutlineBuff; // temporaere Puffer fuer Outline- - OutlineBuffer aRowOutlineBuff; // Angabe + OutlineBuffer* pColOutlineBuff; + OutlineBuffer* pRowOutlineBuff; ColRowSettings* pColRowBuff; // Col/Row-Einstellungen 1 Tabelle + typedef ScfDelList< OutlineDataBuffer > OutlineListBuffer; + OutlineListBuffer* pOutlineListBuffer; + UINT16 nIxfeIndex; // merkt sich Angabe im IXFE-Record UINT16 nLastXF; // letzter XF in Formula-Record UINT16 nBdshtTab; // Counter fuer Boundsheet @@ -341,7 +359,6 @@ protected: BYTE nFlag, BOOL bShrFmla ); // -> excform.cxx - void ResetBof( void ); void EndSheet( void ); void NeueTabelle( void ); const ScTokenArray* ErrorToFormula( BYTE bErrOrVal, BYTE nError, |