fdo#82577: Handle Window

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

Change-Id: Ib1beb7ab4ad75562a42aeb252732a073d25eff1a

2 files changed, 9 insertions, 9 deletions

diff --git a/toolkit/source/controls/accessiblecontrolcontext.cxx b/toolkit/source/controls/accessiblecontrolcontext.cxx
index ac6c9e2dd866..b384af37139c 100644
--- a/toolkit/source/controls/accessiblecontrolcontext.cxx
+++ b/toolkit/source/controls/accessiblecontrolcontext.cxx
@@ -225,14 +225,14 @@ namespace toolkit
     }
 
 
-    Window* OAccessibleControlContext::implGetWindow( Reference< awt::XWindow >* _pxUNOWindow ) const
+    vcl::Window* OAccessibleControlContext::implGetWindow( Reference< awt::XWindow >* _pxUNOWindow ) const
     {
         Reference< awt::XControl > xControl( getAccessibleCreator(), UNO_QUERY );
         Reference< awt::XWindow > xWindow;
         if ( xControl.is() )
             xWindow.set(xControl->getPeer(), css::uno::UNO_QUERY);
 
-        Window* pWindow = xWindow.is() ? VCLUnoHelper::GetWindow( xWindow ) : NULL;
+        vcl::Window* pWindow = xWindow.is() ? VCLUnoHelper::GetWindow( xWindow ) : NULL;
 
         if ( _pxUNOWindow )
             *_pxUNOWindow = xWindow;
@@ -259,7 +259,7 @@ namespace toolkit
 
         // our control
         Reference< awt::XWindow > xWindow;
-        Window* pVCLWindow = implGetWindow( &xWindow );
+        vcl::Window* pVCLWindow = implGetWindow( &xWindow );
 
         awt::Rectangle aBounds( 0, 0, 0, 0 );
         if ( xWindow.is() )
@@ -267,7 +267,7 @@ namespace toolkit
             // ugly, but .... though the XWindow has a getPosSize, it is impossible to determine the
             // parent which this position/size is relative to. This means we must tunnel UNO and ask the
             // implementation
-            Window* pVCLParent = pVCLWindow ? pVCLWindow->GetParent() : NULL;
+            vcl::Window* pVCLParent = pVCLWindow ? pVCLWindow->GetParent() : NULL;
 
             // the relative location of the window
             ::Point aWindowRelativePos( 0, 0);
@@ -326,7 +326,7 @@ namespace toolkit
             // want to do some VCL stuff here ...
         OContextEntryGuard aGuard( this );
 
-        Window* pWindow = implGetWindow( );
+        vcl::Window* pWindow = implGetWindow( );
         sal_Int32 nColor = 0;
         if ( pWindow )
         {
@@ -352,7 +352,7 @@ namespace toolkit
             // want to do some VCL stuff here ...
         OContextEntryGuard aGuard( this );
 
-        Window* pWindow = implGetWindow( );
+        vcl::Window* pWindow = implGetWindow( );
         sal_Int32 nColor = 0;
         if ( pWindow )
         {
diff --git a/toolkit/source/controls/unocontrol.cxx b/toolkit/source/controls/unocontrol.cxx
index 8e7378a96f5f..46bbe3d3a5c2 100644
--- a/toolkit/source/controls/unocontrol.cxx
+++ b/toolkit/source/controls/unocontrol.cxx
@@ -181,10 +181,10 @@ Reference< XWindowPeer >    UnoControl::ImplGetCompatiblePeer( bool bAcceptExist
         Reference< XControl > xMe;
         OWeakAggObject::queryInterface( ::getCppuType( &xMe ) ) >>= xMe;
 
-        Window* pParentWindow( NULL );
+        vcl::Window* pParentWindow( NULL );
         {
             SolarMutexGuard aGuard;
-            pParentWindow = dynamic_cast< Window* >( Application::GetDefaultDevice() );
+            pParentWindow = dynamic_cast< vcl::Window* >( Application::GetDefaultDevice() );
             ENSURE_OR_THROW( pParentWindow != NULL, "could obtain a default parent window!" );
         }
         try
@@ -640,7 +640,7 @@ void UnoControl::ImplModelPropertiesChanged( const Sequence< PropertyChangeEvent
         // Since the implementations for the listeners changed a lot towards 1.1, this
         // would not be the case anymore, if we would not do this listener-lock below
         // #i14703#
-        Window* pVclPeer = VCLUnoHelper::GetWindow( getPeer() );
+        vcl::Window* pVclPeer = VCLUnoHelper::GetWindow( getPeer() );
         VCLXWindow* pPeer = pVclPeer ? pVclPeer->GetWindowPeer() : NULL;
         VclListenerLock aNoVclEventMultiplexing( pPeer );