fdo#82577: Handle Region

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

Change-Id: I6e008111df7cf37121fbc3eaabd44a8306338291

6 files changed, 14 insertions, 14 deletions

diff --git a/canvas/source/cairo/cairo_canvashelper_text.cxx b/canvas/source/cairo/cairo_canvashelper_text.cxx
index 4e489f435221..41f2f85d4538 100644
--- a/canvas/source/cairo/cairo_canvashelper_text.cxx
+++ b/canvas/source/cairo/cairo_canvashelper_text.cxx
@@ -131,7 +131,7 @@ namespace cairocanvas
         // accumulate non-empty clips into one region
         // ==========================================
 
-        Region aClipRegion;
+        vcl::Region aClipRegion;
 
         if( viewState.Clip.is() )
         {
@@ -147,7 +147,7 @@ namespace cairocanvas
                     ::basegfx::unotools::homMatrixFromAffineMatrix( aMatrix,
                                                                     viewState.AffineTransform ) );
 
-                aClipRegion = Region::GetRegionFromPolyPolygon( ::PolyPolygon( aClipPoly ) );
+                aClipRegion = vcl::Region::GetRegionFromPolyPolygon( ::PolyPolygon( aClipPoly ) );
             }
         }
 
@@ -166,7 +166,7 @@ namespace cairocanvas
             if( aClipPoly.count() )
             {
                 // setup non-empty clipping
-                Region aRegion = Region::GetRegionFromPolyPolygon( ::PolyPolygon( aClipPoly ) );
+                vcl::Region aRegion = vcl::Region::GetRegionFromPolyPolygon( ::PolyPolygon( aClipPoly ) );
 
                 if( aClipRegion.IsEmpty() )
                     aClipRegion = aRegion;
diff --git a/canvas/source/directx/dx_textlayout_drawhelper.cxx b/canvas/source/directx/dx_textlayout_drawhelper.cxx
index 19345b6e2dd9..b565d8c598a4 100644
--- a/canvas/source/directx/dx_textlayout_drawhelper.cxx
+++ b/canvas/source/directx/dx_textlayout_drawhelper.cxx
@@ -171,7 +171,7 @@ namespace dxcanvas
                 }
 
                 aClipPoly.transform(aMatrix);
-                const Region& rClipRegion = Region(PolyPolygon(aClipPoly));
+                const vcl::Region& rClipRegion = vcl::Region(PolyPolygon(aClipPoly));
                 aVirtualDevice.IntersectClipRegion(rClipRegion);
             }
 
@@ -179,7 +179,7 @@ namespace dxcanvas
             {
                 ::basegfx::B2DPolyPolygon aClipPoly(dxcanvas::tools::polyPolygonFromXPolyPolygon2D(rRenderState.Clip));
                 aClipPoly.transform(aWorldTransform);
-                const Region& rClipRegion = Region(PolyPolygon(aClipPoly));
+                const vcl::Region& rClipRegion = vcl::Region(PolyPolygon(aClipPoly));
                 aVirtualDevice.IntersectClipRegion(rClipRegion);
             }
 
diff --git a/canvas/source/vcl/canvashelper.cxx b/canvas/source/vcl/canvashelper.cxx
index 116b4ac116c0..29e4dadb66d0 100644
--- a/canvas/source/vcl/canvashelper.cxx
+++ b/canvas/source/vcl/canvashelper.cxx
@@ -1232,7 +1232,7 @@ namespace vclcanvas
         // accumulate non-empty clips into one region
         // ==========================================
 
-        Region aClipRegion(true);
+        vcl::Region aClipRegion(true);
 
         if( viewState.Clip.is() )
         {
@@ -1247,7 +1247,7 @@ namespace vclcanvas
                     ::basegfx::unotools::homMatrixFromAffineMatrix( aMatrix,
                                                                     viewState.AffineTransform ) );
 
