From 8dbde0845a3989528614addb9bd0333f60c522a5 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel@peralex.com>
Date: Sat, 27 Sep 2014 14:52:40 +0200
Subject: fdo#82577: Handle Region

Put the VCL Region class in the vcl namespace. Avoids clash with the X11
Region typedef.

Change-Id: I6e008111df7cf37121fbc3eaabd44a8306338291
---
 extensions/source/update/ui/updatecheckui.cxx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'extensions/source/update')

diff --git a/extensions/source/update/ui/updatecheckui.cxx b/extensions/source/update/ui/updatecheckui.cxx
index 38a7bd155b80..15209ce723ce 100644
--- a/extensions/source/update/ui/updatecheckui.cxx
+++ b/extensions/source/update/ui/updatecheckui.cxx
@@ -89,7 +89,7 @@ namespace
 class BubbleWindow : public FloatingWindow
 {
     Point           maTipPos;
-    Region          maBounds;
+    vcl::Region          maBounds;
     Polygon         maRectPoly;
     Polygon         maTriPoly;
     OUString        maBubbleTitle;
@@ -792,7 +792,7 @@ void BubbleWindow::Resize()
 
     Rectangle aRect( 0, TIP_HEIGHT, aSize.Width(), aSize.Height() - TIP_HEIGHT );
     maRectPoly = Polygon( aRect, 6, 6 );
-    Region aRegion( maRectPoly );
+    vcl::Region aRegion( maRectPoly );
     long nTipOffset = aSize.Width() - TIP_RIGHT_OFFSET + mnTipOffset;
 
     Point aPointArr[4];
@@ -801,7 +801,7 @@ void BubbleWindow::Resize()
     aPointArr[2] = Point( nTipOffset + TIP_WIDTH , TIP_HEIGHT );
     aPointArr[3] = Point( nTipOffset, TIP_HEIGHT );
      maTriPoly = Polygon( 4, aPointArr );
-    Region aTriRegion( maTriPoly );
+    vcl::Region aTriRegion( maTriPoly );
 
     aRegion.Union( aTriRegion);
     maBounds = aRegion;
-- 
cgit