5 files changed, 11 insertions, 11 deletions
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 );