diff options
Diffstat (limited to 'canvas/source')
| -rw-r--r-- | canvas/source/directx/dx_winstuff.hxx | 2 | ||||
| -rw-r--r-- | canvas/source/vcl/canvashelper.cxx | 2 | ||||
| -rw-r--r-- | canvas/source/vcl/canvashelper_texturefill.cxx | 12 | ||||
| -rw-r--r-- | canvas/source/vcl/impltools.cxx | 2 |
4 files changed, 8 insertions, 10 deletions
diff --git a/canvas/source/directx/dx_winstuff.hxx b/canvas/source/directx/dx_winstuff.hxx index 67cf1461f215..5ffd3abb6771 100644 --- a/canvas/source/directx/dx_winstuff.hxx +++ b/canvas/source/directx/dx_winstuff.hxx @@ -46,7 +46,6 @@ #define GradientStyle_RECT win32GradientStyle_RECT -#define Polygon win32Polygon #undef WB_LEFT #undef WB_RIGHT @@ -174,7 +173,6 @@ namespace dxcanvas #undef DELETE #undef GradientStyle_RECT -#undef Polygon #endif // INCLUDED_CANVAS_SOURCE_DIRECTX_DX_WINSTUFF_HXX diff --git a/canvas/source/vcl/canvashelper.cxx b/canvas/source/vcl/canvashelper.cxx index 73e09487253b..a671520ac5a3 100644 --- a/canvas/source/vcl/canvashelper.cxx +++ b/canvas/source/vcl/canvashelper.cxx @@ -259,7 +259,7 @@ namespace vclcanvas const Point& rEndPoint( tools::mapRealPoint2D( _aEndPoint, viewState, renderState ) ); - ::Polygon aPoly(4); + ::tools::Polygon aPoly(4); aPoly.SetPoint( rStartPoint, 0 ); aPoly.SetFlags( 0, POLY_NORMAL ); aPoly.SetPoint( rCtrlPoint1, 1 ); diff --git a/canvas/source/vcl/canvashelper_texturefill.cxx b/canvas/source/vcl/canvashelper_texturefill.cxx index 7e5828314850..e87a26b217a0 100644 --- a/canvas/source/vcl/canvashelper_texturefill.cxx +++ b/canvas/source/vcl/canvashelper_texturefill.cxx @@ -163,7 +163,7 @@ namespace vclcanvas // vertex values in the loop below (as ::Polygon is a // pimpl class, creating one every loop turn would really // stress the mem allocator) - ::Polygon aTempPoly( static_cast<sal_uInt16>(5) ); + ::tools::Polygon aTempPoly( static_cast<sal_uInt16>(5) ); OSL_ENSURE( nStepCount >= 3, "fillLinearGradient(): stepcount smaller than 3" ); @@ -335,7 +335,7 @@ namespace vclcanvas const sal_uInt32 nNumPoints( aOuterPoly.count() ); - ::Polygon aTempPoly( static_cast<sal_uInt16>(nNumPoints+1) ); + ::tools::Polygon aTempPoly( static_cast<sal_uInt16>(nNumPoints+1) ); // increase number of steps by one: polygonal gradients have // the outermost polygon rendered in rColor2, and the @@ -412,8 +412,8 @@ namespace vclcanvas // here, keep it all the way and only change the vertex values // in the loop below (as ::Polygon is a pimpl class, creating // one every loop turn would really stress the mem allocator) - ::tools::PolyPolygon aTempPolyPoly; - ::Polygon aTempPoly2( static_cast<sal_uInt16>(nNumPoints+1) ); + ::tools::PolyPolygon aTempPolyPoly; + ::tools::Polygon aTempPoly2( static_cast<sal_uInt16>(nNumPoints+1) ); aTempPoly2[0] = rBounds.TopLeft(); aTempPoly2[1] = rBounds.TopRight(); @@ -641,11 +641,11 @@ namespace vclcanvas rOutDev.DrawRect( vcl::unotools::rectangleFromB2DRectangle( aTextureDeviceRect ) ); rOutDev.SetLineColor( COL_BLUE ); - ::Polygon aPoly1( + ::tools::Polygon aPoly1( vcl::unotools::rectangleFromB2DRectangle( aRect )); ::basegfx::B2DPolygon aPoly2( aPoly1.getB2DPolygon() ); aPoly2.transform( aTextureTransform ); - ::Polygon aPoly3( aPoly2 ); + ::tools::Polygon aPoly3( aPoly2 ); rOutDev.DrawPolygon( aPoly3 ); } #endif diff --git a/canvas/source/vcl/impltools.cxx b/canvas/source/vcl/impltools.cxx index fe80ea4dbe28..e930b9ff0b3b 100644 --- a/canvas/source/vcl/impltools.cxx +++ b/canvas/source/vcl/impltools.cxx @@ -152,7 +152,7 @@ namespace vclcanvas if( rPolyPoly.Count() != 1 ) return false; - const ::Polygon& rPoly( rPolyPoly[0] ); + const ::tools::Polygon& rPoly( rPolyPoly[0] ); sal_uInt16 nCount( rPoly.GetSize() ); if( nCount < 4 ) |