diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2015-08-16 16:45:12 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2015-08-17 02:07:43 +0000 |
| commit | ef46917ff3163d3fdd5152bda5d16c4503b6ab69 (patch) | |
| tree | 73271cd339b19964bc91157207565595774e98b5 /sw/source/core/layout/paintfrm.cxx | |
| parent | 2ce903c7b2d67a46c2fe2755cfaa66d98f2eddf2 (diff) | |
Put Polygon from tools under tools:: namespace
Polygon is one of these names that Clash with some system objects
A similar work has been done earlier with PolyPolygon.
Change-Id: Icf2217cb2906292b7275760f1a16be0e150312f5
Reviewed-on: https://gerrit.libreoffice.org/17789
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Diffstat (limited to 'sw/source/core/layout/paintfrm.cxx')
| -rw-r--r-- | sw/source/core/layout/paintfrm.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx index aa562093383a..dc5847df166a 100644 --- a/sw/source/core/layout/paintfrm.cxx +++ b/sw/source/core/layout/paintfrm.cxx @@ -1929,10 +1929,10 @@ bool DrawFillAttributes( tools::PolyPolygon tempRegion; for (size_t i = 0; i < rPaintRegion.size(); ++i) { - tempRegion.Insert(Polygon(rPaintRegion[i].SVRect())); + tempRegion.Insert( tools::Polygon(rPaintRegion[i].SVRect())); } - basegfx::B2DPolyPolygon const maskRegion( - tempRegion.getB2DPolyPolygon()); + basegfx::B2DPolyPolygon const maskRegion( tempRegion.getB2DPolyPolygon()); + primitives.realloc(1); primitives[0] = new drawinglayer::primitive2d::MaskPrimitive2D( maskRegion, rSequence); @@ -2259,7 +2259,7 @@ void DrawGraphic( aTmpGrf.Intersection( rOut ); if ( aTmpGrf.HasArea() ) { - Polygon aGrfPoly( aTmpGrf.SVRect() ); + tools::Polygon aGrfPoly( aTmpGrf.SVRect() ); aDrawPoly.Insert( aGrfPoly ); } } @@ -6344,8 +6344,8 @@ static void lcl_paintBitmapExToRect(vcl::RenderContext *pOut, const Point& aPoin /*static*/ void SwPageFrm::PaintNotesSidebarArrows(const Point &aMiddleFirst, const Point &aMiddleSecond, SwViewShell* _pViewShell, const Color& rColorUp, const Color& rColorDown) { - Polygon aTriangleUp(3); - Polygon aTriangleDown(3); + tools::Polygon aTriangleUp(3); + tools::Polygon aTriangleDown(3); aTriangleUp.SetPoint(aMiddleFirst + Point(0,_pViewShell->GetOut()->PixelToLogic(Size(0,-3)).Height()),0); aTriangleUp.SetPoint(aMiddleFirst + Point(_pViewShell->GetOut()->PixelToLogic(Size(-3,0)).Width(),_pViewShell->GetOut()->PixelToLogic(Size(0,3)).Height()),1); |