diff options
Diffstat (limited to 'svx/source/items/zoomslideritem.cxx')
| -rwxr-xr-x[-rw-r--r--] | svx/source/items/zoomslideritem.cxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/svx/source/items/zoomslideritem.cxx b/svx/source/items/zoomslideritem.cxx index e68af5d4250f..816f2604038a 100644..100755 --- a/svx/source/items/zoomslideritem.cxx +++ b/svx/source/items/zoomslideritem.cxx @@ -45,7 +45,7 @@ TYPEINIT1_FACTORY(SvxZoomSliderItem,SfxUInt16Item, new SvxZoomSliderItem); // ----------------------------------------------------------------------- -SvxZoomSliderItem::SvxZoomSliderItem( USHORT nCurrentZoom, USHORT nMinZoom, USHORT nMaxZoom, USHORT _nWhich ) +SvxZoomSliderItem::SvxZoomSliderItem( sal_uInt16 nCurrentZoom, sal_uInt16 nMinZoom, sal_uInt16 nMaxZoom, sal_uInt16 _nWhich ) : SfxUInt16Item( _nWhich, nCurrentZoom ), mnMinZoom( nMinZoom ), mnMaxZoom( nMaxZoom ) { } @@ -109,7 +109,7 @@ int SvxZoomSliderItem::operator==( const SfxPoolItem& rAttr ) const mnMinZoom == rItem.mnMinZoom && mnMaxZoom == rItem.mnMaxZoom ); } -bool SvxZoomSliderItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId ) const +bool SvxZoomSliderItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const { nMemberId &= ~CONVERT_TWIPS; switch ( nMemberId ) @@ -157,7 +157,7 @@ bool SvxZoomSliderItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMember return true; } -bool SvxZoomSliderItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId ) +bool SvxZoomSliderItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) { // sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); nMemberId &= ~CONVERT_TWIPS; @@ -201,10 +201,10 @@ bool SvxZoomSliderItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMe if ( bAllConverted && nConvertedCount == ZOOMSLIDER_PARAMS ) { - SetValue( (UINT16)nCurrentZoom ); + SetValue( (sal_uInt16)nCurrentZoom ); maValues = aValues; - mnMinZoom = sal::static_int_cast< USHORT >( nMinZoom ); - mnMaxZoom = sal::static_int_cast< USHORT >( nMaxZoom ); + mnMinZoom = sal::static_int_cast< sal_uInt16 >( nMinZoom ); + mnMaxZoom = sal::static_int_cast< sal_uInt16 >( nMaxZoom ); return true; } @@ -218,7 +218,7 @@ bool SvxZoomSliderItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMe sal_Int32 nVal = 0; if ( rVal >>= nVal ) { - SetValue( (UINT16)nVal ); + SetValue( (sal_uInt16)nVal ); return true; } else @@ -241,7 +241,7 @@ bool SvxZoomSliderItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMe sal_Int32 nVal = 0; if( rVal >>= nVal ) { - mnMinZoom = (UINT16)nVal; + mnMinZoom = (sal_uInt16)nVal; return true; } else @@ -252,7 +252,7 @@ bool SvxZoomSliderItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMe sal_Int32 nVal = 0; if( rVal >>= nVal ) { - mnMaxZoom = (UINT16)nVal; + mnMaxZoom = (sal_uInt16)nVal; return true; } else |