fdo#82577: Handle Region

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

Change-Id: I6e008111df7cf37121fbc3eaabd44a8306338291

12 files changed, 100 insertions, 95 deletions

diff --git a/include/vcl/alpha.hxx b/include/vcl/alpha.hxx
index fd8476537f6b..ec89be425e12 100644
--- a/include/vcl/alpha.hxx
+++ b/include/vcl/alpha.hxx
@@ -72,7 +72,7 @@ public:
 
 private:
     friend class BitmapEx;
-    friend class OutputDevice;
+    friend class ::OutputDevice;
     friend bool VCL_DLLPUBLIC ReadDIBBitmapEx(BitmapEx& rTarget, SvStream& rIStm);
 
     SAL_DLLPRIVATE const Bitmap&    ImplGetBitmap() const;
diff --git a/include/vcl/bitmap.hxx b/include/vcl/bitmap.hxx
index 6f66f9ce8c24..516e4072f05b 100644
--- a/include/vcl/bitmap.hxx
+++ b/include/vcl/bitmap.hxx
@@ -159,7 +159,7 @@ public:
         }
 
 private:
-    friend class Bitmap;
+    friend class ::Bitmap;
     friend class BitmapEx;
     friend class Animation;
 
@@ -609,7 +609,7 @@ public:
 
         @return the generated region.
      */
