diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-10-22 07:00:26 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-10-22 07:00:26 +0000 |
| commit | 8c4c2acbb10585838bd4fd36e9051d9e95e8a45d (patch) | |
| tree | 45e51f19eb1eccfc25f9ca3d876352f7feb4f55d /sc/source/filter/excel/xehelper.cxx | |
| parent | c79ab12a53b94cce9288d8f830362bca40359228 (diff) | |
INTEGRATION: CWS calc23 (1.17.4); FILE MERGED
2004/09/21 21:21:51 er 1.17.4.1: #115823# jump matrix handling for [HV]?LOOKUP(), MATCH(), SUMIF()
Diffstat (limited to 'sc/source/filter/excel/xehelper.cxx')
| -rw-r--r-- | sc/source/filter/excel/xehelper.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sc/source/filter/excel/xehelper.cxx b/sc/source/filter/excel/xehelper.cxx index 82f4e3a5050b..1ec8d8e4f7d9 100644 --- a/sc/source/filter/excel/xehelper.cxx +++ b/sc/source/filter/excel/xehelper.cxx @@ -2,9 +2,9 @@ * * $RCSfile: xehelper.cxx,v $ * - * $Revision: 1.18 $ + * $Revision: 1.19 $ * - * last change: $Author: obo $ $Date: 2004-10-18 15:14:22 $ + * last change: $Author: rt $ $Date: 2004-10-22 08:00:26 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1014,11 +1014,11 @@ XclExpCachedMatrix::XclExpCachedMatrix( const ScMatrix& rMatrix, XclStrFlags nFl for( SCSIZE nScCol = 0; nScCol < mnScCols; ++nScCol ) { XclExpCachedValue* pNewVal = 0; - BOOL bIsString = FALSE; - const MatValue* pMatVal = rMatrix.Get( nScCol, nScRow, bIsString ); + ScMatValType nMatValType = SC_MATVAL_VALUE; + const ScMatrixValue* pMatVal = rMatrix.Get( nScCol, nScRow, nMatValType ); if( !pMatVal ) pNewVal = new XclExpCachedString( EMPTY_STRING, nFlags ); - else if( bIsString ) + else if( nMatValType != SC_MATVAL_VALUE ) pNewVal = new XclExpCachedString( pMatVal->GetString(), nFlags ); else if( USHORT nScError = pMatVal->GetError() ) pNewVal = new XclExpCachedError( nScError ); |