-                aClipRegion = Region::GetRegionFromPolyPolygon( ::PolyPolygon( aClipPoly ) );
+                aClipRegion = vcl::Region::GetRegionFromPolyPolygon( ::PolyPolygon( aClipPoly ) );
             }
             else
             {
@@ -1270,7 +1270,7 @@ namespace vclcanvas
             if( aClipPoly.count() )
             {
                 // setup non-empty clipping
-                Region aRegion = Region::GetRegionFromPolyPolygon( ::PolyPolygon( aClipPoly ) );
+                vcl::Region aRegion = vcl::Region::GetRegionFromPolyPolygon( ::PolyPolygon( aClipPoly ) );
                 aClipRegion.Intersect( aRegion );
             }
             else
diff --git a/canvas/source/vcl/canvashelper_texturefill.cxx b/canvas/source/vcl/canvashelper_texturefill.cxx
index d6397c03cd5b..103302593f6f 100644
--- a/canvas/source/vcl/canvashelper_texturefill.cxx
+++ b/canvas/source/vcl/canvashelper_texturefill.cxx
@@ -607,7 +607,7 @@ namespace vclcanvas
             }
             else
             {
-                const Region aPolyClipRegion( rPoly );
+                const vcl::Region aPolyClipRegion( rPoly );
 
                 rOutDev.Push( PUSH_CLIPREGION );
                 rOutDev.SetClipRegion( aPolyClipRegion );
@@ -1034,7 +1034,7 @@ namespace vclcanvas
                             aPolyPoly.Translate( ::Point( -aPolygonDeviceRect.Left(),
                                                           -aPolygonDeviceRect.Top() ) );
 
-                            const Region aPolyClipRegion( aPolyPoly );
+                            const vcl::Region aPolyClipRegion( aPolyPoly );
 
                             aVDev.SetClipRegion( aPolyClipRegion );
                             textureFill( aVDev,
@@ -1069,7 +1069,7 @@ namespace vclcanvas
                         }
                         else
                         {
-                            const Region aPolyClipRegion( aPolyPoly );
+                            const vcl::Region aPolyClipRegion( aPolyPoly );
 
                             rOutDev.Push( PUSH_CLIPREGION );
                             rOutDev.SetClipRegion( aPolyClipRegion );
diff --git a/canvas/source/vcl/spritecanvashelper.cxx b/canvas/source/vcl/spritecanvashelper.cxx
index 08c532cc8421..dd4fd2bac735 100644
--- a/canvas/source/vcl/spritecanvashelper.cxx
+++ b/canvas/source/vcl/spritecanvashelper.cxx
@@ -89,7 +89,7 @@ namespace vclcanvas
             // scrolled sprite content outside this area)
             rOutDev.EnableMapMode( false );
             rOutDev.SetAntialiasing( ANTIALIASING_ENABLE_B2DDRAW );
-            rOutDev.SetClipRegion(Region(rRequestedArea));
+            rOutDev.SetClipRegion(vcl::Region(rRequestedArea));
 
             // repaint affected sprite directly to output device (at
             // the actual screen output position)
@@ -275,7 +275,7 @@ namespace vclcanvas
             // clips. besides that, will interfere with animations (as for
             // Window-invalidate repaints, only parts of the window will
             // be redrawn otherwise)
-            const Region aFullWindowRegion( Rectangle(aEmptyPoint,
+            const vcl::Region aFullWindowRegion( Rectangle(aEmptyPoint,
                                                       aOutDevSize) );
             pTargetWindow->ExpandPaintClipRegion(aFullWindowRegion);
         }
diff --git a/canvas/source/vcl/spritehelper.cxx b/canvas/source/vcl/spritehelper.cxx
index 0bda848d1f57..ebbd8142d75c 100644
--- a/canvas/source/vcl/spritehelper.cxx
+++ b/canvas/source/vcl/spritehelper.cxx
@@ -262,7 +262,7 @@ namespace vclcanvas
                             rTargetSurface.DrawPolyPolygon(PolyPolygon(aClipPoly)); // #i76339#
                         }
 
-                        Region aClipRegion( aClipPoly );
+                        vcl::Region aClipRegion( aClipPoly );
                         rTargetSurface.SetClipRegion( aClipRegion );
                     }
                 }