-    Region                  CreateRegion( const Color& rColor, const Rectangle& rRect ) const;
+    vcl::Region                  CreateRegion( const Color& rColor, const Rectangle& rRect ) const;
 
     /** Replace all pixel where the given mask is on with the specified color
 
diff --git a/include/vcl/image.hxx b/include/vcl/image.hxx
index 82f53a2d94c9..7ca4985de04c 100644
--- a/include/vcl/image.hxx
+++ b/include/vcl/image.hxx
@@ -47,7 +47,7 @@ enum ImageColorTransform
 class VCL_DLLPUBLIC Image
 {
     friend class ImageList;
-    friend class OutputDevice;
+    friend class ::OutputDevice;
 
 public:
                     Image();
diff --git a/include/vcl/metaact.hxx b/include/vcl/metaact.hxx
index e2eead04c452..d98d9ef87e57 100644
--- a/include/vcl/metaact.hxx
+++ b/include/vcl/metaact.hxx
@@ -1022,7 +1022,7 @@ class VCL_DLLPUBLIC MetaClipRegionAction : public MetaAction
 {
 private:
 
-    Region              maRegion;
+    vcl::Region              maRegion;
     bool                mbClip;
 
     virtual bool    Compare( const MetaAction& ) const SAL_OVERRIDE;
@@ -1037,12 +1037,12 @@ public:
     virtual void        Write( SvStream& rOStm, ImplMetaWriteData* pData ) SAL_OVERRIDE;
     virtual void        Read( SvStream& rIStm, ImplMetaReadData* pData ) SAL_OVERRIDE;
 
-                        MetaClipRegionAction( const Region& rRegion, bool bClip );
+                        MetaClipRegionAction( const vcl::Region& rRegion, bool bClip );
 
     virtual void        Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE;
     virtual void        Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE;
 
-    const Region&       GetRegion() const { return maRegion; }
+    const vcl::Region&       GetRegion() const { return maRegion; }
     bool                IsClipping() const { return mbClip; }
 };
 
@@ -1076,7 +1076,7 @@ class VCL_DLLPUBLIC MetaISectRegionClipRegionAction : public MetaAction
 {
 private:
 
-    Region              maRegion;
+    vcl::Region              maRegion;
 
     virtual bool    Compare( const MetaAction& ) const SAL_OVERRIDE;
 
@@ -1090,12 +1090,12 @@ public:
     virtual void        Write( SvStream& rOStm, ImplMetaWriteData* pData ) SAL_OVERRIDE;
     virtual void        Read( SvStream& rIStm, ImplMetaReadData* pData ) SAL_OVERRIDE;
 
-    explicit            MetaISectRegionClipRegionAction( const Region& );
+    explicit            MetaISectRegionClipRegionAction( const vcl::Region& );
 
     virtual void        Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE;
     virtual void        Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE;
 
-    const Region&       GetRegion() const { return maRegion; }
+    const vcl::Region&       GetRegion() const { return maRegion; }
 };
 
 class VCL_DLLPUBLIC MetaMoveClipRegionAction : public MetaAction
diff --git a/include/vcl/metric.hxx b/include/vcl/metric.hxx
index eb144507bd0a..6eb2da736838 100644
--- a/include/vcl/metric.hxx
+++ b/include/vcl/metric.hxx
@@ -115,7 +115,7 @@ public:
 
 
 private:
-    friend class OutputDevice;
+    friend class ::OutputDevice;
     void                Reset( const ImplFontCharMap* pNewMap = NULL );
 
     // prevent assignment and copy construction
@@ -125,7 +125,7 @@ private:
 
 class VCL_DLLPUBLIC TextRectInfo
 {
-    friend class OutputDevice;
+    friend class ::OutputDevice;
 
 private:
     long            mnMaxWidth;
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index a0e18f2c79dc..6dc4f076cba7 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -253,7 +253,7 @@ extern const sal_uLong nVCLLut[ 256 ];
 class VCL_DLLPUBLIC OutputDevice: private boost::noncopyable
 {
     friend class Application;
-    friend class Bitmap;
+    friend class ::Bitmap;
     friend class ImplImageBmp;
     friend class Printer;
     friend class System;
@@ -310,7 +310,7 @@ private:
     ImplThresholdRes                maThresRes;
     OutDevType                      meOutDevType;
     OutDevViewType                  meOutDevViewType;
-    Region                          maRegion;           // contains the clip region, see SetClipRegion(...)
+    vcl::Region                          maRegion;           // contains the clip region, see SetClipRegion(...)
     Color                           maLineColor;
     Color                           maFillColor;
     vcl::Font                       maFont;
@@ -491,7 +491,7 @@ private:
     SAL_DLLPRIVATE void         ImplGetFrameDev     ( const Point& rPt, const Point& rDevPt, const Size& rDevSize,
                                                       OutputDevice& rOutDev );
     SAL_DLLPRIVATE void         ImplDrawFrameDev    ( const Point& rPt, const Point& rDevPt, const Size& rDevSize,
-                                                      const OutputDevice& rOutDev, const Region& rRegion );
+                                                      const OutputDevice& rOutDev, const vcl::Region& rRegion );
     ///@}
 
 
@@ -611,18 +611,18 @@ private:
 
 public:
 
-    Region                      GetClipRegion() const;
+    vcl::Region                      GetClipRegion() const;
     void                        SetClipRegion();
-    void                        SetClipRegion( const Region& rRegion );
-    bool                        SelectClipRegion( const Region&, SalGraphics* pGraphics = NULL );
+    void                        SetClipRegion( const vcl::Region& rRegion );
+    bool                        SelectClipRegion( const vcl::Region&, SalGraphics* pGraphics = NULL );
 
     bool                        IsClipRegion() const { return mbClipRegion; }
 
     void                        MoveClipRegion( long nHorzMove, long nVertMove );
     void                        IntersectClipRegion( const Rectangle& rRect );
-    void                        IntersectClipRegion( const Region& rRegion );
+    void                        IntersectClipRegion( const vcl::Region& rRegion );
 
-    virtual Region              GetActiveClipRegion() const;
+    virtual vcl::Region              GetActiveClipRegion() const;
 
 protected:
 
@@ -631,7 +631,7 @@ protected:
 
 private:
 
-    SAL_DLLPRIVATE void         SetDeviceClipRegion( const Region* pRegion );
+    SAL_DLLPRIVATE void         SetDeviceClipRegion( const vcl::Region* pRegion );
     ///@}
 
 
@@ -1234,7 +1234,7 @@ public:
     SAL_DLLPRIVATE bool         ImplIsAntiparallel() const ;
     SAL_DLLPRIVATE void         ReMirror( Point &rPoint ) const;
     SAL_DLLPRIVATE void         ReMirror( Rectangle &rRect ) const;
-    SAL_DLLPRIVATE void         ReMirror( Region &rRegion ) const;
+    SAL_DLLPRIVATE void         ReMirror( vcl::Region &rRegion ) const;
     SAL_DLLPRIVATE bool         ImplIsRecordLayout() const;
     virtual bool                HasMirroredGraphics() const;
     SAL_DLLPRIVATE SalLayout*   ImplLayout( const OUString&, sal_Int32 nIndex, sal_Int32 nLen,
@@ -1616,7 +1616,7 @@ public:
     Polygon                     LogicToPixel( const Polygon& rLogicPoly ) const;
     PolyPolygon                 LogicToPixel( const PolyPolygon& rLogicPolyPoly ) const;
     basegfx::B2DPolyPolygon     LogicToPixel( const basegfx::B2DPolyPolygon& rLogicPolyPoly ) const;
-    Region                      LogicToPixel( const Region& rLogicRegion )const;
+    vcl::Region                      LogicToPixel( const vcl::Region& rLogicRegion )const;
     Point                       LogicToPixel( const Point& rLogicPt,
                                               const MapMode& rMapMode ) const;
     Size                        LogicToPixel( const Size& rLogicSize,
@@ -1631,7 +1631,7 @@ public:
                                               const MapMode& rMapMode ) const;
     basegfx::B2DPolyPolygon     LogicToPixel( const basegfx::B2DPolyPolygon& rLogicPolyPoly,
                                               const MapMode& rMapMode ) const;
-    Region                      LogicToPixel( const Region& rLogicRegion,
+    vcl::Region                      LogicToPixel( const vcl::Region& rLogicRegion,
                                               const MapMode& rMapMode ) const;
     basegfx::B2DPolygon         LogicToPixel( const basegfx::B2DPolygon& rLogicPoly ) const;
 
@@ -1641,7 +1641,7 @@ public:
     Polygon                     PixelToLogic( const Polygon& rDevicePoly ) const;
     PolyPolygon                 PixelToLogic( const PolyPolygon& rDevicePolyPoly ) const;
     basegfx::B2DPolyPolygon     PixelToLogic( const basegfx::B2DPolyPolygon& rDevicePolyPoly ) const;
-    Region                      PixelToLogic( const Region& rDeviceRegion ) const;
+    vcl::Region                      PixelToLogic( const vcl::Region& rDeviceRegion ) const;
     Point                       PixelToLogic( const Point& rDevicePt,
                                               const MapMode& rMapMode ) const;
     Size                        PixelToLogic( const Size& rDeviceSize,
@@ -1656,7 +1656,7 @@ public:
                                               const MapMode& rMapMode ) const;
     basegfx::B2DPolyPolygon     PixelToLogic( const basegfx::B2DPolyPolygon& rDevicePolyPoly,
                                               const MapMode& rMapMode ) const;
-    Region                      PixelToLogic( const Region& rDeviceRegion,
+    vcl::Region                      PixelToLogic( const vcl::Region& rDeviceRegion,
                                               const MapMode& rMapMode ) const;
 
     Point                       LogicToLogic( const Point&      rPtSource,
@@ -1856,9 +1856,9 @@ private:
 
      @param         rPixelRect  Const reference to region.
 
-     @returns Region based on device pixel coordinates and units.
+     @returns vcl::Region based on device pixel coordinates and units.
      */
