fdo#82577: Handle Region

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

Change-Id: I6e008111df7cf37121fbc3eaabd44a8306338291

4 files changed, 12 insertions, 12 deletions

diff --git a/svx/source/sdr/contact/displayinfo.cxx b/svx/source/sdr/contact/displayinfo.cxx
index 052c9a5d0ba9..4b9f2f41ee91 100644
--- a/svx/source/sdr/contact/displayinfo.cxx
+++ b/svx/source/sdr/contact/displayinfo.cxx
@@ -46,7 +46,7 @@ namespace sdr
         }
 
         // access to RedrawArea
-        void DisplayInfo::SetRedrawArea(const Region& rRegion)
+        void DisplayInfo::SetRedrawArea(const vcl::Region& rRegion)
         {
             maRedrawArea = rRegion;
         }
diff --git a/svx/source/sdr/contact/objectcontactofpageview.cxx b/svx/source/sdr/contact/objectcontactofpageview.cxx
index 8894d9910c06..f778df103307 100644
--- a/svx/source/sdr/contact/objectcontactofpageview.cxx
+++ b/svx/source/sdr/contact/objectcontactofpageview.cxx
@@ -156,7 +156,7 @@ namespace sdr
             OutputDevice* pOutDev = TryToGetOutputDevice();
             OSL_ENSURE(0 != pOutDev, "ObjectContactOfPageView without OutDev, someone has overloaded TryToGetOutputDevice wrong (!)");
             bool bClipRegionPushed(false);
-            const Region& rRedrawArea(rDisplayInfo.GetRedrawArea());
+            const vcl::Region& rRedrawArea(rDisplayInfo.GetRedrawArea());
 
             if(!rRedrawArea.IsEmpty())
             {
diff --git a/svx/source/sdr/overlay/overlaymanager.cxx b/svx/source/sdr/overlay/overlaymanager.cxx
index 80758a01578c..ec754ba54b56 100644
--- a/svx/source/sdr/overlay/overlaymanager.cxx
+++ b/svx/source/sdr/overlay/overlaymanager.cxx
@@ -236,7 +236,7 @@ namespace sdr
             }
         }
 
-        void OverlayManager::completeRedraw(const Region& rRegion, OutputDevice* pPreRenderDevice) const
+        void OverlayManager::completeRedraw(const vcl::Region& rRegion, OutputDevice* pPreRenderDevice) const
         {
             if(!rRegion.IsEmpty() && maOverlayObjects.size())
             {
@@ -266,7 +266,7 @@ namespace sdr
             // unbuffered versions do nothing here
         }
 
-        void OverlayManager::restoreBackground(const Region& /*rRegion*/) const
+        void OverlayManager::restoreBackground(const vcl::Region& /*rRegion*/) const
         {
             // unbuffered versions do nothing here
         }
diff --git a/svx/source/sdr/overlay/overlaymanagerbuffered.cxx b/svx/source/sdr/overlay/overlaymanagerbuffered.cxx
index 7cc57642da12..46bd77b0b8c7 100644
--- a/svx/source/sdr/overlay/overlaymanagerbuffered.cxx
+++ b/svx/source/sdr/overlay/overlaymanagerbuffered.cxx
@@ -104,12 +104,12 @@ namespace sdr
             const Rectangle aRegionRectanglePixel(
                 maBufferRememberedRangePixel.getMinX(), maBufferRememberedRangePixel.getMinY(),
                 maBufferRememberedRangePixel.getMaxX(), maBufferRememberedRangePixel.getMaxY());
-            const Region aRegionPixel(aRegionRectanglePixel);
+            const vcl::Region aRegionPixel(aRegionRectanglePixel);
 
             ImpRestoreBackground(aRegionPixel);
         }
 
-        void OverlayManagerBuffered::ImpRestoreBackground(const Region& rRegionPixel) const
+        void OverlayManagerBuffered::ImpRestoreBackground(const vcl::Region& rRegionPixel) const
         {
             // MapModes off
             const bool bMapModeWasEnabledDest(getOutputDevice().IsMapModeEnabled());
@@ -178,7 +178,7 @@ namespace sdr
             ((OverlayManagerBuffered*)this)->maBufferDevice.EnableMapMode(bMapModeWasEnabledSource);
         }
 
-        void OverlayManagerBuffered::ImpSaveBackground(const Region& rRegion, OutputDevice* pPreRenderDevice)
+        void OverlayManagerBuffered::ImpSaveBackground(const vcl::Region& rRegion, OutputDevice* pPreRenderDevice)
         {
             // prepare source
             OutputDevice& rSource = (pPreRenderDevice) ? *pPreRenderDevice : getOutputDevice();
@@ -187,14 +187,14 @@ namespace sdr
             ImpPrepareBufferDevice();
 
             // build region which needs to be copied
-            Region aRegion(rSource.LogicToPixel(rRegion));
+            vcl::Region aRegion(rSource.LogicToPixel(rRegion));
 
             // limit to PaintRegion if it's a window. This will be evtl. the expanded one,
             // but always the exact redraw area
             if(OUTDEV_WINDOW == rSource.GetOutDevType())
             {
                 vcl::Window& rWindow = (vcl::Window&)rSource;
-                Region aPaintRegionPixel = rWindow.LogicToPixel(rWindow.GetPaintRegion());
+                vcl::Region aPaintRegionPixel = rWindow.LogicToPixel(rWindow.GetPaintRegion());
                 aRegion.Intersect(aPaintRegionPixel);
 
                 // #i72754# Make sure content is completetly rendered, the window
@@ -452,7 +452,7 @@ namespace sdr
             }
         }
 
-        void OverlayManagerBuffered::completeRedraw(const Region& rRegion, OutputDevice* pPreRenderDevice) const
+        void OverlayManagerBuffered::completeRedraw(const vcl::Region& rRegion, OutputDevice* pPreRenderDevice) const
         {
             if(!rRegion.IsEmpty())
             {
@@ -477,10 +477,10 @@ namespace sdr
             maBufferDevice.CopyArea(rDestPt, rSrcPt, rSrcSize);
         }
 
-        void OverlayManagerBuffered::restoreBackground(const Region& rRegion) const
+        void OverlayManagerBuffered::restoreBackground(const vcl::Region& rRegion) const
         {
             // restore
-            const Region aRegionPixel(getOutputDevice().LogicToPixel(rRegion));
+            const vcl::Region aRegionPixel(getOutputDevice().LogicToPixel(rRegion));
             ImpRestoreBackground(aRegionPixel);
 
             // call parent