diff options
| author | Christian Lippka <christian.lippka@sun.com> | 2010-06-01 14:04:07 +0200 |
|---|---|---|
| committer | Christian Lippka <christian.lippka@sun.com> | 2010-06-01 14:04:07 +0200 |
| commit | bba2a81a5e2215591d8f29e69bd64d0e31fc23b1 (patch) | |
| tree | b299bb6409a1700f49d22c603461ba51b44ef7a7 /connectivity/source/drivers/calc/CTable.cxx | |
| parent | 5c3614277d347e72c403135f5c92c0c13fb55d5f (diff) | |
| parent | f8e7afbac976ca862a801b9648fd95b2107757b2 (diff) | |
cws renaissance2: rebase m80
Diffstat (limited to 'connectivity/source/drivers/calc/CTable.cxx')
| -rw-r--r-- | connectivity/source/drivers/calc/CTable.cxx | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/connectivity/source/drivers/calc/CTable.cxx b/connectivity/source/drivers/calc/CTable.cxx index 1d19c05a46c0..d95c6263b7ed 100644 --- a/connectivity/source/drivers/calc/CTable.cxx +++ b/connectivity/source/drivers/calc/CTable.cxx @@ -347,14 +347,15 @@ void lcl_SetValue( ORowSetValue& rValue, const Reference<XSpreadsheet>& xSheet, switch (nType) { case DataType::VARCHAR: - if ( eCellType == CellContentType_TEXT ) + if ( eCellType == CellContentType_EMPTY ) + rValue.setNull(); + else { + // #i25840# still let Calc convert numbers to text const Reference<XText> xText( xCell, UNO_QUERY ); if ( xText.is() ) rValue = xText->getString(); - } // if ( eCellType == CellContentType_TEXT ) - else - rValue.setNull(); + } break; case DataType::DECIMAL: if ( eCellType == CellContentType_VALUE ) |