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 /sfx2/source/control/templatecontaineritem.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 'sfx2/source/control/templatecontaineritem.cxx')
| -rw-r--r-- | sfx2/source/control/templatecontaineritem.cxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/sfx2/source/control/templatecontaineritem.cxx b/sfx2/source/control/templatecontaineritem.cxx index b4f2f6322e0e..25bd3a2d9055 100644 --- a/sfx2/source/control/templatecontaineritem.cxx +++ b/sfx2/source/control/templatecontaineritem.cxx @@ -76,17 +76,17 @@ void TemplateContainerItem::Paint (drawinglayer::processor2d::BaseProcessor2D *p if (mbHover) fTransparence = pAttrs->fHighlightTransparence; - aSeq[nCount++] = drawinglayer::primitive2d::Primitive2DReference( new PolyPolygonSelectionPrimitive2D( - B2DPolyPolygon(Polygon(maDrawArea,5,5).getB2DPolygon()), - aFillColor, - fTransparence, - 0.0, - true)); + aSeq[nCount++] = drawinglayer::primitive2d::Primitive2DReference( + new PolyPolygonSelectionPrimitive2D( B2DPolyPolygon( ::tools::Polygon(maDrawArea,5,5).getB2DPolygon()), + aFillColor, + fTransparence, + 0.0, + true)); // Create rounded rectangle border - aSeq[nCount++] = drawinglayer::primitive2d::Primitive2DReference(new PolygonStrokePrimitive2D( - Polygon(maThumbnailArea, 5, 5).getB2DPolygon(), - LineAttribute(BColor(0.5, 0.5, 0.5), 2.0))); + aSeq[nCount++] = drawinglayer::primitive2d::Primitive2DReference( + new PolygonStrokePrimitive2D( ::tools::Polygon(maThumbnailArea, 5, 5).getB2DPolygon(), + LineAttribute(BColor(0.5, 0.5, 0.5), 2.0))); // Paint the thumbnails side by side on a 2x2 grid long nThumbPadding = 4; |