basic/source/sbx/sbxvalue.cxx | 16 ---------------- 1 file changed, 16 deletions(-)
New commits: commit 0a1b0458cb4fa3f253ec1800bdcce154c1ef754b Author: Noel Grandin <[email protected]> Date: Fri Jan 5 13:45:23 2018 +0200 SAL_TYPES_SIZEOFINT == 2 no longer possible on any of our platforms Change-Id: Id453ada9c79c76f2736f568436e386b05bcd08c5 Reviewed-on: https://gerrit.libreoffice.org/47468 Tested-by: Jenkins <[email protected]> Reviewed-by: Noel Grandin <[email protected]> diff --git a/basic/source/sbx/sbxvalue.cxx b/basic/source/sbx/sbxvalue.cxx index 06fd0c30192a..5c53815de4e7 100644 --- a/basic/source/sbx/sbxvalue.cxx +++ b/basic/source/sbx/sbxvalue.cxx @@ -313,18 +313,10 @@ bool SbxValue::Get( SbxValues& rRes ) const case SbxCoreSTRING: p->aPic = ImpGetCoreString( &p->aData ); rRes.pOUString = &p->aPic; break; case SbxINT: -#if SAL_TYPES_SIZEOFINT == 2 - rRes.nInt = (int) ImpGetInteger( &p->aData ); -#else rRes.nInt = (int) ImpGetLong( &p->aData ); -#endif break; case SbxUINT: -#if SAL_TYPES_SIZEOFINT == 2 - rRes.nUInt = (int) ImpGetUShort( &p->aData ); -#else rRes.nUInt = (int) ImpGetULong( &p->aData ); -#endif break; case SbxOBJECT: if( p->aData.eType == SbxOBJECT ) @@ -461,18 +453,10 @@ bool SbxValue::Put( const SbxValues& rVal ) case SbxLPSTR: case SbxSTRING: ImpPutString( &p->aData, rVal.pOUString ); break; case SbxINT: -#if SAL_TYPES_SIZEOFINT == 2 - ImpPutInteger( &p->aData, (sal_Int16) rVal.nInt ); -#else ImpPutLong( &p->aData, (sal_Int32) rVal.nInt ); -#endif break; case SbxUINT: -#if SAL_TYPES_SIZEOFINT == 2 - ImpPutUShort( &p->aData, (sal_uInt16) rVal.nUInt ); -#else ImpPutULong( &p->aData, (sal_uInt32) rVal.nUInt ); -#endif break; case SbxOBJECT: if( !p->IsFixed() || p->aData.eType == SbxOBJECT ) _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
