fdo#82577: Handle Window

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

Change-Id: Ib1beb7ab4ad75562a42aeb252732a073d25eff1a

19 files changed, 197 insertions, 197 deletions

diff --git a/toolkit/inc/helper/unowrapper.hxx b/toolkit/inc/helper/unowrapper.hxx
index 8e131ccddd44..15eab553a095 100644
--- a/toolkit/inc/helper/unowrapper.hxx
+++ b/toolkit/inc/helper/unowrapper.hxx
@@ -52,26 +52,26 @@ public:
     virtual void                ReleaseAllGraphics( OutputDevice* pOutDev ) SAL_OVERRIDE;
 
     // Window
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer> GetWindowInterface( Window* pWindow, bool bCreate ) SAL_OVERRIDE;
-    virtual void                SetWindowInterface( Window* pWindow, ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer> xIFace ) SAL_OVERRIDE;
-
-    void                WindowDestroyed( Window* pWindow ) SAL_OVERRIDE;
-    void                WindowEvent_Move( Window* pWindow );
-    void                WindowEvent_Resize( Window* pWindow );
-    void                WindowEvent_Show( Window* pWindow, bool bShow );
-    void                WindowEvent_Close( Window* pWindow );
-    void                WindowEvent_Minimize( Window* pWindow );
-    void                WindowEvent_Normalize( Window* pWindow );
-    void                WindowEvent_Activate( Window* pWindow, bool bActivated );
-    void                WindowEvent_MouseButtonUp( Window* pWindow, const MouseEvent& rEvt );
-    void                WindowEvent_MouseButtonDown( Window* pWindow, const MouseEvent& rEvt );
-    void                WindowEvent_MouseMove( Window* pWindow, const MouseEvent& rEvt );
-    void                WindowEvent_Command( Window* pWindow, const CommandEvent& rCEvt );
-    void                WindowEvent_KeyInput( Window* pWindow, const KeyEvent& rEvt );
-    void                WindowEvent_KeyUp( Window* pWindow, const KeyEvent& rEvt );
-    void                WindowEvent_GetFocus( Window* pWindow );
-    void                WindowEvent_LoseFocus( Window* pWindow );
-    void                WindowEvent_Paint( Window* pWindow, const Rectangle& rRect );
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer> GetWindowInterface( vcl::Window* pWindow, bool bCreate ) SAL_OVERRIDE;
+    virtual void                SetWindowInterface( vcl::Window* pWindow, ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer> xIFace ) SAL_OVERRIDE;
+
+    void                WindowDestroyed( vcl::Window* pWindow ) SAL_OVERRIDE;
+    void                WindowEvent_Move( vcl::Window* pWindow );
+    void                WindowEvent_Resize( vcl::Window* pWindow );
+    void                WindowEvent_Show( vcl::Window* pWindow, bool bShow );
+    void                WindowEvent_Close( vcl::Window* pWindow );
+    void                WindowEvent_Minimize( vcl::Window* pWindow );
+    void                WindowEvent_Normalize( vcl::Window* pWindow );
+    void                WindowEvent_Activate( vcl::Window* pWindow, bool bActivated );
+    void                WindowEvent_MouseButtonUp( vcl::Window* pWindow, const MouseEvent& rEvt );
+    void                WindowEvent_MouseButtonDown( vcl::Window* pWindow, const MouseEvent& rEvt );
+    void                WindowEvent_MouseMove( vcl::Window* pWindow, const MouseEvent& rEvt );
+    void                WindowEvent_Command( vcl::Window* pWindow, const CommandEvent& rCEvt );
+    void                WindowEvent_KeyInput( vcl::Window* pWindow, const KeyEvent& rEvt );
+    void                WindowEvent_KeyUp( vcl::Window* pWindow, const KeyEvent& rEvt );
+    void                WindowEvent_GetFocus( vcl::Window* pWindow );
+    void                WindowEvent_LoseFocus( vcl::Window* pWindow );
+    void                WindowEvent_Paint( vcl::Window* pWindow, const Rectangle& rRect );
 
     // Accessibility
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
diff --git a/toolkit/source/awt/scrollabledialog.cxx b/toolkit/source/awt/scrollabledialog.cxx
index f776bdc8ed37..2d98a0c2574f 100644
--- a/toolkit/source/awt/scrollabledialog.cxx
+++ b/toolkit/source/awt/scrollabledialog.cxx
@@ -31,7 +31,7 @@ namespace toolkit
 // in the same bitmap :-( WB_VSCROLL & WB_HSCROLL apparently are only for
 // child classes ( whole thing is a mess if you ask me )
 template< class T>
