connectivity/source/commontools/FValue.cxx | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 462a22db365551c376ca8d719911305dd68d98eb
Author: Lionel Elie Mamane <lio...@mamane.lu>
Date: Sat Apr 25 19:34:58 2015 +0200
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 <mst...@redhat.com>
Tested-by: Michael Stahl <mst...@redhat.com>
diff --git a/connectivity/source/commontools/FValue.cxx
b/connectivity/source/commontools/FValue.cxx
index cc53d24..8248fd7 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;
}
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
