fdo#82577: Handle Region

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

Change-Id: I6e008111df7cf37121fbc3eaabd44a8306338291

19 files changed, 51 insertions, 51 deletions

diff --git a/svx/inc/sdr/overlay/overlaymanagerbuffered.hxx b/svx/inc/sdr/overlay/overlaymanagerbuffered.hxx
index 95448b5d0eab..6bcd68fc8293 100644
--- a/svx/inc/sdr/overlay/overlaymanagerbuffered.hxx
+++ b/svx/inc/sdr/overlay/overlaymanagerbuffered.hxx
@@ -58,8 +58,8 @@ namespace sdr
             // Internal methods for buffering
             void ImpPrepareBufferDevice();
             void ImpRestoreBackground() const ;
-            void ImpRestoreBackground(const Region& rRegionPixel) const;
-            void ImpSaveBackground(const Region& rRegion, OutputDevice* pPreRenderDevice = 0L);
+            void ImpRestoreBackground(const vcl::Region& rRegionPixel) const;
+            void ImpSaveBackground(const vcl::Region& rRegion, OutputDevice* pPreRenderDevice = 0L);
 
             OverlayManagerBuffered(
                 OutputDevice& rOutputDevice,
@@ -71,7 +71,7 @@ namespace sdr
                 bool bRefreshWithPreRendering = false);
 
             // complete redraw
-            virtual void completeRedraw(const Region& rRegion, OutputDevice* pPreRenderDevice = 0L) const SAL_OVERRIDE;
+            virtual void completeRedraw(const vcl::Region& rRegion, OutputDevice* pPreRenderDevice = 0L) const SAL_OVERRIDE;
 
             // flush. Do buffered updates.
             virtual void flush() SAL_OVERRIDE;
@@ -80,7 +80,7 @@ namespace sdr
             virtual void copyArea(const Point& rDestPt, const Point& rSrcPt, const Size& rSrcSize) SAL_OVERRIDE;
 
             // restore part of background. Implemented form buffered versions only.
-            virtual void restoreBackground(const Region& rRegion) const SAL_OVERRIDE;
+            virtual void restoreBackground(const vcl::Region& rRegion) const SAL_OVERRIDE;
 
             // invalidate the given range at local OutputDevice
             virtual void invalidateRange(const basegfx::B2DRange& rRange) SAL_OVERRIDE;
diff --git a/svx/source/dialog/contwnd.cxx b/svx/source/dialog/contwnd.cxx
index 28db0b862969..64a8ae3b2e15 100644
--- a/svx/source/dialog/contwnd.cxx
+++ b/svx/source/dialog/contwnd.cxx
@@ -261,7 +261,7 @@ void ContourWindow::Paint( const Rectangle& rRect )
     }
 
     // #i75482#
-    const Region aRepaintRegion(rRect);
+    const vcl::Region aRepaintRegion(rRect);
     pView->DoCompleteRedraw(*pPaintWindow, aRepaintRegion);
     pView->EndCompleteRedraw(*pPaintWindow, true);
 }
diff --git a/svx/source/dialog/dlgctl3d.cxx b/svx/source/dialog/dlgctl3d.cxx
index 5845b50daece..32b37bc67ef5 100644
--- a/svx/source/dialog/dlgctl3d.cxx
+++ b/svx/source/dialog/dlgctl3d.cxx
@@ -168,7 +168,7 @@ void Svx3DPreviewControl::Resize()
 
 void Svx3DPreviewControl::Paint(const Rectangle& rRect)
 {
-    mp3DView->CompleteRedraw(this, Region(rRect));
+    mp3DView->CompleteRedraw(this, vcl::Region(rRect));
 }
 
 void Svx3DPreviewControl::MouseButtonDown(const MouseEvent& rMEvt)