-    SAL_DLLPRIVATE Region       ImplPixelToDevicePixel( const Region& rRegion ) const;
+    SAL_DLLPRIVATE vcl::Region       ImplPixelToDevicePixel( const vcl::Region& rRegion ) const;
 
     /** Invalidate the view transformation.
 
diff --git a/include/vcl/outdevstate.hxx b/include/vcl/outdevstate.hxx
index e53b7c18a923..9b2811a86a6a 100644
--- a/include/vcl/outdevstate.hxx
+++ b/include/vcl/outdevstate.hxx
@@ -108,7 +108,7 @@ public:
 
     MapMode*        mpMapMode;
     bool            mbMapActive;
-    Region*         mpClipRegion;
+    vcl::Region*         mpClipRegion;
     Color*          mpLineColor;
     Color*          mpFillColor;
     vcl::Font*      mpFont;
diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx
index 8cb430d4619b..6de196c8a6c8 100644
--- a/include/vcl/print.hxx
+++ b/include/vcl/print.hxx
@@ -198,7 +198,7 @@ public:
 
 class VCL_DLLPUBLIC Printer : public OutputDevice
 {
-    friend class OutputDevice;
+    friend class ::OutputDevice;
 
 private:
     SalInfoPrinter*             mpInfoPrinter;
diff --git a/include/vcl/region.hxx b/include/vcl/region.hxx
index 6f334f7e11fe..f4d2dd31644a 100644
--- a/include/vcl/region.hxx
+++ b/include/vcl/region.hxx
@@ -31,18 +31,22 @@ class RegionBand;
 class Polygon;
 class PolyPolygon;
 namespace vcl { class Window; }
+class OutputDevice;
+class Bitmap;
 
 typedef boost::shared_ptr< RegionBand > RegionBandPtr;
 typedef boost::shared_ptr< PolyPolygon > PolyPolygonPtr;
 typedef boost::shared_ptr< basegfx::B2DPolyPolygon > B2DPolyPolygonPtr;
 typedef std::vector< Rectangle > RectangleVector;
 
+namespace vcl {
+
 class VCL_DLLPUBLIC Region
 {
 private:
-    friend class OutputDevice;
-    friend class vcl::Window;
-    friend class Bitmap;
+    friend class ::OutputDevice;
+    friend class ::vcl::Window;
+    friend class ::Bitmap;
 
     // possible contents
     B2DPolyPolygonPtr           mpB2DPolyPolygon;
@@ -66,7 +70,7 @@ public:
     explicit Region(const Polygon& rPolygon);
     explicit Region(const PolyPolygon& rPolyPoly);
     explicit Region(const basegfx::B2DPolyPolygon&);
-    Region(const Region& rRegion);
+    Region(const vcl::Region& rRegion);
     ~Region();
 
     // direct access to contents
@@ -87,10 +91,10 @@ public:
     bool Intersect( const Rectangle& rRegion );
     bool Exclude( const Rectangle& rRegion );
     bool XOr( const Rectangle& rRegion );
-    bool Union( const Region& rRegion );
-    bool Intersect( const Region& rRegion );
-    bool Exclude( const Region& rRegion );
-    bool XOr( const Region& rRegion );
+    bool Union( const vcl::Region& rRegion );
+    bool Intersect( const vcl::Region& rRegion );
+    bool Exclude( const vcl::Region& rRegion );
+    bool XOr( const vcl::Region& rRegion );
 
     bool IsEmpty() const;
     bool IsNull() const { return mbIsNull;}
@@ -106,31 +110,32 @@ public:
     bool IsInside( const Rectangle& rRect ) const;
     bool IsOver( const Rectangle& rRect ) const;
 
-    Region& operator=( const Region& rRegion );
-    Region& operator=( const Rectangle& rRect );
+    vcl::Region& operator=( const vcl::Region& rRegion );
+    vcl::Region& operator=( const Rectangle& rRect );
 
-    bool operator==( const Region& rRegion ) const;
-    bool operator!=( const Region& rRegion ) const { return !(Region::operator==( rRegion )); }
+    bool operator==( const vcl::Region& rRegion ) const;
+    bool operator!=( const vcl::Region& rRegion ) const { return !(Region::operator==( rRegion )); }
 
-    friend VCL_DLLPUBLIC SvStream& ReadRegion( SvStream& rIStm, Region& rRegion );
-    friend VCL_DLLPUBLIC SvStream& WriteRegion( SvStream& rOStm, const Region& rRegion );
+    friend VCL_DLLPUBLIC SvStream& ReadRegion( SvStream& rIStm, vcl::Region& rRegion );
+    friend VCL_DLLPUBLIC SvStream& WriteRegion( SvStream& rOStm, const vcl::Region& rRegion );
 
     /* workaround: faster conversion for PolyPolygons
      * if half of the Polygons contained in rPolyPoly are actually
-     * rectangles, then the returned Region will be constructed by
+     * rectangles, then the returned vcl::Region will be constructed by
      * XOr'ing the contained Polygons together; in the case of
      * only Rectangles this can be up to eight times faster than
      * Region( const PolyPolygon& ).
-     * Caution: this is only useful if the Region is known to be
+     * Caution: this is only useful if the vcl::Region is known to be
      * changed to rectangles; e.g. if being set as clip region
      */
