From 827c46e7d75000cb03b0ce21759f9d0825f0c096 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel@peralex.com>
Date: Tue, 23 Sep 2014 11:20:40 +0200
Subject: fdo#82577: Handle Window

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

Change-Id: Ib1beb7ab4ad75562a42aeb252732a073d25eff1a
---
 svx/source/engine3d/float3d.cxx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'svx/source/engine3d')

diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx
index d28b3cded20b..d418277476cb 100644
--- a/svx/source/engine3d/float3d.cxx
+++ b/svx/source/engine3d/float3d.cxx
@@ -84,7 +84,7 @@ namespace {
 }
 
 Svx3DWin::Svx3DWin( SfxBindings* pInBindings,
-                SfxChildWindow *pCW, Window* pParent ) :
+                SfxChildWindow *pCW, vcl::Window* pParent ) :
         SfxDockingWindow    ( pInBindings, pCW, pParent,
                                     SVX_RES( RID_SVXFLOAT_3D ) ),
         aBtnGeo             ( this, SVX_RES( BTN_GEO ) ),
@@ -3231,7 +3231,7 @@ ColorLB* Svx3DWin::GetLbByButton( const PushButton* pBtn )
 
 // Derivation from SfxChildWindow as "containers" for effects
 
-Svx3DChildWindow::Svx3DChildWindow( Window* _pParent,
+Svx3DChildWindow::Svx3DChildWindow( vcl::Window* _pParent,
                                                          sal_uInt16 nId,
                                                          SfxBindings* pBindings,
                                                          SfxChildWinInfo* pInfo ) :
-- 
cgit