diff options
| author | Michael Stahl <mstahl@redhat.com> | 2016-09-14 17:01:50 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2016-09-15 12:01:11 +0200 |
| commit | b647996a9babbee7b33cf45192e57df6a124628b (patch) | |
| tree | ddc6dfe8a62ec53fbacc4eeccfeb20019f3ef4f0 /basic/source/sbx | |
| parent | a19a67e20e847a42063559694ec5beec71abcfb3 (diff) | |
replace sal_Size with std::size_t (or sal_uInt64 for SvStream pos)
... except in include/rtl, include/sal, include/uno, where sal_Size is
retained for compatibility, and where callers of rtl functions pass in
pointers that are incompatible on MSVC.
Change-Id: I8344453780689f5120ba0870e44965b6d292450c
Diffstat (limited to 'basic/source/sbx')
| -rw-r--r-- | basic/source/sbx/sbxbase.cxx | 8 | ||||
| -rw-r--r-- | basic/source/sbx/sbxobj.cxx | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/basic/source/sbx/sbxbase.cxx b/basic/source/sbx/sbxbase.cxx index d0296fcf4c5f..1204e9ff7fb5 100644 --- a/basic/source/sbx/sbxbase.cxx +++ b/basic/source/sbx/sbxbase.cxx @@ -198,7 +198,7 @@ SbxBase* SbxBase::Load( SvStream& rStrm ) if( nFlags & SbxFlagBits::Reserved ) nFlags = ( nFlags & ~SbxFlagBits::Reserved ) | SbxFlagBits::GlobalSearch; - sal_Size nOldPos = rStrm.Tell(); + sal_uInt64 nOldPos = rStrm.Tell(); rStrm.ReadUInt32( nSize ); SbxBase* p = Create( nSbxId, nCreator ); if( p ) @@ -206,7 +206,7 @@ SbxBase* SbxBase::Load( SvStream& rStrm ) p->nFlags = nFlags; if( p->LoadData( rStrm, nVer ) ) { - sal_Size nNewPos = rStrm.Tell(); + sal_uInt64 const nNewPos = rStrm.Tell(); nOldPos += nSize; DBG_ASSERT( nOldPos >= nNewPos, "SBX: Too much data loaded" ); if( nOldPos != nNewPos ) @@ -239,10 +239,10 @@ bool SbxBase::Store( SvStream& rStrm ) .WriteUInt16( GetSbxId() ) .WriteUInt16( static_cast<sal_uInt16>(GetFlags()) ) .WriteUInt16( GetVersion() ); - sal_Size nOldPos = rStrm.Tell(); + sal_uInt64 const nOldPos = rStrm.Tell(); rStrm.WriteUInt32( 0 ); bool bRes = StoreData( rStrm ); - sal_Size nNewPos = rStrm.Tell(); + sal_uInt64 const nNewPos = rStrm.Tell(); rStrm.Seek( nOldPos ); rStrm.WriteUInt32( nNewPos - nOldPos ); rStrm.Seek( nNewPos ); diff --git a/basic/source/sbx/sbxobj.cxx b/basic/source/sbx/sbxobj.cxx index d1b4ad92899d..5382b499cc18 100644 --- a/basic/source/sbx/sbxobj.cxx +++ b/basic/source/sbx/sbxobj.cxx @@ -603,9 +603,9 @@ bool SbxObject::LoadData( SvStream& rStrm, sal_uInt16 nVer ) OUString aDfltProp; aClassName = read_uInt16_lenPrefixed_uInt8s_ToOUString(rStrm, RTL_TEXTENCODING_ASCII_US); aDfltProp = read_uInt16_lenPrefixed_uInt8s_ToOUString(rStrm, RTL_TEXTENCODING_ASCII_US); - sal_Size nPos = rStrm.Tell(); + sal_uInt64 nPos = rStrm.Tell(); rStrm.ReadUInt32( nSize ); - sal_Size nNewPos = rStrm.Tell(); + sal_uInt64 const nNewPos = rStrm.Tell(); nPos += nSize; DBG_ASSERT( nPos >= nNewPos, "SBX: Loaded too much data" ); if( nPos != nNewPos ) @@ -640,9 +640,9 @@ bool SbxObject::StoreData( SvStream& rStrm ) const } write_uInt16_lenPrefixed_uInt8s_FromOUString(rStrm, aClassName, RTL_TEXTENCODING_ASCII_US); write_uInt16_lenPrefixed_uInt8s_FromOUString(rStrm, aDfltProp, RTL_TEXTENCODING_ASCII_US); - sal_Size nPos = rStrm.Tell(); + sal_uInt64 const nPos = rStrm.Tell(); rStrm.WriteUInt32( 0 ); - sal_Size nNew = rStrm.Tell(); + sal_uInt64 const nNew = rStrm.Tell(); rStrm.Seek( nPos ); rStrm.WriteUInt32( nNew - nPos ); rStrm.Seek( nNew ); |