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 /extensions/source | |
| 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 'extensions/source')
| -rw-r--r-- | extensions/source/update/ui/updatecheckui.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/extensions/source/update/ui/updatecheckui.cxx b/extensions/source/update/ui/updatecheckui.cxx index 03d8b21e155d..d2ce4062dca8 100644 --- a/extensions/source/update/ui/updatecheckui.cxx +++ b/extensions/source/update/ui/updatecheckui.cxx @@ -90,9 +90,9 @@ namespace class BubbleWindow : public FloatingWindow { Point maTipPos; - vcl::Region maBounds; - Polygon maRectPoly; - Polygon maTriPoly; + vcl::Region maBounds; + tools::Polygon maRectPoly; + tools::Polygon maTriPoly; OUString maBubbleTitle; OUString maBubbleText; Image maBubbleImage; @@ -785,7 +785,7 @@ void BubbleWindow::Resize() return; Rectangle aRect( 0, TIP_HEIGHT, aSize.Width(), aSize.Height() - TIP_HEIGHT ); - maRectPoly = Polygon( aRect, 6, 6 ); + maRectPoly = tools::Polygon( aRect, 6, 6 ); vcl::Region aRegion( maRectPoly ); long nTipOffset = aSize.Width() - TIP_RIGHT_OFFSET + mnTipOffset; @@ -794,7 +794,7 @@ void BubbleWindow::Resize() aPointArr[1] = Point( nTipOffset, 0 ); aPointArr[2] = Point( nTipOffset + TIP_WIDTH , TIP_HEIGHT ); aPointArr[3] = Point( nTipOffset, TIP_HEIGHT ); - maTriPoly = Polygon( 4, aPointArr ); + maTriPoly = tools::Polygon( 4, aPointArr ); vcl::Region aTriRegion( maTriPoly ); aRegion.Union( aTriRegion); |