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
---
 vcl/source/window/window.cxx | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'vcl/source/window/window.cxx')

diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index e04def3b9e39..9fa514680d8f 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -573,8 +573,8 @@ Window::~Window()
 WindowImpl::WindowImpl( WindowType nType )
 {
     maZoom                              = Fraction( 1, 1 );
-    maWinRegion                         = Region(true);
-    maWinClipRegion                     = Region(true);
+    maWinRegion                         = vcl::Region(true);
+    maWinClipRegion                     = vcl::Region(true);
     mpWinData                           = NULL;                      // Extra Window Data, that we dont need for all windows
     mpOverlapData                       = NULL;                      // Overlap Data
     mpFrameData                         = NULL;                      // Frame Data
@@ -1499,8 +1499,8 @@ void Window::ImplPosSizeWindow( long nX, long nY,
     long    nOldOutOffY     = mnOutOffY;
     long    nOldOutWidth    = mnOutWidth;
     long    nOldOutHeight   = mnOutHeight;
-    Region* pOverlapRegion  = NULL;
-    Region* pOldRegion      = NULL;
+    vcl::Region* pOverlapRegion  = NULL;
+    vcl::Region* pOldRegion      = NULL;
 
     if ( IsReallyVisible() )
     {
@@ -1509,7 +1509,7 @@ void Window::ImplPosSizeWindow( long nX, long nY,
 
         Rectangle aOldWinRect( Point( nOldOutOffX, nOldOutOffY ),
                                Size( nOldOutWidth, nOldOutHeight ) );
-        pOldRegion = new Region( aOldWinRect );
+        pOldRegion = new vcl::Region( aOldWinRect );
         if ( mpWindowImpl->mbWinRegion )
             pOldRegion->Intersect( ImplPixelToDevicePixel( mpWindowImpl->maWinRegion ) );
 
@@ -1594,7 +1594,7 @@ void Window::ImplPosSizeWindow( long nX, long nY,
         {
             if ( bCopyBits && !pOverlapRegion )
             {
-                pOverlapRegion = new Region();
+                pOverlapRegion = new vcl::Region();
                 ImplCalcOverlapRegion( Rectangle( Point( mnOutOffX, mnOutOffY ),
                                                   Size( mnOutWidth, mnOutHeight ) ),
                                        *pOverlapRegion, false, true, true );
@@ -1612,7 +1612,7 @@ void Window::ImplPosSizeWindow( long nX, long nY,
         {
             if ( bCopyBits && !pOverlapRegion )
             {
-                pOverlapRegion = new Region();
+                pOverlapRegion = new vcl::Region();
                 ImplCalcOverlapRegion( Rectangle( Point( mnOutOffX, mnOutOffY ),
                                                   Size( mnOutWidth, mnOutHeight ) ),
                                        *pOverlapRegion, false, true, true );
@@ -1704,7 +1704,7 @@ void Window::ImplPosSizeWindow( long nX, long nY,
                     if ( bCopyBits && bParentPaint && !HasPaintEvent() )
                     {
                         Point aPoint( mnOutOffX, mnOutOffY );
-                        Region aRegion( Rectangle( aPoint,
+                        vcl::Region aRegion( Rectangle( aPoint,
                                                    Size( mnOutWidth, mnOutHeight ) ) );
                         if ( mpWindowImpl->mbWinRegion )
                             aRegion.Intersect( ImplPixelToDevicePixel( mpWindowImpl->maWinRegion ) );
@@ -1756,7 +1756,7 @@ void Window::ImplPosSizeWindow( long nX, long nY,
                 else
                 {
                     Point aPoint( mnOutOffX, mnOutOffY );
-                    Region aRegion( Rectangle( aPoint,
+                    vcl::Region aRegion( Rectangle( aPoint,
                                                Size( mnOutWidth, mnOutHeight ) ) );
                     aRegion.Exclude( *pOldRegion );
                     if ( mpWindowImpl->mbWinRegion )
@@ -1771,7 +1771,7 @@ void Window::ImplPosSizeWindow( long nX, long nY,
             if ( bNewPos ||
                  (mnOutWidth < nOldOutWidth) || (mnOutHeight < nOldOutHeight) )
             {
-                Region aRegion( *pOldRegion );
+                vcl::Region aRegion( *pOldRegion );
                 if ( !mpWindowImpl->mbPaintTransparent )
                     ImplExcludeWindowRegion( aRegion );
                 ImplClipBoundaries( aRegion, false, true );
@@ -2263,7 +2263,7 @@ void Window::Show( bool bVisible, sal_uInt16 nFlags )
 
         if ( mpWindowImpl->mbReallyVisible )
         {
-            Region  aInvRegion;
+            vcl::Region  aInvRegion;
             bool    bSaveBack = false;
 
             if ( ImplIsOverlapWindow() && !mpWindowImpl->mbFrame )
-- 
cgit