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 /reportdesign | |
| 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 'reportdesign')
| -rw-r--r-- | reportdesign/source/ui/report/EndMarker.cxx | 4 | ||||
| -rw-r--r-- | reportdesign/source/ui/report/StartMarker.cxx | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/reportdesign/source/ui/report/EndMarker.cxx b/reportdesign/source/ui/report/EndMarker.cxx index a16d89b5b10c..0be8a7341d36 100644 --- a/reportdesign/source/ui/report/EndMarker.cxx +++ b/reportdesign/source/ui/report/EndMarker.cxx @@ -53,7 +53,7 @@ void OEndMarker::Paint(vcl::RenderContext& rRenderContext, const Rectangle& /*rR aSize.Width() += nCornerSpace; Rectangle aWholeRect(Point(-nCornerSpace,0),aSize); tools::PolyPolygon aPoly; - aPoly.Insert(Polygon(aWholeRect,nCornerSpace,nCornerSpace)); + aPoly.Insert( tools::Polygon(aWholeRect,nCornerSpace,nCornerSpace)); Color aStartColor(m_nColor); aStartColor.IncreaseLuminance(10); @@ -73,7 +73,7 @@ void OEndMarker::Paint(vcl::RenderContext& rRenderContext, const Rectangle& /*rR Size(aSize.Width() - nCornerSpace, aSize.Height() - nCornerSpace - nCornerSpace)); ColorChanger aColors(this, COL_WHITE, COL_WHITE); - rRenderContext.DrawPolyLine(Polygon(PixelToLogic(aRect)), LineInfo(LINE_SOLID, 2)); + rRenderContext.DrawPolyLine( tools::Polygon(PixelToLogic(aRect)), LineInfo(LINE_SOLID, 2)); } } diff --git a/reportdesign/source/ui/report/StartMarker.cxx b/reportdesign/source/ui/report/StartMarker.cxx index dc2b4fe8f744..4dde6f5fb5d1 100644 --- a/reportdesign/source/ui/report/StartMarker.cxx +++ b/reportdesign/source/ui/report/StartMarker.cxx @@ -127,7 +127,7 @@ void OStartMarker::Paint(vcl::RenderContext& rRenderContext, const Rectangle& /* { const ColorChanger aColors(&rRenderContext, m_nTextBoundaries, m_nColor); tools::PolyPolygon aPoly; - aPoly.Insert(Polygon(aWholeRect,nCornerWidth,nCornerWidth)); + aPoly.Insert( tools::Polygon(aWholeRect,nCornerWidth,nCornerWidth)); Color aStartColor(m_nColor); aStartColor.IncreaseLuminance(10); @@ -149,7 +149,7 @@ void OStartMarker::Paint(vcl::RenderContext& rRenderContext, const Rectangle& /* Size(aSize.Width() - nCornerWidth - nCornerWidth, aSize.Height() - nCornerHeight - nCornerHeight)); ColorChanger aColors(&rRenderContext, COL_WHITE, COL_WHITE); - rRenderContext.DrawPolyLine(Polygon(rRenderContext.PixelToLogic(aRect)), + rRenderContext.DrawPolyLine( tools::Polygon(rRenderContext.PixelToLogic(aRect)), LineInfo(LINE_SOLID, 2)); } } |