-    static Region GetRegionFromPolyPolygon( const PolyPolygon& rPolyPoly );
+    static vcl::Region GetRegionFromPolyPolygon( const PolyPolygon& rPolyPoly );
 };
 
+} /* namespace vcl */
 
 template< typename charT, typename traits >
 inline std::basic_ostream<charT, traits> & operator <<(
-    std::basic_ostream<charT, traits> & stream, const Region& rRegion)
+    std::basic_ostream<charT, traits> & stream, const vcl::Region& rRegion)
 {
     if (rRegion.IsEmpty())
         return stream << "EMPTY";
diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx
index 13a8ddc40f9f..7bde25e90362 100644
--- a/include/vcl/toolbox.hxx
+++ b/include/vcl/toolbox.hxx
@@ -260,9 +260,9 @@ public:
                                                long& rRight, long& rBottom, const ToolBox *pThis );
     static SAL_DLLPRIVATE void ImplDrawGrip( ToolBox* pThis );
     static SAL_DLLPRIVATE void ImplDrawGradientBackground( ToolBox* pThis, ImplDockingWindowWrapper *pWrapper );
-    static SAL_DLLPRIVATE bool ImplDrawNativeBackground( ToolBox* pThis, const Region &rRegion );
-    static SAL_DLLPRIVATE void ImplDrawTransparentBackground( ToolBox* pThis, const Region &rRegion );
-    static SAL_DLLPRIVATE void ImplDrawConstantBackground( ToolBox* pThis, const Region &rRegion, bool bIsInPopupMode );
+    static SAL_DLLPRIVATE bool ImplDrawNativeBackground( ToolBox* pThis, const vcl::Region &rRegion );
+    static SAL_DLLPRIVATE void ImplDrawTransparentBackground( ToolBox* pThis, const vcl::Region &rRegion );
+    static SAL_DLLPRIVATE void ImplDrawConstantBackground( ToolBox* pThis, const vcl::Region &rRegion, bool bIsInPopupMode );
     static SAL_DLLPRIVATE void ImplDrawBackground( ToolBox* pThis, const Rectangle &rRect );
     static SAL_DLLPRIVATE void ImplErase( ToolBox* pThis, const Rectangle &rRect, bool bHighlight = false, bool bHasOpenPopup = false );
     static SAL_DLLPRIVATE void ImplDrawBorder( ToolBox* pWin );
