User: vg Date: 05/02/17 02:14:37 Modified: /dba/connectivity/source/commontools/ FValue.cxx
Log: INTEGRATION: CWS dba23 (1.24.62); FILE MERGED 2005/01/20 16:49:13 oj 1.24.62.1: #i40648# new datatype BOOLEAN File Changes: Directory: /dba/connectivity/source/commontools/ ================================================ File [changed]: FValue.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/commontools/FValue.cxx?r1=1.25&r2=1.26 Delta lines: +21 -4 -------------------- --- FValue.cxx 16 Feb 2005 17:23:05 -0000 1.25 +++ FValue.cxx 17 Feb 2005 10:14:35 -0000 1.26 @@ -119,14 +119,17 @@ case DataType::INTEGER: bIsCompatible = (DataType::SMALLINT == _eType2) || (DataType::TINYINT == _eType2) - || (DataType::BIT == _eType2); + || (DataType::BIT == _eType2) + || (DataType::BOOLEAN == _eType2); break; case DataType::SMALLINT: bIsCompatible = (DataType::TINYINT == _eType2) - || (DataType::BIT == _eType2); + || (DataType::BIT == _eType2) + || (DataType::BOOLEAN == _eType2); break; case DataType::TINYINT: - bIsCompatible = (DataType::BIT == _eType2); + bIsCompatible = (DataType::BIT == _eType2) + || (DataType::BOOLEAN == _eType2); break; case DataType::BLOB: @@ -263,6 +266,7 @@ (*this) = getInt32(); break; case DataType::BIT: + case DataType::BOOLEAN: (*this) = getBool(); break; case DataType::DATE: @@ -440,6 +444,7 @@ TRACE_ALLOC( Sequence_sal_Int8 ) break; case DataType::BIT: + case DataType::BOOLEAN: m_aValue.m_bBool = _rRH.m_aValue.m_bBool; break; case DataType::TINYINT: @@ -507,6 +512,7 @@ (*this) = *(Sequence<sal_Int8>*)_rRH.m_aValue.m_pValue; break; case DataType::BIT: + case DataType::BOOLEAN: m_aValue.m_bBool = _rRH.m_aValue.m_bBool; break; case DataType::TINYINT: @@ -699,7 +705,7 @@ ORowSetValue& ORowSetValue::operator=(const sal_Bool _rRH) { - if(m_eTypeKind != DataType::BIT) + if(m_eTypeKind != DataType::BIT && DataType::BOOLEAN != m_eTypeKind ) free(); m_aValue.m_bBool = _rRH; @@ -849,6 +855,7 @@ } break; case DataType::BIT: + case DataType::BOOLEAN: bRet = m_aValue.m_bBool == _rRH.m_aValue.m_bBool; break; case DataType::DATE: @@ -936,6 +943,7 @@ rValue = getAny(); break; case DataType::BIT: + case DataType::BOOLEAN: rValue.setValue( &m_aValue.m_bBool, ::getCppuBooleanType() ); break; case DataType::TINYINT: @@ -1015,6 +1023,7 @@ } break; case DataType::BIT: + case DataType::BOOLEAN: aRet = ::rtl::OUString::valueOf((sal_Int32)(sal_Bool)*this); break; case DataType::TINYINT: @@ -1073,6 +1082,7 @@ OSL_ASSERT(!"getBool() for this type is not allowed!"); break; case DataType::BIT: + case DataType::BOOLEAN: bRet = m_aValue.m_bBool; break; case DataType::TINYINT: @@ -1124,6 +1134,7 @@ OSL_ASSERT(!"getInt8() for this type is not allowed!"); break; case DataType::BIT: + case DataType::BOOLEAN: nRet = m_aValue.m_bBool; break; case DataType::TINYINT: @@ -1184,6 +1195,7 @@ OSL_ASSERT(!"getInt16() for this type is not allowed!"); break; case DataType::BIT: + case DataType::BOOLEAN: nRet = m_aValue.m_bBool; break; case DataType::TINYINT: @@ -1247,6 +1259,7 @@ OSL_ASSERT(!"getInt32() for this type is not allowed!"); break; case DataType::BIT: + case DataType::BOOLEAN: nRet = m_aValue.m_bBool; break; case DataType::TINYINT: @@ -1310,6 +1323,7 @@ OSL_ASSERT(!"getInt32() for this type is not allowed!"); break; case DataType::BIT: + case DataType::BOOLEAN: nRet = m_aValue.m_bBool; break; case DataType::TINYINT: @@ -1377,6 +1391,7 @@ OSL_ASSERT(!"getDouble() for this type is not allowed!"); break; case DataType::BIT: + case DataType::BOOLEAN: nRet = m_aValue.m_bBool; break; case DataType::TINYINT: @@ -1446,6 +1461,7 @@ OSL_ASSERT(!"getDouble() for this type is not allowed!"); break; case DataType::BIT: + case DataType::BOOLEAN: nRet = m_aValue.m_bBool; break; case DataType::TINYINT: @@ -1529,6 +1545,7 @@ OSL_ASSERT(!"setFromDouble() for this type is not allowed!"); break; case DataType::BIT: + case DataType::BOOLEAN: m_aValue.m_bBool = _rVal != 0.0; break; case DataType::TINYINT: --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
