fdo#82577: Handle Window

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

Change-Id: Ib1beb7ab4ad75562a42aeb252732a073d25eff1a

37 files changed, 68 insertions, 68 deletions

diff --git a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxBase.hxx b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxBase.hxx
index 7fad609d60b3..a10356fe276f 100644
--- a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxBase.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxBase.hxx
@@ -47,7 +47,7 @@
 
 
 
-class Window;
+namespace vcl { class Window; }
 
 namespace utl {
     class AccessibleStateSetHelper;
diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx
index 904ddec28d43..93b4da974f31 100644
--- a/accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx
@@ -43,7 +43,7 @@
 
 
 
-class Window;
+namespace vcl { class Window; }
 
 namespace utl {
     class AccessibleStateSetHelper;
diff --git a/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx b/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx
index 2655b8950e76..bd0dbd1324a0 100644
--- a/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx
+++ b/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx
@@ -92,14 +92,14 @@ public:
     inline ~WindowListenerGuard() { endListening(); }
 
     // Not thread safe:
-    void startListening(::Window & rNotifier);
+    void startListening(vcl::Window & rNotifier);
 
     // Not thread safe:
     void endListening();
 
 private:
     ::Link m_aListener;
-    ::Window * m_pNotifier;
+    vcl::Window * m_pNotifier;
 };
 
 class ParagraphInfo
diff --git a/accessibility/inc/accessibility/helper/IComboListBoxHelper.hxx b/accessibility/inc/accessibility/helper/IComboListBoxHelper.hxx
index dc3c93e54d24..c218d0e59ee2 100644
--- a/accessibility/inc/accessibility/helper/IComboListBoxHelper.hxx
+++ b/accessibility/inc/accessibility/helper/IComboListBoxHelper.hxx
@@ -30,7 +30,7 @@ namespace com { namespace sun { namespace star { namespace datatransfer { namesp
 
 class Point;
 class Rectangle;
-class Window;
+namespace vcl { class Window; }
 namespace accessibility
 {
     class IComboListBoxHelper
@@ -41,7 +41,7 @@ namespace accessibility
         virtual OUString        GetEntry( sal_Int32  nPos ) const = 0;
         virtual Rectangle       GetDropDownPosSizePixel( ) const = 0;
         virtual Rectangle       GetBoundingRectangle( sal_uInt16 nItem ) const = 0;
-        virtual Rectangle       GetWindowExtentsRelative( Window* pRelativeWindow ) = 0;
+        virtual Rectangle       GetWindowExtentsRelative( vcl::Window* pRelativeWindow ) = 0;
         virtual bool            IsActive() const = 0;
         virtual bool            IsEnabled() const = 0;
         virtual bool            IsEntryVisible( sal_Int32  nPos ) const = 0;
diff --git a/accessibility/inc/accessibility/helper/listboxhelper.hxx b/accessibility/inc/accessibility/helper/listboxhelper.hxx
index 96a45909e7e4..98ee64ddcfde 100644
--- a/accessibility/inc/accessibility/helper/listboxhelper.hxx
+++ b/accessibility/inc/accessibility/helper/listboxhelper.hxx
@@ -76,7 +76,7 @@ public:
         return aRect;
     }
 
-    virtual Rectangle       GetWindowExtentsRelative( Window* pRelativeWindow ) SAL_OVERRIDE
+    virtual Rectangle       GetWindowExtentsRelative( vcl::Window* pRelativeWindow ) SAL_OVERRIDE
     {
         return m_aComboListBox.GetWindowExtentsRelative( pRelativeWindow );
     }
diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblemenubar.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblemenubar.hxx
index 7861dc397e0c..a792d51cccad 100644
--- a/accessibility/inc/accessibility/standard/vclxaccessiblemenubar.hxx
+++ b/accessibility/inc/accessibility/standard/vclxaccessiblemenubar.hxx
@@ -24,7 +24,7 @@
 
 class VclSimpleEvent;
 class VclWindowEvent;
-class Window;
+namespace vcl { class Window; }
 
 
 
@@ -34,7 +34,7 @@ class Window;
 class VCLXAccessibleMenuBar :   public OAccessibleMenuComponent
 {
 protected:
-    Window*                 m_pWindow;
+    vcl::Window*                 m_pWindow;
 
     virtual bool            IsFocused() SAL_OVERRIDE;
 
diff --git a/accessibility/inc/accessibility/standard/vclxaccessibletoolbox.hxx b/accessibility/inc/accessibility/standard/vclxaccessibletoolbox.hxx
index 2a4defcbfad2..213a570b853c 100644
--- a/accessibility/inc/accessibility/standard/vclxaccessibletoolbox.hxx
+++ b/accessibility/inc/accessibility/standard/vclxaccessibletoolbox.hxx
@@ -49,7 +49,7 @@ private:
     void                        UpdateAllItems_Impl();
     void                        UpdateItemName_Impl( sal_Int32 _nPos );
     void                        UpdateItemEnabled_Impl( sal_Int32 _nPos );
-    void                        UpdateCustomPopupItemp_Impl( Window* pWindow, bool bOpen );
+    void                        UpdateCustomPopupItemp_Impl( vcl::Window* pWindow, bool bOpen );
     void                        HandleSubToolBarEvent( const VclWindowEvent& rVclWindowEvent, bool _bShow );
     void                        ReleaseSubToolBox( ToolBox* _pSubToolBox );
 
diff --git a/accessibility/source/extended/AccessibleBrowseBox.cxx b/accessibility/source/extended/AccessibleBrowseBox.cxx
index 91af550b5d23..1215c78867a5 100644
--- a/accessibility/source/extended/AccessibleBrowseBox.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBox.cxx
@@ -208,7 +208,7 @@ OUString SAL_CALL AccessibleBrowseBox::getImplementationName()
 
 Rectangle AccessibleBrowseBox::implGetBoundingBox()
 {
-    Window* pParent = mpBrowseBox->GetAccessibleParentWindow();
+    vcl::Window* pParent = mpBrowseBox->GetAccessibleParentWindow();
     OSL_ENSURE( pParent, "implGetBoundingBox - missing parent window" );
     return mpBrowseBox->GetWindowExtentsRelative( pParent );
 }
diff --git a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx
index bc0ad897f1a1..7427feac6b9a 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx
@@ -502,7 +502,7 @@ sal_Int32 SAL_CALL AccessibleBrowseBoxBase::getForeground(  ) throw (::com::sun:
     ensureIsAlive();
 
     sal_Int32 nColor = 0;
-    Window* pInst = mpBrowseBox->GetWindowInstance();
+    vcl::Window* pInst = mpBrowseBox->GetWindowInstance();
     if ( pInst )
     {
         if ( pInst->IsControlForeground() )
@@ -527,7 +527,7 @@ sal_Int32 SAL_CALL AccessibleBrowseBoxBase::getBackground(  ) throw (::com::sun:
     ::osl::MutexGuard aGuard( getOslMutex() );
     ensureIsAlive();
     sal_Int32 nColor = 0;
-    Window* pInst = mpBrowseBox->GetWindowInstance();
+    vcl::Window* pInst = mpBrowseBox->GetWindowInstance();
     if ( pInst )
     {
         if ( pInst->IsControlBackground() )
diff --git a/accessibility/source/extended/AccessibleGridControl.cxx b/accessibility/source/extended/AccessibleGridControl.cxx
index 109b6cd0845d..23f2f9c70b0a 100644
--- a/accessibility/source/extended/AccessibleGridControl.cxx
+++ b/accessibility/source/extended/AccessibleGridControl.cxx
@@ -236,7 +236,7 @@ OUString SAL_CALL AccessibleGridControl::getImplementationName()
 
 Rectangle AccessibleGridControl::implGetBoundingBox()
 {
-    Window* pParent = m_aTable.GetAccessibleParentWindow();
+    vcl::Window* pParent = m_aTable.GetAccessibleParentWindow();
     OSL_ENSURE( pParent, "implGetBoundingBox - missing parent window" );
     return m_aTable.GetWindowExtentsRelative( pParent );
 }
diff --git a/accessibility/source/extended/AccessibleGridControlBase.cxx b/accessibility/source/extended/AccessibleGridControlBase.cxx
index cb9a6bf3b7a8..e523ec1c9eed 100644
--- a/accessibility/source/extended/AccessibleGridControlBase.cxx
+++ b/accessibility/source/extended/AccessibleGridControlBase.cxx
@@ -419,7 +419,7 @@ sal_Int32 SAL_CALL AccessibleGridControlBase::getForeground(  ) throw (::com::su
     ensureIsAlive();
 
     sal_Int32 nColor = 0;
-    Window* pInst = m_aTable.GetWindowInstance();
+    vcl::Window* pInst = m_aTable.GetWindowInstance();
     if ( pInst )
     {
         if ( pInst->IsControlForeground() )
@@ -443,7 +443,7 @@ sal_Int32 SAL_CALL AccessibleGridControlBase::getBackground(  ) throw (::com::su
 
     ensureIsAlive();
     sal_Int32 nColor = 0;
-    Window* pInst = m_aTable.GetWindowInstance();
+    vcl::Window* pInst = m_aTable.GetWindowInstance();
     if ( pInst )
     {
         if ( pInst->IsControlBackground() )
diff --git a/accessibility/source/extended/AccessibleGridControlHeader.cxx b/accessibility/source/extended/AccessibleGridControlHeader.cxx
index 7fbf33684f03..f114bb53c1f4 100644
--- a/accessibility/source/extended/AccessibleGridControlHeader.cxx
+++ b/accessibility/source/extended/AccessibleGridControlHeader.cxx
@@ -217,7 +217,7 @@ Sequence< sal_Int8 > SAL_CALL AccessibleGridControlHeader::getImplementationId()
 
 Rectangle AccessibleGridControlHeader::implGetBoundingBox()
 {
-    Window* pParent = m_aTable.GetAccessibleParentWindow();
+    vcl::Window* pParent = m_aTable.GetAccessibleParentWindow();
     Rectangle aGridRect( m_aTable.GetWindowExtentsRelative( pParent ) );
     Rectangle aHeaderRect (m_aTable.calcHeaderRect(isColumnBar()));
     if(isColumnBar())
diff --git a/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx b/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx
index ced105fc8acc..662328c27910 100644
--- a/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx
+++ b/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx
@@ -134,7 +134,7 @@ OUString SAL_CALL AccessibleGridControlHeaderCell::getImplementationName()
 
 Rectangle AccessibleGridControlHeaderCell::implGetBoundingBox()
 {
-    Window* pParent = m_aTable.GetAccessibleParentWindow();
+    vcl::Window* pParent = m_aTable.GetAccessibleParentWindow();
     Rectangle aGridRect( m_aTable.GetWindowExtentsRelative( pParent ) );
     sal_Int32 nIndex = getAccessibleIndexInParent();
     Rectangle aCellRect;
diff --git a/accessibility/source/extended/AccessibleGridControlTable.cxx b/accessibility/source/extended/AccessibleGridControlTable.cxx
index 33aac08d4eb8..5392c54af73b 100644
--- a/accessibility/source/extended/AccessibleGridControlTable.cxx
+++ b/accessibility/source/extended/AccessibleGridControlTable.cxx
@@ -344,7 +344,7 @@ OUString SAL_CALL AccessibleGridControlTable::getImplementationName()
 
 Rectangle AccessibleGridControlTable::implGetBoundingBox()
 {
-    Window* pParent = m_aTable.GetAccessibleParentWindow();
+    vcl::Window* pParent = m_aTable.GetAccessibleParentWindow();
     DBG_ASSERT( pParent, "implGetBoundingBox - missing parent window" );
     Rectangle aGridRect( m_aTable.GetWindowExtentsRelative( pParent ));
     Rectangle aTableRect( m_aTable.calcTableRect() );
diff --git a/accessibility/source/extended/AccessibleGridControlTableCell.cxx b/accessibility/source/extended/AccessibleGridControlTableCell.cxx
index a7b02564d5eb..85f10f7c7e0b 100644
--- a/accessibility/source/extended/AccessibleGridControlTableCell.cxx
+++ b/accessibility/source/extended/AccessibleGridControlTableCell.cxx
@@ -338,7 +338,7 @@ namespace accessibility
 
     Rectangle AccessibleGridControlTableCell::implGetBoundingBox()
     {
-        Window* pParent = m_aTable.GetAccessibleParentWindow();
+        vcl::Window* pParent = m_aTable.GetAccessibleParentWindow();
         DBG_ASSERT( pParent, "implGetBoundingBox - missing parent window" );
         Rectangle aGridRect = m_aTable.GetWindowExtentsRelative( pParent );
         sal_Int32 nIndex = getAccessibleIndexInParent();
diff --git a/accessibility/source/extended/AccessibleToolPanelDeck.cxx b/accessibility/source/extended/AccessibleToolPanelDeck.cxx
index d1d11ed051fd..78e093d21a88 100644
--- a/accessibility/source/extended/AccessibleToolPanelDeck.cxx
+++ b/accessibility/source/extended/AccessibleToolPanelDeck.cxx
@@ -291,7 +291,7 @@ namespace accessibility
 
         const ::Point aRequestedPoint( VCLUnoHelper::ConvertToVCLPoint( i_rPoint ) );
         // check the panel window itself
-        const ::Window& rActivePanelAnchor( m_pImpl->m_pPanelDeck->GetPanelWindowAnchor() );
+        const vcl::Window& rActivePanelAnchor( m_pImpl->m_pPanelDeck->GetPanelWindowAnchor() );
         const Rectangle aPanelAnchorArea( rActivePanelAnchor.GetPosPixel(), rActivePanelAnchor.GetOutputSizePixel() );
         if ( aPanelAnchorArea.IsInside( aRequestedPoint ) )
             // note that this assumes that the Window which actually implements the concrete panel covers
diff --git a/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx b/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx
index 3bd67c112b77..658c5e9dc92c 100644
--- a/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx
+++ b/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx
@@ -337,7 +337,7 @@ namespace accessibility
 
     namespace
     {
-        bool lcl_covers( const ::Window& i_rWindow, const ::Point& i_rPoint )
+        bool lcl_covers( const vcl::Window& i_rWindow, const ::Point& i_rPoint )
         {
             const Rectangle aWindowBounds( i_rWindow.GetWindowExtentsRelative( i_rWindow.GetParent() ) );
             return aWindowBounds.IsInside( i_rPoint );
diff --git a/accessibility/source/extended/accessiblelistbox.cxx b/accessibility/source/extended/accessiblelistbox.cxx
index 177210436e1f..5cf07bc2bf31 100644
--- a/accessibility/source/extended/accessiblelistbox.cxx
+++ b/accessibility/source/extended/accessiblelistbox.cxx
@@ -127,7 +127,7 @@ namespace accessibility
                     bool bNeedFocus = false;
                     if (pBox)
                     {
-                        Window* pParent = ((Window*)pBox)->GetParent();
+                        vcl::Window* pParent = ((vcl::Window*)pBox)->GetParent();
                         if (pParent && pParent->GetType() == WINDOW_FLOATINGWINDOW)
                         {
                             // MT: ImplGetAppSVData shouldn't be exported from VCL.
diff --git a/accessibility/source/extended/accessibletabbar.cxx b/accessibility/source/extended/accessibletabbar.cxx
index 1fc53c747045..5a368d7b4629 100644
--- a/accessibility/source/extended/accessibletabbar.cxx
+++ b/accessibility/source/extended/accessibletabbar.cxx
@@ -253,7 +253,7 @@ namespace accessibility
 
                 if ( i < nCount )
                 {
-                    Window* pChild = m_pTabBar->GetAccessibleChildWindow( (sal_uInt16)i );
+                    vcl::Window* pChild = m_pTabBar->GetAccessibleChildWindow( (sal_uInt16)i );
                     if ( pChild )
                         xChild = pChild->GetAccessible();
                 }
@@ -279,7 +279,7 @@ namespace accessibility
         Reference< XAccessible > xParent;
         if ( m_pTabBar )
         {
-            Window* pParent = m_pTabBar->GetAccessibleParentWindow();
+            vcl::Window* pParent = m_pTabBar->GetAccessibleParentWindow();
             if ( pParent )
                 xParent = pParent->GetAccessible();
         }
@@ -296,13 +296,13 @@ namespace accessibility
         sal_Int32 nIndexInParent = -1;
         if ( m_pTabBar )
         {
-            Window* pParent = m_pTabBar->GetAccessibleParentWindow();
+            vcl::Window* pParent = m_pTabBar->GetAccessibleParentWindow();
             if ( pParent )
             {
                 for ( sal_uInt16 i = 0, nCount = pParent->GetAccessibleChildWindowCount(); i < nCount; ++i )
                 {
-                    Window* pChild = pParent->GetAccessibleChildWindow( i );
-                    if ( pChild == static_cast< Window* >( m_pTabBar ) )
+                    vcl::Window* pChild = pParent->GetAccessibleChildWindow( i );
+                    if ( pChild == static_cast< vcl::Window* >( m_pTabBar ) )
                     {
                         nIndexInParent = i;
                         break;
diff --git a/accessibility/source/extended/accessibletabbarbase.cxx b/accessibility/source/extended/accessibletabbarbase.cxx
index 1de69c655679..01ff84ebdea2 100644
--- a/accessibility/source/extended/accessibletabbarbase.cxx
+++ b/accessibility/source/extended/accessibletabbarbase.cxx
@@ -49,7 +49,7 @@ IMPL_LINK( AccessibleTabBarBase, WindowEventListener, VclSimpleEvent*, pEvent )
     OSL_ENSURE( pWinEvent, "AccessibleTabBarBase::WindowEventListener - unknown window event" );
     if( pWinEvent )
     {
-        Window* pEventWindow = pWinEvent->GetWindow();
+        vcl::Window* pEventWindow = pWinEvent->GetWindow();
         OSL_ENSURE( pEventWindow, "AccessibleTabBarBase::WindowEventListener: no window!" );
 
         if( ( pWinEvent->GetId() == VCLEVENT_TABBAR_PAGEREMOVED ) &&
diff --git a/accessibility/source/extended/textwindowaccessibility.cxx b/accessibility/source/extended/textwindowaccessibility.cxx
index 24f0be2652e8..9e53b48808b0 100644
--- a/accessibility/source/extended/textwindowaccessibility.cxx
+++ b/accessibility/source/extended/textwindowaccessibility.cxx
@@ -46,7 +46,7 @@ void SfxListenerGuard::endListening()
     }
 }
 
-void WindowListenerGuard::startListening(::Window & rNotifier)
+void WindowListenerGuard::startListening(vcl::Window & rNotifier)
 {
     OSL_ENSURE(m_pNotifier == 0, "called more than once");
     m_pNotifier = &rNotifier;
@@ -267,7 +267,7 @@ css::awt::Size SAL_CALL Paragraph::getSize()
 void SAL_CALL Paragraph::grabFocus() throw (css::uno::RuntimeException, std::exception)
 {
     checkDisposed();
-    Window* pWindow = m_xDocument->GetWindow();
+    vcl::Window* pWindow = m_xDocument->GetWindow();
     if ( pWindow )
     {
         pWindow->GrabFocus();
diff --git a/accessibility/source/helper/acc_factory.cxx b/accessibility/source/helper/acc_factory.cxx
index 5b9bdca63b95..34e29e5f27a7 100644
--- a/accessibility/source/helper/acc_factory.cxx
+++ b/accessibility/source/helper/acc_factory.cxx
@@ -74,9 +74,9 @@ using namespace ::svt::table;
 
 namespace {
 
-inline bool hasFloatingChild(Window *pWindow)
+inline bool hasFloatingChild(vcl::Window *pWindow)
 {
-    Window * pChild = pWindow->GetAccessibleChildWindow(0);
+    vcl::Window * pChild = pWindow->GetAccessibleChildWindow(0);
     if( pChild && WINDOW_FLOATINGWINDOW == pChild->GetType() )
         return true;
 
@@ -304,7 +304,7 @@ Reference< XAccessibleContext > AccessibleFactory::createAccessibleContext( VCLX
 {
     Reference< XAccessibleContext > xContext;
 
-    Window* pWindow = _pXWindow->GetWindow();
+    vcl::Window* pWindow = _pXWindow->GetWindow();
     if ( pWindow )
     {
         WindowType nType = pWindow->GetType();
@@ -348,7 +348,7 @@ Reference< XAccessibleContext > AccessibleFactory::createAccessibleContext( VCLX
             // The logic here has to match that of Window::GetAccessibleParentWindow in
             // vcl/source/window/window.cxx to avoid PopupMenuFloatingWindow
             // becoming a11y parents of themselves
-            Window* pChild = pWindow->GetAccessibleChildWindow(0);
+            vcl::Window* pChild = pWindow->GetAccessibleChildWindow(0);
             if (PopupMenuFloatingWindow::isPopupMenu(pChild))
             {
                 // Get the accessible context from the child window.
diff --git a/accessibility/source/standard/accessiblemenucomponent.cxx b/accessibility/source/standard/accessiblemenucomponent.cxx
index 0824882917ec..1590d99510e8 100644
--- a/accessibility/source/standard/accessiblemenucomponent.cxx
+++ b/accessibility/source/standard/accessiblemenucomponent.cxx
@@ -111,7 +111,7 @@ awt::Rectangle OAccessibleMenuComponent::implGetBounds() throw (RuntimeException
 
     if ( m_pMenu )
     {
-        Window* pWindow = m_pMenu->GetWindow();
+        vcl::Window* pWindow = m_pMenu->GetWindow();
         if ( pWindow )
         {
             // get bounding rectangle of the window in screen coordinates
@@ -183,10 +183,10 @@ Reference< XAccessible > OAccessibleMenuComponent::getAccessibleParent(  ) throw
 
     if ( m_pMenu )
     {
-        Window* pWindow = m_pMenu->GetWindow();
+        vcl::Window* pWindow = m_pMenu->GetWindow();
         if ( pWindow )
         {
-            Window* pParent = pWindow->GetAccessibleParentWindow();
+            vcl::Window* pParent = pWindow->GetAccessibleParentWindow();
             if ( pParent )
                 xParent = pParent->GetAccessible();
         }
@@ -213,7 +213,7 @@ OUString OAccessibleMenuComponent::getAccessibleDescription( ) throw (RuntimeExc
     OUString sDescription;
     if ( m_pMenu )
     {
-        Window* pWindow = m_pMenu->GetWindow();
+        vcl::Window* pWindow = m_pMenu->GetWindow();
         if ( pWindow )
             sDescription = pWindow->GetAccessibleDescription();
     }
@@ -271,7 +271,7 @@ awt::Point OAccessibleMenuComponent::getLocationOnScreen(  ) throw (RuntimeExcep
 
     if ( m_pMenu )
     {
-        Window* pWindow = m_pMenu->GetWindow();
+        vcl::Window* pWindow = m_pMenu->GetWindow();
         if ( pWindow )
         {
             Rectangle aRect = pWindow->GetWindowExtentsRelative( NULL );
@@ -290,7 +290,7 @@ void OAccessibleMenuComponent::grabFocus(  ) throw (RuntimeException, std::excep
 
     if ( m_pMenu )
     {
-        Window* pWindow = m_pMenu->GetWindow();
+        vcl::Window* pWindow = m_pMenu->GetWindow();
         if ( pWindow )
             pWindow->GrabFocus();
     }
@@ -329,7 +329,7 @@ Reference< awt::XFont > OAccessibleMenuComponent::getFont(  ) throw (RuntimeExce
 
     if ( m_pMenu )
     {
-        Window* pWindow = m_pMenu->GetWindow();
+        vcl::Window* pWindow = m_pMenu->GetWindow();
         if ( pWindow )
         {
             Reference< awt::XDevice > xDev( pWindow->GetComponentInterface(), UNO_QUERY );
diff --git a/accessibility/source/standard/accessiblemenuitemcomponent.cxx b/accessibility/source/standard/accessiblemenuitemcomponent.cxx
index 79fbcbc43aba..60c7b6b77e96 100644
--- a/accessibility/source/standard/accessiblemenuitemcomponent.cxx
+++ b/accessibility/source/standard/accessiblemenuitemcomponent.cxx
@@ -137,7 +137,7 @@ void OAccessibleMenuItemComponent::Click()
     // click the menu item
     if ( m_pParent )
     {
-        Window* pWindow = m_pParent->GetWindow();
+        vcl::Window* pWindow = m_pParent->GetWindow();
         if ( pWindow )
         {
             // #102438# Menu items are not selectable
@@ -264,7 +264,7 @@ awt::Rectangle OAccessibleMenuItemComponent::implGetBounds() throw (RuntimeExcep
         aBounds = AWTRectangle( m_pParent->GetBoundingRectangle( m_nItemPos ) );
 
         // get position of containing window in screen coordinates
-        Window* pWindow = m_pParent->GetWindow();
+        vcl::Window* pWindow = m_pParent->GetWindow();
         if ( pWindow )
         {
             Rectangle aRect = pWindow->GetWindowExtentsRelative( NULL );
diff --git a/accessibility/source/standard/floatingwindowaccessible.cxx b/accessibility/source/standard/floatingwindowaccessible.cxx
index f75e7ce5b15a..a6238c0dc977 100644
--- a/accessibility/source/standard/floatingwindowaccessible.cxx
+++ b/accessibility/source/standard/floatingwindowaccessible.cxx
@@ -37,10 +37,10 @@ FloatingWindowAccessible::~FloatingWindowAccessible()
 
 void FloatingWindowAccessible::FillAccessibleRelationSet(utl::AccessibleRelationSetHelper& rRelationSet)
 {
-    Window* pWindow = GetWindow();
+    vcl::Window* pWindow = GetWindow();
     if ( pWindow )
     {
-        Window* pParentWindow = pWindow->GetParent();
+        vcl::Window* pParentWindow = pWindow->GetParent();
         if( pParentWindow )
         {
             uno::Sequence< uno::Reference< uno::XInterface > > aSequence(1);
diff --git a/accessibility/source/standard/vclxaccessiblebox.cxx b/accessibility/source/standard/vclxaccessiblebox.cxx
index fdf2e58c0457..295bbe41153d 100644
--- a/accessibility/source/standard/vclxaccessiblebox.cxx
+++ b/accessibility/source/standard/vclxaccessiblebox.cxx
@@ -69,7 +69,7 @@ void VCLXAccessibleBox::ProcessWindowChildEvent( const VclWindowEvent& rVclWindo
         case VCLEVENT_WINDOW_SHOW:
         case VCLEVENT_WINDOW_HIDE:
         {
-            Window* pChildWindow = (Window *) rVclWindowEvent.GetData();
+            vcl::Window* pChildWindow = (vcl::Window *) rVclWindowEvent.GetData();
             // Just compare to the combo box text field.  All other children
             // are identical to this object in which case this object will
             // be removed in a short time.
@@ -164,7 +164,7 @@ void VCLXAccessibleBox::ProcessWindowEvent (const VclWindowEvent& rVclWindowEven
             {
                 pList->ProcessWindowEvent (rVclWindowEvent);
             }
-            Window* pWindow = GetWindow();
+            vcl::Window* pWindow = GetWindow();
             if( pWindow && (pWindow->HasFocus() || pWindow->HasChildPathFocus()) )
             {
                 Any aOldValue, aNewValue;
diff --git a/accessibility/source/standard/vclxaccessiblebutton.cxx b/accessibility/source/standard/vclxaccessiblebutton.cxx
index 078d4100340a..4e9c9f20a910 100644
--- a/accessibility/source/standard/vclxaccessiblebutton.cxx
+++ b/accessibility/source/standard/vclxaccessiblebutton.cxx
@@ -227,7 +227,7 @@ Reference< XAccessibleKeyBinding > VCLXAccessibleButton::getAccessibleActionKeyB
     OAccessibleKeyBindingHelper* pKeyBindingHelper = new OAccessibleKeyBindingHelper();
     Reference< XAccessibleKeyBinding > xKeyBinding = pKeyBindingHelper;
 
-    Window* pWindow = GetWindow();
+    vcl::Window* pWindow = GetWindow();
     if ( pWindow )
     {
         KeyEvent aKeyEvent = pWindow->GetActivationKey();
diff --git a/accessibility/source/standard/vclxaccessiblecheckbox.cxx b/accessibility/source/standard/vclxaccessiblecheckbox.cxx
index a9cc86c9bc2f..bdaf8593d5b7 100644
--- a/accessibility/source/standard/vclxaccessiblecheckbox.cxx
+++ b/accessibility/source/standard/vclxaccessiblecheckbox.cxx
@@ -248,7 +248,7 @@ Reference< XAccessibleKeyBinding > VCLXAccessibleCheckBox::getAccessibleActionKe
     OAccessibleKeyBindingHelper* pKeyBindingHelper = new OAccessibleKeyBindingHelper();
     Reference< XAccessibleKeyBinding > xKeyBinding = pKeyBindingHelper;
 
-    Window* pWindow = GetWindow();
+    vcl::Window* pWindow = GetWindow();
     if ( pWindow )
     {
         KeyEvent aKeyEvent = pWindow->GetActivationKey();
diff --git a/accessibility/source/standard/vclxaccessibleedit.cxx b/accessibility/source/standard/vclxaccessibleedit.cxx
index ef800f2a754c..8a1fd5c9fdbe 100644
--- a/accessibility/source/standard/vclxaccessibleedit.cxx
+++ b/accessibility/source/standard/vclxaccessibleedit.cxx
@@ -82,7 +82,7 @@ void VCLXAccessibleEdit::ProcessWindowEvent( const VclWindowEvent& rVclWindowEve
             sal_Int32 nOldCaretPosition = m_nCaretPosition;
             m_nCaretPosition = getCaretPosition();
 
-            Window* pWindow = GetWindow();
+            vcl::Window* pWindow = GetWindow();
             if (pWindow && pWindow->HasChildPathFocus())
             {
                 if (m_nCaretPosition != nOldCaretPosition)
@@ -97,7 +97,7 @@ void VCLXAccessibleEdit::ProcessWindowEvent( const VclWindowEvent& rVclWindowEve
         break;
         case VCLEVENT_EDIT_SELECTIONCHANGED:
         {
-            Window* pWindow = GetWindow();
+            vcl::Window* pWindow = GetWindow();
             if (pWindow && pWindow->HasChildPathFocus())
             {
                 NotifyAccessibleEvent( AccessibleEventId::TEXT_SELECTION_CHANGED, Any(), Any() );
@@ -256,7 +256,7 @@ sal_Bool VCLXAccessibleEdit::doAccessibleAction ( sal_Int32 nIndex ) throw (Inde
         throw IndexOutOfBoundsException();
 
     bool bDoAction = false;
-    Window* pWindow = GetWindow();
+    vcl::Window* pWindow = GetWindow();
     if ( pWindow )
     {
         pWindow->GrabFocus();
diff --git a/accessibility/source/standard/vclxaccessiblelist.cxx b/accessibility/source/standard/vclxaccessiblelist.cxx
index 77c597037642..f5b103433db9 100644
--- a/accessibility/source/standard/vclxaccessiblelist.cxx
+++ b/accessibility/source/standard/vclxaccessiblelist.cxx
@@ -660,7 +660,7 @@ bool SAL_CALL VCLXAccessibleList::contains( const awt::Point& rPoint ) throw (Ru
 
     bool bInside = false;
 
-    Window* pListBox = GetWindow();
+    vcl::Window* pListBox = GetWindow();
     if ( pListBox )
     {
         Rectangle aRect( Point(0,0), pListBox->GetSizePixel() );
diff --git a/accessibility/source/standard/vclxaccessiblemenubar.cxx b/accessibility/source/standard/vclxaccessiblemenubar.cxx
index 2cb4cc4c353d..fc541ab388d1 100644
--- a/accessibility/source/standard/vclxaccessiblemenubar.cxx
+++ b/accessibility/source/standard/vclxaccessiblemenubar.cxx
@@ -160,15 +160,15 @@ sal_Int32 VCLXAccessibleMenuBar::getAccessibleIndexInParent(  ) throw (RuntimeEx
 
     if ( m_pMenu )
     {
-        Window* pWindow = m_pMenu->GetWindow();
+        vcl::Window* pWindow = m_pMenu->GetWindow();
         if ( pWindow )
         {
-            Window* pParent = pWindow->GetAccessibleParentWindow();
+            vcl::Window* pParent = pWindow->GetAccessibleParentWindow();
             if ( pParent )
             {
                 for ( sal_uInt16 n = pParent->GetAccessibleChildWindowCount(); n; )
                 {
-                    Window* pChild = pParent->GetAccessibleChildWindow( --n );
+                    vcl::Window* pChild = pParent->GetAccessibleChildWindow( --n );
                     if ( pChild == pWindow )
                     {
                         nIndexInParent = n;
diff --git a/accessibility/source/standard/vclxaccessiblemenuitem.cxx b/accessibility/source/standard/vclxaccessiblemenuitem.cxx
index 971f3194bbf8..95c59ebe4b4d 100644
--- a/accessibility/source/standard/vclxaccessiblemenuitem.cxx
+++ b/accessibility/source/standard/vclxaccessiblemenuitem.cxx
@@ -395,7 +395,7 @@ sal_Bool VCLXAccessibleMenuItem::copyText( sal_Int32 nStartIndex, sal_Int32 nEnd
 
     if ( m_pParent )
     {
-        Window* pWindow = m_pParent->GetWindow();
+        vcl::Window* pWindow = m_pParent->GetWindow();
         if ( pWindow )
         {
             Reference< datatransfer::clipboard::XClipboard > xClipboard = pWindow->GetClipboard();
diff --git a/accessibility/source/standard/vclxaccessibleradiobutton.cxx b/accessibility/source/standard/vclxaccessibleradiobutton.cxx
index a2e07ee050d8..baabdd5555f1 100644
--- a/accessibility/source/standard/vclxaccessibleradiobutton.cxx
+++ b/accessibility/source/standard/vclxaccessibleradiobutton.cxx
@@ -204,7 +204,7 @@ Reference< XAccessibleKeyBinding > VCLXAccessibleRadioButton::getAccessibleActio
     OAccessibleKeyBindingHelper* pKeyBindingHelper = new OAccessibleKeyBindingHelper();
     Reference< XAccessibleKeyBinding > xKeyBinding = pKeyBindingHelper;
 
-    Window* pWindow = GetWindow();
+    vcl::Window* pWindow = GetWindow();
     if ( pWindow )
     {
         KeyEvent aKeyEvent = pWindow->GetActivationKey();
diff --git a/accessibility/source/standard/vclxaccessibletabcontrol.cxx b/accessibility/source/standard/vclxaccessibletabcontrol.cxx
index f71f561700f9..3a40f68778d1 100644
--- a/accessibility/source/standard/vclxaccessibletabcontrol.cxx
+++ b/accessibility/source/standard/vclxaccessibletabcontrol.cxx
@@ -271,7 +271,7 @@ void VCLXAccessibleTabControl::ProcessWindowChildEvent( const VclWindowEvent& rV
         {
             if ( m_pTabControl )
             {
-                Window* pChild = static_cast< Window* >( rVclWindowEvent.GetData() );
+                vcl::Window* pChild = static_cast< vcl::Window* >( rVclWindowEvent.GetData() );
                 if ( pChild && pChild->GetType() == WINDOW_TABPAGE )
                 {
                     for ( sal_Int32 i = 0, nCount = m_pTabControl->GetPageCount(); i < nCount; ++i )
diff --git a/accessibility/source/standard/vclxaccessibletabpagewindow.cxx b/accessibility/source/standard/vclxaccessibletabpagewindow.cxx
index 33e929e59832..6b43aa3d4b2c 100644
--- a/accessibility/source/standard/vclxaccessibletabpagewindow.cxx
+++ b/accessibility/source/standard/vclxaccessibletabpagewindow.cxx
@@ -41,7 +41,7 @@ VCLXAccessibleTabPageWindow::VCLXAccessibleTabPageWindow( VCLXWindow* pVCLXWindo
     m_nPageId = 0;
     if ( m_pTabPage )
     {
-        Window* pParent = m_pTabPage->GetAccessibleParentWindow();
+        vcl::Window* pParent = m_pTabPage->GetAccessibleParentWindow();
         if ( pParent && pParent->GetType() == WINDOW_TABCONTROL )
         {
             m_pTabControl = static_cast< TabControl* >( pParent );
diff --git a/accessibility/source/standard/vclxaccessibletoolbox.cxx b/accessibility/source/standard/vclxaccessibletoolbox.cxx
index 00267fca7947..003eaa517211 100644
--- a/accessibility/source/standard/vclxaccessibletoolbox.cxx
+++ b/accessibility/source/standard/vclxaccessibletoolbox.cxx
@@ -425,7 +425,7 @@ void VCLXAccessibleToolBox::UpdateAllItems_Impl()
     }
 }
 
-void VCLXAccessibleToolBox::UpdateCustomPopupItemp_Impl( Window* pWindow, bool bOpen )
+void VCLXAccessibleToolBox::UpdateCustomPopupItemp_Impl( vcl::Window* pWindow, bool bOpen )
 {
     ToolBox* pToolBox = static_cast< ToolBox* >( GetWindow() );
     if( pWindow && pToolBox )
@@ -458,7 +458,7 @@ void VCLXAccessibleToolBox::UpdateItemEnabled_Impl( sal_Int32 _nPos )
 
 void VCLXAccessibleToolBox::HandleSubToolBarEvent( const VclWindowEvent& rVclWindowEvent, bool _bShow )
 {
-    Window* pChildWindow = (Window *) rVclWindowEvent.GetData();
+    vcl::Window* pChildWindow = (vcl::Window *) rVclWindowEvent.GetData();
     ToolBox* pToolBox = static_cast< ToolBox* >( GetWindow() );
     if ( pChildWindow
         && pToolBox
@@ -605,7 +605,7 @@ void VCLXAccessibleToolBox::ProcessWindowEvent( const VclWindowEvent& rVclWindow
         case VCLEVENT_DROPDOWN_OPEN:
         case VCLEVENT_DROPDOWN_CLOSE:
         {
-            UpdateCustomPopupItemp_Impl( static_cast< Window* >( rVclWindowEvent.GetData() ), rVclWindowEvent.GetId() == VCLEVENT_DROPDOWN_OPEN );
+            UpdateCustomPopupItemp_Impl( static_cast< vcl::Window* >( rVclWindowEvent.GetData() ), rVclWindowEvent.GetId() == VCLEVENT_DROPDOWN_OPEN );
             break;
         }
 
@@ -723,7 +723,7 @@ Reference< XAccessible > SAL_CALL VCLXAccessibleToolBox::getAccessibleChild( sal
         {
             sal_uInt16 nItemId = pToolBox->GetItemId( (sal_uInt16)i );
             sal_uInt16 nHighlightItemId = pToolBox->GetHighlightItemId();
-            Window* pItemWindow = pToolBox->GetItemWindow( nItemId );
+            vcl::Window* pItemWindow = pToolBox->GetItemWindow( nItemId );
             // not found -> create a new child
             VCLXAccessibleToolBoxItem* pChild = new VCLXAccessibleToolBoxItem( pToolBox, i );
             Reference< XAccessible> xParent = pChild;
@@ -772,7 +772,7 @@ Reference< XAccessible > SAL_CALL VCLXAccessibleToolBox::getAccessibleAtPoint( c
 Reference< XAccessible > VCLXAccessibleToolBox::GetItemWindowAccessible( const VclWindowEvent& rVclWindowEvent )
 {
     Reference< XAccessible > xReturn;
-    Window* pChildWindow = (Window *) rVclWindowEvent.GetData();
+    vcl::Window* pChildWindow = (vcl::Window *) rVclWindowEvent.GetData();
     ToolBox* pToolBox = static_cast< ToolBox* >( GetWindow() );
     if ( pChildWindow && pToolBox )
     {
@@ -780,7 +780,7 @@ Reference< XAccessible > VCLXAccessibleToolBox::GetItemWindowAccessible( const V
         for (sal_uInt16 i = 0 ; i < nCount && !xReturn.is() ; ++i)
         {
             sal_uInt16 nItemId = pToolBox->GetItemId( i );
-            Window* pItemWindow = pToolBox->GetItemWindow( nItemId );
+            vcl::Window* pItemWindow = pToolBox->GetItemWindow( nItemId );
             if ( pItemWindow == pChildWindow )
                 xReturn = getAccessibleChild(i);
         }
diff --git a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
index 7afe893c73ad..3f77107d42fb 100644
--- a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
+++ b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
@@ -133,7 +133,7 @@ OUString VCLXAccessibleToolBoxItem::GetText( bool _bAsName )
             sRet = m_pToolBox->GetQuickHelpText( m_nItemId );
             if (sRet.isEmpty())
             {
-                Window* pItemWindow = m_pToolBox->GetItemWindow( m_nItemId );
+                vcl::Window* pItemWindow = m_pToolBox->GetItemWindow( m_nItemId );
                 if ( m_nRole == AccessibleRole::PANEL && pItemWindow && pItemWindow->GetAccessible().is() &&
                      pItemWindow->GetAccessible()->getAccessibleContext().is() )
                 {