diff options
| author | mst <mst@openoffice.org> | 2011-09-17 22:41:59 +0000 |
|---|---|---|
| committer | Thorsten Behrens <tbehrens@suse.com> | 2011-11-29 17:57:31 +0100 |
| commit | 5b6487aa8ce1406efb8e29de28a9ecd1c3d06cf2 (patch) | |
| tree | 33961de01a579e05e01451c141bbdca72ee6e615 /connectivity | |
| parent | e2ba9814858156af6a2b39f885b3a6387ca29da2 (diff) | |
fs34c: #i117666# check first if value is null
* found as LGPLv3-only fix at svn rev 1172125 (http://svn.apache.org/viewvc?view=revision&revision=1172125)
Diffstat (limited to 'connectivity')
| -rw-r--r-- | connectivity/source/commontools/FValue.cxx | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/connectivity/source/commontools/FValue.cxx b/connectivity/source/commontools/FValue.cxx index e467b5507b1d..bfa3b12a520a 100644 --- a/connectivity/source/commontools/FValue.cxx +++ b/connectivity/source/commontools/FValue.cxx @@ -786,6 +786,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) @@ -808,10 +814,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!"); |