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

diff --git a/svtools/source/control/calendar.cxx b/svtools/source/control/calendar.cxx
index 920a3ccfa85a..ff3a748a4475 100644
--- a/svtools/source/control/calendar.cxx
+++ b/svtools/source/control/calendar.cxx
@@ -238,7 +238,7 @@ void Calendar::ImplInitSettings()
 
 
 
-Calendar::Calendar( Window* pParent, WinBits nWinStyle ) :
+Calendar::Calendar( vcl::Window* pParent, WinBits nWinStyle ) :
     Control( pParent, nWinStyle & (WB_TABSTOP | WB_GROUP | WB_BORDER | WB_3DLOOK | WB_RANGESELECT | WB_MULTISELECT) ),
     maCalendarWrapper( Application::GetAppLocaleDataWrapper().getComponentContext() ),
     maOldFormatFirstDate( 0, 0, 1900 ),
@@ -2192,7 +2192,7 @@ private:
     FixedLine*      mpFixedLine;
 
 public:
-                    ImplCFieldFloatWin( Window* pParent );
+                    ImplCFieldFloatWin( vcl::Window* pParent );
                     virtual ~ImplCFieldFloatWin();
 
     void            SetCalendar( Calendar* pCalendar )
@@ -2207,7 +2207,7 @@ public:
 
 
 
-ImplCFieldFloatWin::ImplCFieldFloatWin( Window* pParent ) :
+ImplCFieldFloatWin::ImplCFieldFloatWin( vcl::Window* pParent ) :
     FloatingWindow( pParent, WB_BORDER | WB_SYSTEMWINDOW | WB_NOSHADOW  )
 {
     mpCalendar  = NULL;
@@ -2369,7 +2369,7 @@ bool ImplCFieldFloatWin::Notify( NotifyEvent& rNEvt )
     return FloatingWindow::Notify( rNEvt );
 }
 
-CalendarField::CalendarField(Window* pParent, WinBits nWinStyle)
+CalendarField::CalendarField(vcl::Window* pParent, WinBits nWinStyle)
     : DateField(pParent, nWinStyle)
     , mpFloatWin(NULL)
     , mpCalendar(NULL)
@@ -2513,7 +2513,7 @@ bool CalendarField::ShowDropDown( bool bShow )
 
 
 
-Calendar* CalendarField::CreateCalendar( Window* pParent )
+Calendar* CalendarField::CreateCalendar( vcl::Window* pParent )
 {
     return new Calendar( pParent, mnCalendarStyle | WB_TABSTOP );
 }
diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx
index f3359c82d56d..a51de50c1963 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -90,21 +90,21 @@ void ColorListBox::ImplDestroyColorEntries()
     pColorList->clear();
 }
 
-ColorListBox::ColorListBox( Window* pParent, WinBits nWinStyle ) :
+ColorListBox::ColorListBox( vcl::Window* pParent, WinBits nWinStyle ) :
     ListBox( pParent, nWinStyle )
 {
     ImplInit();
     SetEdgeBlending(true);
 }
 
