summaryrefslogtreecommitdiff
path: root/connectivity
diff options
context:
space:
mode:
authorLionel Elie Mamane <lionel@mamane.lu>2015-04-25 19:34:58 +0200
committerLionel Elie Mamane <lionel@mamane.lu>2015-04-25 19:37:56 +0200
commit062c3afd4e829692cf022c5011b2a226d21c35e4 (patch)
tree38c9937ccc8259070079f66c39f7bca1d66a12dc /connectivity
parented3c69588a7f65cb534075a68607b094c40664f0 (diff)
tdf#90614 oups... I was too eager in replacing getAny() with makeAny()
also handle the SQLNULL case Change-Id: Ie7fffd6b46ed8b3dfa7231928f55743f71d2ea98
Diffstat (limited to 'connectivity')
-rw-r--r--connectivity/source/commontools/FValue.cxx5
1 files changed, 4 insertions, 1 deletions
diff --git a/connectivity/source/commontools/FValue.cxx b/connectivity/source/commontools/FValue.cxx
index ba02dbbc6414..93648c1a409d 100644
--- a/connectivity/source/commontools/FValue.cxx
+++ b/connectivity/source/commontools/FValue.cxx
@@ -885,6 +885,9 @@ Any ORowSetValue::makeAny() const
{
switch(getTypeKind())
{
+ case DataType::SQLNULL:
+ assert(rValue == Any());
+ break;
case DataType::CHAR:
case DataType::VARCHAR:
case DataType::DECIMAL:
@@ -964,7 +967,7 @@ Any ORowSetValue::makeAny() const
break;
default:
SAL_WARN( "connectivity.commontools","ORowSetValue::makeAny(): UNSUPPORTED TYPE!");
- rValue = makeAny();
+ rValue = getAny();
break;
}
}