diff options
| author | Lionel Elie Mamane <lionel@mamane.lu> | 2015-04-25 19:34:58 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-04-27 21:24:38 +0000 |
| commit | 462a22db365551c376ca8d719911305dd68d98eb (patch) | |
| tree | a273aed0bd6e3cc738f4ee9fe01fc1a5d86e0bd5 | |
| parent | 363afdf0e937afb179af3819276c6023c48f2b49 (diff) | |
tdf#90614 oups... I was too eager in replacing getAny() with makeAny()
also handle the SQLNULL case
Conflicts:
connectivity/source/commontools/FValue.cxx
Change-Id: Ie7fffd6b46ed8b3dfa7231928f55743f71d2ea98
Reviewed-on: https://gerrit.libreoffice.org/15530
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
| -rw-r--r-- | connectivity/source/commontools/FValue.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/connectivity/source/commontools/FValue.cxx b/connectivity/source/commontools/FValue.cxx index cc53d24d84ed..8248fd73d7e7 100644 --- a/connectivity/source/commontools/FValue.cxx +++ b/connectivity/source/commontools/FValue.cxx @@ -886,6 +886,9 @@ Any ORowSetValue::makeAny() const { switch(getTypeKind()) { + case DataType::SQLNULL: + assert(rValue == Any()); + break; case DataType::CHAR: case DataType::VARCHAR: case DataType::DECIMAL: @@ -965,7 +968,7 @@ Any ORowSetValue::makeAny() const break; default: SAL_WARN( "connectivity.commontools","ORowSetValue::makeAny(): UNSPUPPORTED TYPE!"); - rValue = makeAny(); + rValue = getAny(); break; } } |