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/inc/sdr/contact/viewcontactofunocontrol.hxx        | 4 ++--
 svx/inc/sdr/contact/viewobjectcontactofopenglobj.hxx   | 4 ++--
 svx/inc/sdr/contact/viewobjectcontactofsdrmediaobj.hxx | 4 ++--
 svx/inc/sdr/contact/viewobjectcontactofunocontrol.hxx  | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'svx/inc/sdr')

diff --git a/svx/inc/sdr/contact/viewcontactofunocontrol.hxx b/svx/inc/sdr/contact/viewcontactofunocontrol.hxx
index b88d9f7207f3..b9e11ddd9792 100644
--- a/svx/inc/sdr/contact/viewcontactofunocontrol.hxx
+++ b/svx/inc/sdr/contact/viewcontactofunocontrol.hxx
@@ -27,7 +27,7 @@
 #include <memory>
 
 class OutputDevice;
-class Window;
+namespace vcl { class Window; }
 class SdrUnoObj;
 namespace com { namespace sun { namespace star {
     namespace awt {
@@ -67,7 +67,7 @@ namespace sdr { namespace contact {
             @seealso SdrUnoObj::GetTemporaryControlForWindow
         */
         ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >
-            getTemporaryControlForWindow( const Window& _rWindow, ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer >& _inout_ControlContainer ) const;
+            getTemporaryControlForWindow( const vcl::Window& _rWindow, ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer >& _inout_ControlContainer ) const;
 
     protected:
         virtual ViewObjectContact& CreateObjectSpecificViewObjectContact( ObjectContact& _rObjectContact ) SAL_OVERRIDE;
diff --git a/svx/inc/sdr/contact/viewobjectcontactofopenglobj.hxx b/svx/inc/sdr/contact/viewobjectcontactofopenglobj.hxx
index 6f5c8ba838c1..5e3827812845 100644
--- a/svx/inc/sdr/contact/viewobjectcontactofopenglobj.hxx
+++ b/svx/inc/sdr/contact/viewobjectcontactofopenglobj.hxx
@@ -13,7 +13,7 @@
 #include <svx/sdr/contact/viewobjectcontactofsdrobj.hxx>
 #include <vcl/opengl/OpenGLContext.hxx>
 
-class Window;
+namespace vcl { class Window; }
 
 namespace sdr {
 namespace contact {
@@ -25,7 +25,7 @@ public:
     virtual ~ViewObjectContactOfOpenGLObj();
 
 private:
-    Window* getWindow() const;
+    vcl::Window* getWindow() const;
 };
 
 } // namespace sdr
diff --git a/svx/inc/sdr/contact/viewobjectcontactofsdrmediaobj.hxx b/svx/inc/sdr/contact/viewobjectcontactofsdrmediaobj.hxx
index 9a3bfbeb1082..d5a3d7472d0a 100644
--- a/svx/inc/sdr/contact/viewobjectcontactofsdrmediaobj.hxx
+++ b/svx/inc/sdr/contact/viewobjectcontactofsdrmediaobj.hxx
@@ -25,7 +25,7 @@
 #include <tools/gen.hxx>
 
 namespace avmedia { class MediaItem; }
-class Window;
+namespace vcl { class Window; }
 
 namespace sdr
 {
@@ -44,7 +44,7 @@ namespace sdr
 
         public:
 
-            Window* getWindow() const;
+            vcl::Window* getWindow() const;
 
             Size    getPreferredSize() const;
 
diff --git a/svx/inc/sdr/contact/viewobjectcontactofunocontrol.hxx b/svx/inc/sdr/contact/viewobjectcontactofunocontrol.hxx
index bfcea286b1f7..50140badca56 100644
--- a/svx/inc/sdr/contact/viewobjectcontactofunocontrol.hxx
+++ b/svx/inc/sdr/contact/viewobjectcontactofunocontrol.hxx
@@ -27,7 +27,7 @@
 #include <svx/svxdllapi.h>
 
 class OutputDevice;
-class Window;
+namespace vcl { class Window; }
 class SdrUnoObj;
 namespace com { namespace sun { namespace star {
     namespace awt {
@@ -63,7 +63,7 @@ namespace sdr { namespace contact {
         */
         static ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >
             getTemporaryControlForWindow(
-                const Window& _rWindow,
+                const vcl::Window& _rWindow,
                 ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer >& _inout_ControlContainer,
                 const SdrUnoObj& _rUnoObject
             );
-- 
cgit