diff options
author | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2013-03-17 19:50:22 +0100 |
---|---|---|
committer | Fridrich Strba <fridrich@documentfoundation.org> | 2013-03-18 06:55:50 +0000 |
commit | 2bc7d0534c946ec73a146dd823bb0a3d478608f2 (patch) | |
tree | 985c79a89807c8fdf52f2a16f057b71ba4e8c6ad /connectivity | |
parent | 96ad8c2ac54993d7d0e9c6bede7e4aa8f10f9ff1 (diff) |
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/2805
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
Diffstat (limited to 'connectivity')
-rw-r--r-- | connectivity/source/commontools/FValue.cxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/connectivity/source/commontools/FValue.cxx b/connectivity/source/commontools/FValue.cxx index fef5087e8ca8..e41a1a70b510 100644 --- a/connectivity/source/commontools/FValue.cxx +++ b/connectivity/source/commontools/FValue.cxx @@ -916,7 +916,7 @@ Any ORowSetValue::makeAny() const break; case DataType::BIT: case DataType::BOOLEAN: - rValue.setValue( &m_aValue.m_bBool, ::getCppuBooleanType() ); + rValue <<= m_aValue.m_bBool; break; case DataType::TINYINT: if ( m_bSigned ) @@ -2414,8 +2414,7 @@ void ORowSetValue::fill(const Any& _rValue) { sal_uInt16 nValue(0); _rValue >>= nValue; - (*this) = static_cast<sal_Int32>(nValue); - setSigned(sal_False); + (*this) = nValue; break; } case TypeClass_LONG: |