-ColorListBox::ColorListBox( Window* pParent, const ResId& rResId ) :
+ColorListBox::ColorListBox( vcl::Window* pParent, const ResId& rResId ) :
     ListBox( pParent, rResId )
 {
     ImplInit();
     SetEdgeBlending(true);
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeColorListBox(Window *pParent, VclBuilder::stringmap &rMap)
+extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeColorListBox(vcl::Window *pParent, VclBuilder::stringmap &rMap)
 {
     bool bDropdown = VclBuilder::extractDropdown(rMap);
     WinBits nWinBits = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_TABSTOP;
@@ -715,7 +715,7 @@ void LineListBox::ImplInit()
     UpdatePaintLineColor();
 }
 
-LineListBox::LineListBox( Window* pParent, WinBits nWinStyle ) :
+LineListBox::LineListBox( vcl::Window* pParent, WinBits nWinStyle ) :
     ListBox( pParent, nWinStyle ),
     m_nWidth( 5 ),
     m_sNone( ),
@@ -725,7 +725,7 @@ LineListBox::LineListBox( Window* pParent, WinBits nWinStyle ) :
     ImplInit();
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeLineListBox(Window *pParent, VclBuilder::stringmap &rMap)
+extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeLineListBox(vcl::Window *pParent, VclBuilder::stringmap &rMap)
 {
     bool bDropdown = VclBuilder::extractDropdown(rMap);
     WinBits nWinBits = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_TABSTOP;
@@ -953,7 +953,7 @@ void LineListBox::DataChanged( const DataChangedEvent& rDCEvt )
         UpdateEntries( m_nWidth );
 }
 
-FontNameBox::FontNameBox( Window* pParent, WinBits nWinStyle ) :
+FontNameBox::FontNameBox( vcl::Window* pParent, WinBits nWinStyle ) :
     ComboBox( pParent, nWinStyle )
 {
     mpFontList = NULL;
@@ -961,7 +961,7 @@ FontNameBox::FontNameBox( Window* pParent, WinBits nWinStyle ) :
     InitFontMRUEntriesFile();
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeFontNameBox(Window *pParent, VclBuilder::stringmap &rMap)
+extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeFontNameBox(vcl::Window *pParent, VclBuilder::stringmap &rMap)
 {
     bool bDropdown = VclBuilder::extractDropdown(rMap);
     WinBits nWinBits = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_TABSTOP;
@@ -1315,7 +1315,7 @@ void FontNameBox::UserDraw( const UserDrawEvent& rUDEvt )
     }
 }
 
-FontStyleBox::FontStyleBox(Window* pParent, WinBits nBits)
+FontStyleBox::FontStyleBox(vcl::Window* pParent, WinBits nBits)
     : ComboBox(pParent, nBits)
 {
     //Use the standard texts to get an optimal size and stick to that size.
@@ -1339,7 +1339,7 @@ Size FontStyleBox::GetOptimalSize() const
     return ComboBox::GetOptimalSize();
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeFontStyleBox(Window *pParent, VclBuilder::stringmap &rMap)
+extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeFontStyleBox(vcl::Window *pParent, VclBuilder::stringmap &rMap)
 {
     bool bDropdown = VclBuilder::extractDropdown(rMap);
     WinBits nWinBits = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_TABSTOP;
@@ -1533,13 +1533,13 @@ void FontStyleBox::Fill( const OUString& rName, const FontList* pList )
     }
 }
 
-FontSizeBox::FontSizeBox( Window* pParent, WinBits nWinSize ) :
+FontSizeBox::FontSizeBox( vcl::Window* pParent, WinBits nWinSize ) :
     MetricBox( pParent, nWinSize )
 {
     ImplInit();
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeFontSizeBox(Window *pParent, VclBuilder::stringmap &rMap)
+extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeFontSizeBox(vcl::Window *pParent, VclBuilder::stringmap &rMap)
 {
     bool bDropdown = VclBuilder::extractDropdown(rMap);
     WinBits nWinBits = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_TABSTOP;
diff --git a/svtools/source/control/filectrl.cxx b/svtools/source/control/filectrl.cxx
index c26a13c7ec7f..f6df0e4fac02 100644
--- a/svtools/source/control/filectrl.cxx
+++ b/svtools/source/control/filectrl.cxx
@@ -34,7 +34,7 @@ using namespace ::com::sun::star::ui;
 
 
 
-FileControl::FileControl( Window* pParent, WinBits nStyle, FileControlMode nFlags ) :
+FileControl::FileControl( vcl::Window* pParent, WinBits nStyle, FileControlMode nFlags ) :
     Window( pParent, nStyle|WB_DIALOGCONTROL ),
     maEdit( this, (nStyle&(~WB_BORDER))|WB_NOTABSTOP ),
     maButton( this, (nStyle&(~WB_BORDER))|WB_NOLIGHTBORDER|WB_NOPOINTERFOCUS|WB_NOTABSTOP ),
diff --git a/svtools/source/control/fileurlbox.cxx b/svtools/source/control/fileurlbox.cxx
index 13f96f01a3ff..5ed40d77eaac 100644
--- a/svtools/source/control/fileurlbox.cxx
+++ b/svtools/source/control/fileurlbox.cxx
@@ -30,7 +30,7 @@ namespace svt
     //= FileURLBox
 
 
-    FileURLBox::FileURLBox( Window* _pParent, WinBits _nStyle )
+    FileURLBox::FileURLBox( vcl::Window* _pParent, WinBits _nStyle )
         :SvtURLBox( _pParent, _nStyle, INET_PROT_FILE )
     {
         DisableHistory();
diff --git a/svtools/source/control/fmtfield.cxx b/svtools/source/control/fmtfield.cxx
index df5f6656cdde..edb8ad31aac5 100644
--- a/svtools/source/control/fmtfield.cxx
+++ b/svtools/source/control/fmtfield.cxx
@@ -297,7 +297,7 @@ FormattedField::StaticFormatter::~StaticFormatter()
 }
 
 
-FormattedField::FormattedField(Window* pParent, WinBits nStyle, SvNumberFormatter* pInitialFormatter, sal_Int32 nFormatKey)
+FormattedField::FormattedField(vcl::Window* pParent, WinBits nStyle, SvNumberFormatter* pInitialFormatter, sal_Int32 nFormatKey)
     :SpinField(pParent, nStyle)
     ,m_aLastSelection(0,0)
     ,m_dMinValue(0)
@@ -328,7 +328,7 @@ FormattedField::FormattedField(Window* pParent, WinBits nStyle, SvNumberFormatte
     }
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeFormattedField(Window *pParent, VclBuilder::stringmap &)
+extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeFormattedField(vcl::Window *pParent, VclBuilder::stringmap &)
 {
     WinBits nWinBits = WB_BORDER | WB_SPIN;
     return new FormattedField(pParent, nWinBits);
@@ -1067,7 +1067,7 @@ void DoubleNumericField::ResetConformanceTester()
     m_pNumberValidator = new validation::NumberValidator( cSeparatorThousand, cSeparatorDecimal );
 }
 
-DoubleCurrencyField::DoubleCurrencyField(Window* pParent, WinBits nStyle)
+DoubleCurrencyField::DoubleCurrencyField(vcl::Window* pParent, WinBits nStyle)
     :FormattedField(pParent, nStyle)
     ,m_bChangingFormat(false)
 {
diff --git a/svtools/source/control/headbar.cxx b/svtools/source/control/headbar.cxx
index def0e6ad1997..5f513e6e0220 100644
--- a/svtools/source/control/headbar.cxx
+++ b/svtools/source/control/headbar.cxx
@@ -103,7 +103,7 @@ void HeaderBar::ImplInit( WinBits nWinStyle )
 
 
 
-HeaderBar::HeaderBar( Window* pParent, WinBits nWinStyle ) :
+HeaderBar::HeaderBar( vcl::Window* pParent, WinBits nWinStyle ) :
     Window( pParent, nWinStyle & WB_3DLOOK )
 {
     ImplInit( nWinStyle );
@@ -303,7 +303,7 @@ void HeaderBar::ImplDrawItem( OutputDevice* pDev,
                               const Rectangle* pRect,
                               sal_uLong )
 {
-    Window *const pWin = (pDev->GetOutDevType()==OUTDEV_WINDOW) ? (Window*) pDev : NULL;
+    vcl::Window *const pWin = (pDev->GetOutDevType()==OUTDEV_WINDOW) ? (vcl::Window*) pDev : NULL;
     ImplControlValue aControlValue(0);
     Rectangle aCtrlRegion;
     ControlState nState(0);
diff --git a/svtools/source/control/hyperlabel.cxx b/svtools/source/control/hyperlabel.cxx
index e6aab88342e4..5c724842f7d1 100644
--- a/svtools/source/control/hyperlabel.cxx
+++ b/svtools/source/control/hyperlabel.cxx
@@ -48,7 +48,7 @@ namespace svt
     {
     }
 
-    HyperLabel::HyperLabel( Window* _pParent, WinBits _nWinStyle )
+    HyperLabel::HyperLabel( vcl::Window* _pParent, WinBits _nWinStyle )
         :FixedText( _pParent, _nWinStyle )
         ,m_pImpl( new HyperLabelImpl )
     {
diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx
index a5850531c182..21a40a6fd250 100644
--- a/svtools/source/control/inettbc.cxx
+++ b/svtools/source/control/inettbc.cxx
@@ -832,7 +832,7 @@ void SvtURLBox::TryAutoComplete()
 }
 
 
-SvtURLBox::SvtURLBox( Window* pParent, INetProtocol eSmart, bool bSetDefaultHelpID )
+SvtURLBox::SvtURLBox( vcl::Window* pParent, INetProtocol eSmart, bool bSetDefaultHelpID )
     :   ComboBox( pParent , WB_DROPDOWN | WB_AUTOSIZE | WB_AUTOHSCROLL ),
         eSmartProtocol( eSmart ),
         bAutoCompleteMode( false ),
@@ -851,7 +851,7 @@ SvtURLBox::SvtURLBox( Window* pParent, INetProtocol eSmart, bool bSetDefaultHelp
 }
 
 
-SvtURLBox::SvtURLBox( Window* pParent, WinBits _nStyle, INetProtocol eSmart,
+SvtURLBox::SvtURLBox( vcl::Window* pParent, WinBits _nStyle, INetProtocol eSmart,
     bool bSetDefaultHelpID )
     :   ComboBox( pParent, _nStyle ),
         eSmartProtocol( eSmart ),
@@ -865,7 +865,7 @@ SvtURLBox::SvtURLBox( Window* pParent, WinBits _nStyle, INetProtocol eSmart,
     Init(bSetDefaultHelpID);
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvtURLBox(Window *pParent, VclBuilder::stringmap &)
+extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvtURLBox(vcl::Window *pParent, VclBuilder::stringmap &)
 {
     WinBits nWinBits = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_TABSTOP|
                        WB_DROPDOWN|WB_AUTOSIZE|WB_AUTOHSCROLL;
@@ -875,7 +875,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvtURLBox(Window *pParent,
 }
 
 
-SvtURLBox::SvtURLBox( Window* pParent, const ResId& _rResId, INetProtocol eSmart,
+SvtURLBox::SvtURLBox( vcl::Window* pParent, const ResId& _rResId, INetProtocol eSmart,
     bool bSetDefaultHelpID )
     :   ComboBox( pParent , _rResId ),
         eSmartProtocol( eSmart ),
diff --git a/svtools/source/control/roadmap.cxx b/svtools/source/control/roadmap.cxx
index cc90d4344ed4..58f3d06ba0e8 100644
--- a/svtools/source/control/roadmap.cxx
+++ b/svtools/source/control/roadmap.cxx
@@ -45,7 +45,7 @@ namespace svt
     class IDLabel :  public FixedText
     {
     public:
-        IDLabel( Window* _pParent, WinBits _nWinStyle = 0 );
+        IDLabel( vcl::Window* _pParent, WinBits _nWinStyle = 0 );
         virtual ~IDLabel( );
         virtual void    DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE;
     };
@@ -79,7 +79,7 @@ namespace svt
         bool                    IsEnabled() const;
         void                    GrabFocus();
 
-        bool                    Contains( const Window* _pWindow ) const;
+        bool                    Contains( const vcl::Window* _pWindow ) const;
 
         HyperLabel*             GetDescriptionHyperLabel() const { return mpDescription; }
 
@@ -162,7 +162,7 @@ namespace svt
     //= Roadmap
 
 
-    ORoadmap::ORoadmap( Window* _pParent, WinBits _nWinStyle )
+    ORoadmap::ORoadmap( vcl::Window* _pParent, WinBits _nWinStyle )
         :Control( _pParent, _nWinStyle )
         ,m_pImpl( new RoadmapImpl( *this ) )
 
@@ -598,7 +598,7 @@ namespace svt
     }
 
 
-    RoadmapItem* ORoadmap::GetByPointer(Window* pWindow)
+    RoadmapItem* ORoadmap::GetByPointer(vcl::Window* pWindow)
     {
         const HL_Vector& rItems = m_pImpl->getHyperLabels();
         for (   HL_Vector::const_iterator i = rItems.begin();
@@ -618,7 +618,7 @@ namespace svt
         // capture KeyEvents for taskpane cycling
         if ( _rNEvt.GetType() == EVENT_KEYINPUT )
         {
-            Window* pWindow = _rNEvt.GetWindow();
+            vcl::Window* pWindow = _rNEvt.GetWindow();
             RoadmapItem* pItem = GetByPointer( pWindow );
             if ( pItem != NULL )
             {
@@ -693,7 +693,7 @@ namespace svt
     }
 
 
-    bool RoadmapItem::Contains( const Window* _pWindow ) const
+    bool RoadmapItem::Contains( const vcl::Window* _pWindow ) const
     {
         return ( mpID == _pWindow ) || ( mpDescription == _pWindow );
     }
@@ -851,7 +851,7 @@ namespace svt
     }
 
 
-    IDLabel::IDLabel( Window* _pParent, WinBits _nWinStyle )
+    IDLabel::IDLabel( vcl::Window* _pParent, WinBits _nWinStyle )
         :FixedText( _pParent, _nWinStyle )
     {
 
diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx
index 0a0170f2cc49..6dfce365f415 100644
--- a/svtools/source/control/ruler.cxx
+++ b/svtools/source/control/ruler.cxx
@@ -283,7 +283,7 @@ void Ruler::ImplInit( WinBits nWinBits )
     pAccContext = NULL;
 }
 
-Ruler::Ruler( Window* pParent, WinBits nWinStyle ) :
+Ruler::Ruler( vcl::Window* pParent, WinBits nWinStyle ) :
     Window( pParent, nWinStyle & WB_3DLOOK ),
     maVirDev( *this ),
     maMapMode( MAP_100TH_MM ),
@@ -2802,7 +2802,7 @@ void Ruler::DrawTicks()
 
 uno::Reference< XAccessible > Ruler::CreateAccessible()
 {
-    Window* pParent = GetAccessibleParentWindow();
+    vcl::Window* pParent = GetAccessibleParentWindow();
     OSL_ENSURE( pParent, "-SvxRuler::CreateAccessible(): No Parent!" );
     uno::Reference< XAccessible >   xAccParent  = pParent->GetAccessible();
     if( xAccParent.is() )
diff --git a/svtools/source/control/scrwin.cxx b/svtools/source/control/scrwin.cxx
index 68feada7de87..e948e2c76144 100644
--- a/svtools/source/control/scrwin.cxx
+++ b/svtools/source/control/scrwin.cxx
@@ -40,7 +40,7 @@ void ScrollableWindow::ImpInitialize( ScrollableWindowFlags nFlags )
 
 
 
-ScrollableWindow::ScrollableWindow( Window* pParent, WinBits nBits,
+ScrollableWindow::ScrollableWindow( vcl::Window* pParent, WinBits nBits,
                                     ScrollableWindowFlags nFlags ) :
     Window( pParent, WinBits(nBits|WB_CLIPCHILDREN) ),
     aVScroll( this, WinBits(WB_VSCROLL | WB_DRAG) ),
diff --git a/svtools/source/control/stdctrl.cxx b/svtools/source/control/stdctrl.cxx
index bc117dcc848c..4e3b03c8c5ce 100644
--- a/svtools/source/control/stdctrl.cxx
+++ b/svtools/source/control/stdctrl.cxx
@@ -19,7 +19,7 @@
 
 #include <svtools/stdctrl.hxx>
 
-FixedInfo::FixedInfo( Window* pParent, const ResId& rResId ) :
+FixedInfo::FixedInfo( vcl::Window* pParent, const ResId& rResId ) :
     FixedText( pParent, rResId )
 {
     SetStyle( GetStyle() | WB_INFO );
diff --git a/svtools/source/control/tabbar.cxx b/svtools/source/control/tabbar.cxx
index 81afa0a95f81..7dd15b0d55e1 100644
--- a/svtools/source/control/tabbar.cxx
+++ b/svtools/source/control/tabbar.cxx
@@ -142,7 +142,7 @@ bool ImplTabButton::PreNotify( NotifyEvent& rNEvt )
 // - ImplTabSizer -
 
 
-class ImplTabSizer : public Window
+class ImplTabSizer : public vcl::Window
 {
 public:
                     ImplTabSizer( TabBar* pParent, WinBits nWinStyle = 0 );
@@ -434,7 +434,7 @@ void TabBar::ImplInit( WinBits nWinStyle )
 
 
 
-TabBar::TabBar( Window* pParent, WinBits nWinStyle ) :
+TabBar::TabBar( vcl::Window* pParent, WinBits nWinStyle ) :
     Window( pParent, (nWinStyle & WB_3DLOOK) | WB_CLIPCHILDREN )
 {
     ImplInit( nWinStyle );
diff --git a/svtools/source/control/toolbarmenu.cxx b/svtools/source/control/toolbarmenu.cxx
index 2be0e430d8bb..fb03917624d5 100644
--- a/svtools/source/control/toolbarmenu.cxx
+++ b/svtools/source/control/toolbarmenu.cxx
@@ -41,7 +41,7 @@ namespace svtools {
 
 
 
-static Window* GetTopMostParentSystemWindow( Window* pWindow )
+static vcl::Window* GetTopMostParentSystemWindow( vcl::Window* pWindow )
 {
     OSL_ASSERT( pWindow );
     if ( pWindow )
@@ -437,7 +437,7 @@ IMPL_LINK( ToolbarMenu, HighlightHdl, Control *, pControl )
 
 
 
-ToolbarMenu::ToolbarMenu( const Reference< XFrame >& rFrame, Window* pParentWindow, WinBits nBits )
+ToolbarMenu::ToolbarMenu( const Reference< XFrame >& rFrame, vcl::Window* pParentWindow, WinBits nBits )
 : DockingWindow(pParentWindow, nBits)
 {
     implInit(rFrame);
@@ -445,7 +445,7 @@ ToolbarMenu::ToolbarMenu( const Reference< XFrame >& rFrame, Window* pParentWind
 
 
 
-ToolbarMenu::ToolbarMenu( const Reference< XFrame >& rFrame, Window* pParentWindow, const ResId& rResId )
+ToolbarMenu::ToolbarMenu( const Reference< XFrame >& rFrame, vcl::Window* pParentWindow, const ResId& rResId )
 : DockingWindow(pParentWindow, rResId)
 {
     implInit(rFrame);
@@ -462,7 +462,7 @@ void ToolbarMenu::implInit(const Reference< XFrame >& rFrame)
 
     initWindow();
 
-    Window* pWindow = GetTopMostParentSystemWindow( this );
+    vcl::Window* pWindow = GetTopMostParentSystemWindow( this );
     if ( pWindow )
         ((SystemWindow *)pWindow)->GetTaskPaneList()->AddWindow( this );
 }
@@ -471,7 +471,7 @@ void ToolbarMenu::implInit(const Reference< XFrame >& rFrame)
 
 ToolbarMenu::~ToolbarMenu()
 {
-    Window* pWindow = GetTopMostParentSystemWindow( this );
+    vcl::Window* pWindow = GetTopMostParentSystemWindow( this );
     if ( pWindow )
         ((SystemWindow *)pWindow)->GetTaskPaneList()->RemoveWindow( this );
 
@@ -584,7 +584,7 @@ void ToolbarMenu::initWindow()
 
 
 
-static long ImplGetNativeCheckAndRadioSize( Window* pWin, long& rCheckHeight, long& rRadioHeight, long &rMaxWidth )
+static long ImplGetNativeCheckAndRadioSize( vcl::Window* pWin, long& rCheckHeight, long& rRadioHeight, long &rMaxWidth )
 {
     rMaxWidth = rCheckHeight = rRadioHeight = 0;
 
@@ -1283,7 +1283,7 @@ void ToolbarMenu::KeyInput( const KeyEvent& rKEvent )
 }
 
 
-static void ImplPaintCheckBackground( Window* i_pWindow, const Rectangle& i_rRect, bool i_bHighlight )
+static void ImplPaintCheckBackground( vcl::Window* i_pWindow, const Rectangle& i_rRect, bool i_bHighlight )
 {
     bool bNativeOk = false;
     if( i_pWindow->IsNativeControlSupported( CTRL_TOOLBAR, PART_BUTTON ) )
diff --git a/svtools/source/control/toolbarmenuacc.cxx b/svtools/source/control/toolbarmenuacc.cxx
index a8bae45688eb..2464694faa0c 100644
--- a/svtools/source/control/toolbarmenuacc.cxx
+++ b/svtools/source/control/toolbarmenuacc.cxx
@@ -182,7 +182,7 @@ Reference< XAccessible > SAL_CALL ToolbarMenuAcc::getAccessibleParent() throw (R
 
     Reference< XAccessible > xRet;
 
-    Window* pParent = mpParent->mrMenu.GetParent();
+    vcl::Window* pParent = mpParent->mrMenu.GetParent();
     if( pParent )
         xRet = pParent->GetAccessible();
 
@@ -196,7 +196,7 @@ sal_Int32 SAL_CALL ToolbarMenuAcc::getAccessibleIndexInParent() throw (RuntimeEx
     const SolarMutexGuard aSolarGuard;
     ThrowIfDisposed();
 
-    Window* pParent = mpParent->mrMenu.GetParent();
+    vcl::Window* pParent = mpParent->mrMenu.GetParent();
     if( pParent )
     {
         for( sal_uInt16 i = 0, nCount = pParent->GetChildCount(); i < nCount ; i++ )
@@ -238,7 +238,7 @@ OUString SAL_CALL ToolbarMenuAcc::getAccessibleName() throw (RuntimeException, s
 
     if( aRet.isEmpty() )
     {
-        Window* pLabel = mpParent->mrMenu.GetAccessibleRelationLabeledBy();
+        vcl::Window* pLabel = mpParent->mrMenu.GetAccessibleRelationLabeledBy();
         if( pLabel && pLabel != &mpParent->mrMenu )
             aRet = OutputDevice::GetNonMnemonicString( pLabel->GetText() );
     }
diff --git a/svtools/source/control/urlcontrol.cxx b/svtools/source/control/urlcontrol.cxx
index 771bd144f426..e22b6b351c26 100644
--- a/svtools/source/control/urlcontrol.cxx
+++ b/svtools/source/control/urlcontrol.cxx
@@ -26,13 +26,13 @@
 namespace svt
 {
     //= OFileURLControl
-    OFileURLControl::OFileURLControl(Window* _pParent, WinBits nStyle)
+    OFileURLControl::OFileURLControl(vcl::Window* _pParent, WinBits nStyle)
         : SvtURLBox(_pParent, nStyle, INET_PROT_FILE)
     {
         DisableHistory();
     }
 
-    extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeOFileURLControl(Window *pParent, VclBuilder::stringmap &)
+    extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeOFileURLControl(vcl::Window *pParent, VclBuilder::stringmap &)
     {
         WinBits nWinBits = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_TABSTOP|
                            WB_DROPDOWN|WB_AUTOSIZE|WB_AUTOHSCROLL;
diff --git a/svtools/source/control/valueacc.cxx b/svtools/source/control/valueacc.cxx
index 585908b4a0e8..56f515c3877a 100644
--- a/svtools/source/control/valueacc.cxx
+++ b/svtools/source/control/valueacc.cxx
@@ -216,7 +216,7 @@ uno::Reference< accessibility::XAccessible > SAL_CALL ValueSetAcc::getAccessible
 {
     ThrowIfDisposed();
     const SolarMutexGuard aSolarGuard;
-    Window*                                         pParent = mpParent->GetParent();
+    vcl::Window*                                         pParent = mpParent->GetParent();
     uno::Reference< accessibility::XAccessible >    xRet;
 
     if( pParent )
@@ -232,7 +232,7 @@ sal_Int32 SAL_CALL ValueSetAcc::getAccessibleIndexInParent()
 {
     ThrowIfDisposed();
     const SolarMutexGuard aSolarGuard;
-    Window*                 pParent = mpParent->GetParent();
+    vcl::Window*                 pParent = mpParent->GetParent();
     sal_Int32               nRet = 0;
 
     if( pParent )
@@ -292,7 +292,7 @@ OUString SAL_CALL ValueSetAcc::getAccessibleName()
 
         if ( aRet.isEmpty() )
         {
-            Window* pLabel = mpParent->GetAccessibleRelationLabeledBy();
+            vcl::Window* pLabel = mpParent->GetAccessibleRelationLabeledBy();
             if ( pLabel && pLabel != mpParent )
                 aRet = OutputDevice::GetNonMnemonicString( pLabel->GetText() );
 
@@ -312,13 +312,13 @@ uno::Reference< accessibility::XAccessibleRelationSet > SAL_CALL ValueSetAcc::ge
     ThrowIfDisposed();
     SolarMutexGuard g;
     uno::Reference< accessibility::XAccessibleRelationSet > xRelSet;
-    Window* pWindow = (Window*)mpParent;
+    vcl::Window* pWindow = (vcl::Window*)mpParent;
     if ( pWindow )
     {
         utl::AccessibleRelationSetHelper* pRelationSet = new utl::AccessibleRelationSetHelper;
         xRelSet = pRelationSet;
 
-        Window *pLabeledBy = pWindow->GetAccessibleRelationLabeledBy();
+        vcl::Window *pLabeledBy = pWindow->GetAccessibleRelationLabeledBy();
         if ( pLabeledBy && pLabeledBy != pWindow )
         {
             uno::Sequence< uno::Reference< uno::XInterface > > aSequence(1);
@@ -326,7 +326,7 @@ uno::Reference< accessibility::XAccessibleRelationSet > SAL_CALL ValueSetAcc::ge
             pRelationSet->AddRelation( accessibility::AccessibleRelation( accessibility::AccessibleRelationType::LABELED_BY, aSequence ) );
         }
 
-        Window* pMemberOf = pWindow->GetAccessibleRelationMemberOf();
+        vcl::Window* pMemberOf = pWindow->GetAccessibleRelationMemberOf();
         if ( pMemberOf && pMemberOf != pWindow )
         {
             uno::Sequence< uno::Reference< uno::XInterface > > aSequence(1);
diff --git a/svtools/source/control/valueset.cxx b/svtools/source/control/valueset.cxx
index 3792f2ef1262..f7d0fa936015 100644
--- a/svtools/source/control/valueset.cxx
+++ b/svtools/source/control/valueset.cxx
@@ -94,7 +94,7 @@ void ValueSet::ImplInit()
     ImplInitSettings( true, true, true );
 }
 
-ValueSet::ValueSet( Window* pParent, WinBits nWinStyle, bool bDisableTransientChildren ) :
+ValueSet::ValueSet( vcl::Window* pParent, WinBits nWinStyle, bool bDisableTransientChildren ) :
     Control( pParent, nWinStyle ),
     maVirDev( *this ),
     maColor( COL_TRANSPARENT )
@@ -103,7 +103,7 @@ ValueSet::ValueSet( Window* pParent, WinBits nWinStyle, bool bDisableTransientCh
     mbIsTransientChildrenDisabled = bDisableTransientChildren;
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeValueSet(Window *pParent, VclBuilder::stringmap &rMap)
+extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeValueSet(vcl::Window *pParent, VclBuilder::stringmap &rMap)
 {
     WinBits nWinBits = WB_TABSTOP;
 
@@ -114,7 +114,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeValueSet(Window *pParent, V
     return new ValueSet(pParent, nWinBits);
 }
 
-ValueSet::ValueSet( Window* pParent, const ResId& rResId, bool bDisableTransientChildren ) :
+ValueSet::ValueSet( vcl::Window* pParent, const ResId& rResId, bool bDisableTransientChildren ) :
     Control( pParent, rResId ),
     maVirDev( *this ),
     maColor( COL_TRANSPARENT )
diff --git a/svtools/source/control/vclxaccessibleheaderbar.cxx b/svtools/source/control/vclxaccessibleheaderbar.cxx
index 9ec4012b9526..94415b4f1420 100644
--- a/svtools/source/control/vclxaccessibleheaderbar.cxx
+++ b/svtools/source/control/vclxaccessibleheaderbar.cxx
@@ -37,7 +37,7 @@ using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::accessibility;
 using namespace ::comphelper;
 
-VCLXHeaderBar::VCLXHeaderBar(Window* pHeaderBar)
+VCLXHeaderBar::VCLXHeaderBar(vcl::Window* pHeaderBar)
 {
     SetWindow(pHeaderBar);
 }