-ScrollableWrapper<T>::ScrollableWrapper( Window* pParent, WinBits nStyle ) : T( pParent, nStyle & ~( WB_AUTOHSCROLL | WB_AUTOVSCROLL ) ), maHScrollBar( this, WB_HSCROLL | WB_DRAG), maVScrollBar( this, WB_VSCROLL | WB_DRAG ), mbHasHoriBar( false ), mbHasVertBar( false ), maScrollVis( None )
+ScrollableWrapper<T>::ScrollableWrapper( vcl::Window* pParent, WinBits nStyle ) : T( pParent, nStyle & ~( WB_AUTOHSCROLL | WB_AUTOVSCROLL ) ), maHScrollBar( this, WB_HSCROLL | WB_DRAG), maVScrollBar( this, WB_VSCROLL | WB_DRAG ), mbHasHoriBar( false ), mbHasVertBar( false ), maScrollVis( None )
 {
     Link aLink( LINK( this, ScrollableWrapper, ScrollBarHdl ) );
     maVScrollBar.SetScrollHdl( aLink );
@@ -90,7 +90,7 @@ void ScrollableWrapper<T>::lcl_Scroll( long nX, long nY )
     // Manually scroll all children ( except the scrollbars )
     for ( int index = 0; index < T::GetChildCount(); ++index )
     {
-        Window* pChild = T::GetChild( index );
+        vcl::Window* pChild = T::GetChild( index );
         if ( pChild && pChild != &maVScrollBar && pChild != &maHScrollBar )
         {
             Point aPos = pChild->GetPosPixel();
diff --git a/toolkit/source/awt/stylesettings.cxx b/toolkit/source/awt/stylesettings.cxx
index 81519531e104..5250952e1abb 100644
--- a/toolkit/source/awt/stylesettings.cxx
+++ b/toolkit/source/awt/stylesettings.cxx
@@ -111,7 +111,7 @@ namespace toolkit
     WindowStyleSettings::WindowStyleSettings(::osl::Mutex& i_rListenerMutex, VCLXWindow& i_rOwningWindow )
         :m_pData( new WindowStyleSettings_Data(i_rListenerMutex, i_rOwningWindow ) )
     {
-        Window* pWindow = i_rOwningWindow.GetWindow();
+        vcl::Window* pWindow = i_rOwningWindow.GetWindow();
         if ( !pWindow )
             throw RuntimeException();
         pWindow->AddEventListener( LINK( m_pData.get(), WindowStyleSettings_Data, OnWindowEvent ) );
@@ -127,7 +127,7 @@ namespace toolkit
     {
         StyleMethodGuard aGuard( *m_pData );
 
-        Window* pWindow = m_pData->pOwningWindow->GetWindow();
+        vcl::Window* pWindow = m_pData->pOwningWindow->GetWindow();
         OSL_ENSURE( pWindow, "WindowStyleSettings::dispose: window has been reset before we could revoke the listener!" );
         if ( pWindow )
             pWindow->RemoveEventListener( LINK( m_pData.get(), WindowStyleSettings_Data, OnWindowEvent ) );
@@ -143,7 +143,7 @@ namespace toolkit
     {
         sal_Int32 lcl_getStyleColor( WindowStyleSettings_Data& i_rData, Color const & (StyleSettings::*i_pGetter)() const )
         {
-            const Window* pWindow = i_rData.pOwningWindow->GetWindow();
+            const vcl::Window* pWindow = i_rData.pOwningWindow->GetWindow();
             const AllSettings aAllSettings = pWindow->GetSettings();
             const StyleSettings aStyleSettings = aAllSettings.GetStyleSettings();
             return (aStyleSettings.*i_pGetter)().GetColor();
@@ -151,7 +151,7 @@ namespace toolkit
 
         void lcl_setStyleColor( WindowStyleSettings_Data& i_rData, void (StyleSettings::*i_pSetter)( Color const & ), const sal_Int32 i_nColor )
         {
-            Window* pWindow = i_rData.pOwningWindow->GetWindow();
+            vcl::Window* pWindow = i_rData.pOwningWindow->GetWindow();
             AllSettings aAllSettings = pWindow->GetSettings();
             StyleSettings aStyleSettings = aAllSettings.GetStyleSettings();
             (aStyleSettings.*i_pSetter)( Color( i_nColor ) );
@@ -161,7 +161,7 @@ namespace toolkit
 
         FontDescriptor lcl_getStyleFont( WindowStyleSettings_Data& i_rData, vcl::Font const & (StyleSettings::*i_pGetter)() const )
         {
-            const Window* pWindow = i_rData.pOwningWindow->GetWindow();
+            const vcl::Window* pWindow = i_rData.pOwningWindow->GetWindow();
             const AllSettings aAllSettings = pWindow->GetSettings();
             const StyleSettings aStyleSettings = aAllSettings.GetStyleSettings();
             return VCLUnoHelper::CreateFontDescriptor( (aStyleSettings.*i_pGetter)() );
@@ -170,7 +170,7 @@ namespace toolkit
         void lcl_setStyleFont( WindowStyleSettings_Data& i_rData, void (StyleSettings::*i_pSetter)( vcl::Font const &),
             vcl::Font const & (StyleSettings::*i_pGetter)() const, const FontDescriptor& i_rFont )
         {
-            Window* pWindow = i_rData.pOwningWindow->GetWindow();
+            vcl::Window* pWindow = i_rData.pOwningWindow->GetWindow();
             AllSettings aAllSettings = pWindow->GetSettings();
             StyleSettings aStyleSettings = aAllSettings.GetStyleSettings();
             const vcl::Font aNewFont = VCLUnoHelper::CreateFont( i_rFont, (aStyleSettings.*i_pGetter)() );
@@ -394,7 +394,7 @@ namespace toolkit
     ::sal_Int32 SAL_CALL WindowStyleSettings::getFaceGradientColor() throw (RuntimeException, std::exception)
     {
         StyleMethodGuard aGuard( *m_pData );
-        const Window* pWindow = m_pData->pOwningWindow->GetWindow();
+        const vcl::Window* pWindow = m_pData->pOwningWindow->GetWindow();
         const AllSettings aAllSettings = pWindow->GetSettings();
         const StyleSettings aStyleSettings = aAllSettings.GetStyleSettings();
         return aStyleSettings.GetFaceGradientColor().GetColor();
@@ -698,7 +698,7 @@ namespace toolkit
     ::sal_Int32 SAL_CALL WindowStyleSettings::getSeparatorColor() throw (RuntimeException, std::exception)
     {
         StyleMethodGuard aGuard( *m_pData );
-        const Window* pWindow = m_pData->pOwningWindow->GetWindow();
+        const vcl::Window* pWindow = m_pData->pOwningWindow->GetWindow();
         const AllSettings aAllSettings = pWindow->GetSettings();
         const StyleSettings aStyleSettings = aAllSettings.GetStyleSettings();
         return aStyleSettings.GetSeparatorColor().GetColor();
@@ -764,7 +764,7 @@ namespace toolkit
     sal_Bool SAL_CALL WindowStyleSettings::getHighContrastMode() throw (RuntimeException, std::exception)
     {
         StyleMethodGuard aGuard( *m_pData );
-        const Window* pWindow = m_pData->pOwningWindow->GetWindow();
+        const vcl::Window* pWindow = m_pData->pOwningWindow->GetWindow();
         const AllSettings aAllSettings = pWindow->GetSettings();
         const StyleSettings aStyleSettings = aAllSettings.GetStyleSettings();
         return aStyleSettings.GetHighContrastMode();
@@ -774,7 +774,7 @@ namespace toolkit
     void SAL_CALL WindowStyleSettings::setHighContrastMode( sal_Bool _highcontrastmode ) throw (RuntimeException, std::exception)
     {
         StyleMethodGuard aGuard( *m_pData );
-        Window* pWindow = m_pData->pOwningWindow->GetWindow();
+        vcl::Window* pWindow = m_pData->pOwningWindow->GetWindow();
         AllSettings aAllSettings = pWindow->GetSettings();
         StyleSettings aStyleSettings = aAllSettings.GetStyleSettings();
         aStyleSettings.SetHighContrastMode( _highcontrastmode );
diff --git a/toolkit/source/awt/vclxaccessiblecomponent.cxx b/toolkit/source/awt/vclxaccessiblecomponent.cxx
index 85d33dabe800..37ab3886d49b 100644
--- a/toolkit/source/awt/vclxaccessiblecomponent.cxx
+++ b/toolkit/source/awt/vclxaccessiblecomponent.cxx
@@ -143,8 +143,8 @@ uno::Reference< accessibility::XAccessible > VCLXAccessibleComponent::GetChildAc
     // checks if the data in the window event is our direct child
     // and returns its accessible
 
-    // MT: Change this later, normally a show/hide event shouldn't have the Window* in pData.
-    Window* pChildWindow = (Window *) rVclWindowEvent.GetData();
+    // MT: Change this later, normally a show/hide event shouldn't have the vcl::Window* in pData.
+    vcl::Window* pChildWindow = (vcl::Window *) rVclWindowEvent.GetData();
     if( pChildWindow && GetWindow() == pChildWindow->GetAccessibleParentWindow() )
         return pChildWindow->GetAccessible( rVclWindowEvent.GetId() == VCLEVENT_WINDOW_SHOW );
     else
@@ -185,7 +185,7 @@ void VCLXAccessibleComponent::ProcessWindowEvent( const VclWindowEvent& rVclWind
 {
     uno::Any aOldValue, aNewValue;
 
-    Window* pAccWindow = rVclWindowEvent.GetWindow();
+    vcl::Window* pAccWindow = rVclWindowEvent.GetWindow();
     assert(pAccWindow && "VCLXAccessibleComponent::ProcessWindowEvent - Window?");
 
     switch ( rVclWindowEvent.GetId() )
@@ -200,7 +200,7 @@ void VCLXAccessibleComponent::ProcessWindowEvent( const VclWindowEvent& rVclWind
         break;
         case VCLEVENT_WINDOW_CHILDDESTROYED:
         {
-            Window* pWindow = (Window*) rVclWindowEvent.GetData();
+            vcl::Window* pWindow = (vcl::Window*) rVclWindowEvent.GetData();
             DBG_ASSERT( pWindow, "VCLEVENT_WINDOW_CHILDDESTROYED - Window=?" );
             if ( pWindow->GetAccessible( false ).is() )
             {
@@ -356,17 +356,17 @@ void VCLXAccessibleComponent::disposing()
     mpVCLXindow = NULL;
 }
 
-Window* VCLXAccessibleComponent::GetWindow() const
+vcl::Window* VCLXAccessibleComponent::GetWindow() const
 {
     return GetVCLXWindow() ? GetVCLXWindow()->GetWindow() : NULL;
 }
 
 void VCLXAccessibleComponent::FillAccessibleRelationSet( utl::AccessibleRelationSetHelper& rRelationSet )
 {
-    Window* pWindow = GetWindow();
+    vcl::Window* pWindow = GetWindow();
     if ( pWindow )
     {
-        Window *pLabeledBy = pWindow->GetAccessibleRelationLabeledBy();
+        vcl::Window *pLabeledBy = pWindow->GetAccessibleRelationLabeledBy();
         if ( pLabeledBy && pLabeledBy != pWindow )
         {
             uno::Sequence< uno::Reference< uno::XInterface > > aSequence(1);
@@ -374,7 +374,7 @@ void VCLXAccessibleComponent::FillAccessibleRelationSet( utl::AccessibleRelation
             rRelationSet.AddRelation( accessibility::AccessibleRelation( accessibility::AccessibleRelationType::LABELED_BY, aSequence ) );
         }
 
-        Window* pLabelFor = pWindow->GetAccessibleRelationLabelFor();
+        vcl::Window* pLabelFor = pWindow->GetAccessibleRelationLabelFor();
         if ( pLabelFor && pLabelFor != pWindow )
         {
             uno::Sequence< uno::Reference< uno::XInterface > > aSequence(1);
@@ -382,7 +382,7 @@ void VCLXAccessibleComponent::FillAccessibleRelationSet( utl::AccessibleRelation
             rRelationSet.AddRelation( accessibility::AccessibleRelation( accessibility::AccessibleRelationType::LABEL_FOR, aSequence ) );
         }
 
-        Window* pMemberOf = pWindow->GetAccessibleRelationMemberOf();
+        vcl::Window* pMemberOf = pWindow->GetAccessibleRelationMemberOf();
         if ( pMemberOf && pMemberOf != pWindow )
         {
             uno::Sequence< uno::Reference< uno::XInterface > > aSequence(1);
@@ -394,7 +394,7 @@ void VCLXAccessibleComponent::FillAccessibleRelationSet( utl::AccessibleRelation
 
 void VCLXAccessibleComponent::FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet )
 {
-    Window* pWindow = GetWindow();
+    vcl::Window* pWindow = GetWindow();
     if ( pWindow )
     {
         if ( pWindow->IsVisible() )
@@ -446,11 +446,11 @@ void VCLXAccessibleComponent::FillAccessibleStateSet( utl::AccessibleStateSetHel
                     rStateSet.AddState( accessibility::AccessibleStateType::EDITABLE );
         }
 
-        Window* pChild = pWindow->GetWindow( WINDOW_FIRSTCHILD );
+        vcl::Window* pChild = pWindow->GetWindow( WINDOW_FIRSTCHILD );
 
         while( pWindow && pChild )
         {
-            Window* pWinTemp = pChild->GetWindow( WINDOW_FIRSTCHILD );
+            vcl::Window* pWinTemp = pChild->GetWindow( WINDOW_FIRSTCHILD );
             if( pWinTemp && pWinTemp->GetType() == WINDOW_EDIT )
             {
                 if( !( pWinTemp->GetStyle() & WB_READONLY) ||
@@ -520,7 +520,7 @@ uno::Reference< accessibility::XAccessible > VCLXAccessibleComponent::getAccessi
     uno::Reference< accessibility::XAccessible > xAcc;
     if ( GetWindow() )
     {
-        Window* pChild = GetWindow()->GetAccessibleChildWindow( (sal_uInt16)i );
+        vcl::Window* pChild = GetWindow()->GetAccessibleChildWindow( (sal_uInt16)i );
         if ( pChild )
             xAcc = pChild->GetAccessible();
     }
@@ -533,7 +533,7 @@ uno::Reference< accessibility::XAccessible > VCLXAccessibleComponent::getVclPare
     uno::Reference< accessibility::XAccessible > xAcc;
     if ( GetWindow() )
     {
-        Window* pParent = GetWindow()->GetAccessibleParentWindow();
+        vcl::Window* pParent = GetWindow()->GetAccessibleParentWindow();
         if ( pParent )
             xAcc = pParent->GetAccessible();
     }
@@ -568,7 +568,7 @@ sal_Int32 VCLXAccessibleComponent::getAccessibleIndexInParent(  ) throw (uno::Ru
     {
         if ( GetWindow() )
         {
-            Window* pParent = GetWindow()->GetAccessibleParentWindow();
+            vcl::Window* pParent = GetWindow()->GetAccessibleParentWindow();
             if ( pParent )
             {
                 //  Iterate over all the parent's children and search for this object.
@@ -701,12 +701,12 @@ awt::Rectangle VCLXAccessibleComponent::implGetBounds() throw (uno::RuntimeExcep
 {
     awt::Rectangle aBounds ( 0, 0, 0, 0 );
 
-    Window* pWindow = GetWindow();
+    vcl::Window* pWindow = GetWindow();
     if ( pWindow )
     {
         Rectangle aRect = pWindow->GetWindowExtentsRelative( NULL );
         aBounds = AWTRectangle( aRect );
-        Window* pParent = pWindow->GetAccessibleParentWindow();
+        vcl::Window* pParent = pWindow->GetAccessibleParentWindow();
         if ( pParent )
         {
             Rectangle aParentRect = pParent->GetWindowExtentsRelative( NULL );
@@ -778,7 +778,7 @@ sal_Int32 SAL_CALL VCLXAccessibleComponent::getForeground(  ) throw (uno::Runtim
     OExternalLockGuard aGuard( this );
 
     sal_Int32 nColor = 0;
-    Window* pWindow = GetWindow();
+    vcl::Window* pWindow = GetWindow();
     if ( pWindow )
     {
         if ( pWindow->IsControlForeground() )
@@ -805,7 +805,7 @@ sal_Int32 SAL_CALL VCLXAccessibleComponent::getBackground(  ) throw (uno::Runtim
     OExternalLockGuard aGuard( this );
 
     sal_Int32 nColor = 0;
-    Window* pWindow = GetWindow();
+    vcl::Window* pWindow = GetWindow();
     if ( pWindow )
     {
         if ( pWindow->IsControlBackground() )
@@ -824,7 +824,7 @@ uno::Reference< awt::XFont > SAL_CALL VCLXAccessibleComponent::getFont(  ) throw
     OExternalLockGuard aGuard( this );
 
     uno::Reference< awt::XFont > xFont;
-    Window* pWindow = GetWindow();
+    vcl::Window* pWindow = GetWindow();
     if ( pWindow )
     {
         uno::Reference< awt::XDevice > xDev( pWindow->GetComponentInterface(), uno::UNO_QUERY );
diff --git a/toolkit/source/awt/vclxcontainer.cxx b/toolkit/source/awt/vclxcontainer.cxx
index 04292434b9e6..2b78ada73fcd 100644
--- a/toolkit/source/awt/vclxcontainer.cxx
+++ b/toolkit/source/awt/vclxcontainer.cxx
@@ -84,7 +84,7 @@ void VCLXContainer::removeVclContainerListener( const ::com::sun::star::uno::Ref
 
     // Request container interface from all children
     ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > > aSeq;
-    Window* pWindow = GetWindow();
+    vcl::Window* pWindow = GetWindow();
     if ( pWindow )
     {
         sal_uInt16 nChildren = pWindow->GetChildCount();
@@ -94,7 +94,7 @@ void VCLXContainer::removeVclContainerListener( const ::com::sun::star::uno::Ref
             ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > * pChildRefs = aSeq.getArray();
             for ( sal_uInt16 n = 0; n < nChildren; n++ )
             {
-                Window* pChild = pWindow->GetChild( n );
+                vcl::Window* pChild = pWindow->GetChild( n );
                 ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >  xWP = pChild->GetComponentInterface( true );
                 ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > xW( xWP, ::com::sun::star::uno::UNO_QUERY );
                 pChildRefs[n] = xW;
@@ -110,7 +110,7 @@ void VCLXContainer::enableDialogControl( sal_Bool bEnable ) throw(::com::sun::st
 {
     SolarMutexGuard aGuard;
 
-    Window* pWindow = GetWindow();
+    vcl::Window* pWindow = GetWindow();
     if ( pWindow )
     {
         WinBits nStyle = pWindow->GetStyle();
@@ -131,11 +131,11 @@ void VCLXContainer::setTabOrder( const ::com::sun::star::uno::Sequence< ::com::s
     const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > * pComps = Components.getConstArray();
     const ::com::sun::star::uno::Any* pTabs = Tabs.getConstArray();
 
-    Window* pPrevWin = NULL;
+    vcl::Window* pPrevWin = NULL;
     for ( sal_uInt32 n = 0; n < nCount; n++ )
     {
         // ::com::sun::star::style::TabStop
-        Window* pWin = VCLUnoHelper::GetWindow( pComps[n] );
+        vcl::Window* pWin = VCLUnoHelper::GetWindow( pComps[n] );
         // May be NULL if a ::com::sun::star::uno::Sequence is originated from TabController and is missing a peer!
         if ( pWin )
         {
@@ -174,14 +174,14 @@ void VCLXContainer::setGroup( const ::com::sun::star::uno::Sequence< ::com::sun:
     sal_uInt32 nCount = Components.getLength();
     const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > * pComps = Components.getConstArray();
 
-    Window* pPrevWin = NULL;
-    Window* pPrevRadio = NULL;
+    vcl::Window* pPrevWin = NULL;
+    vcl::Window* pPrevRadio = NULL;
     for ( sal_uInt32 n = 0; n < nCount; n++ )
     {
-        Window* pWin = VCLUnoHelper::GetWindow( pComps[n] );
+        vcl::Window* pWin = VCLUnoHelper::GetWindow( pComps[n] );
         if ( pWin )
         {
-            Window* pSortBehind = pPrevWin;
+            vcl::Window* pSortBehind = pPrevWin;
             // #57096# Sort all radios consecutively
             bool bNewPrevWin = true;
             if ( pWin->GetType() == WINDOW_RADIOBUTTON )
@@ -209,7 +209,7 @@ void VCLXContainer::setGroup( const ::com::sun::star::uno::Sequence< ::com::sun:
             // Add WB_GROUP after the last group
             if ( n == ( nCount - 1 ) )
             {
-                Window* pBehindLast = pWin->GetWindow( WINDOW_NEXT );
+                vcl::Window* pBehindLast = pWin->GetWindow( WINDOW_NEXT );
                 if ( pBehindLast )
                 {
                     WinBits nLastStyle = pBehindLast->GetStyle();
@@ -242,7 +242,7 @@ throw(::com::sun::star::uno::RuntimeException, std::exception)
             sal_Int32 nVal =0;
             Value >>= nVal;
             Size aSize( nVal, nVal );
-            Window* pWindow = GetWindow();
+            vcl::Window* pWindow = GetWindow();
             MapMode aMode( MAP_APPFONT );
             toolkit::ScrollableInterface* pScrollable = dynamic_cast< toolkit::ScrollableInterface* >( pWindow );
             if ( pWindow && pScrollable )
diff --git a/toolkit/source/awt/vclxdevice.cxx b/toolkit/source/awt/vclxdevice.cxx
index ce0e3de429ca..2a48f73288bb 100644
--- a/toolkit/source/awt/vclxdevice.cxx
+++ b/toolkit/source/awt/vclxdevice.cxx
@@ -128,8 +128,8 @@ IMPL_XTYPEPROVIDER_END
         OutDevType eDevType = mpOutputDevice->GetOutDevType();
         if ( eDevType == OUTDEV_WINDOW )
         {
-            aDevSz = ((Window*)mpOutputDevice)->GetSizePixel();
-            ((Window*)mpOutputDevice)->GetBorder( aInfo.LeftInset, aInfo.TopInset, aInfo.RightInset, aInfo.BottomInset );
+            aDevSz = ((vcl::Window*)mpOutputDevice)->GetSizePixel();
+            ((vcl::Window*)mpOutputDevice)->GetBorder( aInfo.LeftInset, aInfo.TopInset, aInfo.RightInset, aInfo.BottomInset );
         }
         else if ( eDevType == OUTDEV_PRINTER )
         {
diff --git a/toolkit/source/awt/vclxspinbutton.cxx b/toolkit/source/awt/vclxspinbutton.cxx
index ca65735eb814..b3ab308edd92 100644
--- a/toolkit/source/awt/vclxspinbutton.cxx
+++ b/toolkit/source/awt/vclxspinbutton.cxx
@@ -37,7 +37,7 @@ namespace toolkit
 
     namespace
     {
-        void lcl_modifyStyle( Window* _pWindow, WinBits _nStyleBits, bool _bShouldBePresent )
+        void lcl_modifyStyle( vcl::Window* _pWindow, WinBits _nStyleBits, bool _bShouldBePresent )
         {
             WinBits nStyle = _pWindow->GetStyle();
             if ( _bShouldBePresent )
@@ -98,7 +98,7 @@ namespace toolkit
         typedef long (SpinButton::*GetSpinButtonValue) (void) const;
 
 
-        void lcl_setSpinButtonValue(Window* _pWindow, SetSpinButtonValue _pSetter, sal_Int32 _nValue )
+        void lcl_setSpinButtonValue(vcl::Window* _pWindow, SetSpinButtonValue _pSetter, sal_Int32 _nValue )
         {
             SolarMutexGuard aGuard;
             SpinButton* pSpinButton = static_cast< SpinButton* >( _pWindow );
@@ -107,7 +107,7 @@ namespace toolkit
         }
 
 
-        sal_Int32 lcl_getSpinButtonValue(const Window* _pWindow, GetSpinButtonValue _pGetter )
+        sal_Int32 lcl_getSpinButtonValue(const vcl::Window* _pWindow, GetSpinButtonValue _pGetter )
         {
             SolarMutexGuard aGuard;
 
diff --git a/toolkit/source/awt/vclxsystemdependentwindow.cxx b/toolkit/source/awt/vclxsystemdependentwindow.cxx
index 17b1877f73ff..e76a8be7d42e 100644
--- a/toolkit/source/awt/vclxsystemdependentwindow.cxx
+++ b/toolkit/source/awt/vclxsystemdependentwindow.cxx
@@ -68,7 +68,7 @@ IMPL_XTYPEPROVIDER_END
 
     // TODO, check the process id
     ::com::sun::star::uno::Any aRet;
-    Window* pWindow = GetWindow();
+    vcl::Window* pWindow = GetWindow();
     if ( pWindow )
     {
         const SystemEnvData* pSysData = ((SystemChildWindow *)pWindow)->GetSystemData();
diff --git a/toolkit/source/awt/vclxtabpagecontainer.cxx b/toolkit/source/awt/vclxtabpagecontainer.cxx
index a876693fa31b..90d62a14b11c 100644
--- a/toolkit/source/awt/vclxtabpagecontainer.cxx
+++ b/toolkit/source/awt/vclxtabpagecontainer.cxx
@@ -180,7 +180,7 @@ void SAL_CALL VCLXTabPageContainer::elementInserted( const ::com::sun::star::con
         Reference< awt::tab::XTabPageModel > xP( xControl->getModel(), UNO_QUERY );
         sal_Int16 nPageID = xP->getTabPageID();
 
-        Window* pWindow = VCLUnoHelper::GetWindow(xControl->getPeer());
+        vcl::Window* pWindow = VCLUnoHelper::GetWindow(xControl->getPeer());
         TabPage* pPage = (TabPage*)pWindow;
         pTabCtrl->InsertPage(nPageID,pPage->GetText());
 
diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx
index a6b4a1041027..4e57b33418ae 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -137,10 +137,10 @@ using org::libreoffice::touch::ByteBufferWrapper;
 
 namespace {
 
-extern "C" typedef Window* (SAL_CALL *FN_SvtCreateWindow)(
+extern "C" typedef vcl::Window* (SAL_CALL *FN_SvtCreateWindow)(
         VCLXWindow** ppNewComp,
         const css::awt::WindowDescriptor* pDescriptor,
-        Window* pParent,
+        vcl::Window* pParent,
         WinBits nWinBits );
 
 class VCLXToolkit_Impl
@@ -186,7 +186,7 @@ protected:
 
     virtual void SAL_CALL disposing() SAL_OVERRIDE;
 
-    Window* ImplCreateWindow( VCLXWindow** ppNewComp, const css::awt::WindowDescriptor& rDescriptor, Window* pParent, WinBits nWinBits );
+    vcl::Window* ImplCreateWindow( VCLXWindow** ppNewComp, const css::awt::WindowDescriptor& rDescriptor, vcl::Window* pParent, WinBits nWinBits );
     css::uno::Reference< css::awt::XWindowPeer > ImplCreateWindow( const css::awt::WindowDescriptor& Descriptor, WinBits nWinBits );
 
 public:
@@ -765,14 +765,14 @@ void SAL_CALL VCLXToolkit::disposing()
     return xRef;
 }
 
-Window* VCLXToolkit::ImplCreateWindow( VCLXWindow** ppNewComp,
+vcl::Window* VCLXToolkit::ImplCreateWindow( VCLXWindow** ppNewComp,
     const ::com::sun::star::awt::WindowDescriptor& rDescriptor,
-    Window* pParent, WinBits nWinBits )
+    vcl::Window* pParent, WinBits nWinBits )
 {
     OUString aServiceName( rDescriptor.WindowServiceName );
     aServiceName = aServiceName.toAsciiLowerCase();
 
-    Window* pNewWindow = NULL;
+    vcl::Window* pNewWindow = NULL;
     sal_uInt16 nType = ImplGetComponentType( aServiceName );
     bool bFrameControl = false;
     if ( aServiceName == "frame" )
@@ -1142,7 +1142,7 @@ Window* VCLXToolkit::ImplCreateWindow( VCLXWindow** ppNewComp,
                     if (nType == WINDOW_DOCKINGWINDOW )
                         pNewWindow = new DockingWindow( pParent, nWinBits );
                     else
-                        pNewWindow = new Window( pParent, nWinBits );
+                        pNewWindow = new vcl::Window( pParent, nWinBits );
                     *ppNewComp = new VCLXContainer;
                 }
                 else
@@ -1150,7 +1150,7 @@ Window* VCLXToolkit::ImplCreateWindow( VCLXWindow** ppNewComp,
                     if (nType == WINDOW_DOCKINGWINDOW )
                         pNewWindow = new DockingWindow( pParent, nWinBits );
                     else
-                        pNewWindow = new Window( pParent, nWinBits );
+                        pNewWindow = new vcl::Window( pParent, nWinBits );
                     *ppNewComp = new VCLXWindow;
                 }
             break;
@@ -1182,7 +1182,7 @@ extern "C" { static void SAL_CALL thisModule() {} }
 
 #else
 
-extern "C" Window* SAL_CALL CreateWindow( VCLXWindow** ppNewComp, const ::com::sun::star::awt::WindowDescriptor* pDescriptor, Window* pParent, WinBits nWinBits );
+extern "C" vcl::Window* SAL_CALL CreateWindow( VCLXWindow** ppNewComp, const ::com::sun::star::awt::WindowDescriptor* pDescriptor, vcl::Window* pParent, WinBits nWinBits );
 
 #endif
 
@@ -1196,7 +1196,7 @@ css::uno::Reference< css::awt::XWindowPeer > VCLXToolkit::ImplCreateWindow(
 
     ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > xRef;
 
-    Window* pParent = NULL;
+    vcl::Window* pParent = NULL;
     if ( rDescriptor.Parent.is() )
     {
         VCLXWindow* pParentComponent = VCLXWindow::GetImplementation( rDescriptor.Parent );
@@ -1213,7 +1213,7 @@ css::uno::Reference< css::awt::XWindowPeer > VCLXToolkit::ImplCreateWindow(
 
     VCLXWindow* pNewComp = NULL;
 
-    Window* pNewWindow = NULL;
+    vcl::Window* pNewWindow = NULL;
     // Try to create the window with SvTools
     // (do this _before_ creating it on our own: The old mechanism (extended toolkit in SvTools) did it this way,
     // and we need to stay compatible)
@@ -1311,7 +1311,7 @@ css::uno::Reference< css::awt::XWindowPeer > VCLXToolkit::ImplCreateWindow(
 // ::com::sun::star::awt::XSystemChildFactory
 ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > VCLXToolkit::createSystemChild( const ::com::sun::star::uno::Any& Parent, const ::com::sun::star::uno::Sequence< sal_Int8 >& /*ProcessId*/, sal_Int16 nSystemType ) throw(::com::sun::star::uno::RuntimeException, std::exception)
 {
-    Window* pChildWindow = NULL;
+    vcl::Window* pChildWindow = NULL;
     if ( nSystemType == SYSTEM_DEPENDENT_TYPE )
     {
         // use sal_Int64 here to accommodate all int types
@@ -1446,7 +1446,7 @@ css::uno::Reference< css::awt::XWindowPeer > VCLXToolkit::ImplCreateWindow(
     css::uno::Reference< css::awt::XWindow > xWindow( xMsgBox, css::uno::UNO_QUERY );
     if ( xMsgBox.is() && xWindow.is() )
     {
-        Window * pWindow = VCLUnoHelper::GetWindow( xWindow );
+        vcl::Window * pWindow = VCLUnoHelper::GetWindow( xWindow );
         if ( pWindow )
         {
             SolarMutexGuard aGuard;
@@ -1460,7 +1460,7 @@ css::uno::Reference< css::awt::XWindowPeer > VCLXToolkit::ImplCreateWindow(
 
 ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDragGestureRecognizer > SAL_CALL VCLXToolkit::getDragGestureRecognizer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& window ) throw(::com::sun::star::uno::RuntimeException, std::exception)
 {
-    Window * pWindow = VCLUnoHelper::GetWindow( window );
+    vcl::Window * pWindow = VCLUnoHelper::GetWindow( window );
 
     if( pWindow )
         return pWindow->GetDragGestureRecognizer();
@@ -1472,7 +1472,7 @@ css::uno::Reference< css::awt::XWindowPeer > VCLXToolkit::ImplCreateWindow(
 {
     SolarMutexGuard g;
 
-    Window * pWindow = VCLUnoHelper::GetWindow( window );
+    vcl::Window * pWindow = VCLUnoHelper::GetWindow( window );
 
     if( pWindow )
         return pWindow->GetDragSource();
@@ -1484,7 +1484,7 @@ css::uno::Reference< css::awt::XWindowPeer > VCLXToolkit::ImplCreateWindow(
 {
     SolarMutexGuard g;
 
-    Window * pWindow = VCLUnoHelper::GetWindow( window );
+    vcl::Window * pWindow = VCLUnoHelper::GetWindow( window );
 
     if( pWindow )
         return pWindow->GetDropTarget();
@@ -1546,7 +1546,7 @@ css::uno::Reference< css::awt::XTopWindow > SAL_CALL
 VCLXToolkit::getTopWindow(::sal_Int32 nIndex)
     throw (css::uno::RuntimeException, std::exception)
 {
-    ::Window * p = ::Application::GetTopWindow(static_cast< long >(nIndex));
+    vcl::Window * p = ::Application::GetTopWindow(static_cast< long >(nIndex));
         // XXX  numeric overflow
     return css::uno::Reference< css::awt::XTopWindow >(
         p == 0 ? 0 : static_cast< css::awt::XWindow * >(p->GetWindowPeer()),
@@ -1557,7 +1557,7 @@ VCLXToolkit::getTopWindow(::sal_Int32 nIndex)
 css::uno::Reference< css::awt::XTopWindow > SAL_CALL
 VCLXToolkit::getActiveTopWindow() throw (css::uno::RuntimeException, std::exception)
 {
-    ::Window * p = ::Application::GetActiveTopWindow();
+    vcl::Window * p = ::Application::GetActiveTopWindow();
     return css::uno::Reference< css::awt::XTopWindow >(
         p == 0 ? 0 : static_cast< css::awt::XWindow * >(p->GetWindowPeer()),
         css::uno::UNO_QUERY);
@@ -1748,7 +1748,7 @@ void VCLXToolkit::callTopWindowListeners(
     void (SAL_CALL css::awt::XTopWindowListener::* pFn)(
         css::lang::EventObject const &))
 {
-    ::Window * pWindow
+    vcl::Window * pWindow
           = static_cast< ::VclWindowEvent const * >(pEvent)->GetWindow();
     if (pWindow->IsTopWindow())
     {
@@ -1786,7 +1786,7 @@ long VCLXToolkit::callKeyHandlers(::VclSimpleEvent const * pEvent,
 
     if (aHandlers.hasElements())
     {
-        ::Window * pWindow = static_cast< ::VclWindowEvent const * >(pEvent)->GetWindow();
+        vcl::Window * pWindow = static_cast< ::VclWindowEvent const * >(pEvent)->GetWindow();
 
         // See implementation in vclxwindow.cxx for mapping between VCL and UNO AWT event
         ::KeyEvent * pKeyEvent = static_cast< ::KeyEvent * >(
@@ -1829,7 +1829,7 @@ long VCLXToolkit::callKeyHandlers(::VclSimpleEvent const * pEvent,
 void VCLXToolkit::callFocusListeners(::VclSimpleEvent const * pEvent,
                                      bool bGained)
 {
-    ::Window * pWindow
+    vcl::Window * pWindow
           = static_cast< ::VclWindowEvent const * >(pEvent)->GetWindow();
     if (pWindow->IsTopWindow())
     {
@@ -1841,8 +1841,8 @@ void VCLXToolkit::callFocusListeners(::VclSimpleEvent const * pEvent,
             // window that gets the focus next (see implementation in
             // vclxwindow.cxx for mapping between VCL and UNO AWT event):
             css::uno::Reference< css::uno::XInterface > xNext;
-            ::Window * pFocus = ::Application::GetFocusWindow();
-            for (::Window * p = pFocus; p != 0; p = p->GetParent())
+            vcl::Window * pFocus = ::Application::GetFocusWindow();
+            for (vcl::Window * p = pFocus; p != 0; p = p->GetParent())
                 if (!p->IsCompoundControl())
                 {
                     pFocus = p;
diff --git a/toolkit/source/awt/vclxtopwindow.cxx b/toolkit/source/awt/vclxtopwindow.cxx
index c7dccda58fda..e3d0dd6acfc0 100644
--- a/toolkit/source/awt/vclxtopwindow.cxx
+++ b/toolkit/source/awt/vclxtopwindow.cxx
@@ -80,7 +80,7 @@ Sequence< Type > VCLXTopWindow_Base::getTypes() throw(RuntimeException, std::exc
 
     // TODO, check the process id
     ::com::sun::star::uno::Any aRet;
-    Window* pWindow = GetWindowImpl();
+    vcl::Window* pWindow = GetWindowImpl();
     if ( pWindow )
     {
         const SystemEnvData* pSysData = ((SystemWindow *)pWindow)->GetSystemData();
@@ -134,7 +134,7 @@ void VCLXTopWindow_Base::toFront(  ) throw(::com::sun::star::uno::RuntimeExcepti
 {
     SolarMutexGuard aGuard;
 
-    Window* pWindow = GetWindowImpl();
+    vcl::Window* pWindow = GetWindowImpl();
     if ( pWindow )
         ((WorkWindow*)pWindow)->ToTop( TOTOP_RESTOREWHENMIN );
 }
@@ -254,7 +254,7 @@ VCLXTopWindow::~VCLXTopWindow()
 {
 }
 
-Window* VCLXTopWindow::GetWindowImpl()
+vcl::Window* VCLXTopWindow::GetWindowImpl()
 {
     return VCLXContainer::GetWindow();
 }
diff --git a/toolkit/source/awt/vclxwindow.cxx b/toolkit/source/awt/vclxwindow.cxx
index a527f418f4e7..e80cc2233e94 100644
--- a/toolkit/source/awt/vclxwindow.cxx
+++ b/toolkit/source/awt/vclxwindow.cxx
@@ -321,7 +321,7 @@ Reference< XStyleSettings > VCLXWindowImpl::getStyleSettings()
 
 // Uses an out-parameter instead of return value, due to the object reference
 
-void ImplInitWindowEvent( ::com::sun::star::awt::WindowEvent& rEvent, Window* pWindow )
+void ImplInitWindowEvent( ::com::sun::star::awt::WindowEvent& rEvent, vcl::Window* pWindow )
 {
     Point aPos = pWindow->GetPosPixel();
     Size aSz = pWindow->GetSizePixel();
@@ -365,7 +365,7 @@ void VCLXWindow::ImplExecuteAsyncWithoutSolarLock( const Callback& i_callback )
     return mpImpl->getAccessibleFactory().getFactory();
 }
 
-void VCLXWindow::SetWindow( Window* pWindow )
+void VCLXWindow::SetWindow( vcl::Window* pWindow )
 {
     if ( GetWindow() )
     {
@@ -394,7 +394,7 @@ void VCLXWindow::resumeVclEventListening( )
     --mpImpl->mnListenerLockLevel;
 }
 
-void VCLXWindow::notifyWindowRemoved( Window& _rWindow )
+void VCLXWindow::notifyWindowRemoved( vcl::Window& _rWindow )
 {
     if ( mpImpl->getContainerListeners().getLength() )
     {
@@ -607,11 +607,11 @@ void VCLXWindow::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent )
                     aEvent.FocusFlags = rVclWindowEvent.GetWindow()->GetGetFocusFlags();
                     aEvent.Temporary = sal_False;
 
-                    Window* pNext = Application::GetFocusWindow();
+                    vcl::Window* pNext = Application::GetFocusWindow();
                     if ( pNext )
                     {
                         // Don't care about internals if this control is compound
-                        Window* pNextC = pNext;
+                        vcl::Window* pNextC = pNext;
                         while ( pNextC && !pNextC->IsCompoundControl() )
                             pNextC = pNextC->GetParent();
                         if ( pNextC )
@@ -891,7 +891,7 @@ Size VCLXWindow::ImplCalcWindowSize( const Size& rOutSz ) const
 {
     Size aSz = rOutSz;
 
-    Window* pWindow = GetWindow();
+    vcl::Window* pWindow = GetWindow();
     if ( pWindow )
     {
         sal_Int32 nLeft, nTop, nRight, nBottom;
@@ -968,8 +968,8 @@ void VCLXWindow::setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int3
 
     if ( GetWindow() )
     {
-        if( Window::GetDockingManager()->IsDockable( GetWindow() ) )
-            Window::GetDockingManager()->SetPosSizePixel( GetWindow() , X, Y, Width, Height, Flags );
+        if( vcl::Window::GetDockingManager()->IsDockable( GetWindow() ) )
+            vcl::Window::GetDockingManager()->SetPosSizePixel( GetWindow() , X, Y, Width, Height, Flags );
         else
             GetWindow()->setPosSizePixel( X, Y, Width, Height, Flags );
     }
@@ -982,8 +982,8 @@ void VCLXWindow::setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int3
     ::com::sun::star::awt::Rectangle aBounds;
     if ( GetWindow() )
     {
-        if( Window::GetDockingManager()->IsDockable( GetWindow() ) )
-            aBounds = AWTRectangle( Window::GetDockingManager()->GetPosSizePixel( GetWindow() ) );
+        if( vcl::Window::GetDockingManager()->IsDockable( GetWindow() ) )
+            aBounds = AWTRectangle( vcl::Window::GetDockingManager()->GetPosSizePixel( GetWindow() ) );
         else
             aBounds = AWTRectangle( Rectangle( GetWindow()->GetPosPixel(), GetWindow()->GetSizePixel() ) );
     }
@@ -995,7 +995,7 @@ void VCLXWindow::setVisible( sal_Bool bVisible ) throw(::com::sun::star::uno::Ru
 {
     SolarMutexGuard aGuard;
 
-    Window* pWindow = GetWindow();
+    vcl::Window* pWindow = GetWindow();
     if ( pWindow )
     {
         mpImpl->setDirectVisible( bVisible );
@@ -1007,7 +1007,7 @@ void VCLXWindow::setEnable( sal_Bool bEnable ) throw(::com::sun::star::uno::Runt
 {
     SolarMutexGuard aGuard;
 
-    Window* pWindow = GetWindow();
+    vcl::Window* pWindow = GetWindow();
     if ( pWindow )
     {
         pWindow->Enable( bEnable, false ); // #95824# without children!
@@ -1173,10 +1173,10 @@ sal_Bool VCLXWindow::isChild( const ::com::sun::star::uno::Reference< ::com::sun
     SolarMutexGuard aGuard;
 
     bool bIsChild = false;
-    Window* pWindow = GetWindow();
+    vcl::Window* pWindow = GetWindow();
     if ( pWindow )
     {
-        Window* pPeerWindow = VCLUnoHelper::GetWindow( rxPeer );
+        vcl::Window* pPeerWindow = VCLUnoHelper::GetWindow( rxPeer );
         bIsChild = pPeerWindow && pWindow->IsChild( pPeerWindow );
     }
 
@@ -1255,7 +1255,7 @@ void VCLXWindow::getStyles( sal_Int16 nType, ::com::sun::star::awt::FontDescript
 
 namespace toolkit
 {
-    static void setColorSettings( Window* _pWindow, const ::com::sun::star::uno::Any& _rValue,
+    static void setColorSettings( vcl::Window* _pWindow, const ::com::sun::star::uno::Any& _rValue,
         void (StyleSettings::*pSetter)( const Color& ), const Color& (StyleSettings::*pGetter)( ) const )
     {
         sal_Int32 nColor = 0;
@@ -1342,7 +1342,7 @@ void VCLXWindow::GetPropertyIds( std::list< sal_uInt16 >& _out_rIds )
 
 namespace
 {
-    void    lcl_updateWritingMode( Window& _rWindow, const sal_Int16 _nWritingMode, const sal_Int16 _nContextWritingMode )
+    void    lcl_updateWritingMode( vcl::Window& _rWindow, const sal_Int16 _nWritingMode, const sal_Int16 _nContextWritingMode )
     {
         bool bEnableRTL = false;
         switch ( _nWritingMode )
@@ -1360,7 +1360,7 @@ namespace
                 case WritingMode2::RL_TB:   bEnableRTL = true; break;
                 case WritingMode2::CONTEXT:
                 {
-                    const Window* pParent = _rWindow.GetParent();
+                    const vcl::Window* pParent = _rWindow.GetParent();
                     OSL_ENSURE( pParent, "lcl_updateWritingMode: cannot determine context's writing mode!" );
                     if ( pParent )
                         bEnableRTL = pParent->IsRTLEnabled();
@@ -1383,7 +1383,7 @@ void VCLXWindow::setProperty( const OUString& PropertyName, const ::com::sun::st
 {
     SolarMutexGuard aGuard;
 
-    Window* pWindow = GetWindow();
+    vcl::Window* pWindow = GetWindow();
     if ( !pWindow )
         return;
 
@@ -2229,7 +2229,7 @@ void VCLXWindow::draw( sal_Int32 nX, sal_Int32 nY ) throw(::com::sun::star::uno:
 {
     SolarMutexGuard aGuard;
 
-    Window* pWindow = GetWindow();
+    vcl::Window* pWindow = GetWindow();
     if ( !pWindow )
         return;
 
@@ -2396,7 +2396,7 @@ void SAL_CALL VCLXWindow::enableDocking( sal_Bool bEnable ) throw (::com::sun::s
 {
     SolarMutexGuard aGuard;
 
-    Window* pWindow = GetWindow();
+    vcl::Window* pWindow = GetWindow();
     if ( pWindow )
         pWindow->EnableDocking( bEnable );
 }
@@ -2405,9 +2405,9 @@ sal_Bool SAL_CALL VCLXWindow::isFloating(  ) throw (::com::sun::star::uno::Runti
 {
     SolarMutexGuard aGuard;
 
-    Window* pWindow = GetWindow();
+    vcl::Window* pWindow = GetWindow();
     if( pWindow )
-        return Window::GetDockingManager()->IsFloating( pWindow );
+        return vcl::Window::GetDockingManager()->IsFloating( pWindow );
     else
         return sal_False;
 }
@@ -2416,18 +2416,18 @@ void SAL_CALL VCLXWindow::setFloatingMode( sal_Bool bFloating ) throw (::com::su
 {
     SolarMutexGuard aGuard;
 
-    Window* pWindow = GetWindow();
+    vcl::Window* pWindow = GetWindow();
     if( pWindow )
-        Window::GetDockingManager()->SetFloatingMode( pWindow, bFloating );
+        vcl::Window::GetDockingManager()->SetFloatingMode( pWindow, bFloating );
 }
 
 sal_Bool SAL_CALL VCLXWindow::isLocked(  ) throw (::com::sun::star::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
-    Window* pWindow = GetWindow();
+    vcl::Window* pWindow = GetWindow();
     if( pWindow )
-        return Window::GetDockingManager()->IsLocked( pWindow );
+        return vcl::Window::GetDockingManager()->IsLocked( pWindow );
     else
         return sal_False;
 }
@@ -2436,18 +2436,18 @@ void SAL_CALL VCLXWindow::lock(  ) throw (::com::sun::star::uno::RuntimeExceptio
 {
     SolarMutexGuard aGuard;
 
-    Window* pWindow = GetWindow();
-    if( pWindow && !Window::GetDockingManager()->IsFloating( pWindow ) )
-        Window::GetDockingManager()->Lock( pWindow );
+    vcl::Window* pWindow = GetWindow();
+    if( pWindow && !vcl::Window::GetDockingManager()->IsFloating( pWindow ) )
+        vcl::Window::GetDockingManager()->Lock( pWindow );
 }
 
 void SAL_CALL VCLXWindow::unlock(  ) throw (::com::sun::star::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
-    Window* pWindow = GetWindow();
-    if( pWindow && !Window::GetDockingManager()->IsFloating( pWindow ) )
-        Window::GetDockingManager()->Unlock( pWindow );
+    vcl::Window* pWindow = GetWindow();
+    if( pWindow && !vcl::Window::GetDockingManager()->IsFloating( pWindow ) )
+        vcl::Window::GetDockingManager()->Unlock( pWindow );
 }
 void SAL_CALL VCLXWindow::startPopupMode( const ::com::sun::star::awt::Rectangle& ) throw (::com::sun::star::uno::RuntimeException, std::exception)
 {
@@ -2469,7 +2469,7 @@ sal_Bool SAL_CALL VCLXWindow::isInPopupMode(  ) throw (::com::sun::star::uno::Ru
 void SAL_CALL VCLXWindow::setOutputSize( const ::com::sun::star::awt::Size& aSize ) throw (::com::sun::star::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
-    Window *pWindow;
+    vcl::Window *pWindow;
     if( (pWindow = GetWindow()) != NULL )
     {
         DockingWindow *pDockingWindow = dynamic_cast< DockingWindow* >(pWindow);
@@ -2483,7 +2483,7 @@ void SAL_CALL VCLXWindow::setOutputSize( const ::com::sun::star::awt::Size& aSiz
 ::com::sun::star::awt::Size SAL_CALL VCLXWindow::getOutputSize(  ) throw (::com::sun::star::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
-    Window *pWindow;
+    vcl::Window *pWindow;
     if( (pWindow = GetWindow()) != NULL )
     {
         DockingWindow *pDockingWindow = dynamic_cast< DockingWindow* >(pWindow);
diff --git a/toolkit/source/awt/vclxwindow1.cxx b/toolkit/source/awt/vclxwindow1.cxx
index 4bb9da294539..b4d0f72eb291 100644
--- a/toolkit/source/awt/vclxwindow1.cxx
+++ b/toolkit/source/awt/vclxwindow1.cxx
@@ -37,7 +37,7 @@
 void VCLXWindow::SetSystemParent_Impl( const com::sun::star::uno::Any& rHandle )
 {
     // does only work for WorkWindows
-    Window *pWindow = GetWindow();
+    vcl::Window *pWindow = GetWindow();
     if ( pWindow->GetType() != WINDOW_WORKWINDOW )
     {
         com::sun::star::uno::RuntimeException aException;
diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx
index 01fbbe0a132c..6161e73273fb 100644
--- a/toolkit/source/awt/vclxwindows.cxx
+++ b/toolkit/source/awt/vclxwindows.cxx
@@ -97,7 +97,7 @@ namespace toolkit
 {
     /** sets the "face color" for button like controls (scroll bar, spin button)
     */
-    void setButtonLikeFaceColor( Window* _pWindow, const ::com::sun::star::uno::Any& _rColorValue )
+    void setButtonLikeFaceColor( vcl::Window* _pWindow, const ::com::sun::star::uno::Any& _rColorValue )
     {
         AllSettings aSettings = _pWindow->GetSettings();
         StyleSettings aStyleSettings = aSettings.GetStyleSettings();
@@ -151,13 +151,13 @@ namespace toolkit
         _pWindow->SetSettings( aSettings, true );
     }
 
-    Any getButtonLikeFaceColor( const Window* _pWindow )
+    Any getButtonLikeFaceColor( const vcl::Window* _pWindow )
     {
         sal_Int32 nBackgroundColor = _pWindow->GetSettings().GetStyleSettings().GetFaceColor().GetColor();
         return makeAny( nBackgroundColor );
     }
 
-    static void adjustBooleanWindowStyle( const Any& _rValue, Window* _pWindow, WinBits _nBits, bool _bInverseSemantics )
+    static void adjustBooleanWindowStyle( const Any& _rValue, vcl::Window* _pWindow, WinBits _nBits, bool _bInverseSemantics )
     {
         WinBits nStyle = _pWindow->GetStyle();
         bool bValue( false );
@@ -169,7 +169,7 @@ namespace toolkit
         _pWindow->SetStyle( nStyle );
     }
 
-    static void setVisualEffect( const Any& _rValue, Window* _pWindow )
+    static void setVisualEffect( const Any& _rValue, vcl::Window* _pWindow )
     {
         AllSettings aSettings = _pWindow->GetSettings();
         StyleSettings aStyleSettings = aSettings.GetStyleSettings();
@@ -189,7 +189,7 @@ namespace toolkit
         _pWindow->SetSettings( aSettings );
     }
 
-    static Any getVisualEffect( Window* _pWindow )
+    static Any getVisualEffect( vcl::Window* _pWindow )
     {
         Any aEffect;
 
@@ -423,7 +423,7 @@ void VCLXButton::setLabel( const OUString& rLabel ) throw(::com::sun::star::uno:
 {
     SolarMutexGuard aGuard;
 
-    Window* pWindow = GetWindow();
+    vcl::Window* pWindow = GetWindow();
     if ( pWindow )
         pWindow->SetText( rLabel );
 }
@@ -850,7 +850,7 @@ void VCLXCheckBox::setLabel( const OUString& rLabel ) throw(::com::sun::star::un
 {
     SolarMutexGuard aGuard;
 
-    Window* pWindow = GetWindow();
+    vcl::Window* pWindow = GetWindow();
     if ( pWindow )
         pWindow->SetText( rLabel );
 }
@@ -1216,7 +1216,7 @@ void VCLXRadioButton::setLabel( const OUString& rLabel ) throw(::com::sun::star:
 {
     SolarMutexGuard aGuard;
 
-    Window* pWindow = GetWindow();
+    vcl::Window* pWindow = GetWindow();
     if ( pWindow )
         pWindow->SetText( rLabel );
 }
@@ -1413,7 +1413,7 @@ void VCLXSpinField::enableRepeat( sal_Bool bRepeat ) throw(::com::sun::star::uno
 {
     SolarMutexGuard aGuard;
 
-    Window* pWindow = GetWindow();
+    vcl::Window* pWindow = GetWindow();
     if ( pWindow )
     {
         WinBits nStyle = pWindow->GetStyle();
@@ -2210,7 +2210,7 @@ void VCLXMessageBox::setCaptionText( const OUString& rText ) throw(::com::sun::s
 {
     SolarMutexGuard aGuard;
 
-    Window* pWindow = GetWindow();
+    vcl::Window* pWindow = GetWindow();
     if ( pWindow )
         pWindow->SetText( rText );
 }
@@ -2220,7 +2220,7 @@ OUString VCLXMessageBox::getCaptionText() throw(::com::sun::star::uno::RuntimeEx
     SolarMutexGuard aGuard;
 
     OUString aText;
-    Window* pWindow = GetWindow();
+    vcl::Window* pWindow = GetWindow();
     if ( pWindow )
         aText = pWindow->GetText();
     return aText;
@@ -2307,7 +2307,7 @@ void SAL_CALL VCLXDialog::setHelpId( const OUString& rId ) throw (RuntimeExcepti
 {
     SolarMutexGuard aGuard;
 
-    Window* pWindow = GetWindow();
+    vcl::Window* pWindow = GetWindow();
     if ( pWindow )
         pWindow->SetHelpId( OUStringToOString( rId, RTL_TEXTENCODING_UTF8 ) );
 }
@@ -2316,7 +2316,7 @@ void VCLXDialog::setTitle( const OUString& Title ) throw(::com::sun::star::uno::
 {
     SolarMutexGuard aGuard;
 
-    Window* pWindow = GetWindow();
+    vcl::Window* pWindow = GetWindow();
     if ( pWindow )
         pWindow->SetText( Title );
 }
@@ -2326,7 +2326,7 @@ OUString VCLXDialog::getTitle() throw(::com::sun::star::uno::RuntimeException, s
     SolarMutexGuard aGuard;
 
     OUString aTitle;
-    Window* pWindow = GetWindow();
+    vcl::Window* pWindow = GetWindow();
     if ( pWindow )
         aTitle = pWindow->GetText();
     return aTitle;
@@ -2340,13 +2340,13 @@ sal_Int16 VCLXDialog::execute() throw(::com::sun::star::uno::RuntimeException, s
     if ( GetWindow() )
     {
         Dialog* pDlg = (Dialog*) GetWindow();
-        Window* pParent = pDlg->GetWindow( WINDOW_PARENTOVERLAP );
-        Window* pOldParent = NULL;
-        Window* pSetParent = NULL;
+        vcl::Window* pParent = pDlg->GetWindow( WINDOW_PARENTOVERLAP );
+        vcl::Window* pOldParent = NULL;
+        vcl::Window* pSetParent = NULL;
         if ( pParent && !pParent->IsReallyVisible() )
         {
             pOldParent = pDlg->GetParent();
-            Window* pFrame = pDlg->GetWindow( WINDOW_FRAME );
+            vcl::Window* pFrame = pDlg->GetWindow( WINDOW_FRAME );
             if( pFrame != pDlg )
             {
                 pDlg->SetParent( pFrame );
@@ -2372,7 +2372,7 @@ void VCLXDialog::endExecute() throw(::com::sun::star::uno::RuntimeException, std
 void SAL_CALL VCLXDialog::draw( sal_Int32 nX, sal_Int32 nY ) throw(::com::sun::star::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
-    Window* pWindow = GetWindow();
+    vcl::Window* pWindow = GetWindow();
 
     if ( pWindow )
     {
@@ -2506,7 +2506,7 @@ void SAL_CALL VCLXMultiPage::draw( sal_Int32 nX, sal_Int32 nY )
 throw(::com::sun::star::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
-    Window* pWindow = GetWindow();
+    vcl::Window* pWindow = GetWindow();
 
     if ( pWindow )
     {
@@ -2780,7 +2780,7 @@ void SAL_CALL VCLXTabPage::draw( sal_Int32 nX, sal_Int32 nY )
 throw(::com::sun::star::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
-    Window* pWindow = GetWindow();
+    vcl::Window* pWindow = GetWindow();
 
     if ( pWindow )
     {
@@ -2966,7 +2966,7 @@ OUString VCLXFixedHyperlink::getText() throw(::com::sun::star::uno::RuntimeExcep
     SolarMutexGuard aGuard;
 
     OUString aText;
-    Window* pWindow = GetWindow();
+    vcl::Window* pWindow = GetWindow();
     if ( pWindow )
         aText = pWindow->GetText();
     return aText;
@@ -2996,7 +2996,7 @@ void VCLXFixedHyperlink::setAlignment( short nAlign ) throw(::com::sun::star::un
 {
     SolarMutexGuard aGuard;
 
-    Window* pWindow = GetWindow();
+    vcl::Window* pWindow = GetWindow();
     if ( pWindow )
     {
         WinBits nNewBits = 0;
@@ -3018,7 +3018,7 @@ short VCLXFixedHyperlink::getAlignment() throw(::com::sun::star::uno::RuntimeExc
     SolarMutexGuard aGuard;
 
     short nAlign = 0;
-    Window* pWindow = GetWindow();
+    vcl::Window* pWindow = GetWindow();
     if ( pWindow )
     {
         WinBits nStyle = pWindow->GetStyle();
@@ -3218,7 +3218,7 @@ void VCLXFixedText::setText( const OUString& Text ) throw(::com::sun::star::uno:
 {
     SolarMutexGuard aGuard;
 
-    Window* pWindow = GetWindow();
+    vcl::Window* pWindow = GetWindow();
     if ( pWindow )
         pWindow->SetText( Text );
 }
@@ -3228,7 +3228,7 @@ OUString VCLXFixedText::getText() throw(::com::sun::star::uno::RuntimeException,
     SolarMutexGuard aGuard;
 
     OUString aText;
-    Window* pWindow = GetWindow();
+    vcl::Window* pWindow = GetWindow();
     if ( pWindow )
         aText = pWindow->GetText();
     return aText;
@@ -3238,7 +3238,7 @@ void VCLXFixedText::setAlignment( short nAlign ) throw(::com::sun::star::uno::Ru
 {
     SolarMutexGuard aGuard;
 
-    Window* pWindow = GetWindow();
+    vcl::Window* pWindow = GetWindow();
     if ( pWindow )
     {
         WinBits nNewBits = 0;
@@ -3260,7 +3260,7 @@ short VCLXFixedText::getAlignment() throw(::com::sun::star::uno::RuntimeExceptio
     SolarMutexGuard aGuard;
 
     short nAlign = 0;
-    Window* pWindow = GetWindow();
+    vcl::Window* pWindow = GetWindow();
     if ( pWindow )
     {
         WinBits nStyle = pWindow->GetStyle();
@@ -3499,7 +3499,7 @@ void VCLXScrollBar::setOrientation( sal_Int32 n ) throw(::com::sun::star::uno::R
 {
     SolarMutexGuard aGuard;
 
-    Window* pWindow = GetWindow();
+    vcl::Window* pWindow = GetWindow();
     if ( pWindow )
     {
         WinBits nStyle = pWindow->GetStyle();
@@ -3519,7 +3519,7 @@ sal_Int32 VCLXScrollBar::getOrientation() throw(::com::sun::star::uno::RuntimeEx
     SolarMutexGuard aGuard;
 
     sal_Int32 n = 0;
-    Window* pWindow = GetWindow();
+    vcl::Window* pWindow = GetWindow();
     if ( pWindow )
     {
         WinBits nStyle = pWindow->GetStyle();
@@ -3765,7 +3765,7 @@ void VCLXScrollBar::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent )
     }
 }
 
-::com::sun::star::awt::Size SAL_CALL VCLXScrollBar::implGetMinimumSize( Window* p ) throw(::com::sun::star::uno::RuntimeException)
+::com::sun::star::awt::Size SAL_CALL VCLXScrollBar::implGetMinimumSize( vcl::Window* p ) throw(::com::sun::star::uno::RuntimeException)
 {
     long n = p->GetSettings().GetStyleSettings().GetScrollBarSize();
     return ::com::sun::star::awt::Size( n, n );
@@ -3906,7 +3906,7 @@ OUString VCLXEdit::getText() throw(::com::sun::star::uno::RuntimeException, std:
     SolarMutexGuard aGuard;
 
     OUString aText;
-    Window* pWindow = GetWindow();
+    vcl::Window* pWindow = GetWindow();
     if ( pWindow )
         aText = pWindow->GetText();
     return aText;
@@ -4809,7 +4809,7 @@ VCLXDateField::~VCLXDateField()
 //change the window type here to match the role
 ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > VCLXDateField::CreateAccessibleContext()
 {
-    Window* pWindow = GetWindow();
+    vcl::Window* pWindow = GetWindow();
     if ( pWindow )
     {
         pWindow->SetType( WINDOW_DATEFIELD );
@@ -5157,7 +5157,7 @@ VCLXTimeField::~VCLXTimeField()
 //change the window type here to match the role
 ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > VCLXTimeField::CreateAccessibleContext()
 {
-    Window* pWindow = GetWindow();
+    vcl::Window* pWindow = GetWindow();
     if ( pWindow )
     {
         pWindow->SetType( WINDOW_TIMEFIELD );
@@ -6601,7 +6601,7 @@ void SAL_CALL VCLXFrame::draw( sal_Int32 nX, sal_Int32 nY )
 throw(::com::sun::star::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
-    Window* pWindow = GetWindow();
+    vcl::Window* pWindow = GetWindow();
 
     if ( pWindow )
     {
diff --git a/toolkit/source/awt/vclxwindows_internal.hxx b/toolkit/source/awt/vclxwindows_internal.hxx
index 6140f2050e51..a6506b18ab8e 100644
--- a/toolkit/source/awt/vclxwindows_internal.hxx
+++ b/toolkit/source/awt/vclxwindows_internal.hxx
@@ -22,8 +22,8 @@
 
 namespace toolkit
 {
-    void                        setButtonLikeFaceColor( Window* _pWindow, const ::com::sun::star::uno::Any& _rColorValue );
-    ::com::sun::star::uno::Any  getButtonLikeFaceColor( const Window* _pWindow );
+    void                        setButtonLikeFaceColor( vcl::Window* _pWindow, const ::com::sun::star::uno::Any& _rColorValue );
+    ::com::sun::star::uno::Any  getButtonLikeFaceColor( const vcl::Window* _pWindow );
 }
 
 #endif // INCLUDED_TOOLKIT_SOURCE_AWT_VCLXWINDOWS_INTERNAL_HXX
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 );
 
diff --git a/toolkit/source/helper/unowrapper.cxx b/toolkit/source/helper/unowrapper.cxx
index b9934c1b3f61..1a1b22435a16 100644
--- a/toolkit/source/helper/unowrapper.cxx
+++ b/toolkit/source/helper/unowrapper.cxx
@@ -39,7 +39,7 @@
 
 using namespace ::com::sun::star;
 
-::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > CreateXWindow( Window* pWindow )
+::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > CreateXWindow( vcl::Window* pWindow )
 {
     switch ( pWindow->GetType() )
     {
@@ -152,7 +152,7 @@ UnoWrapper::~UnoWrapper()
     return mxToolkit.get();
 }
 
-::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer> UnoWrapper::GetWindowInterface( Window* pWindow, bool bCreate )
+::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer> UnoWrapper::GetWindowInterface( vcl::Window* pWindow, bool bCreate )
 {
     ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer> xPeer = pWindow->GetWindowPeer();
     if ( !xPeer.is() && bCreate )
@@ -163,7 +163,7 @@ UnoWrapper::~UnoWrapper()
     return xPeer;
 }
 
-void UnoWrapper::SetWindowInterface( Window* pWindow, ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer> xIFace )
+void UnoWrapper::SetWindowInterface( vcl::Window* pWindow, ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer> xIFace )
 {
     VCLXWindow* pVCLXWindow = VCLXWindow::GetImplementation( xIFace );
 
@@ -206,25 +206,25 @@ void UnoWrapper::ReleaseAllGraphics( OutputDevice* pOutDev )
 
 }
 
-static bool lcl_ImplIsParent( Window* pParentWindow, Window* pPossibleChild )
+static bool lcl_ImplIsParent( vcl::Window* pParentWindow, vcl::Window* pPossibleChild )
 {
-    Window* pWindow = ( pPossibleChild != pParentWindow ) ? pPossibleChild : NULL;
+    vcl::Window* pWindow = ( pPossibleChild != pParentWindow ) ? pPossibleChild : NULL;
     while ( pWindow && ( pWindow != pParentWindow ) )
         pWindow = pWindow->GetParent();
 
     return pWindow ? sal_True : sal_False;
 }
 
-void UnoWrapper::WindowDestroyed( Window* pWindow )
+void UnoWrapper::WindowDestroyed( vcl::Window* pWindow )
 {
     // their still might be some children created with ::com::sun::star::loader::Java
     // that would otherwise not be destroyed until the garbage collector cleans up
-    Window* pChild = pWindow->GetWindow( WINDOW_FIRSTCHILD );
+    vcl::Window* pChild = pWindow->GetWindow( WINDOW_FIRSTCHILD );
     while ( pChild )
     {
-        Window* pNextChild = pChild->GetWindow( WINDOW_NEXT );
+        vcl::Window* pNextChild = pChild->GetWindow( WINDOW_NEXT );
 
-        Window* pClient = pChild->GetWindow( WINDOW_CLIENT );
+        vcl::Window* pClient = pChild->GetWindow( WINDOW_CLIENT );
         if ( pClient->GetWindowPeer() )
         {
             ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > xComp( pClient->GetComponentInterface( false ), ::com::sun::star::uno::UNO_QUERY );
@@ -235,14 +235,14 @@ void UnoWrapper::WindowDestroyed( Window* pWindow )
     }
 
     // System-Windows suchen...
-    Window* pOverlap = pWindow->GetWindow( WINDOW_OVERLAP );
+    vcl::Window* pOverlap = pWindow->GetWindow( WINDOW_OVERLAP );
     if ( pOverlap )
     {
         pOverlap = pOverlap->GetWindow( WINDOW_FIRSTOVERLAP );
         while ( pOverlap )
         {
-            Window* pNextOverlap = pOverlap->GetWindow( WINDOW_NEXT );
-            Window* pClient = pOverlap->GetWindow( WINDOW_CLIENT );
+            vcl::Window* pNextOverlap = pOverlap->GetWindow( WINDOW_NEXT );
+            vcl::Window* pClient = pOverlap->GetWindow( WINDOW_CLIENT );
 
             if ( pClient->GetWindowPeer() && lcl_ImplIsParent( pWindow, pClient ) )
             {
@@ -254,7 +254,7 @@ void UnoWrapper::WindowDestroyed( Window* pWindow )
         }
     }
 
-    Window* pParent = pWindow->GetParent();
+    vcl::Window* pParent = pWindow->GetParent();
     if ( pParent && pParent->GetWindowPeer() )
         pParent->GetWindowPeer()->notifyWindowRemoved( *pWindow );
 
@@ -276,13 +276,13 @@ void UnoWrapper::WindowDestroyed( Window* pWindow )
     // #i42462#/#116855# no, don't loop: Instead, just ensure that all our top-window-children
     // are disposed, too (which should also be a valid fix for #102132#, but doesn't have the extreme
     // performance penalties)
-    Window* pTopWindowChild = pWindow->GetWindow( WINDOW_FIRSTTOPWINDOWCHILD );
+    vcl::Window* pTopWindowChild = pWindow->GetWindow( WINDOW_FIRSTTOPWINDOWCHILD );
     while ( pTopWindowChild )
     {
         OSL_ENSURE( pTopWindowChild->GetParent() == pWindow,
                     "UnoWrapper::WindowDestroyed: inconsistency in the SystemWindow relationship!" );
 
-        Window* pNextTopChild = pTopWindowChild->GetWindow( WINDOW_NEXTTOPWINDOWSIBLING );
+        vcl::Window* pNextTopChild = pTopWindowChild->GetWindow( WINDOW_NEXTTOPWINDOWSIBLING );
 
         //the window still could be on the stack, so we have to
         // use lazy delete ( it will automatically
diff --git a/toolkit/source/helper/vclunohelper.cxx b/toolkit/source/helper/vclunohelper.cxx
index 1b598ca1c98f..8e4b75a6f194 100644
--- a/toolkit/source/helper/vclunohelper.cxx
+++ b/toolkit/source/helper/vclunohelper.cxx
@@ -108,19 +108,19 @@ BitmapEx VCLUnoHelper::GetBitmap( const ::com::sun::star::uno::Reference< ::com:
     return xBmp;
 }
 
-Window* VCLUnoHelper::GetWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow>& rxWindow )
+vcl::Window* VCLUnoHelper::GetWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow>& rxWindow )
 {
     VCLXWindow* pVCLXWindow = VCLXWindow::GetImplementation( rxWindow );
     return pVCLXWindow ? pVCLXWindow->GetWindow() : NULL;
 }
 
-Window* VCLUnoHelper::GetWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow2>& rxWindow )
+vcl::Window* VCLUnoHelper::GetWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow2>& rxWindow )
 {
     VCLXWindow* pVCLXWindow = VCLXWindow::GetImplementation( rxWindow );
     return pVCLXWindow ? pVCLXWindow->GetWindow() : NULL;
 }
 
-Window* VCLUnoHelper::GetWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer>& rxWindow )
+vcl::Window* VCLUnoHelper::GetWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer>& rxWindow )
 {
     VCLXWindow* pVCLXWindow = VCLXWindow::GetImplementation( rxWindow );
     return pVCLXWindow ? pVCLXWindow->GetWindow() : NULL;
@@ -142,7 +142,7 @@ Region VCLUnoHelper::GetRegion( const ::com::sun::star::uno::Reference< ::com::s
     return aRegion;
 }
 
-::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow> VCLUnoHelper::GetInterface( Window* pWindow )
+::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow> VCLUnoHelper::GetInterface( vcl::Window* pWindow )
 {
     ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > xWin;
     if ( pWindow )
@@ -187,7 +187,7 @@ Polygon VCLUnoHelper::CreatePolygon( const ::com::sun::star::uno::Sequence< sal_
     return aPoly;
 }
 
-::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer> VCLUnoHelper::CreateControlContainer( Window* pWindow )
+::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer> VCLUnoHelper::CreateControlContainer( vcl::Window* pWindow )
 {
     UnoControlContainer* pContainer = new UnoControlContainer( pWindow->GetComponentInterface( true ) );
     ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer > x = pContainer;