diff options
Diffstat (limited to 'svtools/source/misc/unitconv.cxx')
| -rw-r--r-- | svtools/source/misc/unitconv.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/svtools/source/misc/unitconv.cxx b/svtools/source/misc/unitconv.cxx index 612bcb4f0221..fa92a6ecb0be 100644 --- a/svtools/source/misc/unitconv.cxx +++ b/svtools/source/misc/unitconv.cxx @@ -37,7 +37,7 @@ // ----------------------------------------------------------------------- -void SetFieldUnit( MetricField& rField, FieldUnit eUnit, BOOL bAll ) +void SetFieldUnit( MetricField& rField, FieldUnit eUnit, sal_Bool bAll ) { sal_Int64 nFirst = rField.Denormalize( rField.GetFirst( FUNIT_TWIP ) ); sal_Int64 nLast = rField.Denormalize( rField.GetLast( FUNIT_TWIP ) ); @@ -94,7 +94,7 @@ void SetFieldUnit( MetricField& rField, FieldUnit eUnit, BOOL bAll ) // ----------------------------------------------------------------------- -void SetFieldUnit( MetricBox& rBox, FieldUnit eUnit, BOOL bAll ) +void SetFieldUnit( MetricBox& rBox, FieldUnit eUnit, sal_Bool bAll ) { sal_Int64 nMin = rBox.Denormalize( rBox.GetMin( FUNIT_TWIP ) ); sal_Int64 nMax = rBox.Denormalize( rBox.GetMax( FUNIT_TWIP ) ); @@ -350,7 +350,7 @@ long ConvertValueToUnit( long nVal, SfxMapUnit eUnit ) // ----------------------------------------------------------------------- -long CalcToPoint( long nIn, SfxMapUnit eUnit, USHORT nFaktor ) +long CalcToPoint( long nIn, SfxMapUnit eUnit, sal_uInt16 nFaktor ) { DBG_ASSERT( eUnit == SFX_MAPUNIT_TWIP || eUnit == SFX_MAPUNIT_100TH_MM || @@ -722,8 +722,8 @@ long TransformMetric( long nVal, FieldUnit aOld, FieldUnit aNew ) return nVal; } - USHORT nOld = 0; - USHORT nNew = 0; + sal_uInt16 nOld = 0; + sal_uInt16 nNew = 0; switch ( aOld ) { |