fdo#82577: Handle Region

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

Change-Id: I6e008111df7cf37121fbc3eaabd44a8306338291

2 files changed, 11 insertions, 11 deletions

diff --git a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
index 5cad9d63da67..8d7032505268 100644
--- a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
@@ -361,20 +361,20 @@ namespace
 
 namespace
 {
-    /** helper to convert a Region to a B2DPolyPolygon
+    /** helper to convert a vcl::Region to a B2DPolyPolygon
         when it does not yet contain one. In the future
         this may be expanded to merge the polygons created
         from rectangles or use a special algo to directly turn
         the spans of regions to a single, already merged
         PolyPolygon.
      */
-    basegfx::B2DPolyPolygon getB2DPolyPolygonFromRegion(const Region& rRegion)
+    basegfx::B2DPolyPolygon getB2DPolyPolygonFromRegion(const vcl::Region& rRegion)
     {
         basegfx::B2DPolyPolygon aRetval;
 
         if(!rRegion.IsEmpty())
         {
-            Region aRegion(rRegion);
+            vcl::Region aRegion(rRegion);
 
             aRetval = aRegion.GetAsB2DPolyPolygon();
         }
@@ -940,9 +940,9 @@ namespace
     }
 
     /** helper to take needed action on ClipRegion change. This method needs to be called
-        on any Region change, e.g. at the obvious actions doing this, but also at pop-calls
-        which change the Region of the current context. It takes care of creating the
-        current embeddec context, set the new Region at the context and eventually prepare
+        on any vcl::Region change, e.g. at the obvious actions doing this, but also at pop-calls
+        which change the vcl::Region of the current context. It takes care of creating the
+        current embeddec context, set the new vcl::Region at the context and eventually prepare
         a new target for embracing new geometry to the current region
      */
     void HandleNewClipRegion(
@@ -1608,9 +1608,9 @@ namespace
 
         It tries to handle clipping no longer as Regions and spans of Rectangles, but as PolyPolygon
         ClipRegions with (where possible) high precision by using the best possible data quality
-        from the Region. The Region is unavoidable as data container, but nowadays allows the transport
+        from the Region. The vcl::Region is unavoidable as data container, but nowadays allows the transport
         of Polygon-based clip regions. Where this is not used, a Polygon is constructed from the
-        Region ranges. All primitive clipping uses the MaskPrimitive2D with Polygon-based clipping.
+        vcl::Region ranges. All primitive clipping uses the MaskPrimitive2D with Polygon-based clipping.
 
         I have marked the single MetaActions with:
 
@@ -2505,7 +2505,7 @@ namespace
                 {
                     /** CHECKED, WORKS WELL */
                     const MetaISectRegionClipRegionAction* pA = (const MetaISectRegionClipRegionAction*)pAction;
-                    const Region& rNewRegion = pA->GetRegion();
+                    const vcl::Region& rNewRegion = pA->GetRegion();
 
                     if(rNewRegion.IsEmpty())
                     {
diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
index bc72beae0fbd..5e368fba4bf5 100644
--- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
@@ -1782,10 +1782,10 @@ namespace drawinglayer
                             if(maClipPolyPolygon.count())
                             {
                                 // set VCL clip region; subdivide before conversion to tools polygon. Subdivision necessary (!)
-                                // Removed subdivision and fixed in Region::ImplPolyPolyRegionToBandRegionFunc() in VCL where
+                                // Removed subdivision and fixed in vcl::Region::ImplPolyPolyRegionToBandRegionFunc() in VCL where
                                 // the ClipRegion is built from the Polygon. A AdaptiveSubdivide on the source polygon was missing there
                                 mpOutputDevice->Push(PUSH_CLIPREGION);
-                                mpOutputDevice->SetClipRegion(Region(maClipPolyPolygon));
+                                mpOutputDevice->SetClipRegion(vcl::Region(maClipPolyPolygon));
 
                                 // recursively paint content
                                 // #i121267# Only need to process sub-content when clip polygon is *not* empty.