diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-03-06 14:40:23 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-03-06 14:40:23 +0000 |
| commit | 01e5be3389388ad70b8f8cbc207c5baf3c47e42d (patch) | |
| tree | 0d5d3dc8411faa1b99dec01aaf0e862a860375bc /sc | |
| parent | 5b760bf19581e5cbd4436c95ac9dc2d2e02d4af5 (diff) | |
INTEGRATION: CWS odff (1.44.60); FILE MERGED
2008/02/27 18:33:16 er 1.44.60.3: RESYNC: (1.44-1.45); FILE MERGED
2008/01/10 14:40:48 dr 1.44.60.2: import/export error codes
2007/11/29 19:06:47 er 1.44.60.1: #i4904# range operator ocRange
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/filter/excel/excform8.cxx | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/sc/source/filter/excel/excform8.cxx b/sc/source/filter/excel/excform8.cxx index 26bd6784cb18..1d6ee61fd5e0 100644 --- a/sc/source/filter/excel/excform8.cxx +++ b/sc/source/filter/excel/excform8.cxx @@ -4,9 +4,9 @@ * * $RCSfile: excform8.cxx,v $ * - * $Revision: 1.45 $ + * $Revision: 1.46 $ * - * last change: $Author: rt $ $Date: 2008-01-29 15:24:00 $ + * last change: $Author: kz $ $Date: 2008-03-06 15:40:23 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -217,7 +217,9 @@ ConvErr ExcelToSc8::Convert( const ScTokenArray*& rpTokArray, XclImpStream& aIn, aPool >> aStack; break; case 0x11: // Range [314 265] - PushRangeOperator(); + aStack >> nMerk0; + aPool << aStack << ocRange << nMerk0; + aPool >> aStack; break; case 0x12: // Unary Plus [312 264] aPool << ocAdd << aStack; @@ -334,6 +336,9 @@ ConvErr ExcelToSc8::Convert( const ScTokenArray*& rpTokArray, XclImpStream& aIn, case 0x1C: // Error Value [314 266] { aIn >> nByte; +#if 0 // erAck + aPool.StoreError( XclTools::GetScErrorCode( nByte ) ); +#else DefTokenId eOc; switch( nByte ) { @@ -349,7 +354,7 @@ ConvErr ExcelToSc8::Convert( const ScTokenArray*& rpTokArray, XclImpStream& aIn, aPool << eOc; if( eOc != ocStop ) aPool << ocOpen << ocClose; - +#endif aPool >> aStack; } break; |