diff options
author | Mikhail Voytenko <mav@openoffice.org> | 2011-01-10 16:11:35 +0100 |
---|---|---|
committer | Mikhail Voytenko <mav@openoffice.org> | 2011-01-10 16:11:35 +0100 |
commit | 71dc3c18c669b89c84c372bc730cc6dc7cc600e4 (patch) | |
tree | 10c7c3db906e41702a76f9856ad675300025c233 /svx/source/items/grfitem.cxx | |
parent | fbbfb5731d28118759aafe1a29a15bb71a2bc40f (diff) |
removetooltypes01: #i112600# remove tooltypes from svx
Diffstat (limited to 'svx/source/items/grfitem.cxx')
-rw-r--r-- | svx/source/items/grfitem.cxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/svx/source/items/grfitem.cxx b/svx/source/items/grfitem.cxx index 0d055de333..da39466001 100644 --- a/svx/source/items/grfitem.cxx +++ b/svx/source/items/grfitem.cxx @@ -44,13 +44,13 @@ using namespace ::com::sun::star; * Implementierung class SwCropGrf ******************************************************************************/ -SvxGrfCrop::SvxGrfCrop( USHORT nItemId ) +SvxGrfCrop::SvxGrfCrop( sal_uInt16 nItemId ) : SfxPoolItem( nItemId ), nLeft( 0 ), nRight( 0 ), nTop( 0 ), nBottom( 0 ) {} SvxGrfCrop::SvxGrfCrop( sal_Int32 nL, sal_Int32 nR, - sal_Int32 nT, sal_Int32 nB, USHORT nItemId ) + sal_Int32 nT, sal_Int32 nB, sal_uInt16 nItemId ) : SfxPoolItem( nItemId ), nLeft( nL ), nRight( nR ), nTop( nT ), nBottom( nB ) {} @@ -76,7 +76,7 @@ SfxPoolItem* SvxGrfCrop::Clone( SfxItemPool* ) const */ /* -USHORT SvxGrfCrop::GetVersion( USHORT nFFVer ) const +sal_uInt16 SvxGrfCrop::GetVersion( sal_uInt16 nFFVer ) const { DBG_ASSERT( SOFFICE_FILEFORMAT_31==nFFVer || SOFFICE_FILEFORMAT_40==nFFVer || @@ -86,9 +86,9 @@ USHORT SvxGrfCrop::GetVersion( USHORT nFFVer ) const } */ -SfxPoolItem* SvxGrfCrop::Create( SvStream& rStrm, USHORT nVersion ) const +SfxPoolItem* SvxGrfCrop::Create( SvStream& rStrm, sal_uInt16 nVersion ) const { - INT32 top, left, right, bottom; + sal_Int32 top, left, right, bottom; rStrm >> top >> left >> right >> bottom; if( GRFCROP_VERSION_SWDEFAULT == nVersion ) @@ -103,9 +103,9 @@ SfxPoolItem* SvxGrfCrop::Create( SvStream& rStrm, USHORT nVersion ) const } -SvStream& SvxGrfCrop::Store( SvStream& rStrm, USHORT nVersion ) const +SvStream& SvxGrfCrop::Store( SvStream& rStrm, sal_uInt16 nVersion ) const { - INT32 left = GetLeft(), right = GetRight(), + sal_Int32 left = GetLeft(), right = GetRight(), top = GetTop(), bottom = GetBottom(); if( GRFCROP_VERSION_SWDEFAULT == nVersion ) top = -top, bottom = -bottom, left = -left, right = -right; @@ -117,7 +117,7 @@ SvStream& SvxGrfCrop::Store( SvStream& rStrm, USHORT nVersion ) const -BOOL SvxGrfCrop::QueryValue( uno::Any& rVal, BYTE nMemberId ) const +sal_Bool SvxGrfCrop::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const { sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); nMemberId &= ~CONVERT_TWIPS; @@ -140,7 +140,7 @@ BOOL SvxGrfCrop::QueryValue( uno::Any& rVal, BYTE nMemberId ) const return sal_True; } -BOOL SvxGrfCrop::PutValue( const uno::Any& rVal, BYTE nMemberId ) +sal_Bool SvxGrfCrop::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) { sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); nMemberId &= ~CONVERT_TWIPS; |