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
---
 slideshow/test/demoshow.cxx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'slideshow/test')

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 ),
-- 
cgit