diff options
Diffstat (limited to 'svl/source/items/szitem.cxx')
-rw-r--r-- | svl/source/items/szitem.cxx | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/svl/source/items/szitem.cxx b/svl/source/items/szitem.cxx index 6c5ab66b8422..161468b1009b 100644 --- a/svl/source/items/szitem.cxx +++ b/svl/source/items/szitem.cxx @@ -54,7 +54,7 @@ SfxSizeItem::SfxSizeItem() // ----------------------------------------------------------------------- -SfxSizeItem::SfxSizeItem( USHORT nW, const Size& rVal ) : +SfxSizeItem::SfxSizeItem( sal_uInt16 nW, const Size& rVal ) : SfxPoolItem( nW ), aVal( rVal ) { @@ -63,7 +63,7 @@ SfxSizeItem::SfxSizeItem( USHORT nW, const Size& rVal ) : // ----------------------------------------------------------------------- -SfxSizeItem::SfxSizeItem( USHORT nW, SvStream &rStream ) : +SfxSizeItem::SfxSizeItem( sal_uInt16 nW, SvStream &rStream ) : SfxPoolItem( nW ) { DBG_CTOR(SfxSizeItem, 0); @@ -117,7 +117,7 @@ SfxPoolItem* SfxSizeItem::Clone(SfxItemPool *) const // ----------------------------------------------------------------------- -SfxPoolItem* SfxSizeItem::Create(SvStream &rStream, USHORT ) const +SfxPoolItem* SfxSizeItem::Create(SvStream &rStream, sal_uInt16 ) const { DBG_CHKTHIS(SfxSizeItem, 0); Size aStr; @@ -127,7 +127,7 @@ SfxPoolItem* SfxSizeItem::Create(SvStream &rStream, USHORT ) const // ----------------------------------------------------------------------- -SvStream& SfxSizeItem::Store(SvStream &rStream, USHORT ) const +SvStream& SfxSizeItem::Store(SvStream &rStream, sal_uInt16 ) const { DBG_CHKTHIS(SfxSizeItem, 0); rStream << aVal; @@ -135,8 +135,8 @@ SvStream& SfxSizeItem::Store(SvStream &rStream, USHORT ) const } // ----------------------------------------------------------------------- -BOOL SfxSizeItem::QueryValue( com::sun::star::uno::Any& rVal, - BYTE nMemberId ) const +sal_Bool SfxSizeItem::QueryValue( com::sun::star::uno::Any& rVal, + sal_uInt8 nMemberId ) const { sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); nMemberId &= ~CONVERT_TWIPS; @@ -159,20 +159,20 @@ BOOL SfxSizeItem::QueryValue( com::sun::star::uno::Any& rVal, rVal <<= aTmp.getWidth(); break; case MID_HEIGHT: rVal <<= aTmp.getHeight(); break; - default: DBG_ERROR("Wrong MemberId!"); return FALSE; + default: DBG_ERROR("Wrong MemberId!"); return sal_False; } - return TRUE; + return sal_True; } // ----------------------------------------------------------------------- -BOOL SfxSizeItem::PutValue( const com::sun::star::uno::Any& rVal, - BYTE nMemberId ) +sal_Bool SfxSizeItem::PutValue( const com::sun::star::uno::Any& rVal, + sal_uInt8 nMemberId ) { sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); nMemberId &= ~CONVERT_TWIPS; - BOOL bRet = FALSE; + sal_Bool bRet = sal_False; com::sun::star::awt::Size aValue; sal_Int32 nVal = 0; if ( !nMemberId ) |