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

diff --git a/svtools/inc/roadmap.hxx b/svtools/inc/roadmap.hxx
index a42c6a0e2d42..c1f8e4689dbe 100644
--- a/svtools/inc/roadmap.hxx
+++ b/svtools/inc/roadmap.hxx
@@ -56,7 +56,7 @@ namespace svt
         void            implInit();
 
     public:
-        ORoadmap( Window* _pParent, WinBits _nWinStyle = 0 );
+        ORoadmap( vcl::Window* _pParent, WinBits _nWinStyle = 0 );
         virtual ~ORoadmap( );
 
         void            SetRoadmapBitmap( const BitmapEx& maBitmap, bool _bInvalidate = true );
@@ -109,7 +109,7 @@ namespace svt
         void                        DeselectOldRoadmapItems();
         ItemId                      GetNextAvailableItemId( ItemIndex _NewIndex );
         ItemId                      GetPreviousAvailableItemId( ItemIndex _NewIndex );
-        RoadmapItem*                GetByPointer(Window* pWindow);
+        RoadmapItem*                GetByPointer(vcl::Window* pWindow);
         RoadmapItem*                InsertHyperLabel( ItemIndex _Index, const OUString& _aStr, ItemId _RMID, bool _bEnabled = true  );
         void                        UpdatefollowingHyperLabels( ItemIndex _Index );
     };
diff --git a/svtools/inc/table/gridtablerenderer.hxx b/svtools/inc/table/gridtablerenderer.hxx
index 9bd98251cff4..4df38f8eeaf5 100644
--- a/svtools/inc/table/gridtablerenderer.hxx
+++ b/svtools/inc/table/gridtablerenderer.hxx
@@ -83,8 +83,8 @@ namespace svt { namespace table
                             bool i_hasControlFocus, bool _bSelected,
                             OutputDevice& _rDevice, const Rectangle& _rArea,
                             const StyleSettings& _rStyle ) SAL_OVERRIDE;
-        virtual void    ShowCellCursor( Window& _rView, const Rectangle& _rCursorRect) SAL_OVERRIDE;
-        virtual void    HideCellCursor( Window& _rView, const Rectangle& _rCursorRect) SAL_OVERRIDE;
+        virtual void    ShowCellCursor( vcl::Window& _rView, const Rectangle& _rCursorRect) SAL_OVERRIDE;
+        virtual void    HideCellCursor( vcl::Window& _rView, const Rectangle& _rCursorRect) SAL_OVERRIDE;
         virtual bool    FitsIntoCell(
                             ::com::sun::star::uno::Any const & i_cellContent,
                             ColPos const i_colPos, RowPos const i_rowPos,
diff --git a/svtools/inc/table/tablecontrol.hxx b/svtools/inc/table/tablecontrol.hxx
index 4cf5b4c0f5fe..7b0e01bf0b8d 100644
--- a/svtools/inc/table/tablecontrol.hxx
+++ b/svtools/inc/table/tablecontrol.hxx
@@ -65,7 +65,7 @@ namespace svt { namespace table
 
 
     public:
-        TableControl( Window* _pParent, WinBits _nStyle );
+        TableControl( vcl::Window* _pParent, WinBits _nStyle );
         virtual ~TableControl();
 
         /// sets a new table model
@@ -141,7 +141,7 @@ namespace svt { namespace table
             if the row, which should be removed, is selected, it will be erased from the vector
         */
         SelectionEngine*    getSelEngine();
-        Window&             getDataWindow();
+        vcl::Window&             getDataWindow();
 
         // Window overridables
         virtual void        GetFocus() SAL_OVERRIDE;
@@ -166,11 +166,11 @@ namespace svt { namespace table
 
 
         // IAccessibleTable
-        virtual Rectangle GetWindowExtentsRelative( Window *pRelativeWindow ) const SAL_OVERRIDE;
+        virtual Rectangle GetWindowExtentsRelative( vcl::Window *pRelativeWindow ) const SAL_OVERRIDE;
         virtual void GrabFocus() SAL_OVERRIDE;
         virtual css::uno::Reference< css::accessibility::XAccessible > GetAccessible( bool bCreate = true ) SAL_OVERRIDE;
-        virtual Window* GetAccessibleParentWindow() const SAL_OVERRIDE;
-        virtual Window* GetWindowInstance() SAL_OVERRIDE;
+        virtual vcl::Window* GetAccessibleParentWindow() const SAL_OVERRIDE;
+        virtual vcl::Window* GetWindowInstance() SAL_OVERRIDE;
         virtual sal_Int32 GetAccessibleControlCount() const SAL_OVERRIDE;
         virtual bool ConvertPointToControlIndex( sal_Int32& _rnIndex, const Point& _rPoint ) SAL_OVERRIDE;
         virtual long GetRowCount() const SAL_OVERRIDE;
diff --git a/svtools/inc/vclxaccessibleheaderbar.hxx b/svtools/inc/vclxaccessibleheaderbar.hxx
index 31abcd6fd865..f283821e3b2a 100644
--- a/svtools/inc/vclxaccessibleheaderbar.hxx
+++ b/svtools/inc/vclxaccessibleheaderbar.hxx
@@ -67,7 +67,7 @@ private:
 class VCLXHeaderBar :  public VCLXWindow
 {
 public:
-    VCLXHeaderBar(Window* pHeaderBar);
+    VCLXHeaderBar(vcl::Window* pHeaderBar);
     virtual ~VCLXHeaderBar();
 
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > CreateAccessibleContext() SAL_OVERRIDE;