connectivity/source/drivers/firebird/ResultSet.cxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit dba4e216c9d866699204af121f575829e64768d1
Author: Andrzej J.R. Hunt <andr...@ahunt.org>
Date: Wed Sep 18 21:02:19 2013 +0100
Remove null indicator for type checking. (firebird-sdbc)
Change-Id: I3f693f5662f3022323c7ec726c9d7a506ce02185
diff --git a/connectivity/source/drivers/firebird/ResultSet.cxx
b/connectivity/source/drivers/firebird/ResultSet.cxx
index 8d8e3a7..e31e39e 100644
--- a/connectivity/source/drivers/firebird/ResultSet.cxx
+++ b/connectivity/source/drivers/firebird/ResultSet.cxx
@@ -375,7 +375,7 @@ T OResultSet::retrieveValue(const sal_Int32 nColumnIndex,
const ISC_SHORT nType)
if ((m_bWasNull = isNull(nColumnIndex)))
return T();
- if (m_pSqlda->sqlvar[nColumnIndex-1].sqltype == nType)
+ if ((m_pSqlda->sqlvar[nColumnIndex-1].sqltype & ~1) == nType)
return *((T*) m_pSqlda->sqlvar[nColumnIndex-1].sqldata);
else
return T();
@@ -419,7 +419,7 @@ ISC_QUAD* OResultSet::retrieveValue(const sal_Int32
nColumnIndex, const ISC_SHOR
// TODO: this is probably wrong
if ((m_bWasNull = isNull(nColumnIndex)))
return 0;
- if (m_pSqlda->sqlvar[nColumnIndex-1].sqltype == nType)
+ if ((m_pSqlda->sqlvar[nColumnIndex-1].sqltype & ~1) == nType)
return (ISC_QUAD*) m_pSqlda->sqlvar[nColumnIndex-1].sqldata;
else
throw SQLException(); // TODO: better exception (can't convert Blob)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
