fdo#82577: Handle Region

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

Change-Id: I6e008111df7cf37121fbc3eaabd44a8306338291

9 files changed, 24 insertions, 24 deletions

diff --git a/include/svx/galtheme.hxx b/include/svx/galtheme.hxx
index e36d804b13c9..50f5d98416f9 100644
--- a/include/svx/galtheme.hxx
+++ b/include/svx/galtheme.hxx
@@ -67,7 +67,7 @@ class ListBox;
 
 struct GalDragParams
 {
-    Region  aDragRegion;
+    vcl::Region  aDragRegion;
     sal_uIntPtr nDragObjPos;
     OUString aThemeName;
     OUString aFileName;
diff --git a/include/svx/sdr/contact/displayinfo.hxx b/include/svx/sdr/contact/displayinfo.hxx
index a842fc6c4ee4..23190a450f40 100644
--- a/include/svx/sdr/contact/displayinfo.hxx
+++ b/include/svx/sdr/contact/displayinfo.hxx
@@ -36,7 +36,7 @@ namespace sdr
 
             // The redraw area, in logical coordinates of OutputDevice. If Region
             // is empty, everything needs to be redrawn
-            Region                                          maRedrawArea;
+            vcl::Region                                          maRedrawArea;
 
             // bitfield
 
@@ -77,8 +77,8 @@ namespace sdr
             const SetOfByte& GetProcessLayers() const { return maProcessLayers; }
 
             // access to RedrawArea
-            void SetRedrawArea(const Region& rRegion);
-            const Region& GetRedrawArea() const { return maRedrawArea; }
+            void SetRedrawArea(const vcl::Region& rRegion);
+            const vcl::Region& GetRedrawArea() const { return maRedrawArea; }
 
             // Access to ControlLayerProcessingActive flag
             void SetControlLayerProcessingActive(bool bDoPaint);
diff --git a/include/svx/sdr/contact/viewobjectcontact.hxx b/include/svx/sdr/contact/viewobjectcontact.hxx
index bac055dc6911..4e472702e2c0 100644
--- a/include/svx/sdr/contact/viewobjectcontact.hxx
+++ b/include/svx/sdr/contact/viewobjectcontact.hxx
@@ -29,7 +29,7 @@
 
 // predeclarations
 
-class Region;
+namespace vcl { class Region; }
 
 namespace sdr { namespace contact {
     class DisplayInfo;
diff --git a/include/svx/sdr/overlay/overlaymanager.hxx b/include/svx/sdr/overlay/overlaymanager.hxx
index fd7437a0509d..5d84de28c865 100644
--- a/include/svx/sdr/overlay/overlaymanager.hxx
+++ b/include/svx/sdr/overlay/overlaymanager.hxx
@@ -36,7 +36,7 @@
 // predeclarations
 
 class OutputDevice;
-class Region;
+namespace vcl { class Region; }
 
 namespace sdr { namespace overlay {
     class OverlayObject;
@@ -99,7 +99,7 @@ namespace sdr
             const drawinglayer::geometry::ViewInformation2D getCurrentViewInformation2D() const;
 
             // complete redraw
-            virtual void completeRedraw(const Region& rRegion, OutputDevice* pPreRenderDevice = 0) const;
+            virtual void completeRedraw(const vcl::Region& rRegion, OutputDevice* pPreRenderDevice = 0) const;
 
             // flush. Do buffered updates.
             virtual void flush();
@@ -108,7 +108,7 @@ namespace sdr
             virtual void copyArea(const Point& rDestPt, const Point& rSrcPt, const Size& rSrcSize);
 
             // restore part of background. Implemented form buffered versions only.
-            virtual void restoreBackground(const Region& rRegion) const;
+            virtual void restoreBackground(const vcl::Region& rRegion) const;
 
             // get the OutputDevice
             OutputDevice& getOutputDevice() const { return rmOutputDevice; }
diff --git a/include/svx/sdrpagewindow.hxx b/include/svx/sdrpagewindow.hxx
index 36ea6b864137..078edaf0e201 100644
--- a/include/svx/sdrpagewindow.hxx
+++ b/include/svx/sdrpagewindow.hxx
@@ -35,7 +35,7 @@
 
 // predeclarations
 
-class Region;
+namespace vcl { class Region; }
 class SdrUnoObj;
 class SdrPageView;
 
@@ -101,7 +101,7 @@ public:
 
     // the repaint method. For migration from pPaintProc, use one more parameter
     void PrePaint();
-    void PrepareRedraw(const Region& rReg);
+    void PrepareRedraw(const vcl::Region& rReg);
     void RedrawAll(sdr::contact::ViewObjectContactRedirector* pRedirector) const;
     void RedrawLayer(const SdrLayerID* pId, sdr::contact::ViewObjectContactRedirector* pRedirector) const;
 
diff --git a/include/svx/sdrpaintwindow.hxx b/include/svx/sdrpaintwindow.hxx
index ca65289bf220..3a1f1ef7f986 100644
--- a/include/svx/sdrpaintwindow.hxx
+++ b/include/svx/sdrpaintwindow.hxx
@@ -60,7 +60,7 @@ public:
     ~SdrPreRenderDevice();
 
     void PreparePreRenderDevice();
-    void OutputPreRenderDevice(const Region& rExpandedRegion);
+    void OutputPreRenderDevice(const vcl::Region& rExpandedRegion);
 
     OutputDevice& GetOriginalOutputDevice() const { return mrOutputDevice; }
     OutputDevice& GetPreRenderDevice() { return maPreRenderDevice; }
@@ -85,7 +85,7 @@ private:
     SdrPreRenderDevice*                                 mpPreRenderDevice;
 
     // The RedrawRegion used for rendering
-    Region                                              maRedrawRegion;
+    vcl::Region                                              maRedrawRegion;
 
     // bitfield
     // #i72889# flag if this is only a temporary target for repaint, default is false
@@ -112,7 +112,7 @@ public:
     rtl::Reference< ::sdr::overlay::OverlayManager > GetOverlayManager() const;
 
     // #i73602# add flag if buffer shall be used
-    void DrawOverlay(const Region& rRegion);
+    void DrawOverlay(const vcl::Region& rRegion);
 
     // calculate visible area and return
     Rectangle GetVisibleArea() const;
@@ -132,12 +132,12 @@ public:
     // prepare PreRendering (evtl.)
     void PreparePreRenderDevice();
     void DestroyPreRenderDevice();
-    void OutputPreRenderDevice(const Region& rExpandedRegion);
+    void OutputPreRenderDevice(const vcl::Region& rExpandedRegion);
     SdrPreRenderDevice* GetPreRenderDevice() const { return mpPreRenderDevice; }
 
     // RedrawRegion
-    const Region& GetRedrawRegion() const { return maRedrawRegion;}
-    void SetRedrawRegion(const Region& rNew);
+    const vcl::Region& GetRedrawRegion() const { return maRedrawRegion;}
+    void SetRedrawRegion(const vcl::Region& rNew);
 
     // #i72889# read/write access to TempoparyTarget
     bool getTemporaryTarget() const { return (bool)mbTemporaryTarget; }
diff --git a/include/svx/svdhdl.hxx b/include/svx/svdhdl.hxx
index 5d59a1c20df7..334ad3161956 100644
--- a/include/svx/svdhdl.hxx
+++ b/include/svx/svdhdl.hxx
@@ -35,7 +35,7 @@
 
 class VirtualDevice;
 class OutputDevice;
-class Region;
+namespace vcl { class Region; }
 namespace vcl { class Window; }
 class SdrHdlList;
 class SdrMarkView;
diff --git a/include/svx/svdpagv.hxx b/include/svx/svdpagv.hxx
index 2450e409617e..9fb2d9568bdc 100644
--- a/include/svx/svdpagv.hxx
+++ b/include/svx/svdpagv.hxx
@@ -35,7 +35,7 @@
 
 
 
-class Region;
+namespace vcl { class Region; }
 class SdrObjList;
 class SdrObject;
 class SdrPage;
@@ -166,7 +166,7 @@ public:
     void PrePaint();
 
     // rReg bezieht sich auf's OutDev, nicht auf die Page
-    void CompleteRedraw(SdrPaintWindow& rPaintWindow, const Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector = 0L) const;
+    void CompleteRedraw(SdrPaintWindow& rPaintWindow, const vcl::Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector = 0L) const;
 
     // write access to mpPreparedPageWindow
     void setPreparedPageWindow(SdrPageWindow* pKnownTarget);
diff --git a/include/svx/svdpntv.hxx b/include/svx/svdpntv.hxx
index 1c63d3faede7..16bdc9d93136 100644
--- a/include/svx/svdpntv.hxx
+++ b/include/svx/svdpntv.hxx
@@ -365,7 +365,7 @@ public:
 
 
     // used internally for Draw/Impress/sch/chart2
-    virtual void CompleteRedraw(OutputDevice* pOut, const Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector = 0);
+    virtual void CompleteRedraw(OutputDevice* pOut, const vcl::Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector = 0);
 
     // #i72889# used from CompleteRedraw() implementation internally, added to be able to do a complete redraw in single steps
 
@@ -376,16 +376,16 @@ public:
     // EndCompleteRedraw does the necessary refreshes, evtl. paints text edit and overlay and evtl destroys the
     // SdrPaintWindow again. This means: the SdrPaintWindow is no longer safe after this closing call.
     virtual SdrPaintWindow* BeginCompleteRedraw(OutputDevice* pOut);
-    virtual void DoCompleteRedraw(SdrPaintWindow& rPaintWindow, const Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector = 0);
+    virtual void DoCompleteRedraw(SdrPaintWindow& rPaintWindow, const vcl::Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector = 0);
     virtual void EndCompleteRedraw(SdrPaintWindow& rPaintWindow, bool bPaintFormLayer);
 
 
     // used for the other applications basctl/sc/sw which call DrawLayer at PageViews
     // #i74769# Interface change to use common BeginCompleteRedraw/EndCompleteRedraw
     // #i76114# bDisableIntersect disables intersecting rReg with the Window's paint region
-    SdrPaintWindow* BeginDrawLayers(OutputDevice* pOut, const Region& rReg, bool bDisableIntersect = false);
+    SdrPaintWindow* BeginDrawLayers(OutputDevice* pOut, const vcl::Region& rReg, bool bDisableIntersect = false);
     // used when the region passed to BeginDrawLayers needs to be changed
-    void UpdateDrawLayersRegion(OutputDevice* pOut, const Region& rReg, bool bDisableIntersect = false);
+    void UpdateDrawLayersRegion(OutputDevice* pOut, const vcl::Region& rReg, bool bDisableIntersect = false);
     void EndDrawLayers(SdrPaintWindow& rPaintWindow, bool bPaintFormLayer);
 
 protected:
@@ -393,7 +393,7 @@ protected:
     // used to paint the form layer after the PreRender device is flushed (painted) to the window.
     void ImpFormLayerDrawing(SdrPaintWindow& rPaintWindow) const;
 
-    Region OptimizeDrawLayersRegion(OutputDevice* pOut, const Region& rReg, bool bDisableIntersect);
+    vcl::Region OptimizeDrawLayersRegion(OutputDevice* pOut, const vcl::Region& rReg, bool bDisableIntersect);
 
 public:
     bool IsPageVisible() const { return bPageVisible; }             // Seite (weisse Flaeche) malen oder nicht