summaryrefslogtreecommitdiff
path: root/connectivity/source/drivers
diff options
context:
space:
mode:
authorka <kai.ahrens@sun.com>2010-06-03 20:35:47 +0200
committerka <kai.ahrens@sun.com>2010-06-03 20:35:47 +0200
commit6e5f7e581dc5b8edcb78dc92a4d0c89d81f2aef9 (patch)
tree2dd6e2841016be3eb86a0948395241118adccbc5 /connectivity/source/drivers
parent13a131cfc6343d2f5693f3c3e9485cfe9e48f8ad (diff)
parentf8e7afbac976ca862a801b9648fd95b2107757b2 (diff)
impressbi01: latest changes
Diffstat (limited to 'connectivity/source/drivers')
-rw-r--r--connectivity/source/drivers/calc/CTable.cxx9
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 )