diff --git a/svx/source/dialog/framelink.cxx b/svx/source/dialog/framelink.cxx
index d8b6153e1165..190858bdc9fe 100644
--- a/svx/source/dialog/framelink.cxx
+++ b/svx/source/dialog/framelink.cxx
@@ -719,7 +719,7 @@ inline Polygon lclCreatePolygon( const PointVec& rPoints )
 }
 
 /** Returns a polygon constructed from the five passed points. */
-Region lclCreatePolygon( const Point& rP1, const Point& rP2, const Point& rP3, const Point& rP4, const Point& rP5 )
+vcl::Region lclCreatePolygon( const Point& rP1, const Point& rP2, const Point& rP3, const Point& rP4, const Point& rP5 )
 {
     PointVec aPoints;
     aPoints.reserve( 5 );
@@ -728,7 +728,7 @@ Region lclCreatePolygon( const Point& rP1, const Point& rP2, const Point& rP3, c
     aPoints.push_back( rP3 );
     aPoints.push_back( rP4 );
     aPoints.push_back( rP5 );
-    return Region(lclCreatePolygon(aPoints));
+    return vcl::Region(lclCreatePolygon(aPoints));
 }
 
 /** Sets the color of the passed frame style to the output device.
@@ -989,7 +989,7 @@ void lclPushCrossingClipRegion( OutputDevice& rDev, const Rectangle& rRect, bool
     LinePoints aLPoints( lclGetDiagLineEnds( rRect, !bTLBR, lclGetPrimEnd( rCrossStyle ) ) );
     LinePoints aRPoints( lclGetDiagLineEnds( rRect, !bTLBR, lclGetSecnBeg( rCrossStyle ) ) );
 
-    Region aClipReg;
+    vcl::Region aClipReg;
     if( bTLBR )
     {
         aClipReg = lclCreatePolygon(
diff --git a/svx/source/dialog/frmsel.cxx b/svx/source/dialog/frmsel.cxx
index 0fc0d0f1a21c..aa7f8ca434d2 100644
--- a/svx/source/dialog/frmsel.cxx
+++ b/svx/source/dialog/frmsel.cxx
@@ -175,7 +175,7 @@ void FrameBorder::AddClickRect( const Rectangle& rRect )
 
 bool FrameBorder::ContainsClickPoint( const Point& rPos ) const
 {
-    return Region( maClickArea ).IsInside( rPos );
+    return vcl::Region( maClickArea ).IsInside( rPos );
 }
 
 Rectangle FrameBorder::GetClickBoundRect() const
diff --git a/svx/source/dialog/graphctl.cxx b/svx/source/dialog/graphctl.cxx
index c39f9d55e452..0c590d3becce 100644
--- a/svx/source/dialog/graphctl.cxx
+++ b/svx/source/dialog/graphctl.cxx
@@ -255,7 +255,7 @@ void GraphCtrl::Paint( const Rectangle& rRect )
             aGraphic.Draw(&rTarget, Point(), aGraphSize);
         }
 
-        const Region aRepaintRegion(rRect);
+        const vcl::Region aRepaintRegion(rRect);
         pView->DoCompleteRedraw(*pPaintWindow, aRepaintRegion);
         pView->EndCompleteRedraw(*pPaintWindow, true);
     }
diff --git a/svx/source/dialog/imapwnd.cxx b/svx/source/dialog/imapwnd.cxx
index a1f8358bc8a8..0d7f66ae6384 100644
--- a/svx/source/dialog/imapwnd.cxx
+++ b/svx/source/dialog/imapwnd.cxx
@@ -466,7 +466,7 @@ IMapObject* IMapWindow::GetIMapObj( const SdrObject* pSdrObj ) const
 
 void IMapWindow::Command(const CommandEvent& rCEvt)
 {
-    Region  aRegion;
+    vcl::Region  aRegion;
 
     if ( rCEvt.GetCommand() == COMMAND_CONTEXTMENU )
     {
diff --git a/svx/source/gallery2/galctrl.cxx b/svx/source/gallery2/galctrl.cxx
index af04a9d0947a..88f328beaf75 100644
--- a/svx/source/gallery2/galctrl.cxx
+++ b/svx/source/gallery2/galctrl.cxx
@@ -409,7 +409,7 @@ sal_Int8 GalleryIconView::ExecuteDrop( const ExecuteDropEvent& rEvt )
 void GalleryIconView::StartDrag( sal_Int8, const Point& )
 {
     const CommandEvent  aEvt( GetPointerPosPixel(), COMMAND_STARTDRAG, true );
-    Region              aRegion;
+    vcl::Region              aRegion;
 
     // call this to initiate dragging for ValueSet
     ValueSet::StartDrag( aEvt, aRegion );
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
diff --git a/svx/source/svdraw/sdrpagewindow.cxx b/svx/source/svdraw/sdrpagewindow.cxx
index 01d5f5cb9b0e..f4cccca0797a 100644
--- a/svx/source/svdraw/sdrpagewindow.cxx
+++ b/svx/source/svdraw/sdrpagewindow.cxx
@@ -165,7 +165,7 @@ void SdrPageWindow::PrePaint()
     }
 }
 
-void SdrPageWindow::PrepareRedraw(const Region& rReg)
+void SdrPageWindow::PrepareRedraw(const vcl::Region& rReg)
 {
     // give OC the chance to do ProcessDisplay preparations
     if(HasObjectContact())
@@ -280,7 +280,7 @@ void SdrPageWindow::RedrawAll(sdr::contact::ViewObjectContactRedirector* pRedire
     SetOfByte aProcessLayers = bPrinter ? mrPageView.GetPrintableLayers() : mrPageView.GetVisibleLayers();
 
     // create PaintInfoRec; use Rectangle only temporarily
-    const Region& rRegion = GetPaintWindow().GetRedrawRegion();
+    const vcl::Region& rRegion = GetPaintWindow().GetRedrawRegion();
 
     // create processing data
     sdr::contact::DisplayInfo aDisplayInfo;
@@ -340,7 +340,7 @@ void SdrPageWindow::RedrawLayer(const SdrLayerID* pId, sdr::contact::ViewObjectC
         const bool bControlLayerProcessingActive(nControlLayerId == *pId);
 
         // create PaintInfoRec, use Rectangle only temporarily
-        const Region& rRegion = GetPaintWindow().GetRedrawRegion();
+        const vcl::Region& rRegion = GetPaintWindow().GetRedrawRegion();
 
         // create processing data
         sdr::contact::DisplayInfo aDisplayInfo;
diff --git a/svx/source/svdraw/sdrpaintwindow.cxx b/svx/source/svdraw/sdrpaintwindow.cxx
index 4b6b47d01e25..f64aea30c499 100644
--- a/svx/source/svdraw/sdrpaintwindow.cxx
+++ b/svx/source/svdraw/sdrpaintwindow.cxx
@@ -141,10 +141,10 @@ void SdrPreRenderDevice::PreparePreRenderDevice()
     maPreRenderDevice.SetSettings(mrOutputDevice.GetSettings());
 }
 
-void SdrPreRenderDevice::OutputPreRenderDevice(const Region& rExpandedRegion)
+void SdrPreRenderDevice::OutputPreRenderDevice(const vcl::Region& rExpandedRegion)
 {
     // region to pixels
-    const Region aRegionPixel(mrOutputDevice.LogicToPixel(rExpandedRegion));
+    const vcl::Region aRegionPixel(mrOutputDevice.LogicToPixel(rExpandedRegion));
     //RegionHandle aRegionHandle(aRegionPixel.BeginEnumRects());
     //Rectangle aRegionRectanglePixel;
 
@@ -341,7 +341,7 @@ void SdrPaintWindow::DestroyPreRenderDevice()
     }
 }
 
-void SdrPaintWindow::OutputPreRenderDevice(const Region& rExpandedRegion)
+void SdrPaintWindow::OutputPreRenderDevice(const vcl::Region& rExpandedRegion)
 {
     if(mpPreRenderDevice)
     {
@@ -350,7 +350,7 @@ void SdrPaintWindow::OutputPreRenderDevice(const Region& rExpandedRegion)
 }
 
 // #i73602# add flag if buffer shall be used
-void SdrPaintWindow::DrawOverlay(const Region& rRegion)
+void SdrPaintWindow::DrawOverlay(const vcl::Region& rRegion)
 {
     // ## force creation of OverlayManager since the first repaint needs to
     // save the background to get a controlled start into overlay mechanism
@@ -370,7 +370,7 @@ void SdrPaintWindow::DrawOverlay(const Region& rRegion)
 }
 
 
-void SdrPaintWindow::SetRedrawRegion(const Region& rNew)
+void SdrPaintWindow::SetRedrawRegion(const vcl::Region& rNew)
 {
     maRedrawRegion = rNew;
 }
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index 5b7cd4e30a8d..56028fb6672f 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -301,7 +301,7 @@ void SdrObjEditView::TextEditDrawing(SdrPaintWindow& rPaintWindow) const
 
             if(nViewAnz)
             {
-                const Region& rRedrawRegion = rPaintWindow.GetRedrawRegion();
+                const vcl::Region& rRedrawRegion = rPaintWindow.GetRedrawRegion();
                 const Rectangle aCheckRect(rRedrawRegion.GetBoundRect());
 
                 for(sal_uInt32 i(0); i < nViewAnz; i++)
diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx
index 390bb851adcc..e8a03aa36850 100644
--- a/svx/source/svdraw/svdibrow.cxx
+++ b/svx/source/svdraw/svdibrow.cxx
@@ -358,7 +358,7 @@ void _SdrItemBrowserControl::PaintField(OutputDevice& rDev, const Rectangle& rRe
             rDev.DrawText(rRect.TopLeft(),pEntry->aName);
         }
     } else {
-        rDev.SetClipRegion(Region(aR));
+        rDev.SetClipRegion(vcl::Region(aR));
         rDev.DrawText(aR.TopLeft(),GetCellText(nAktPaintRow,nColumnId));
         rDev.SetClipRegion();
     }
diff --git a/svx/source/svdraw/svdpagv.cxx b/svx/source/svdraw/svdpagv.cxx
index c03339346cef..f8ae2586fec4 100644
--- a/svx/source/svdraw/svdpagv.cxx
+++ b/svx/source/svdraw/svdpagv.cxx
@@ -282,7 +282,7 @@ void SdrPageView::PrePaint()
     }
 }
 
-void SdrPageView::CompleteRedraw(SdrPaintWindow& rPaintWindow, const Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector) const
+void SdrPageView::CompleteRedraw(SdrPaintWindow& rPaintWindow, const vcl::Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector) const
 {
     if(GetPage())
     {
@@ -345,11 +345,11 @@ void SdrPageView::DrawLayer(SdrLayerID nID, OutputDevice* pGivenTarget, sdr::con
 
                     // Copy existing paint region to use the same as prepared in BeginDrawLayer
                     SdrPaintWindow& rExistingPaintWindow = pPreparedTarget->GetPaintWindow();
-                    const Region& rExistingRegion = rExistingPaintWindow.GetRedrawRegion();
+                    const vcl::Region& rExistingRegion = rExistingPaintWindow.GetRedrawRegion();
                     bool bUseRect(false);
                     if (!rRect.IsEmpty())
                     {
-                        Region r(rExistingRegion);
+                        vcl::Region r(rExistingRegion);
                         r.Intersect(rRect);
                         // fdo#74435: FIXME: visibility check broken if empty
                         if (!r.IsEmpty())
@@ -358,7 +358,7 @@ void SdrPageView::DrawLayer(SdrLayerID nID, OutputDevice* pGivenTarget, sdr::con
                     if (!bUseRect)
                         aTemporaryPaintWindow.SetRedrawRegion(rExistingRegion);
                     else
-                        aTemporaryPaintWindow.SetRedrawRegion(Region(rRect));
+                        aTemporaryPaintWindow.SetRedrawRegion(vcl::Region(rRect));
 
                     // patch the ExistingPageWindow
                     pPreparedTarget->patchPaintWindow(aTemporaryPaintWindow);
@@ -386,7 +386,7 @@ void SdrPageView::DrawLayer(SdrLayerID nID, OutputDevice* pGivenTarget, sdr::con
                     {
                         SdrPageWindow* pExistingPageWindow = GetPageWindow(0L);
                         SdrPaintWindow& rExistingPaintWindow = pExistingPageWindow->GetPaintWindow();
-                        const Region& rExistingRegion = rExistingPaintWindow.GetRedrawRegion();
+                        const vcl::Region& rExistingRegion = rExistingPaintWindow.GetRedrawRegion();
                         aTemporaryPaintWindow.SetRedrawRegion(rExistingRegion);
                     }
 
diff --git a/svx/source/svdraw/svdpntv.cxx b/svx/source/svdraw/svdpntv.cxx
index edd234dd7a6f..e63b6f70363e 100644
--- a/svx/source/svdraw/svdpntv.cxx
+++ b/svx/source/svdraw/svdpntv.cxx
@@ -568,7 +568,7 @@ void SdrPaintView::PrePaint()
 
 // #define SVX_REPAINT_TIMER_TEST
 
-void SdrPaintView::CompleteRedraw(OutputDevice* pOut, const Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector)
+void SdrPaintView::CompleteRedraw(OutputDevice* pOut, const vcl::Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector)
 {
 #ifdef SVX_REPAINT_TIMER_TEST
 #define REMEMBERED_TIMES_COUNT  (10)
@@ -593,7 +593,7 @@ void SdrPaintView::CompleteRedraw(OutputDevice* pOut, const Region& rReg, sdr::c
     // rReg may be made more granular (fine) with using it. Normally, rReg
     // does come from Window::Paint() anyways and thus is based on a single
     // rectangle which was derived from exactly that repaint region
-    Region aOptimizedRepaintRegion(rReg);
+    vcl::Region aOptimizedRepaintRegion(rReg);
 
     if(pOut && OUTDEV_WINDOW == pOut->GetOutDevType())
     {
@@ -723,7 +723,7 @@ SdrPaintWindow* SdrPaintView::BeginCompleteRedraw(OutputDevice* pOut)
     return pPaintWindow;
 }
 
-void SdrPaintView::DoCompleteRedraw(SdrPaintWindow& rPaintWindow, const Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector)
+void SdrPaintView::DoCompleteRedraw(SdrPaintWindow& rPaintWindow, const vcl::Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector)
 {
     // redraw all PageViews with the target. This may expand the RedrawRegion
     // at the PaintWindow, plus taking care of FormLayer expansion
@@ -767,7 +767,7 @@ void SdrPaintView::EndCompleteRedraw(SdrPaintWindow& rPaintWindow, bool bPaintFo
 
 
 
-SdrPaintWindow* SdrPaintView::BeginDrawLayers(OutputDevice* pOut, const Region& rReg, bool bDisableIntersect)
+SdrPaintWindow* SdrPaintView::BeginDrawLayers(OutputDevice* pOut, const vcl::Region& rReg, bool bDisableIntersect)
 {
     // #i74769# use BeginCompleteRedraw() as common base
     SdrPaintWindow* pPaintWindow = BeginCompleteRedraw(pOut);
@@ -779,7 +779,7 @@ SdrPaintWindow* SdrPaintView::BeginDrawLayers(OutputDevice* pOut, const Region&
 
         if(pKnownTarget)
         {
-            Region aOptimizedRepaintRegion = OptimizeDrawLayersRegion( pOut, rReg, bDisableIntersect );
+            vcl::Region aOptimizedRepaintRegion = OptimizeDrawLayersRegion( pOut, rReg, bDisableIntersect );
 
             // prepare redraw
             pKnownTarget->PrepareRedraw(aOptimizedRepaintRegion);
@@ -804,7 +804,7 @@ void SdrPaintView::EndDrawLayers(SdrPaintWindow& rPaintWindow, bool bPaintFormLa
     }
 }
 
-void SdrPaintView::UpdateDrawLayersRegion(OutputDevice* pOut, const Region& rReg, bool bDisableIntersect)
+void SdrPaintView::UpdateDrawLayersRegion(OutputDevice* pOut, const vcl::Region& rReg, bool bDisableIntersect)
 {
     SdrPaintWindow* pPaintWindow = FindPaintWindow(*pOut);
     OSL_ENSURE(pPaintWindow, "SdrPaintView::UpdateDrawLayersRegion: No SdrPaintWindow (!)");
@@ -815,20 +815,20 @@ void SdrPaintView::UpdateDrawLayersRegion(OutputDevice* pOut, const Region& rReg
 
         if(pKnownTarget)
         {
-            Region aOptimizedRepaintRegion = OptimizeDrawLayersRegion( pOut, rReg, bDisableIntersect );
+            vcl::Region aOptimizedRepaintRegion = OptimizeDrawLayersRegion( pOut, rReg, bDisableIntersect );
             pKnownTarget->GetPaintWindow().SetRedrawRegion(aOptimizedRepaintRegion);
             mpPageView->setPreparedPageWindow(pKnownTarget); // already set actually
         }
     }
 }
 
-Region SdrPaintView::OptimizeDrawLayersRegion(OutputDevice* pOut, const Region& rReg, bool bDisableIntersect)
+vcl::Region SdrPaintView::OptimizeDrawLayersRegion(OutputDevice* pOut, const vcl::Region& rReg, bool bDisableIntersect)
 {
     // #i74769# check if pOut is a win and has a ClipRegion. If Yes, the Region
     // rReg may be made more granular (fine) with using it. Normally, rReg
     // does come from Window::Paint() anyways and thus is based on a single
     // rectangle which was derived from exactly that repaint region
-    Region aOptimizedRepaintRegion(rReg);
+    vcl::Region aOptimizedRepaintRegion(rReg);
 
     // #i76114# Intersecting the region with the Window's paint region is disabled
     // for print preview in Calc, because the intersection can be empty (if the paint
diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx b/svx/source/unodraw/UnoGraphicExporter.cxx
index 87a1ce69d312..75a38bef4fa5 100644
--- a/svx/source/unodraw/UnoGraphicExporter.cxx
+++ b/svx/source/unodraw/UnoGraphicExporter.cxx
@@ -447,7 +447,7 @@ VirtualDevice* GraphicExporter::CreatePageVDev( SdrPage* pPage, sal_uIntPtr nWid
         pView->SetHlplVisible( false );
         pView->SetGlueVisible( false );
         pView->ShowSdrPage(pPage);
-        Region aRegion (Rectangle( aPoint, aPageSize ) );
+        vcl::Region aRegion (Rectangle( aPoint, aPageSize ) );
 
         ImplExportCheckVisisbilityRedirector aRedirector( mpCurrentPage );
 
@@ -763,7 +763,7 @@ bool GraphicExporter::GetGraphic( ExportSettings& rSettings, Graphic& aGraphic,
                 // Use new StandardCheckVisisbilityRedirector
                 ImplExportCheckVisisbilityRedirector aRedirector( mpCurrentPage );
 
-                pView->CompleteRedraw(&aVDev, Region(Rectangle(Point(), aNewSize)), &aRedirector);
+                pView->CompleteRedraw(&aVDev, vcl::Region(Rectangle(Point(), aNewSize)), &aRedirector);
 
                 aVDev.Pop();