diff options
Diffstat (limited to 'vcl/source/gdi/graphictools.cxx')
-rw-r--r-- | vcl/source/gdi/graphictools.cxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/vcl/source/gdi/graphictools.cxx b/vcl/source/gdi/graphictools.cxx index 08533663c562..2e20a3639790 100644 --- a/vcl/source/gdi/graphictools.cxx +++ b/vcl/source/gdi/graphictools.cxx @@ -35,7 +35,7 @@ static ::rtl::OString polyToString( const Polygon& rPoly ) { ::rtl::OString aStr; - USHORT nVertex; + sal_uInt16 nVertex; for(nVertex=0; nVertex<rPoly.GetSize(); ++nVertex) { aStr += "("; @@ -67,7 +67,7 @@ static ::rtl::OString polyToString( const Polygon& rPoly ) static ::rtl::OString polyPolyToString( const PolyPolygon& rPolyPoly ) { ::rtl::OString aStr; - USHORT nPoly; + sal_uInt16 nPoly; for(nPoly=0; nPoly<rPolyPoly.Count(); ++nPoly) { const Polygon& rPoly = rPolyPoly[nPoly]; @@ -328,9 +328,9 @@ SvStream& operator<<( SvStream& rOStm, const SvtGraphicStroke& rClass ) rClass.maEndArrow.Write( rOStm ); rOStm << rClass.mfTransparency; rOStm << rClass.mfStrokeWidth; - UINT16 nTmp = sal::static_int_cast<UINT16>( rClass.maCapType ); + sal_uInt16 nTmp = sal::static_int_cast<sal_uInt16>( rClass.maCapType ); rOStm << nTmp; - nTmp = sal::static_int_cast<UINT16>( rClass.maJoinType ); + nTmp = sal::static_int_cast<sal_uInt16>( rClass.maJoinType ); rOStm << nTmp; rOStm << rClass.mfMiterLimit; @@ -351,7 +351,7 @@ SvStream& operator>>( SvStream& rIStm, SvtGraphicStroke& rClass ) rClass.maEndArrow.Read( rIStm ); rIStm >> rClass.mfTransparency; rIStm >> rClass.mfStrokeWidth; - UINT16 nTmp; + sal_uInt16 nTmp; rIStm >> nTmp; rClass.maCapType = SvtGraphicStroke::CapType(nTmp); rIStm >> nTmp; @@ -707,19 +707,19 @@ SvStream& operator<<( SvStream& rOStm, const SvtGraphicFill& rClass ) rClass.maPath.Write( rOStm ); rOStm << rClass.maFillColor; rOStm << rClass.mfTransparency; - UINT16 nTmp = sal::static_int_cast<UINT16>( rClass.maFillRule ); + sal_uInt16 nTmp = sal::static_int_cast<sal_uInt16>( rClass.maFillRule ); rOStm << nTmp; - nTmp = sal::static_int_cast<UINT16>( rClass.maFillType ); + nTmp = sal::static_int_cast<sal_uInt16>( rClass.maFillType ); rOStm << nTmp; int i; for(i=0; i<SvtGraphicFill::Transform::MatrixSize; ++i) rOStm << rClass.maFillTransform.matrix[i]; nTmp = rClass.mbTiling; rOStm << nTmp; - nTmp = sal::static_int_cast<UINT16>( rClass.maHatchType ); + nTmp = sal::static_int_cast<sal_uInt16>( rClass.maHatchType ); rOStm << nTmp; rOStm << rClass.maHatchColor; - nTmp = sal::static_int_cast<UINT16>( rClass.maGradientType ); + nTmp = sal::static_int_cast<sal_uInt16>( rClass.maGradientType ); rOStm << nTmp; rOStm << rClass.maGradient1stColor; rOStm << rClass.maGradient2ndColor; @@ -736,7 +736,7 @@ SvStream& operator>>( SvStream& rIStm, SvtGraphicFill& rClass ) rClass.maPath.Read( rIStm ); rIStm >> rClass.maFillColor; rIStm >> rClass.mfTransparency; - UINT16 nTmp; + sal_uInt16 nTmp; rIStm >> nTmp; rClass.maFillRule = SvtGraphicFill::FillRule( nTmp ); rIStm >> nTmp; |