diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-08-16 16:27:55 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-08-17 11:25:21 +0200 |
| commit | 2e8acde112e1c6754df26902e79a78346ba45a2d (patch) | |
| tree | 2d836747a7aafdd0b64ab9aabf01be59e94745d4 /svx/source/customshapes | |
| parent | 006a7b50546c57e260245d4630de565705f2fc38 (diff) | |
remove UL/L suffixes from integer constants on the RHS of expressions
Change-Id: I899a8126c9d971601fea6c77eca165718aea0ac5
Reviewed-on: https://gerrit.libreoffice.org/41237
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svx/source/customshapes')
| -rw-r--r-- | svx/source/customshapes/EnhancedCustomShape2d.cxx | 12 | ||||
| -rw-r--r-- | svx/source/customshapes/EnhancedCustomShape3d.cxx | 8 |
2 files changed, 10 insertions, 10 deletions
diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx b/svx/source/customshapes/EnhancedCustomShape2d.cxx index 3fc59dcdaf6a..630a2a4cf39d 100644 --- a/svx/source/customshapes/EnhancedCustomShape2d.cxx +++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx @@ -1507,7 +1507,7 @@ void EnhancedCustomShape2d::CreateSubPath( sal_Int32& rSrcPt, sal_Int32& rSegmen break; case MOVETO : { - if(aNewB2DPolygon.count() > 1L) + if(aNewB2DPolygon.count() > 1) { // #i76201# Add conversion to closed polygon when first and last points are equal basegfx::tools::checkClosed(aNewB2DPolygon); @@ -1533,7 +1533,7 @@ void EnhancedCustomShape2d::CreateSubPath( sal_Int32& rSrcPt, sal_Int32& rSegmen { if(aNewB2DPolygon.count()) { - if(aNewB2DPolygon.count() > 1L) + if(aNewB2DPolygon.count() > 1) { aNewB2DPolygon.setClosed(true); aNewB2DPolyPolygon.append(aNewB2DPolygon); @@ -1564,7 +1564,7 @@ void EnhancedCustomShape2d::CreateSubPath( sal_Int32& rSrcPt, sal_Int32& rSegmen { if ( nPntCount ) { - if(aNewB2DPolygon.count() > 1L) + if(aNewB2DPolygon.count() > 1) { // #i76201# Add conversion to closed polygon when first and last points are equal basegfx::tools::checkClosed(aNewB2DPolygon); @@ -1771,7 +1771,7 @@ void EnhancedCustomShape2d::CreateSubPath( sal_Int32& rSrcPt, sal_Int32& rSegmen case ARC : case CLOCKWISEARC : { - if(aNewB2DPolygon.count() > 1L) + if(aNewB2DPolygon.count() > 1) { // #i76201# Add conversion to closed polygon when first and last points are equal basegfx::tools::checkClosed(aNewB2DPolygon); @@ -1952,7 +1952,7 @@ void EnhancedCustomShape2d::CreateSubPath( sal_Int32& rSrcPt, sal_Int32& rSegmen if ( rSegmentInd == nSegInfoSize ) rSegmentInd++; - if(aNewB2DPolygon.count() > 1L) + if(aNewB2DPolygon.count() > 1) { // #i76201# Add conversion to closed polygon when first and last points are equal basegfx::tools::checkClosed(aNewB2DPolygon); @@ -2265,7 +2265,7 @@ SdrObject* EnhancedCustomShape2d::CreatePathObj( bool bLineGeometryNeededOnly ) vObjectList = vTempList; } - if(1L == vObjectList.size()) + if(1 == vObjectList.size()) { // a single object, correct some values AdaptObjColor(*vObjectList[0L],rCustomShapeSet,nColorIndex,nColorCount); diff --git a/svx/source/customshapes/EnhancedCustomShape3d.cxx b/svx/source/customshapes/EnhancedCustomShape3d.cxx index 1fad3815f146..f669338274b2 100644 --- a/svx/source/customshapes/EnhancedCustomShape3d.cxx +++ b/svx/source/customshapes/EnhancedCustomShape3d.cxx @@ -214,7 +214,7 @@ basegfx::B3DPolygon EnhancedCustomShape3d::Transformation2D::ApplySkewSettings( basegfx::B3DPolygon aRetval; sal_uInt32 j; - for ( j = 0L; j < rPoly3D.count(); j++ ) + for ( j = 0; j < rPoly3D.count(); j++ ) { const basegfx::B3DPoint aPoint(rPoly3D.getB3DPoint(j)); double fDepth(-( aPoint.getZ() * fSkew ) / 100.0); @@ -748,12 +748,12 @@ tools::Rectangle EnhancedCustomShape3d::CalculateNewSnapRect( const SdrObject* p basegfx::B3DPolygon aBoundVolume; const tools::Polygon aPolygon( rBoundRect ); - for ( i = 0L; i < 4L; i++ ) + for ( i = 0; i < 4; i++ ) { aBoundVolume.append(basegfx::B3DPoint(aPolygon[ (sal_uInt16)i ].X() - aCenter.X(), aPolygon[ (sal_uInt16)i ].Y() - aCenter.Y(), fExtrusionForward)); } - for ( i = 0L; i < 4L; i++ ) + for ( i = 0; i < 4; i++ ) { aBoundVolume.append(basegfx::B3DPoint(aPolygon[ (sal_uInt16)i ].X() - aCenter.X(), aPolygon[ (sal_uInt16)i ].Y() - aCenter.Y(), fExtrusionBackward)); } @@ -786,7 +786,7 @@ tools::Rectangle EnhancedCustomShape3d::CalculateNewSnapRect( const SdrObject* p aBoundVolume = aTransformation2D.ApplySkewSettings( aBoundVolume ); tools::Polygon aTransformed( 8 ); - for ( i = 0L; i < 8L; i++ ) + for ( i = 0; i < 8; i++ ) aTransformed[ (sal_uInt16)i ] = aTransformation2D.Transform2D( aBoundVolume.getB3DPoint( i ) ); return aTransformed.GetBoundRect(); |