Kaydet (Commit) 2bc7d053 authored tarafından Christian Lohmaier's avatar Christian Lohmaier Kaydeden (comit) Fridrich Strba

fix makeAny calls

checks failed on Mac/PPC - setValue expects sal_Bool, not plain bool
for bool there's assignment operator. Similar for unsigned short -
there's dedicated operator to assign sal_uInt16 - no need to cast to
signed sal_Int23 that then fails to convert properly.

Change-Id: I6c67a3741cf2d7910fc543c9c71db1c6e816bea6
Reviewed-on: https://gerrit.libreoffice.org/2805Reviewed-by: 's avatarFridrich Strba <fridrich@documentfoundation.org>
Tested-by: 's avatarFridrich Strba <fridrich@documentfoundation.org>
üst 96ad8c2a
...@@ -916,7 +916,7 @@ Any ORowSetValue::makeAny() const ...@@ -916,7 +916,7 @@ Any ORowSetValue::makeAny() const
break; break;
case DataType::BIT: case DataType::BIT:
case DataType::BOOLEAN: case DataType::BOOLEAN:
rValue.setValue( &m_aValue.m_bBool, ::getCppuBooleanType() ); rValue <<= m_aValue.m_bBool;
break; break;
case DataType::TINYINT: case DataType::TINYINT:
if ( m_bSigned ) if ( m_bSigned )
...@@ -2414,8 +2414,7 @@ void ORowSetValue::fill(const Any& _rValue) ...@@ -2414,8 +2414,7 @@ void ORowSetValue::fill(const Any& _rValue)
{ {
sal_uInt16 nValue(0); sal_uInt16 nValue(0);
_rValue >>= nValue; _rValue >>= nValue;
(*this) = static_cast<sal_Int32>(nValue); (*this) = nValue;
setSigned(sal_False);
break; break;
} }
case TypeClass_LONG: case TypeClass_LONG:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment