fdo#82577: Handle Window

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

Change-Id: Ib1beb7ab4ad75562a42aeb252732a073d25eff1a

4 files changed, 9 insertions, 9 deletions

diff --git a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
index b28c0f19090f..2d5d062a568e 100644
--- a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
+++ b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
@@ -371,7 +371,7 @@ bool OGLTransitionerImpl::initWindowFromSlideShowView( const Reference< presenta
     mpContext = boost::make_shared<OpenGLContext>();
     mpContext->requestLegacyContext();
 
-    if( !mpContext->init( reinterpret_cast< Window* >( aVal ) ) )
+    if( !mpContext->init( reinterpret_cast< vcl::Window* >( aVal ) ) )
         return false;
     SAL_INFO("slideshow", "created the context");
 
diff --git a/slideshow/source/engine/shapes/viewmediashape.cxx b/slideshow/source/engine/shapes/viewmediashape.cxx
index fd3c507365b3..83cb7b74828e 100644
--- a/slideshow/source/engine/shapes/viewmediashape.cxx
+++ b/slideshow/source/engine/shapes/viewmediashape.cxx
@@ -449,7 +449,7 @@ namespace slideshow
 
                     rVCLDeviceParams[ 1 ] >>= aVal;
 
-                    Window* pWindow = reinterpret_cast< Window* >( aVal );
+                    vcl::Window* pWindow = reinterpret_cast< vcl::Window* >( aVal );
 
                     if( pWindow )
                     {
@@ -472,7 +472,7 @@ namespace slideshow
 #else
                             if( avmedia::IsModel(rMimeType) )
                             {
-                                mpEventHandlerParent.reset(new Window(pWindow, WB_NOBORDER|WB_NODIALOGCONTROL));
+                                mpEventHandlerParent.reset(new vcl::Window(pWindow, WB_NOBORDER|WB_NODIALOGCONTROL));
                                 mpEventHandlerParent->SetPosSizePixel( Point( aAWTRect.X, aAWTRect.Y ),
                                                            Size( aAWTRect.Width, aAWTRect.Height ) );
                                 mpEventHandlerParent->EnablePaint(false);
diff --git a/slideshow/source/engine/shapes/viewmediashape.hxx b/slideshow/source/engine/shapes/viewmediashape.hxx
index dc726f65e726..6d06a14f6d60 100644
--- a/slideshow/source/engine/shapes/viewmediashape.hxx
+++ b/slideshow/source/engine/shapes/viewmediashape.hxx
@@ -30,7 +30,7 @@
 #include "viewlayer.hxx"
 
 class SystemChildWindow;
-class Window;
+namespace vcl { class Window; }
 
 namespace com { namespace sun { namespace star { namespace drawing {
     class XShape;
@@ -148,7 +148,7 @@ namespace slideshow
                                                      const OUString& rMimeType );
             ViewLayerSharedPtr                    mpViewLayer;
             ::std::auto_ptr< SystemChildWindow >  mpMediaWindow;
-            boost::scoped_ptr< Window >           mpEventHandlerParent;
+            boost::scoped_ptr< ::vcl::Window >    mpEventHandlerParent;
             mutable ::com::sun::star::awt::Point  maWindowOffset;
             mutable ::basegfx::B2DRectangle       maBounds;
 
diff --git a/slideshow/test/demoshow.cxx b/slideshow/test/demoshow.cxx
index 7674970d107a..e3409e59e226 100644
--- a/slideshow/test/demoshow.cxx
+++ b/slideshow/test/demoshow.cxx
@@ -305,10 +305,10 @@ public:
     virtual sal_uInt16  Exception( sal_uInt16 nError );
 };
 
-class ChildWindow : public Window
+class ChildWindow : public vcl::Window
 {
 public:
-    ChildWindow( Window* pParent );
+    ChildWindow( vcl::Window* pParent );
     virtual ~ChildWindow();
     virtual void Paint( const Rectangle& rRect );
     virtual void Resize();
@@ -322,7 +322,7 @@ private:
     uno::Reference< presentation::XSlideShow > mxShow;
 };
 
-ChildWindow::ChildWindow( Window* pParent ) :
+ChildWindow::ChildWindow( vcl::Window* pParent ) :
     Window(pParent, WB_CLIPCHILDREN | WB_BORDER| WB_3DLOOK ),
     mpView(),
     mxShow()
@@ -402,7 +402,7 @@ private:
 };
 
 DemoWindow::DemoWindow() :
-    Dialog((Window*)NULL),
+    Dialog((vcl::Window*)NULL),
     maLeftChild( this ),
     maRightTopChild( this ),
     maRightBottomChild( this ),