diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2014-02-24 17:09:15 -0600 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2014-02-25 00:26:43 +0000 |
| commit | 295bc8703ff5d5133f18ae2b25dc3d88cdfffa93 (patch) | |
| tree | 4068dacf4e65fcf6bd21161440bfcca040e4634b /basic/source/sbx/sbxbase.cxx | |
| parent | 553473945b6789cb757ec69aabba6b87c4854916 (diff) | |
basic: remove use of sal_uIntptr in favor of more appropriate type
Change-Id: Ie878f43c7245838519fe7477b039827b079dde63
Reviewed-on: https://gerrit.libreoffice.org/8214
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
Diffstat (limited to 'basic/source/sbx/sbxbase.cxx')
| -rw-r--r-- | basic/source/sbx/sbxbase.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/basic/source/sbx/sbxbase.cxx b/basic/source/sbx/sbxbase.cxx index b6385180f532..7b50b63a0531 100644 --- a/basic/source/sbx/sbxbase.cxx +++ b/basic/source/sbx/sbxbase.cxx @@ -222,7 +222,7 @@ SbxBase* SbxBase::Load( SvStream& rStrm ) if( nFlags & SBX_RESERVED ) nFlags = ( nFlags & ~SBX_RESERVED ) | SBX_GBLSEARCH; - sal_uIntPtr nOldPos = rStrm.Tell(); + sal_Size nOldPos = rStrm.Tell(); rStrm.ReadUInt32( nSize ); SbxBase* p = Create( nSbxId, nCreator ); if( p ) @@ -230,7 +230,7 @@ SbxBase* SbxBase::Load( SvStream& rStrm ) p->nFlags = nFlags; if( p->LoadData( rStrm, nVer ) ) { - sal_uIntPtr nNewPos = rStrm.Tell(); + sal_Size nNewPos = rStrm.Tell(); nOldPos += nSize; DBG_ASSERT( nOldPos >= nNewPos, "SBX: Too much data loaded" ); if( nOldPos != nNewPos ) @@ -262,7 +262,7 @@ void SbxBase::Skip( SvStream& rStrm ) sal_uInt32 nCreator, nSize; rStrm.ReadUInt32( nCreator ).ReadUInt16( nSbxId ).ReadUInt16( nFlags ).ReadUInt16( nVer ); - sal_uIntPtr nStartPos = rStrm.Tell(); + sal_Size nStartPos = rStrm.Tell(); rStrm.ReadUInt32( nSize ); rStrm.Seek( nStartPos + nSize ); @@ -277,10 +277,10 @@ sal_Bool SbxBase::Store( SvStream& rStrm ) .WriteUInt16( (sal_uInt16) GetSbxId() ) .WriteUInt16( (sal_uInt16) GetFlags() ) .WriteUInt16( (sal_uInt16) GetVersion() ); - sal_uIntPtr nOldPos = rStrm.Tell(); + sal_Size nOldPos = rStrm.Tell(); rStrm.WriteUInt32( (sal_uInt32) 0L ); sal_Bool bRes = StoreData( rStrm ); - sal_uIntPtr nNewPos = rStrm.Tell(); + sal_Size nNewPos = rStrm.Tell(); rStrm.Seek( nOldPos ); rStrm.WriteUInt32( (sal_uInt32) ( nNewPos - nOldPos ) ); rStrm.Seek( nNewPos ); |