summaryrefslogtreecommitdiff
path: root/connectivity/source
diff options
context:
space:
mode:
authorMichael Stahl <mst@apache.org>2011-09-17 21:41:59 +0000
committerMichael Stahl <mst@apache.org>2011-09-17 21:41:59 +0000
commit0a01a4642dd5e8c5ba149f8109de49de3f2be1e4 (patch)
treecf92f6e32792bce022abb5ad1d989b6e0bf96b7c /connectivity/source
parentefdf35dcf991532f5ca70e89cd9716296beb7258 (diff)
fs34c: #i117666# check first if value is null
# HG changeset patch # User Ocke Janssen [oj] <Ocke.Janssen@oracle.com> # Date 1301982481 -7200 # Node ID f83826db1f0250fa86b741773613e3caaa25990b # Parent a9158b47276ffd484296b630f9400403f1781fcd
Diffstat (limited to 'connectivity/source')
-rw-r--r--connectivity/source/commontools/FValue.cxx10
1 files changed, 6 insertions, 4 deletions
diff --git a/connectivity/source/commontools/FValue.cxx b/connectivity/source/commontools/FValue.cxx
index 6f65547736d9..c03c3af0cff0 100644
--- a/connectivity/source/commontools/FValue.cxx
+++ b/connectivity/source/commontools/FValue.cxx
@@ -787,6 +787,12 @@ sal_Bool operator==(const DateTime& _rLH,const DateTime& _rRH)
bool ORowSetValue::operator==(const ORowSetValue& _rRH) const
{
+ if ( m_bNull != _rRH.isNull() )
+ return false;
+
+ if(m_bNull && _rRH.isNull())
+ return true;
+
if ( m_eTypeKind != _rRH.m_eTypeKind )
{
switch(m_eTypeKind)
@@ -809,10 +815,6 @@ bool ORowSetValue::operator==(const ORowSetValue& _rRH) const
}
return false;
}
- if ( m_bNull != _rRH.isNull() )
- return false;
- if(m_bNull && _rRH.isNull())
- return true;
bool bRet = false;
OSL_ENSURE(!m_bNull,"SHould not be null!");