summaryrefslogtreecommitdiff
path: root/connectivity
diff options
context:
space:
mode:
authorVladimir Glazunov <vg@openoffice.org>2010-05-28 09:36:24 +0200
committerVladimir Glazunov <vg@openoffice.org>2010-05-28 09:36:24 +0200
commita3f8b65881da98c14d1db26b04f32e626cf8e879 (patch)
treeecba5e7dcbcc5a5457f367aaba6619c781dc4200 /connectivity
parentf1e68b25909388aa45efd2527c7b7f3f7cb8d1de (diff)
parent29ce98cbc3951b64ad079074f84e05b6d87621a0 (diff)
CWS-TOOLING: integrate CWS calc53
Diffstat (limited to 'connectivity')
-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 )