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

diff --git a/svtools/source/hatchwindow/documentcloser.cxx b/svtools/source/hatchwindow/documentcloser.cxx
index 9e64a3dec7f1..08716455213a 100644
--- a/svtools/source/hatchwindow/documentcloser.cxx
+++ b/svtools/source/hatchwindow/documentcloser.cxx
@@ -119,7 +119,7 @@ IMPL_STATIC_LINK( MainThreadFrameCloserRequest, worker, MainThreadFrameCloserReq
                 xWinPeer->setProperty( OUString( "PluginParent" ),
                                         uno::makeAny( (sal_Int64) 0 ) );
 
-                Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
+                vcl::Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
                 if ( pWindow )
                     Dialog::EndAllDialogs( pWindow );
             }
diff --git a/svtools/source/hatchwindow/hatchwindow.cxx b/svtools/source/hatchwindow/hatchwindow.cxx
index eee3307916d7..595fb071a24f 100644
--- a/svtools/source/hatchwindow/hatchwindow.cxx
+++ b/svtools/source/hatchwindow/hatchwindow.cxx
@@ -44,7 +44,7 @@ void VCLXHatchWindow::initializeWindow( const uno::Reference< awt::XWindowPeer >
 {
     SolarMutexGuard aGuard;
 
-    Window* pParent = NULL;
+    vcl::Window* pParent = NULL;
     VCLXWindow* pParentComponent = VCLXWindow::GetImplementation( xParent );
 
     if ( pParentComponent )
diff --git a/svtools/source/hatchwindow/ipwin.cxx b/svtools/source/hatchwindow/ipwin.cxx
index 4f68835d38bb..5ddfba33b8a6 100644
--- a/svtools/source/hatchwindow/ipwin.cxx
+++ b/svtools/source/hatchwindow/ipwin.cxx
@@ -138,7 +138,7 @@ void SvResizeHelper::Draw( OutputDevice * pDev )
 |*
 |*    Description
 *************************************************************************/
-void SvResizeHelper::InvalidateBorder( Window * pWin )
+void SvResizeHelper::InvalidateBorder( vcl::Window * pWin )
 {
     Rectangle   aMoveRects[ 4 ];
     FillMoveRectsPixel( aMoveRects );
@@ -151,7 +151,7 @@ void SvResizeHelper::InvalidateBorder( Window * pWin )
 |*
 |*    Description
 *************************************************************************/
-bool SvResizeHelper::SelectBegin( Window * pWin, const Point & rPos )
+bool SvResizeHelper::SelectBegin( vcl::Window * pWin, const Point & rPos )
 {
     if( -1 == nGrab )
     {
@@ -171,7 +171,7 @@ bool SvResizeHelper::SelectBegin( Window * pWin, const Point & rPos )
 |*
 |*    Description
 *************************************************************************/
-short SvResizeHelper::SelectMove( Window * pWin, const Point & rPos )
+short SvResizeHelper::SelectMove( vcl::Window * pWin, const Point & rPos )
 {
     if( -1 == nGrab )
     {
@@ -421,7 +421,7 @@ void SvResizeHelper::ValidateRect( Rectangle & rValidate ) const
 |*
 |*    Description
 *************************************************************************/
-bool SvResizeHelper::SelectRelease( Window * pWin, const Point & rPos,
+bool SvResizeHelper::SelectRelease( vcl::Window * pWin, const Point & rPos,
                                     Rectangle & rOutPosSize )
 {
     if( -1 != nGrab )
@@ -441,7 +441,7 @@ bool SvResizeHelper::SelectRelease( Window * pWin, const Point & rPos,
 |*
 |*    Description
 *************************************************************************/
-void SvResizeHelper::Release( Window * pWin )
+void SvResizeHelper::Release( vcl::Window * pWin )
 {
     if( nGrab != -1 )
     {
@@ -458,7 +458,7 @@ void SvResizeHelper::Release( Window * pWin )
 *************************************************************************/
 SvResizeWindow::SvResizeWindow
 (
-    Window * pParent,
+    vcl::Window * pParent,
     VCLXHatchWindow* pWrapper
 )
     : Window( pParent, WB_CLIPCHILDREN )
diff --git a/svtools/source/hatchwindow/ipwin.hxx b/svtools/source/hatchwindow/ipwin.hxx
index f3e9dde7137c..534f0d4a6ac6 100644
--- a/svtools/source/hatchwindow/ipwin.hxx
+++ b/svtools/source/hatchwindow/ipwin.hxx
@@ -58,20 +58,20 @@ public:
     void        FillHandleRectsPixel( Rectangle aRects[ 8 ] ) const;
     void        FillMoveRectsPixel( Rectangle aRects[ 4 ] ) const;
     void        Draw( OutputDevice * );
-    void        InvalidateBorder( Window * );
-    bool        SelectBegin( Window *, const Point & rPos );
-    short       SelectMove( Window * pWin, const Point & rPos );
+    void        InvalidateBorder( vcl::Window * );
+    bool        SelectBegin( vcl::Window *, const Point & rPos );
+    short       SelectMove( vcl::Window * pWin, const Point & rPos );
     Point       GetTrackPosPixel( const Rectangle & rRect ) const;
     Rectangle   GetTrackRectPixel( const Point & rTrackPos ) const;
     void        ValidateRect( Rectangle & rValidate ) const;
-    bool        SelectRelease( Window *, const Point & rPos, Rectangle & rOutPosSize );
-    void        Release( Window * pWin );
+    bool        SelectRelease( vcl::Window *, const Point & rPos, Rectangle & rOutPosSize );
+    void        Release( vcl::Window * pWin );
 };
 
 /********************** SvResizeWindow ***********************************
 *************************************************************************/
 class VCLXHatchWindow;
-class SvResizeWindow : public Window
+class SvResizeWindow : public vcl::Window
 {
     Pointer         m_aOldPointer;
     short           m_nMoveGrab;  // last pointer type
@@ -80,7 +80,7 @@ class SvResizeWindow : public Window
 
     VCLXHatchWindow* m_pWrapper;
 public:
-    SvResizeWindow( Window* pParent, VCLXHatchWindow* pWrapper );
+    SvResizeWindow( vcl::Window* pParent, VCLXHatchWindow* pWrapper );
 
     void    SetHatchBorderPixel( const Size & rSize );