fdo#82577: Handle Window

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

Change-Id: Ib1beb7ab4ad75562a42aeb252732a073d25eff1a

10 files changed, 23 insertions, 23 deletions

diff --git a/svx/inc/AccessibleSvxFindReplaceDialog.hxx b/svx/inc/AccessibleSvxFindReplaceDialog.hxx
index 20dc1d50bdd8..0e066db27ab3 100644
--- a/svx/inc/AccessibleSvxFindReplaceDialog.hxx
+++ b/svx/inc/AccessibleSvxFindReplaceDialog.hxx
@@ -40,7 +40,7 @@ public:
 class VCLXSvxFindReplaceDialog : public VCLXDialog
 {
 public:
-    VCLXSvxFindReplaceDialog(Window* pSplDlg)
+    VCLXSvxFindReplaceDialog(vcl::Window* pSplDlg)
     {
         SetWindow(pSplDlg);
     }
diff --git a/svx/inc/GalleryControl.hxx b/svx/inc/GalleryControl.hxx
index 795471878ad9..8b58d7639ac5 100644
--- a/svx/inc/GalleryControl.hxx
+++ b/svx/inc/GalleryControl.hxx
@@ -37,15 +37,15 @@ class FmFormModel;
 namespace svx { namespace sidebar {
 
 
-class SVX_DLLPUBLIC GalleryControl : public Window
+class SVX_DLLPUBLIC GalleryControl : public vcl::Window
 {
 public:
     GalleryControl (
         SfxBindings* pBindings,
-        Window* pParentWindow);
+        vcl::Window* pParentWindow);
     virtual ~GalleryControl (void);
 
-    bool GalleryKeyInput( const KeyEvent& rKEvt, Window* pWindow);
+    bool GalleryKeyInput( const KeyEvent& rKEvt, vcl::Window* pWindow);
 
 private:
     Gallery* mpGallery;
diff --git a/svx/inc/extrusiondepthdialog.hxx b/svx/inc/extrusiondepthdialog.hxx
index 43bafe56c7ef..46362d7ff4c5 100644
--- a/svx/inc/extrusiondepthdialog.hxx
+++ b/svx/inc/extrusiondepthdialog.hxx
@@ -34,7 +34,7 @@ class ExtrusionDepthDialog : public ModalDialog
     MetricField* m_pMtrDepth;
 
 public:
-    ExtrusionDepthDialog( Window* pParent, double fDepth, FieldUnit eDefaultUnit );
+    ExtrusionDepthDialog( vcl::Window* pParent, double fDepth, FieldUnit eDefaultUnit );
 
     double getDepth() const;
 };
diff --git a/svx/inc/galbrws2.hxx b/svx/inc/galbrws2.hxx
index 38cb724c6618..e431fd211de5 100644
--- a/svx/inc/galbrws2.hxx
+++ b/svx/inc/galbrws2.hxx
@@ -152,7 +152,7 @@ public:
 
 public:
 
-                        GalleryBrowser2( Window* pParent, const ResId& rResId, Gallery* pGallery );
+                        GalleryBrowser2( vcl::Window* pParent, const ResId& rResId, Gallery* pGallery );
                         virtual ~GalleryBrowser2();
 
     void                SelectTheme( const OUString& rThemeName );
@@ -160,7 +160,7 @@ public:
     GalleryBrowserMode  GetMode() const { return meMode; }
     void                SetMode( GalleryBrowserMode eMode );
 
-    Window*             GetViewWindow() const;
+    vcl::Window*             GetViewWindow() const;
 
     void                Travel( GalleryBrowserTravel eTravel );
 
@@ -170,10 +170,10 @@ public:
 
     sal_Int8            AcceptDrop( DropTargetHelper& rTarget, const AcceptDropEvent& rEvt );
     sal_Int8            ExecuteDrop( DropTargetHelper& rTarget, const ExecuteDropEvent& rEvt );
-    void                StartDrag( Window* pWindow, const Point* pDragPoint = NULL );
-    void                TogglePreview( Window* pWindow, const Point* pPreviewPoint = NULL );
-    void                ShowContextMenu( Window* pWindow, const Point* pContextPoint = NULL );
-    bool                KeyInput( const KeyEvent& rEvt, Window* pWindow );
+    void                StartDrag( vcl::Window* pWindow, const Point* pDragPoint = NULL );
+    void                TogglePreview( vcl::Window* pWindow, const Point* pPreviewPoint = NULL );
+    void                ShowContextMenu( vcl::Window* pWindow, const Point* pContextPoint = NULL );
+    bool                KeyInput( const KeyEvent& rEvt, vcl::Window* pWindow );
 
     com::sun::star::uno::Reference< com::sun::star::frame::XFrame > GetFrame() const;
     com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > GetUNOContext() const { return m_xContext; }
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
             );
diff --git a/svx/inc/svdibrow.hxx b/svx/inc/svdibrow.hxx
index 364e1130e3a2..52965b1149a9 100644
--- a/svx/inc/svdibrow.hxx
+++ b/svx/inc/svdibrow.hxx
@@ -66,7 +66,7 @@ protected:
     virtual Rectangle GetFieldCharacterBounds(sal_Int32 _nRow,sal_Int32 _nColumnPos,sal_Int32 nIndex) SAL_OVERRIDE;
     virtual sal_Int32 GetFieldIndexAtPoint(sal_Int32 _nRow,sal_Int32 _nColumnPos,const Point& _rPoint) SAL_OVERRIDE;
 public:
-    _SdrItemBrowserControl(Window* pParent, WinBits nBits=WB_3DLOOK|WB_BORDER|WB_TABSTOP);
+    _SdrItemBrowserControl(vcl::Window* pParent, WinBits nBits=WB_3DLOOK|WB_BORDER|WB_TABSTOP);
     virtual ~_SdrItemBrowserControl();
     void Clear();
     void SetAttributes(const SfxItemSet* pAttr, const SfxItemSet* p2ndSet=NULL);
@@ -100,7 +100,7 @@ public:
 class _SdrItemBrowserWindow: public FloatingWindow {
     _SdrItemBrowserControl aBrowse;
 public:
-    _SdrItemBrowserWindow(Window* pParent, WinBits nBits=WB_STDSIZEABLEDOCKWIN);
+    _SdrItemBrowserWindow(vcl::Window* pParent, WinBits nBits=WB_STDSIZEABLEDOCKWIN);
     virtual ~_SdrItemBrowserWindow();
     virtual void Resize() SAL_OVERRIDE;
     virtual void GetFocus() SAL_OVERRIDE;
@@ -118,7 +118,7 @@ class SdrItemBrowser: public _SdrItemBrowserWindow {
     SdrView* pView;
     bool bDirty;
 private:
-    static Window* ImpGetViewWin(SdrView& rView);
+    static vcl::Window* ImpGetViewWin(SdrView& rView);
     DECL_LINK(IdleHdl, void *);
     DECL_LINK(ChangedHdl,_SdrItemBrowserControl*);
     DECL_LINK(SetDirtyHdl, void *);
diff --git a/svx/inc/tbunosearchcontrollers.hxx b/svx/inc/tbunosearchcontrollers.hxx
index a418ff2935e8..25b3f8135d50 100644
--- a/svx/inc/tbunosearchcontrollers.hxx
+++ b/svx/inc/tbunosearchcontrollers.hxx
@@ -45,7 +45,7 @@ namespace {
 class FindTextFieldControl : public ComboBox
 {
 public:
-    FindTextFieldControl( Window* pParent, WinBits nStyle,
+    FindTextFieldControl( vcl::Window* pParent, WinBits nStyle,
         css::uno::Reference< css::frame::XFrame >& xFrame,
         const css::uno::Reference< css::uno::XComponentContext >& xContext );
     virtual ~FindTextFieldControl();