diff options
| author | Oliver Bolte <obo@openoffice.org> | 2006-07-10 12:52:20 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2006-07-10 12:52:20 +0000 |
| commit | 7683dcaf464ebc94e06385495fa174e0275db815 (patch) | |
| tree | 14a43817ba80d09d4c9b13ce4bb71c51e94c4ff2 /sc/source/filter/inc/formel.hxx | |
| parent | 82900e11ad73bc9c0e08489672d77e4dfe2a7726 (diff) | |
INTEGRATION: CWS dr48 (1.7.176); FILE MERGED
2006/05/22 16:34:27 dr 1.7.176.2: type correctness for stream related code in Excel filters (sal_Size vs. ULONG vs. sal_uInt32)
2006/05/10 17:01:21 dr 1.7.176.1: #i63105# backport changes from CWS chart2mst3
Diffstat (limited to 'sc/source/filter/inc/formel.hxx')
| -rw-r--r-- | sc/source/filter/inc/formel.hxx | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/sc/source/filter/inc/formel.hxx b/sc/source/filter/inc/formel.hxx index 0f75c132df31..e43aa26e7b39 100644 --- a/sc/source/filter/inc/formel.hxx +++ b/sc/source/filter/inc/formel.hxx @@ -4,9 +4,9 @@ * * $RCSfile: formel.hxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: rt $ $Date: 2005-09-08 19:19:20 $ + * last change: $Author: obo $ $Date: 2006-07-10 13:52:20 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -229,18 +229,16 @@ public: class ExcelConverterBase : public ConverterBase { protected: - XclImpStream& aIn; - - ExcelConverterBase( XclImpStream& rStr, UINT16 nNewBuffer ); + ExcelConverterBase( UINT16 nNewBuffer ); virtual ~ExcelConverterBase(); public: void Reset(); void Reset( ScAddress aEingPos ); - virtual ConvErr Convert( const ScTokenArray*& rpErg, UINT32 nFormulaLen, + virtual ConvErr Convert( const ScTokenArray*& rpErg, XclImpStream& rStrm, sal_Size nFormulaLen, const FORMULA_TYPE eFT = FT_CellFormula ) = 0; - virtual ConvErr Convert( _ScRangeListTabs&, UINT32 nFormulaLen, + virtual ConvErr Convert( _ScRangeListTabs&, XclImpStream& rStrm, sal_Size nFormulaLen, const FORMULA_TYPE eFT = FT_CellFormula ) = 0; }; |