diff options
Diffstat (limited to 'svl/source/items/lckbitem.cxx')
| -rw-r--r-- | svl/source/items/lckbitem.cxx | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/svl/source/items/lckbitem.cxx b/svl/source/items/lckbitem.cxx index 93aa8fe7a2aa..872420a35322 100644 --- a/svl/source/items/lckbitem.cxx +++ b/svl/source/items/lckbitem.cxx @@ -51,7 +51,7 @@ SfxLockBytesItem::SfxLockBytesItem() // ----------------------------------------------------------------------- -SfxLockBytesItem::SfxLockBytesItem( USHORT nW, SvLockBytes *pLockBytes ) +SfxLockBytesItem::SfxLockBytesItem( sal_uInt16 nW, SvLockBytes *pLockBytes ) : SfxPoolItem( nW ), _xVal( pLockBytes ) { @@ -59,11 +59,11 @@ SfxLockBytesItem::SfxLockBytesItem( USHORT nW, SvLockBytes *pLockBytes ) // ----------------------------------------------------------------------- -SfxLockBytesItem::SfxLockBytesItem( USHORT nW, SvStream &rStream ) +SfxLockBytesItem::SfxLockBytesItem( sal_uInt16 nW, SvStream &rStream ) : SfxPoolItem( nW ) { rStream.Seek( 0L ); - _xVal = new SvLockBytes( new SvCacheStream(), TRUE ); + _xVal = new SvLockBytes( new SvCacheStream(), sal_True ); SvStream aLockBytesStream( _xVal ); rStream >> aLockBytesStream; @@ -101,16 +101,16 @@ SfxPoolItem* SfxLockBytesItem::Clone(SfxItemPool *) const #define MAX_BUF 32000 -SfxPoolItem* SfxLockBytesItem::Create( SvStream &rStream, USHORT ) const +SfxPoolItem* SfxLockBytesItem::Create( SvStream &rStream, sal_uInt16 ) const { sal_uInt32 nSize = 0; - ULONG nActRead = 0; + sal_uLong nActRead = 0; sal_Char cTmpBuf[MAX_BUF]; SvMemoryStream aNewStream; rStream >> nSize; do { - ULONG nToRead; + sal_uLong nToRead; if( (nSize - nActRead) > MAX_BUF ) nToRead = MAX_BUF; else @@ -124,7 +124,7 @@ SfxPoolItem* SfxLockBytesItem::Create( SvStream &rStream, USHORT ) const // ----------------------------------------------------------------------- -SvStream& SfxLockBytesItem::Store(SvStream &rStream, USHORT ) const +SvStream& SfxLockBytesItem::Store(SvStream &rStream, sal_uInt16 ) const { SvStream aLockBytesStream( _xVal ); sal_uInt32 nSize = aLockBytesStream.Seek( STREAM_SEEK_TO_END ); @@ -138,7 +138,7 @@ SvStream& SfxLockBytesItem::Store(SvStream &rStream, USHORT ) const //---------------------------------------------------------------------------- // virtual -bool SfxLockBytesItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE ) +bool SfxLockBytesItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 ) { com::sun::star::uno::Sequence< sal_Int8 > aSeq; if ( rVal >>= aSeq ) @@ -149,7 +149,7 @@ bool SfxLockBytesItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE ) pStream->Write( (void*)aSeq.getConstArray(), aSeq.getLength() ); pStream->Seek(0); - _xVal = new SvLockBytes( pStream, TRUE ); + _xVal = new SvLockBytes( pStream, sal_True ); } else _xVal = NULL; @@ -163,7 +163,7 @@ bool SfxLockBytesItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE ) //---------------------------------------------------------------------------- // virtual -bool SfxLockBytesItem::QueryValue( com::sun::star::uno::Any& rVal,BYTE ) const +bool SfxLockBytesItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 ) const { if ( _xVal.Is() ) { @@ -175,7 +175,7 @@ bool SfxLockBytesItem::QueryValue( com::sun::star::uno::Any& rVal,BYTE ) const else return false; - ULONG nRead = 0; + sal_uLong nRead = 0; com::sun::star::uno::Sequence< sal_Int8 > aSeq( nLen ); _xVal->ReadAt( 0, aSeq.getArray(), nLen, &nRead ); |