fdo#82577: Handle Window

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

Change-Id: Ib1beb7ab4ad75562a42aeb252732a073d25eff1a

22 files changed, 35 insertions, 35 deletions

diff --git a/canvas/source/cairo/cairo_cairo.cxx b/canvas/source/cairo/cairo_cairo.cxx
index 290235a6d25f..cb5eeb951d72 100644
--- a/canvas/source/cairo/cairo_cairo.cxx
+++ b/canvas/source/cairo/cairo_cairo.cxx
@@ -30,7 +30,7 @@ namespace cairo
  *  Surface classes), see platform specific cairo_<platform>_cairo.cxx                  *
  ****************************************************************************************/
 
-    const SystemEnvData* GetSysData(const Window *pOutputWindow)
+    const SystemEnvData* GetSysData(const vcl::Window *pOutputWindow)
     {
         const SystemEnvData* pSysData = NULL;
         // check whether we're a SysChild: have to fetch system data
diff --git a/canvas/source/cairo/cairo_cairo.hxx b/canvas/source/cairo/cairo_cairo.hxx
index b971988333d1..10c92038f5dd 100644
--- a/canvas/source/cairo/cairo_cairo.hxx
+++ b/canvas/source/cairo/cairo_cairo.hxx
@@ -28,7 +28,7 @@ struct BitmapSystemData;
 struct SystemGraphicsData;
 class  VirtualDevice;
 class  OutputDevice;
-class  Window;
+namespace vcl { class Window; }
 class  Size;
 
 #include <cairo.h>
@@ -43,7 +43,7 @@ namespace cairo {
     typedef boost::shared_ptr<cairo_surface_t> CairoSurfaceSharedPtr;
     typedef boost::shared_ptr<Cairo>           CairoSharedPtr;
 
-    const SystemEnvData* GetSysData(const Window *pOutputWindow);
+    const SystemEnvData* GetSysData(const vcl::Window *pOutputWindow);
 
     /** Cairo surface interface
 
diff --git a/canvas/source/cairo/cairo_quartz_cairo.cxx b/canvas/source/cairo/cairo_quartz_cairo.cxx
index 07951eeba94c..390402a9bde5 100644
--- a/canvas/source/cairo/cairo_quartz_cairo.cxx
+++ b/canvas/source/cairo/cairo_quartz_cairo.cxx
@@ -301,7 +301,7 @@ namespace cairo
 
         if( rRefDevice.GetOutDevType() == OUTDEV_WINDOW )
         {
-            const Window &rWindow = (const Window &) rRefDevice;
+            const vcl::Window &rWindow = (const vcl::Window &) rRefDevice;
             const SystemEnvData* pSysData = GetSysData(&rWindow);
             if (pSysData)
                 surf = SurfaceSharedPtr(new QuartzSurface(pSysData->pView, x, y, width, height));
diff --git a/canvas/source/cairo/cairo_spritecanvas.cxx b/canvas/source/cairo/cairo_spritecanvas.cxx
index 78f2450a9029..782d0433aebb 100644
--- a/canvas/source/cairo/cairo_spritecanvas.cxx
+++ b/canvas/source/cairo/cairo_spritecanvas.cxx
@@ -80,7 +80,7 @@ namespace cairocanvas
         uno::Reference< awt::XWindow > xParentWindow;
         maArguments[4] >>= xParentWindow;
 
-        Window* pParentWindow = VCLUnoHelper::GetWindow(xParentWindow);
+        vcl::Window* pParentWindow = VCLUnoHelper::GetWindow(xParentWindow);
         if( !pParentWindow )
             throw lang::NoSupportException(
                 "Parent window not VCL window, or canvas out-of-process!", NULL);
diff --git a/canvas/source/cairo/cairo_spritedevicehelper.cxx b/canvas/source/cairo/cairo_spritedevicehelper.cxx
index 8288186c2f17..ceba72a0ac4b 100644
--- a/canvas/source/cairo/cairo_spritedevicehelper.cxx
+++ b/canvas/source/cairo/cairo_spritedevicehelper.cxx
@@ -51,7 +51,7 @@ namespace cairocanvas
         mbFullScreen( false )
     {}
 
-    void SpriteDeviceHelper::init( Window&                   rOutputWindow,
+    void SpriteDeviceHelper::init( vcl::Window&                   rOutputWindow,
                                    SpriteCanvas&             rSpriteCanvas,
                                    const ::basegfx::B2ISize& rSize,
                                    bool                      bFullscreen )
diff --git a/canvas/source/cairo/cairo_spritedevicehelper.hxx b/canvas/source/cairo/cairo_spritedevicehelper.hxx
index b359de0b76b2..a8be2b676b9b 100644
--- a/canvas/source/cairo/cairo_spritedevicehelper.hxx
+++ b/canvas/source/cairo/cairo_spritedevicehelper.hxx
@@ -43,7 +43,7 @@ namespace cairocanvas
     public:
         SpriteDeviceHelper();
 
-        void init( Window&                   rOutputWindow,
+        void init( vcl::Window&                   rOutputWindow,
                    SpriteCanvas&             rSpriteCanvas,
                    const ::basegfx::B2ISize& rSize,
                    bool                      bFullscreen );
diff --git a/canvas/source/cairo/cairo_win32_cairo.cxx b/canvas/source/cairo/cairo_win32_cairo.cxx
index a70add9500a2..8d4a4d2ff680 100644
--- a/canvas/source/cairo/cairo_win32_cairo.cxx
+++ b/canvas/source/cairo/cairo_win32_cairo.cxx
@@ -231,7 +231,7 @@ namespace cairo
 
         if( rRefDevice.GetOutDevType() == OUTDEV_WINDOW )
         {
-            const Window &rWindow = (const Window &) rRefDevice;
+            const vcl::Window &rWindow = (const vcl::Window &) rRefDevice;
             const SystemEnvData* pSysData = GetSysData(&rWindow);
             if (pSysData && pSysData->hWnd)
                 surf = SurfaceSharedPtr(new Win32Surface(GetDC((HWND) pSysData->hWnd), x, y));
diff --git a/canvas/source/cairo/cairo_xlib_cairo.cxx b/canvas/source/cairo/cairo_xlib_cairo.cxx
index 9b49c7e88cbc..8f496a45f39d 100644
--- a/canvas/source/cairo/cairo_xlib_cairo.cxx
+++ b/canvas/source/cairo/cairo_xlib_cairo.cxx
@@ -318,7 +318,7 @@ namespace cairo
         return SurfaceSharedPtr(new X11Surface(rSurface));
     }
 
-    static X11SysData getSysData( const Window& rWindow )
+    static X11SysData getSysData( const vcl::Window& rWindow )
     {
         const SystemEnvData* pSysData = GetSysData(&rWindow);
 
@@ -337,7 +337,7 @@ namespace cairo
                                     int x, int y, int width, int height )
     {
         if( rRefDevice.GetOutDevType() == OUTDEV_WINDOW )
-            return SurfaceSharedPtr(new X11Surface(getSysData((const Window&)rRefDevice),
+            return SurfaceSharedPtr(new X11Surface(getSysData((const vcl::Window&)rRefDevice),
                                                    x,y,width,height));
         else if( rRefDevice.GetOutDevType() == OUTDEV_VIRDEV )
             return SurfaceSharedPtr(new X11Surface(getSysData((const VirtualDevice&)rRefDevice),
@@ -355,7 +355,7 @@ namespace cairo
         if ( rData.mnWidth == rSize.Width() && rData.mnHeight == rSize.Height() )
         {
             if( rRefDevice.GetOutDevType() == OUTDEV_WINDOW )
-                return SurfaceSharedPtr(new X11Surface(getSysData((const Window&)rRefDevice), rData ));
+                return SurfaceSharedPtr(new X11Surface(getSysData((const vcl::Window&)rRefDevice), rData ));
             else if( rRefDevice.GetOutDevType() == OUTDEV_VIRDEV )
                 return SurfaceSharedPtr(new X11Surface(getSysData((const VirtualDevice&)rRefDevice), rData ));
         }
diff --git a/canvas/source/directx/dx_9rm.cxx b/canvas/source/directx/dx_9rm.cxx
index e34233849fcc..cc48395d8b23 100644
--- a/canvas/source/directx/dx_9rm.cxx
+++ b/canvas/source/directx/dx_9rm.cxx
@@ -181,7 +181,7 @@ namespace dxcanvas
         class DXRenderModule : public IDXRenderModule
         {
         public:
-            explicit DXRenderModule( const ::Window& rWindow );
+            explicit DXRenderModule( const vcl::Window& rWindow );
             ~DXRenderModule();
 
             virtual void lock() const { maMutex.acquire(); }
@@ -211,7 +211,7 @@ namespace dxcanvas
 
         private:
 
-            bool create( const ::Window& rWindow );
+            bool create( const vcl::Window& rWindow );
             bool createDevice();
             bool verifyDevice( const UINT nAdapter );
             UINT getAdapterFromWindow();
@@ -563,7 +563,7 @@ namespace dxcanvas
         // DXRenderModule::DXRenderModule
 
 
-        DXRenderModule::DXRenderModule( const ::Window& rWindow ) :
+        DXRenderModule::DXRenderModule( const vcl::Window& rWindow ) :
             mhWnd(0),
             mpDevice(),
             mpDirect3D9(),
@@ -660,7 +660,7 @@ namespace dxcanvas
         // DXRenderModule::create
 
 
-        bool DXRenderModule::create( const ::Window& rWindow )
+        bool DXRenderModule::create( const vcl::Window& rWindow )
         {
             // TODO(P2): get rid of those fine-grained locking
             ::osl::MutexGuard aGuard( maMutex );
@@ -669,7 +669,7 @@ namespace dxcanvas
 
             mpWindow.reset(
                 new SystemChildWindow(
-                const_cast<Window *>(&rWindow), 0) );
+                const_cast<vcl::Window *>(&rWindow), 0) );
 
             // system child window must not receive mouse events
             mpWindow->SetMouseTransparent( TRUE );
@@ -1336,7 +1336,7 @@ namespace dxcanvas
     // createRenderModule
 
 
-    IDXRenderModuleSharedPtr createRenderModule( const ::Window& rParent )
+    IDXRenderModuleSharedPtr createRenderModule( const vcl::Window& rParent )
     {
         return IDXRenderModuleSharedPtr( new DXRenderModule(rParent) );
     }
diff --git a/canvas/source/directx/dx_rendermodule.hxx b/canvas/source/directx/dx_rendermodule.hxx
index f15d3d3bd01e..6a61a64b09dc 100644
--- a/canvas/source/directx/dx_rendermodule.hxx
+++ b/canvas/source/directx/dx_rendermodule.hxx
@@ -26,7 +26,7 @@
 #include <boost/shared_ptr.hpp>
 #include "dx_winstuff.hxx"
 
-class Window;
+namespace vcl { class Window; }
 namespace basegfx
 {
     class B2IRange;
@@ -75,7 +75,7 @@ namespace dxcanvas
     /** Factory method, to create an IRenderModule instance for the
         given VCL window instance
      */
-    IDXRenderModuleSharedPtr createRenderModule( const ::Window& rParent );
+    IDXRenderModuleSharedPtr createRenderModule( const vcl::Window& rParent );
 }
 
 #endif
diff --git a/canvas/source/directx/dx_spritecanvas.cxx b/canvas/source/directx/dx_spritecanvas.cxx
index 3d36b2033962..6b72848b647d 100644
--- a/canvas/source/directx/dx_spritecanvas.cxx
+++ b/canvas/source/directx/dx_spritecanvas.cxx
@@ -88,7 +88,7 @@ namespace dxcanvas
 
         uno::Reference< awt::XWindow > xParentWindow;
         maArguments[4] >>= xParentWindow;
-        Window* pParentWindow = VCLUnoHelper::GetWindow(xParentWindow);
+        vcl::Window* pParentWindow = VCLUnoHelper::GetWindow(xParentWindow);
         if( !pParentWindow )
             throw lang::NoSupportException( "Parent window not VCL window, or canvas out-of-process!" );
 
diff --git a/canvas/source/directx/dx_spritedevicehelper.cxx b/canvas/source/directx/dx_spritedevicehelper.cxx
index 76cf78efceb0..feede348af1c 100644
--- a/canvas/source/directx/dx_spritedevicehelper.cxx
+++ b/canvas/source/directx/dx_spritedevicehelper.cxx
@@ -51,7 +51,7 @@ namespace dxcanvas
     {
     }
 
-    void SpriteDeviceHelper::init( Window&               rWindow,
+    void SpriteDeviceHelper::init( vcl::Window&               rWindow,
                                    SpriteCanvas&         rSpriteCanvas,
                                    const awt::Rectangle& rRect,
                                    bool                  /*bFullscreen*/ )
diff --git a/canvas/source/directx/dx_spritedevicehelper.hxx b/canvas/source/directx/dx_spritedevicehelper.hxx
index 81a8bb4ee263..bd6ec175b96b 100644
--- a/canvas/source/directx/dx_spritedevicehelper.hxx
+++ b/canvas/source/directx/dx_spritedevicehelper.hxx
@@ -42,7 +42,7 @@ namespace dxcanvas
     public:
         SpriteDeviceHelper();
 
-        void init( Window&                                  rWindow,
+        void init( vcl::Window&                                  rWindow,
                    SpriteCanvas&                            rSpriteCanvas,
                    const ::com::sun::star::awt::Rectangle&  rRect,
                    bool                                     bFullscreen );
diff --git a/canvas/source/opengl/ogl_spritecanvas.cxx b/canvas/source/opengl/ogl_spritecanvas.cxx
index a7e255fa8dda..c378baeae21e 100644
--- a/canvas/source/opengl/ogl_spritecanvas.cxx
+++ b/canvas/source/opengl/ogl_spritecanvas.cxx
@@ -64,7 +64,7 @@ namespace oglcanvas
 
         uno::Reference< awt::XWindow > xParentWindow;
         maArguments[4] >>= xParentWindow;
-        Window* pParentWindow = VCLUnoHelper::GetWindow(xParentWindow);
+        vcl::Window* pParentWindow = VCLUnoHelper::GetWindow(xParentWindow);
         if( !pParentWindow )
             throw lang::NoSupportException(
                 "Parent window not VCL window, or canvas out-of-process!", NULL);
diff --git a/canvas/source/opengl/ogl_spritedevicehelper.cxx b/canvas/source/opengl/ogl_spritedevicehelper.cxx
index 58a59ea1fe1c..5b712b841692 100644
--- a/canvas/source/opengl/ogl_spritedevicehelper.cxx
+++ b/canvas/source/opengl/ogl_spritedevicehelper.cxx
@@ -93,7 +93,7 @@ namespace oglcanvas
     SpriteDeviceHelper::~SpriteDeviceHelper()
     {}
 
-    void SpriteDeviceHelper::init( Window&               rWindow,
+    void SpriteDeviceHelper::init( vcl::Window&               rWindow,
                                    SpriteCanvas&         rSpriteCanvas,
                                    const awt::Rectangle& rViewArea )
     {
diff --git a/canvas/source/opengl/ogl_spritedevicehelper.hxx b/canvas/source/opengl/ogl_spritedevicehelper.hxx
index bb4a976985a1..4eb3c4b0e94c 100644
--- a/canvas/source/opengl/ogl_spritedevicehelper.hxx
+++ b/canvas/source/opengl/ogl_spritedevicehelper.hxx
@@ -22,7 +22,7 @@
 
 #include <set>
 
-class Window;
+namespace vcl { class Window; }
 class SystemChildWindow;
 namespace basegfx{ class B2IVector; class B2DHomMatrix; }
 namespace com { namespace sun { namespace star {
@@ -43,7 +43,7 @@ namespace oglcanvas
         SpriteDeviceHelper();
         ~SpriteDeviceHelper();
 
-        void init( Window&                                 rWindow,
+        void init( vcl::Window&                                 rWindow,
                    SpriteCanvas&                           rSpriteCanvas,
                    const ::com::sun::star::awt::Rectangle& rViewArea );
 
diff --git a/canvas/source/tools/canvastools.cxx b/canvas/source/tools/canvastools.cxx
index e06d0170f9df..3feb2351eddd 100644
--- a/canvas/source/tools/canvastools.cxx
+++ b/canvas/source/tools/canvastools.cxx
@@ -1183,7 +1183,7 @@ namespace canvas
         {
             awt::Rectangle aRetVal( rRect );
 
-            ::Window* pWindow = VCLUnoHelper::GetWindow(xWin);
+            vcl::Window* pWindow = VCLUnoHelper::GetWindow(xWin);
             if( pWindow )
             {
                 ::Point aPoint( aRetVal.X,
diff --git a/canvas/source/vcl/canvashelper.cxx b/canvas/source/vcl/canvashelper.cxx
index d14ec6bed060..116b4ac116c0 100644
--- a/canvas/source/vcl/canvashelper.cxx
+++ b/canvas/source/vcl/canvashelper.cxx
@@ -1436,14 +1436,14 @@ namespace vclcanvas
         {
             // TODO(Q3): Evil downcast. And what's more, Window::Flush is
             // not even const. Wah.
-            static_cast<Window&>(mpOutDev->getOutDev()).Flush();
+            static_cast<vcl::Window&>(mpOutDev->getOutDev()).Flush();
         }
 
         if( mp2ndOutDev && mp2ndOutDev->getOutDev().GetOutDevType() == OUTDEV_WINDOW )
         {
             // TODO(Q3): Evil downcast. And what's more, Window::Flush is
             // not even const. Wah.
-            static_cast<Window&>(mp2ndOutDev->getOutDev()).Flush();
+            static_cast<vcl::Window&>(mp2ndOutDev->getOutDev()).Flush();
         }
     }
 
diff --git a/canvas/source/vcl/spritecanvashelper.cxx b/canvas/source/vcl/spritecanvashelper.cxx
index 58dfa55d3bb3..08c532cc8421 100644
--- a/canvas/source/vcl/spritecanvashelper.cxx
+++ b/canvas/source/vcl/spritecanvashelper.cxx
@@ -266,10 +266,10 @@ namespace vclcanvas
         const Size  aOutDevSize( rBackOutDev.GetOutputSizePixel() );
         const Point aEmptyPoint(0,0);
 
-        Window* pTargetWindow = NULL;
+        vcl::Window* pTargetWindow = NULL;
         if( rOutDev.GetOutDevType() == OUTDEV_WINDOW )
         {
-            pTargetWindow = &static_cast<Window&>(rOutDev); // TODO(Q3): Evil downcast.
+            pTargetWindow = &static_cast<vcl::Window&>(rOutDev); // TODO(Q3): Evil downcast.
 
             // we're double-buffered, thus no need for paint area-limiting
             // clips. besides that, will interfere with animations (as for
diff --git a/canvas/source/vcl/windowoutdevholder.cxx b/canvas/source/vcl/windowoutdevholder.cxx
index 92f4e0ebf0eb..398ae72e829b 100644
--- a/canvas/source/vcl/windowoutdevholder.cxx
+++ b/canvas/source/vcl/windowoutdevholder.cxx
@@ -29,9 +29,9 @@ namespace vclcanvas
 {
     namespace
     {
-        Window& windowFromXWin( const uno::Reference<awt::XWindow>& xWin )
+        vcl::Window& windowFromXWin( const uno::Reference<awt::XWindow>& xWin )
         {
-            Window* pWindow = VCLUnoHelper::GetWindow(xWin);
+            vcl::Window* pWindow = VCLUnoHelper::GetWindow(xWin);
             if( !pWindow )
                 throw lang::NoSupportException(
                     "Parent window not VCL window, or canvas out-of-process!",
diff --git a/canvas/source/vcl/windowoutdevholder.hxx b/canvas/source/vcl/windowoutdevholder.hxx
index 8ac11e7fb243..1d652d1d81d2 100644
--- a/canvas/source/vcl/windowoutdevholder.hxx
+++ b/canvas/source/vcl/windowoutdevholder.hxx
@@ -51,7 +51,7 @@ namespace vclcanvas
         // vcl/source/window/window.cxx is broken, that disposes the
         // canvas during window deletion, we're riding a dead horse
         // here
-        Window& mrOutputWindow;
+        vcl::Window& mrOutputWindow;
     };
 }
 
diff --git a/canvas/workben/canvasdemo.cxx b/canvas/workben/canvasdemo.cxx
index 2d5fa092c8c5..ac8869abdb7d 100644
--- a/canvas/workben/canvasdemo.cxx
+++ b/canvas/workben/canvasdemo.cxx
@@ -76,7 +76,7 @@ static void PrintHelp()
 class TestWindow : public Dialog
 {
     public:
-        TestWindow() : Dialog( (Window *) NULL )
+        TestWindow() : Dialog( (vcl::Window *) NULL )
         {
             SetText( OUString( "Canvas test" ) );
             SetSizePixel( Size( 600, 450 ) );