diff --git a/include/vcl/virdev.hxx b/include/vcl/virdev.hxx
index 8c36f52e5f16..624cb2f0f31a 100644
--- a/include/vcl/virdev.hxx
+++ b/include/vcl/virdev.hxx
@@ -30,7 +30,7 @@ struct SystemGraphicsData;
 class VCL_DLLPUBLIC VirtualDevice : public OutputDevice
 {
     friend class Application;
-    friend class OutputDevice;
+    friend class ::OutputDevice;
     friend class Printer;
 
 private:
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index ce75def7b31f..ae9481973ba0 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -354,9 +354,9 @@ struct WindowResHeader
 
 namespace vcl {
 
-class VCL_DLLPUBLIC Window : public OutputDevice, public Resource
+class VCL_DLLPUBLIC Window : public ::OutputDevice, public Resource
 {
-    friend class vcl::Cursor;
+    friend class ::vcl::Cursor;
     friend class ::OutputDevice;
     friend class ::Application;
     friend class ::SystemWindow;
@@ -379,7 +379,7 @@ class VCL_DLLPUBLIC Window : public OutputDevice, public Resource
     friend class ::ImplPopupFloatWin;
     friend class ::MenuFloatingWindow;
 
-    friend class svt::PopupWindowControllerImpl;
+    friend class ::svt::PopupWindowControllerImpl;
 
 private:
     // NOTE: to remove many dependencies of other modules
@@ -395,7 +395,7 @@ private:
 
     // This is a first attempt to start to remove the dependency of Window on
     // OutputDevice
-    OutputDevice* mpOutputDevice;
+    ::OutputDevice* mpOutputDevice;
 
 #ifdef DBG_UTIL
     friend const char* ::ImplDbgCheckWindow( const void* pObj );
@@ -425,8 +425,8 @@ public:
     SAL_DLLPRIVATE vcl::Window*         ImplGetParent() const;
     SAL_DLLPRIVATE vcl::Window*         ImplFindWindow( const Point& rFramePos );
 
-    SAL_DLLPRIVATE void                 ImplInvalidateFrameRegion( const Region* pRegion, sal_uInt16 nFlags );
-    SAL_DLLPRIVATE void                 ImplInvalidateOverlapFrameRegion( const Region& rRegion );
+    SAL_DLLPRIVATE void                 ImplInvalidateFrameRegion( const vcl::Region* pRegion, sal_uInt16 nFlags );
+    SAL_DLLPRIVATE void                 ImplInvalidateOverlapFrameRegion( const vcl::Region& rRegion );
 
     SAL_DLLPRIVATE bool                 ImplSetClipFlag( bool bSysObjOnlySmaller = false );
 
@@ -482,15 +482,15 @@ protected:
 
     SAL_DLLPRIVATE Point                ImplOutputToFrame( const Point& rPos );
 
-    SAL_DLLPRIVATE void                 ImplInvalidateParentFrameRegion( Region& rRegion );
-    SAL_DLLPRIVATE void                 ImplValidateFrameRegion( const Region* rRegion, sal_uInt16 nFlags );
-    SAL_DLLPRIVATE void                 ImplValidate( const Region* rRegion, sal_uInt16 nFlags );
+    SAL_DLLPRIVATE void                 ImplInvalidateParentFrameRegion( vcl::Region& rRegion );
+    SAL_DLLPRIVATE void                 ImplValidateFrameRegion( const vcl::Region* rRegion, sal_uInt16 nFlags );
+    SAL_DLLPRIVATE void                 ImplValidate( const vcl::Region* rRegion, sal_uInt16 nFlags );
     SAL_DLLPRIVATE void                 ImplMoveInvalidateRegion( const Rectangle& rRect, long nHorzScroll, long nVertScroll, bool bChildren );
     SAL_DLLPRIVATE void                 ImplMoveAllInvalidateRegions( const Rectangle& rRect, long nHorzScroll, long nVertScroll, bool bChildren );
 
     SAL_DLLPRIVATE vcl::Window*              ImplGetBorderWindow() const;
 
-    SAL_DLLPRIVATE void                 ImplInvalidate( const Region* rRegion, sal_uInt16 nFlags );
+    SAL_DLLPRIVATE void                 ImplInvalidate( const vcl::Region* rRegion, sal_uInt16 nFlags );
 
     SAL_DLLPRIVATE sal_uInt16           ImplHitTest( const Point& rFramePos );
 
@@ -499,7 +499,7 @@ protected:
     SAL_DLLPRIVATE void                 ImplScroll( const Rectangle& rRect, long nHorzScroll, long nVertScroll, sal_uInt16 nFlags );
 
     SAL_DLLPRIVATE void                 ImplSaveOverlapBackground();
-    SAL_DLLPRIVATE bool                 ImplRestoreOverlapBackground( Region& rInvRegion );
+    SAL_DLLPRIVATE bool                 ImplRestoreOverlapBackground( vcl::Region& rInvRegion );
     SAL_DLLPRIVATE void                 ImplInvalidateAllOverlapBackgrounds();
 
     SAL_DLLPRIVATE bool                 ImplSetClipFlagChildren( bool bSysObjOnlySmaller = false );
@@ -540,33 +540,33 @@ private:
     SAL_DLLPRIVATE void                 ImplPointToLogic( vcl::Font& rFont ) const;
     SAL_DLLPRIVATE void                 ImplLogicToPoint( vcl::Font& rFont ) const;
 
-    SAL_DLLPRIVATE bool                 ImplSysObjClip( const Region* pOldRegion );
+    SAL_DLLPRIVATE bool                 ImplSysObjClip( const vcl::Region* pOldRegion );
     SAL_DLLPRIVATE void                 ImplUpdateSysObjChildrenClip();
     SAL_DLLPRIVATE void                 ImplUpdateSysObjOverlapsClip();
     SAL_DLLPRIVATE void                 ImplUpdateSysObjClip();
 
-    SAL_DLLPRIVATE void                 ImplIntersectWindowClipRegion( Region& rRegion );
-    SAL_DLLPRIVATE void                 ImplIntersectWindowRegion( Region& rRegion );
-    SAL_DLLPRIVATE void                 ImplExcludeWindowRegion( Region& rRegion );
-    SAL_DLLPRIVATE void                 ImplExcludeOverlapWindows( Region& rRegion );
-    SAL_DLLPRIVATE void                 ImplExcludeOverlapWindows2( Region& rRegion );
+    SAL_DLLPRIVATE void                 ImplIntersectWindowClipRegion( vcl::Region& rRegion );
+    SAL_DLLPRIVATE void                 ImplIntersectWindowRegion( vcl::Region& rRegion );
+    SAL_DLLPRIVATE void                 ImplExcludeWindowRegion( vcl::Region& rRegion );
+    SAL_DLLPRIVATE void                 ImplExcludeOverlapWindows( vcl::Region& rRegion );
+    SAL_DLLPRIVATE void                 ImplExcludeOverlapWindows2( vcl::Region& rRegion );
 
-    SAL_DLLPRIVATE void                 ImplClipBoundaries( Region& rRegion, bool bThis, bool bOverlaps );
-    SAL_DLLPRIVATE bool                 ImplClipChildren( Region& rRegion );
-    SAL_DLLPRIVATE void                 ImplClipAllChildren( Region& rRegion );
-    SAL_DLLPRIVATE void                 ImplClipSiblings( Region& rRegion );
+    SAL_DLLPRIVATE void                 ImplClipBoundaries( vcl::Region& rRegion, bool bThis, bool bOverlaps );
+    SAL_DLLPRIVATE bool                 ImplClipChildren( vcl::Region& rRegion );
+    SAL_DLLPRIVATE void                 ImplClipAllChildren( vcl::Region& rRegion );
+    SAL_DLLPRIVATE void                 ImplClipSiblings( vcl::Region& rRegion );
 
     SAL_DLLPRIVATE void                 ImplInitWinClipRegion();
     SAL_DLLPRIVATE void                 ImplInitWinChildClipRegion();
-    SAL_DLLPRIVATE Region*              ImplGetWinChildClipRegion();
+    SAL_DLLPRIVATE vcl::Region*              ImplGetWinChildClipRegion();
 
-    SAL_DLLPRIVATE void                 ImplIntersectAndUnionOverlapWindows( const Region& rInterRegion, Region& rRegion );
-    SAL_DLLPRIVATE void                 ImplIntersectAndUnionOverlapWindows2( const Region& rInterRegion, Region& rRegion );
-    SAL_DLLPRIVATE void                 ImplCalcOverlapRegionOverlaps( const Region& rInterRegion, Region& rRegion );
-    SAL_DLLPRIVATE void                 ImplCalcOverlapRegion( const Rectangle& rSourceRect, Region& rRegion,
+    SAL_DLLPRIVATE void                 ImplIntersectAndUnionOverlapWindows( const vcl::Region& rInterRegion, vcl::Region& rRegion );
+    SAL_DLLPRIVATE void                 ImplIntersectAndUnionOverlapWindows2( const vcl::Region& rInterRegion, vcl::Region& rRegion );
+    SAL_DLLPRIVATE void                 ImplCalcOverlapRegionOverlaps( const vcl::Region& rInterRegion, vcl::Region& rRegion );
+    SAL_DLLPRIVATE void                 ImplCalcOverlapRegion( const Rectangle& rSourceRect, vcl::Region& rRegion,
                                                                bool bChildren, bool bParent, bool bSiblings );
 
-    SAL_DLLPRIVATE void                 ImplCallPaint( const Region* pRegion, sal_uInt16 nPaintFlags );
+    SAL_DLLPRIVATE void                 ImplCallPaint( const vcl::Region* pRegion, sal_uInt16 nPaintFlags );
     SAL_DLLPRIVATE void                 ImplCallOverlapPaint();
     SAL_DLLPRIVATE void                 ImplPostPaint();
 
@@ -636,13 +636,13 @@ private:
     SAL_DLLPRIVATE bool                 ImplStopDnd();
     SAL_DLLPRIVATE void                 ImplStartDnd();
 
-    SAL_DLLPRIVATE void                 ImplPaintToDevice( OutputDevice* pTargetOutDev, const Point& rPos );
+    SAL_DLLPRIVATE void                 ImplPaintToDevice( ::OutputDevice* pTargetOutDev, const Point& rPos );
 
     SAL_DLLPRIVATE ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvas >
                                         ImplGetCanvas( const Size& rFullscreenSize, bool bFullscreen, bool bSpriteCanvas ) const;
 
 public:
-    virtual Region                      GetActiveClipRegion() const SAL_OVERRIDE;
+    virtual vcl::Region                      GetActiveClipRegion() const SAL_OVERRIDE;
 
 protected:
     // Single argument ctors shall be explicit.
@@ -678,8 +678,8 @@ public:
                                         Window( vcl::Window* pParent, const ResId& rResId );
     virtual                             ~Window();
 
-    OutputDevice const*                 GetOutDev() const { return mpOutputDevice; };
-    OutputDevice*                       GetOutDev()       { return mpOutputDevice; };
+    ::OutputDevice const*               GetOutDev() const { return mpOutputDevice; };
+    ::OutputDevice*                     GetOutDev()       { return mpOutputDevice; };
 
     virtual void                        EnableRTL ( bool bEnable = true ) SAL_OVERRIDE;
     virtual void                        MouseMove( const MouseEvent& rMEvt );
@@ -690,10 +690,10 @@ public:
     virtual void                        PrePaint();
     virtual void                        Paint( const Rectangle& rRect );
     virtual void                        Erase() SAL_OVERRIDE;
-    virtual void                        Erase( const Rectangle& rRect ) SAL_OVERRIDE { OutputDevice::Erase( rRect ); }
+    virtual void                        Erase( const Rectangle& rRect ) SAL_OVERRIDE { ::OutputDevice::Erase( rRect ); }
 
     virtual void                        PostPaint();
-    virtual void                        Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags );
+    virtual void                        Draw( ::OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags );
     virtual void                        Move();
     virtual void                        Resize();
     virtual void                        Activate();
@@ -782,7 +782,7 @@ public:
 
     void                                SetCompositionCharRect( const Rectangle* pRect, long nCompositionLength, bool bVertical = false );
 
-    using                               OutputDevice::SetSettings;
+    using                               ::OutputDevice::SetSettings;
     virtual void                        SetSettings( const AllSettings& rSettings ) SAL_OVERRIDE;
     virtual void                        SetSettings( const AllSettings& rSettings, bool bChild );
     void                                UpdateSettings( const AllSettings& rSettings, bool bChild = false );
@@ -791,8 +791,8 @@ public:
     void                                SetPointFont( const vcl::Font& rFont );
     vcl::Font                           GetPointFont() const;
     void                                SetZoomedPointFont( const vcl::Font& rFont );
-    long                                GetDrawPixel( OutputDevice* pDev, long nPixels ) const;
-    vcl::Font                           GetDrawPixelFont( OutputDevice* pDev ) const;
+    long                                GetDrawPixel( ::OutputDevice* pDev, long nPixels ) const;
+    vcl::Font                           GetDrawPixelFont( ::OutputDevice* pDev ) const;
 
     void                                SetControlFont();
     void                                SetControlFont( const vcl::Font& rFont );
@@ -811,16 +811,16 @@ public:
     sal_uInt16                          GetParentClipMode() const;
 
     void                                SetWindowRegionPixel();
-    void                                SetWindowRegionPixel( const Region& rRegion );
-    const Region&                       GetWindowRegionPixel() const;
+    void                                SetWindowRegionPixel( const vcl::Region& rRegion );
+    const vcl::Region&                       GetWindowRegionPixel() const;
     bool                                IsWindowRegionPixel() const;
-    Region                              GetWindowClipRegionPixel( sal_uInt16 nFlags = 0 ) const;
-    Region                              GetPaintRegion() const;
+    vcl::Region                              GetWindowClipRegionPixel( sal_uInt16 nFlags = 0 ) const;
+    vcl::Region                              GetPaintRegion() const;
     bool                                IsInPaint() const;
     // while IsInPaint returns true ExpandPaintClipRegion adds the
     // submitted region to the paint clip region so you can
     // paint additional parts of your window if necessary
-    void                                ExpandPaintClipRegion( const Region& rRegion );
+    void                                ExpandPaintClipRegion( const vcl::Region& rRegion );
 
     void                                SetParent( vcl::Window* pNewParent );
     vcl::Window*                             GetParent() const;
@@ -953,7 +953,7 @@ public:
                                                 const Rectangle& rRect, sal_uInt16 nFlags = 0 );
     virtual void                        Invalidate( sal_uInt16 nFlags = 0 );
     virtual void                        Invalidate( const Rectangle& rRect, sal_uInt16 nFlags = 0 );
-    virtual void                        Invalidate( const Region& rRegion, sal_uInt16 nFlags = 0 );
+    virtual void                        Invalidate( const vcl::Region& rRegion, sal_uInt16 nFlags = 0 );
     void                                Validate( sal_uInt16 nFlags = 0 );
     bool                                HasPaintEvent() const;
     void                                Update();
@@ -1408,7 +1408,7 @@ public:
     bool    IsNativeWidgetEnabled() const;
 
     // a helper method for a Control's Draw method
-    void PaintToDevice( OutputDevice* pDevice, const Point& rPos, const Size& rSize );
+    void PaintToDevice( ::OutputDevice* pDevice, const Point& rPos, const Size& rSize );
 
     /* mark Window for deletion in top of event queue
     */