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, 5 insertions, 5 deletions

diff --git a/sfx2/inc/guisaveas.hxx b/sfx2/inc/guisaveas.hxx
index 60c575405f45..0c2aa9048746 100644
--- a/sfx2/inc/guisaveas.hxx
+++ b/sfx2/inc/guisaveas.hxx
@@ -38,7 +38,7 @@ namespace com { namespace sun { namespace star {
     }
 } } }
 
-class Window;
+namespace vcl { class Window; }
 class ModelData_Impl;
 
 class SfxStoringHelper
@@ -82,7 +82,7 @@ public:
                                     const OUString& aDefUIName,
                                     bool bCanProceedFurther );
 
-    static Window* GetModelWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xModel );
+    static vcl::Window* GetModelWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xModel );
 
 };
 
diff --git a/sfx2/inc/inettbc.hxx b/sfx2/inc/inettbc.hxx
index a0447b480be4..9bcfe6aeed57 100644
--- a/sfx2/inc/inettbc.hxx
+++ b/sfx2/inc/inettbc.hxx
@@ -53,7 +53,7 @@ public:
                             SfxURLToolBoxControl_Impl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rBox );
     virtual                 ~SfxURLToolBoxControl_Impl();
 
-    virtual Window*         CreateItemWindow( Window* pParent ) SAL_OVERRIDE;
+    virtual vcl::Window*         CreateItemWindow( vcl::Window* pParent ) SAL_OVERRIDE;
     virtual void            StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) SAL_OVERRIDE;
 };
 
diff --git a/sfx2/inc/sidebar/PopupContainer.hxx b/sfx2/inc/sidebar/PopupContainer.hxx
index 92eafe9a3256..764b9af1cea7 100644
--- a/sfx2/inc/sidebar/PopupContainer.hxx
+++ b/sfx2/inc/sidebar/PopupContainer.hxx
@@ -27,7 +27,7 @@ namespace sfx2 { namespace sidebar {
 class SFX2_DLLPUBLIC PopupContainer : public FloatingWindow
 {
 public:
-    PopupContainer (Window* pParent);
+    PopupContainer (vcl::Window* pParent);
     virtual ~PopupContainer (void);
 
     virtual long Notify (NotifyEvent& rNEvt);
diff --git a/sfx2/inc/srchdlg.hxx b/sfx2/inc/srchdlg.hxx
index 40b18f84017a..f846a5267dbf 100644
--- a/sfx2/inc/srchdlg.hxx
+++ b/sfx2/inc/srchdlg.hxx
@@ -58,7 +58,7 @@ private:
     DECL_LINK(FindHdl, void *);
 
 public:
-    SearchDialog( Window* pWindow, const OUString& rConfigName );
+    SearchDialog( vcl::Window* pWindow, const OUString& rConfigName );
     virtual ~SearchDialog();
 
     void         SetFindHdl( const Link& rLink ) { m_aFindHdl = rLink; }