fdo#82577: Handle Window

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

Change-Id: Ib1beb7ab4ad75562a42aeb252732a073d25eff1a

18 files changed, 91 insertions, 91 deletions

diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx
index 72e2a0f6e48b..0516b0bc9d2d 100644
--- a/sfx2/source/appl/app.cxx
+++ b/sfx2/source/appl/app.cxx
@@ -419,7 +419,7 @@ void SfxApplication::ReleaseIndex(sal_uInt16 i)
 
 
 
-Window* SfxApplication::GetTopWindow() const
+vcl::Window* SfxApplication::GetTopWindow() const
 {
     SfxWorkWindow* pWork = GetWorkWindow_Impl( SfxViewFrame::Current() );
     return pWork ? pWork->GetWindow() : NULL;
diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx
index 862c76ba3d0e..1d92c5e71e0d 100644
--- a/sfx2/source/appl/appinit.cxx
+++ b/sfx2/source/appl/appinit.cxx
@@ -153,7 +153,7 @@ Sequence< OUString > SAL_CALL SfxTerminateListener_Impl::getSupportedServiceName
 
 
 
-typedef bool ( *PFunc_getSpecialCharsForEdit)( Window* i_pParent, const vcl::Font& i_rFont, OUString& o_rOutString );
+typedef bool ( *PFunc_getSpecialCharsForEdit)( vcl::Window* i_pParent, const vcl::Font& i_rFont, OUString& o_rOutString );
 
 
 // Lazy binding of the GetSpecialCharsForEdit function as it resides in
@@ -166,11 +166,11 @@ extern "C" { static void SAL_CALL thisModule() {} }
 
 #else
 
-extern "C" bool GetSpecialCharsForEdit( Window* i_pParent, const vcl::Font& i_rFont, OUString& o_rOutString );
+extern "C" bool GetSpecialCharsForEdit( vcl::Window* i_pParent, const vcl::Font& i_rFont, OUString& o_rOutString );
 
 #endif
 
-OUString GetSpecialCharsForEdit(Window* pParent, const vcl::Font& rFont)
+OUString GetSpecialCharsForEdit(vcl::Window* pParent, const vcl::Font& rFont)
 {
     static bool bDetermineFunction = false;
     static PFunc_getSpecialCharsForEdit pfunc_getSpecialCharsForEdit = 0;
diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx
index 7bc992a85ca9..22908faf7a7f 100644
--- a/sfx2/source/appl/appopen.cxx
+++ b/sfx2/source/appl/appopen.cxx
@@ -220,7 +220,7 @@ sal_uInt32 CheckPasswd_Impl
 
                 if ( bIsEncrypted )
                 {
-                    Window* pWin = pDoc ? pDoc->GetDialogParent( pFile ) : NULL;
+                    vcl::Window* pWin = pDoc ? pDoc->GetDialogParent( pFile ) : NULL;
                     if ( pWin )
                         pWin->Show();
 
@@ -461,7 +461,7 @@ void SfxApplication::NewDocExec_Impl( SfxRequest& rReq )
     if ( !pTemplNameItem && !pTemplFileNameItem )
     {
         bool bNewWin = false;
-        Window* pTopWin = GetTopWindow();
+        vcl::Window* pTopWin = GetTopWindow();
 
         SfxTemplateManagerDlg aTemplDlg;
         int nRet = aTemplDlg.Execute();
@@ -830,7 +830,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
             if ( eMode == SvtExtendedSecurityOptions::OPEN_NEVER && aINetProtocol != INET_PROT_VND_SUN_STAR_HELP )
             {
                 SolarMutexGuard aGuard;
-                Window *pWindow = SfxGetpApp()->GetTopWindow();
+                vcl::Window *pWindow = SfxGetpApp()->GetTopWindow();
 
                 MessageDialog aSecurityWarningBox(pWindow,
                                                   SfxResId(STR_SECURITY_WARNING_NO_HYPERLINKS),
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index 7fcb63c9c470..7798695bbbfc 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -237,10 +237,10 @@ namespace
     private:
         DECL_LINK(ShowHdl, void *);
     public:
-        LicenseDialog(Window *pParent=NULL);
+        LicenseDialog(vcl::Window *pParent=NULL);
     };
 
-    LicenseDialog::LicenseDialog(Window *pParent)
+    LicenseDialog::LicenseDialog(vcl::Window *pParent)
         : ModalDialog(pParent, "LicenseDialog", "sfx/ui/licensedialog.ui")
     {
         get<PushButton>("show")->SetClickHdl(LINK(this, LicenseDialog, ShowHdl));
@@ -885,7 +885,7 @@ ResMgr* SfxApplication::GetOffResManager_Impl()
 namespace
 {
 #ifndef DISABLE_SCRIPTING
-    Window* lcl_getDialogParent( const Reference< XFrame >& _rxFrame, Window* _pFallback )
+    vcl::Window* lcl_getDialogParent( const Reference< XFrame >& _rxFrame, vcl::Window* _pFallback )
     {
         if ( !_rxFrame.is() )
             return _pFallback;
@@ -893,7 +893,7 @@ namespace
         try
         {
             Reference< awt::XWindow > xContainerWindow( _rxFrame->getContainerWindow(), UNO_SET_THROW );
-            Window* pWindow = VCLUnoHelper::GetWindow( xContainerWindow );
+            vcl::Window* pWindow = VCLUnoHelper::GetWindow( xContainerWindow );
             OSL_ENSURE( pWindow, "lcl_getDialogParent: cool, somebody implemented a VCL-less toolkit!" );
 
             if ( pWindow )
@@ -1208,7 +1208,7 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq )
 
             OUString aLang( aLanguage );
             OSL_TRACE("SfxApplication::OfaExec_Impl: about to create dialog for: %s", OUStringToOString( aLang , RTL_TEXTENCODING_ASCII_US ).pData->buffer);
-            // not sure about the Window*
+            // not sure about the vcl::Window*
             VclAbstractDialog* pDlg = pFact->CreateSvxScriptOrgDialog( GetTopWindow(), aLanguage );
             if( pDlg )
             {
diff --git a/sfx2/source/appl/childwin.cxx b/sfx2/source/appl/childwin.cxx
index cc56952b40a4..65d887456b0c 100644
--- a/sfx2/source/appl/childwin.cxx
+++ b/sfx2/source/appl/childwin.cxx
@@ -142,7 +142,7 @@ bool GetSplitSizeFromString( const OUString& rStr, Size& rSize )
 }
 
 
-SfxChildWindow::SfxChildWindow(Window *pParentWindow, sal_uInt16 nId)
+SfxChildWindow::SfxChildWindow(vcl::Window *pParentWindow, sal_uInt16 nId)
     : pParent(pParentWindow)
     , nType(nId)
     , eChildAlignment(SFX_ALIGN_NOALIGNMENT)
@@ -191,7 +191,7 @@ SfxChildWindow::~SfxChildWindow()
 
 
 SfxChildWindow* SfxChildWindow::CreateChildWindow( sal_uInt16 nId,
-        Window *pParent, SfxBindings* pBindings, SfxChildWinInfo& rInfo)
+        vcl::Window *pParent, SfxBindings* pBindings, SfxChildWinInfo& rInfo)
 {
     SfxChildWindow *pChild=0;
     SfxChildWinFactory* pFact=0;
@@ -510,7 +510,7 @@ SfxChildWindowContext::~SfxChildWindowContext()
 
 FloatingWindow* SfxChildWindowContext::GetFloatingWindow() const
 {
-    Window *pParent = pWindow->GetParent();
+    vcl::Window *pParent = pWindow->GetParent();
     if (pParent->GetType() == WINDOW_DOCKINGWINDOW || pParent->GetType() == WINDOW_TOOLBOX)
     {
         return ((DockingWindow*)pParent)->GetFloatingWindow();
@@ -673,7 +673,7 @@ void SfxChildWindow::Show( sal_uInt16 nFlags )
     }
 }
 
-Window* SfxChildWindow::GetContextWindow( SfxModule *pModule ) const
+vcl::Window* SfxChildWindow::GetContextWindow( SfxModule *pModule ) const
 {
     return pModule == pImp->pContextModule && pContext ? pContext->GetWindow(): 0;
 }
diff --git a/sfx2/source/appl/fileobj.cxx b/sfx2/source/appl/fileobj.cxx
index e123285cbd03..88761455b147 100644
--- a/sfx2/source/appl/fileobj.cxx
+++ b/sfx2/source/appl/fileobj.cxx
@@ -388,7 +388,7 @@ OUString impl_getFilter( const OUString& _rURL )
     return sFilter;
 }
 
-void SvFileObject::Edit( Window* pParent, sfx2::SvBaseLink* pLink, const Link& rEndEditHdl )
+void SvFileObject::Edit( vcl::Window* pParent, sfx2::SvBaseLink* pLink, const Link& rEndEditHdl )
 {
     aEndEditLink = rEndEditHdl;
     OUString sFile, sRange, sTmpFilter;
diff --git a/sfx2/source/appl/fileobj.hxx b/sfx2/source/appl/fileobj.hxx
index d43e1ebe52e3..78aa1fb4cef4 100644
--- a/sfx2/source/appl/fileobj.hxx
+++ b/sfx2/source/appl/fileobj.hxx
@@ -33,7 +33,7 @@ class SvFileObject : public sfx2::SvLinkSource
     OUString            sReferer;
     Link                aEndEditLink;
     SfxMediumRef        xMed;
-    Window*             pOldParent;
+    vcl::Window*             pOldParent;
 
     sal_uInt8 nType;
 
@@ -67,7 +67,7 @@ public:
                             bool bSynchron = false ) SAL_OVERRIDE;
 
     virtual bool Connect( sfx2::SvBaseLink* ) SAL_OVERRIDE;
-    virtual void Edit( Window *, sfx2::SvBaseLink *, const Link& rEndEditHdl ) SAL_OVERRIDE;
+    virtual void Edit( vcl::Window *, sfx2::SvBaseLink *, const Link& rEndEditHdl ) SAL_OVERRIDE;
 
     // Ask whether you can access data directly or whether it has to be triggered
     virtual bool IsPending() const SAL_OVERRIDE;
diff --git a/sfx2/source/appl/impldde.cxx b/sfx2/source/appl/impldde.cxx
index cf34acc42348..8da693405450 100644
--- a/sfx2/source/appl/impldde.cxx
+++ b/sfx2/source/appl/impldde.cxx
@@ -64,11 +64,11 @@ class SvDDELinkEditDialog : public ModalDialog
 
     DECL_STATIC_LINK( SvDDELinkEditDialog, EditHdl_Impl, Edit* );
 public:
-    SvDDELinkEditDialog( Window* pParent, SvBaseLink* );
+    SvDDELinkEditDialog( vcl::Window* pParent, SvBaseLink* );
     OUString GetCmd() const;
 };
 
-SvDDELinkEditDialog::SvDDELinkEditDialog( Window* pParent, SvBaseLink* pLink )
+SvDDELinkEditDialog::SvDDELinkEditDialog( vcl::Window* pParent, SvBaseLink* pLink )
     : ModalDialog( pParent, "LinkEditDialog", "sfx/ui/linkeditdialog.ui" )
 {
     get(m_pOKButton, "ok");
@@ -253,7 +253,7 @@ bool SvDDEObject::Connect( SvBaseLink * pSvLink )
     return true;
 }
 
-void SvDDEObject::Edit( Window* pParent, sfx2::SvBaseLink* pBaseLink, const Link& rEndEditHdl )
+void SvDDEObject::Edit( vcl::Window* pParent, sfx2::SvBaseLink* pBaseLink, const Link& rEndEditHdl )
 {
     SvDDELinkEditDialog aDlg( pParent, pBaseLink );
     if ( RET_OK == aDlg.Execute() && rEndEditHdl.IsSet() )
diff --git a/sfx2/source/appl/impldde.hxx b/sfx2/source/appl/impldde.hxx
index 53810ab97c0f..00952d391b55 100644
--- a/sfx2/source/appl/impldde.hxx
+++ b/sfx2/source/appl/impldde.hxx
@@ -59,7 +59,7 @@ public:
                                 bool bSynchron = false ) SAL_OVERRIDE;
 
     virtual bool    Connect( SvBaseLink * ) SAL_OVERRIDE;
-    virtual void    Edit( Window* pParent, sfx2::SvBaseLink* pBaseLink, const Link& rEndEditHdl ) SAL_OVERRIDE;
+    virtual void    Edit( vcl::Window* pParent, sfx2::SvBaseLink* pBaseLink, const Link& rEndEditHdl ) SAL_OVERRIDE;
 
     virtual bool    IsPending() const SAL_OVERRIDE;
     virtual bool    IsDataComplete() const SAL_OVERRIDE;
diff --git a/sfx2/source/appl/linkmgr2.cxx b/sfx2/source/appl/linkmgr2.cxx
index c5e38888f4cc..43673a0c5746 100644
--- a/sfx2/source/appl/linkmgr2.cxx
+++ b/sfx2/source/appl/linkmgr2.cxx
@@ -288,7 +288,7 @@ void LinkManager::UpdateAllLinks(
     bool bAskUpdate,
     bool /*bCallErrHdl*/,
     bool bUpdateGrfLinks,
-    Window* pParentWin )
+    vcl::Window* pParentWin )
 {
     // First make a copy of the array in order to update links
     // links in ... no contact between them!
diff --git a/sfx2/source/appl/linksrc.cxx b/sfx2/source/appl/linksrc.cxx
index b5b6548ee843..8b8ee278fa3e 100644
--- a/sfx2/source/appl/linksrc.cxx
+++ b/sfx2/source/appl/linksrc.cxx
@@ -423,7 +423,7 @@ bool SvLinkSource::GetData( ::com::sun::star::uno::Any &, const OUString &, bool
     return false;
 }
 
-void SvLinkSource::Edit( Window *, SvBaseLink *, const Link& )
+void SvLinkSource::Edit( vcl::Window *, SvBaseLink *, const Link& )
 {
 }
 
diff --git a/sfx2/source/appl/lnkbase2.cxx b/sfx2/source/appl/lnkbase2.cxx
index 81f960b6040d..cc1cdfcbd478 100644
--- a/sfx2/source/appl/lnkbase2.cxx
+++ b/sfx2/source/appl/lnkbase2.cxx
@@ -48,7 +48,7 @@ struct BaseLink_Impl
 {
     Link                m_aEndEditLink;
     LinkManager*      m_pLinkMgr;
-    Window*             m_pParentWin;
+    vcl::Window*             m_pParentWin;
     FileDialogHelper*   m_pFileDlg;
     bool                m_bIsConnect;
 
@@ -435,7 +435,7 @@ SvBaseLink::UpdateResult SvBaseLink::DataChanged( const OUString &, const ::com:
     return SUCCESS;
 }
 
-void SvBaseLink::Edit( Window* pParent, const Link& rEndEditHdl )
+void SvBaseLink::Edit( vcl::Window* pParent, const Link& rEndEditHdl )
 {
     pImpl->m_pParentWin = pParent;
     pImpl->m_aEndEditLink = rEndEditHdl;
diff --git a/sfx2/source/appl/module.cxx b/sfx2/source/appl/module.cxx
index 3c783fe5cbf3..e1c4382e4eac 100644
--- a/sfx2/source/appl/module.cxx
+++ b/sfx2/source/appl/module.cxx
@@ -299,7 +299,7 @@ ImageList* SfxModule::GetImageList_Impl( bool bBig )
     return pImpl->GetImageList( pResMgr, bBig );
 }
 
-SfxTabPage*     SfxModule::CreateTabPage( sal_uInt16, Window*, const SfxItemSet& )
+SfxTabPage*     SfxModule::CreateTabPage( sal_uInt16, vcl::Window*, const SfxItemSet& )
 {
     return NULL;
 }
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index 8210a3a82bbb..7df7d962b770 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -175,9 +175,9 @@ namespace sfx2
 {
 
 
-    void HandleTaskPaneList( Window* pWindow, bool bAddToList )
+    void HandleTaskPaneList( vcl::Window* pWindow, bool bAddToList )
     {
-        Window* pParent = pWindow->GetParent();
+        vcl::Window* pParent = pWindow->GetParent();
         DBG_ASSERT( pParent, "HandleTaskPaneList(): every window here should have a parent" );
 
         SystemWindow* pSysWin = pParent->GetSystemWindow();
@@ -271,7 +271,7 @@ struct ContentEntry_Impl
 
 // ContentListBox_Impl ---------------------------------------------------
 
-ContentListBox_Impl::ContentListBox_Impl(Window* pParent, WinBits nStyle)
+ContentListBox_Impl::ContentListBox_Impl(vcl::Window* pParent, WinBits nStyle)
     : SvTreeListBox(pParent, nStyle)
     , aOpenBookImage(SfxResId(IMG_HELP_CONTENT_BOOK_OPEN))
     , aClosedBookImage(SfxResId(IMG_HELP_CONTENT_BOOK_CLOSED))
@@ -291,7 +291,7 @@ ContentListBox_Impl::ContentListBox_Impl(Window* pParent, WinBits nStyle)
     InitRoot();
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeContentListBox(Window *pParent,
+extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeContentListBox(vcl::Window *pParent,
     VclBuilder::stringmap &rMap)
 {
     WinBits nWinStyle = WB_TABSTOP;
@@ -419,7 +419,7 @@ OUString ContentListBox_Impl::GetSelectEntry() const
 }
 
 // class HelpTabPage_Impl ------------------------------------------------
-HelpTabPage_Impl::HelpTabPage_Impl(Window* pParent, SfxHelpIndexWindow_Impl* _pIdxWin,
+HelpTabPage_Impl::HelpTabPage_Impl(vcl::Window* pParent, SfxHelpIndexWindow_Impl* _pIdxWin,
     const OString& rID, const OUString& rUIXMLDescription)
     : TabPage( pParent, rID, rUIXMLDescription)
     , m_pIdxWin( _pIdxWin )
@@ -427,7 +427,7 @@ HelpTabPage_Impl::HelpTabPage_Impl(Window* pParent, SfxHelpIndexWindow_Impl* _pI
 }
 
 // class ContentTabPage_Impl ---------------------------------------------
-ContentTabPage_Impl::ContentTabPage_Impl(Window* pParent, SfxHelpIndexWindow_Impl* _pIdxWin)
+ContentTabPage_Impl::ContentTabPage_Impl(vcl::Window* pParent, SfxHelpIndexWindow_Impl* _pIdxWin)
     : HelpTabPage_Impl(pParent, _pIdxWin, "HelpContentPage",
         "sfx/ui/helpcontentpage.ui")
 {
@@ -450,14 +450,14 @@ Control* ContentTabPage_Impl::GetLastFocusControl()
 
 // class IndexBox_Impl ---------------------------------------------------
 
-IndexBox_Impl::IndexBox_Impl(Window* pParent, WinBits nStyle)
+IndexBox_Impl::IndexBox_Impl(vcl::Window* pParent, WinBits nStyle)
     : ComboBox(pParent, nStyle)
 {
     EnableAutocomplete(true);
     EnableUserDraw(true);
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeIndexBox(Window *pParent,
+extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeIndexBox(vcl::Window *pParent,
     VclBuilder::stringmap &rMap)
 {
     WinBits nWinBits = WB_CLIPCHILDREN|WB_LEFT|WB_VCENTER|WB_3DLOOK;
@@ -525,7 +525,7 @@ void IndexBox_Impl::SelectExecutableEntry()
 
 // class IndexTabPage_Impl -----------------------------------------------
 
-IndexTabPage_Impl::IndexTabPage_Impl(Window* pParent, SfxHelpIndexWindow_Impl* _pIdxWin)
+IndexTabPage_Impl::IndexTabPage_Impl(vcl::Window* pParent, SfxHelpIndexWindow_Impl* _pIdxWin)
     : HelpTabPage_Impl(pParent, _pIdxWin, "HelpIndexPage",
         "sfx/ui/helpindexpage.ui")
     , bIsActivated(false)
@@ -836,7 +836,7 @@ void IndexTabPage_Impl::OpenKeyword()
 
 // class SearchBox_Impl --------------------------------------------------
 
-extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSearchBox(Window *pParent,
+extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSearchBox(vcl::Window *pParent,
     VclBuilder::stringmap &)
 {
     WinBits nWinBits = WB_CLIPCHILDREN|WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_SIMPLEMODE|WB_DROPDOWN;
@@ -869,7 +869,7 @@ void SearchBox_Impl::Select()
 
 // class SearchResultsBox_Impl -------------------------------------------
 
-extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSearchResultsBox(Window *pParent,
+extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSearchResultsBox(vcl::Window *pParent,
     VclBuilder::stringmap &rMap)
 {
     WinBits nWinBits = WB_CLIPCHILDREN|WB_LEFT|WB_VCENTER|WB_3DLOOK;
@@ -896,7 +896,7 @@ bool SearchResultsBox_Impl::Notify( NotifyEvent& rNEvt )
 
 // class SearchTabPage_Impl ----------------------------------------------
 
-SearchTabPage_Impl::SearchTabPage_Impl(Window* pParent, SfxHelpIndexWindow_Impl* _pIdxWin)
+SearchTabPage_Impl::SearchTabPage_Impl(vcl::Window* pParent, SfxHelpIndexWindow_Impl* _pIdxWin)
     : HelpTabPage_Impl(pParent, _pIdxWin, "HelpSearchPage",
         "sfx/ui/helpsearchpage.ui")
     , xBreakIterator(vcl::unohelper::CreateBreakIterator())
@@ -1119,12 +1119,12 @@ void GetBookmarkEntry_Impl
     }
 }
 
-BookmarksBox_Impl::BookmarksBox_Impl(Window* pParent, WinBits nStyle)
+BookmarksBox_Impl::BookmarksBox_Impl(vcl::Window* pParent, WinBits nStyle)
     : ListBox(pParent, nStyle)
 {
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeBookmarksBox(Window *pParent,
+extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeBookmarksBox(vcl::Window *pParent,
     VclBuilder::stringmap &rMap)
 {
     WinBits nWinBits = WB_CLIPCHILDREN|WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_SIMPLEMODE;
@@ -1241,7 +1241,7 @@ bool BookmarksBox_Impl::Notify( NotifyEvent& rNEvt )
 
 // class BookmarksTabPage_Impl -------------------------------------------
 
-BookmarksTabPage_Impl::BookmarksTabPage_Impl(Window* pParent, SfxHelpIndexWindow_Impl* _pIdxWin)
+BookmarksTabPage_Impl::BookmarksTabPage_Impl(vcl::Window* pParent, SfxHelpIndexWindow_Impl* _pIdxWin)
     : HelpTabPage_Impl(pParent, _pIdxWin, "HelpBookmarkPage",
         "sfx/ui/helpbookmarkpage.ui")
 {
@@ -1573,7 +1573,7 @@ IMPL_LINK_NOARG(SfxHelpIndexWindow_Impl, KeywordHdl)
 
 void SfxHelpIndexWindow_Impl::Resize()
 {
-    Window *pChild = GetWindow(WINDOW_FIRSTCHILD);
+    vcl::Window *pChild = GetWindow(WINDOW_FIRSTCHILD);
     if (!pChild)
         return;
     VclContainer::setLayoutAllocation(*pChild, Point(0,0), GetSizePixel());
@@ -1581,7 +1581,7 @@ void SfxHelpIndexWindow_Impl::Resize()
 
 Size SfxHelpIndexWindow_Impl::GetOptimalSize() const
 {
-    const Window *pChild = GetWindow(WINDOW_FIRSTCHILD);
+    const vcl::Window *pChild = GetWindow(WINDOW_FIRSTCHILD);
     if (!pChild)
         return Window::GetOptimalSize();
     return VclContainer::getLayoutRequisition(*pChild);
@@ -1798,7 +1798,7 @@ void SfxHelpIndexWindow_Impl::SelectExecutableEntry()
 
 // class TextWin_Impl ----------------------------------------------------
 
-TextWin_Impl::TextWin_Impl( Window* p ) : DockingWindow( p, 0 )
+TextWin_Impl::TextWin_Impl( vcl::Window* p ) : DockingWindow( p, 0 )
 {
 }
 
@@ -2320,7 +2320,7 @@ bool SfxHelpTextWindow_Impl::PreNotify( NotifyEvent& rNEvt )
     if ( EVENT_COMMAND == nType && rNEvt.GetCommandEvent() )
     {
         const CommandEvent* pCmdEvt = rNEvt.GetCommandEvent();
-        Window* pCmdWin = rNEvt.GetWindow();
+        vcl::Window* pCmdWin = rNEvt.GetWindow();
 
         if ( pCmdEvt->GetCommand() == COMMAND_CONTEXTMENU && pCmdWin != this && pCmdWin != &aToolBox )
         {
@@ -2660,7 +2660,7 @@ void SfxHelpWindow_Impl::MakeLayout()
 {
     if ( nHeight > 0 && xWindow.is() )
     {
-        Window* pScreenWin = VCLUnoHelper::GetWindow(xWindow);
+        vcl::Window* pScreenWin = VCLUnoHelper::GetWindow(xWindow);
 
         /* #i55528#
             Hide() / Show() will produce strange effects.
@@ -2787,7 +2787,7 @@ void SfxHelpWindow_Impl::SaveConfig()
     aUserData += ";";
     aUserData += OUString::number( nH );
 
-    Window* pScreenWin = VCLUnoHelper::GetWindow( xWindow );
+    vcl::Window* pScreenWin = VCLUnoHelper::GetWindow( xWindow );
     aWinPos = pScreenWin->GetWindowExtentsRelative( NULL ).TopLeft();
     aUserData += ";";
     aUserData += OUString::number( aWinPos.X() );
@@ -2948,7 +2948,7 @@ void SfxHelpWindow_Impl::openDone(const OUString& sURL    ,
 
 SfxHelpWindow_Impl::SfxHelpWindow_Impl(
     const ::com::sun::star::uno::Reference < ::com::sun::star::frame::XFrame2 >& rFrame,
-    Window* pParent, WinBits ) :
+    vcl::Window* pParent, WinBits ) :
 
     SplitWindow( pParent, WB_3DLOOK | WB_NOSPLITDRAW ),
 
@@ -2991,7 +2991,7 @@ SfxHelpWindow_Impl::SfxHelpWindow_Impl(
 SfxHelpWindow_Impl::~SfxHelpWindow_Impl()
 {
     SaveConfig();
-    Window* pDel = pIndexWin;
+    vcl::Window* pDel = pIndexWin;
     pIndexWin = NULL;
     delete pDel;
 
@@ -3195,7 +3195,7 @@ bool SfxHelpWindow_Impl::HasHistorySuccessor() const
 
 // class SfxAddHelpBookmarkDialog_Impl -----------------------------------
 
-SfxAddHelpBookmarkDialog_Impl::SfxAddHelpBookmarkDialog_Impl(Window* pParent, bool bRename)
+SfxAddHelpBookmarkDialog_Impl::SfxAddHelpBookmarkDialog_Impl(vcl::Window* pParent, bool bRename)
     : ModalDialog( pParent, "BookmarkDialog", "sfx/ui/bookmarkdialog.ui")
 {
     get(m_pTitleED, "entry");
diff --git a/sfx2/source/appl/newhelp.hxx b/sfx2/source/appl/newhelp.hxx
index 01dfbb8922b1..46016d9eab1c 100644
--- a/sfx2/source/appl/newhelp.hxx
+++ b/sfx2/source/appl/newhelp.hxx
@@ -57,7 +57,7 @@ private:
     void            ClearChildren( SvTreeListEntry* pParent );
 
 public:
-    ContentListBox_Impl(Window* pParent, WinBits nStyle);
+    ContentListBox_Impl(vcl::Window* pParent, WinBits nStyle);
     virtual ~ContentListBox_Impl();
 
 
@@ -78,7 +78,7 @@ protected:
     SfxHelpIndexWindow_Impl*    m_pIdxWin;
 
 public:
-    HelpTabPage_Impl(Window* pParent, SfxHelpIndexWindow_Impl* _pIdxWin,
+    HelpTabPage_Impl(vcl::Window* pParent, SfxHelpIndexWindow_Impl* _pIdxWin,
         const OString& rID, const OUString& rUIXMLDescription);
 
     virtual Control*    GetLastFocusControl() = 0;
@@ -92,7 +92,7 @@ private:
     ContentListBox_Impl* m_pContentBox;
 
 public:
-    ContentTabPage_Impl(Window* pParent, SfxHelpIndexWindow_Impl* _pIdxWin);
+    ContentTabPage_Impl(vcl::Window* pParent, SfxHelpIndexWindow_Impl* _pIdxWin);
 
     virtual void        ActivatePage() SAL_OVERRIDE;
     virtual Control*    GetLastFocusControl() SAL_OVERRIDE;
@@ -107,7 +107,7 @@ public:
 class IndexBox_Impl : public ComboBox
 {
 public:
-    IndexBox_Impl(Window* pParent, WinBits nStyle);
+    IndexBox_Impl(vcl::Window* pParent, WinBits nStyle);
 
     virtual void        UserDraw( const UserDrawEvent& rUDEvt ) SAL_OVERRIDE;
     virtual bool        Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
@@ -137,7 +137,7 @@ private:
     DECL_LINK(          TimeoutHdl, Timer* );
 
 public:
-    IndexTabPage_Impl( Window* pParent, SfxHelpIndexWindow_Impl* _pIdxWin );
+    IndexTabPage_Impl( vcl::Window* pParent, SfxHelpIndexWindow_Impl* _pIdxWin );
     virtual ~IndexTabPage_Impl();
 
     virtual void        ActivatePage() SAL_OVERRIDE;
@@ -167,7 +167,7 @@ private:
     Link                aSearchLink;
 
 public:
-    SearchBox_Impl(Window* pParent, WinBits nStyle)
+    SearchBox_Impl(vcl::Window* pParent, WinBits nStyle)
         : ComboBox(pParent, nStyle)
     {
         SetDropDownLineCount(5);
@@ -182,7 +182,7 @@ public:
 class SearchResultsBox_Impl : public ListBox
 {
 public:
-    SearchResultsBox_Impl(Window* pParent, WinBits nStyle)
+    SearchResultsBox_Impl(vcl::Window* pParent, WinBits nStyle)
         : ListBox(pParent, nStyle)
     {
     }
@@ -213,7 +213,7 @@ private:
     DECL_LINK(ModifyHdl, void *);
 
 public:
-    SearchTabPage_Impl( Window* pParent, SfxHelpIndexWindow_Impl* _pIdxWin );
+    SearchTabPage_Impl( vcl::Window* pParent, SfxHelpIndexWindow_Impl* _pIdxWin );
     virtual ~SearchTabPage_Impl();
 
     virtual void        ActivatePage() SAL_OVERRIDE;
@@ -238,7 +238,7 @@ private:
     void                DoAction( sal_uInt16 nAction );
 
 public:
-    BookmarksBox_Impl(Window* pParent, WinBits nStyle);
+    BookmarksBox_Impl(vcl::Window* pParent, WinBits nStyle);
     virtual ~BookmarksBox_Impl();
 
     virtual bool        Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
@@ -253,7 +253,7 @@ private:
     DECL_LINK(OpenHdl, void *);
 
 public:
-    BookmarksTabPage_Impl( Window* pParent, SfxHelpIndexWindow_Impl* _pIdxWin );
+    BookmarksTabPage_Impl( vcl::Window* pParent, SfxHelpIndexWindow_Impl* _pIdxWin );
 
     virtual void        ActivatePage() SAL_OVERRIDE;
     virtual Control*    GetLastFocusControl() SAL_OVERRIDE;
@@ -268,7 +268,7 @@ public:
 
 class SfxHelpWindow_Impl;
 
-class SfxHelpIndexWindow_Impl : public Window, public VclBuilderContainer
+class SfxHelpIndexWindow_Impl : public vcl::Window, public VclBuilderContainer
 {
 private:
     ListBox*            m_pActiveLB;
@@ -389,7 +389,7 @@ bool SfxHelpIndexWindow_Impl::WasCursorLeftOrRight()
 class TextWin_Impl : public DockingWindow
 {
 public:
-                            TextWin_Impl( Window* pParent );
+                            TextWin_Impl( vcl::Window* pParent );
     virtual                 ~TextWin_Impl();
 
     virtual bool            Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
@@ -400,7 +400,7 @@ public:
 class SvtMiscOptions;
 class SfxHelpWindow_Impl;
 
-class SfxHelpTextWindow_Impl : public Window
+class SfxHelpTextWindow_Impl : public vcl::Window
 {
 private:
     ToolBox                 aToolBox;
@@ -415,7 +415,7 @@ private:
     OUString                sCurrentFactory;
 
     SfxHelpWindow_Impl*     pHelpWin;
-    Window*                 pTextWin;
+    vcl::Window*                 pTextWin;
     sfx2::SearchDialog*     pSrchDlg;
     ::com::sun::star::uno::Reference < ::com::sun::star::frame::XFrame2 >
                             xFrame;
@@ -516,7 +516,7 @@ friend class SfxHelpIndexWindow_Impl;
 
 public:
     SfxHelpWindow_Impl( const ::com::sun::star::uno::Reference < ::com::sun::star::frame::XFrame2 >& rFrame,
-                        Window* pParent, WinBits nBits );
+                        vcl::Window* pParent, WinBits nBits );
     virtual ~SfxHelpWindow_Impl();
 
     virtual bool        PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
@@ -557,7 +557,7 @@ class SfxAddHelpBookmarkDialog_Impl : public ModalDialog
 private:
     Edit* m_pTitleED;
 public:
-    SfxAddHelpBookmarkDialog_Impl( Window* pParent, bool bRename = true );
+    SfxAddHelpBookmarkDialog_Impl( vcl::Window* pParent, bool bRename = true );
 
     void SetTitle( const OUString& rTitle );
     OUString GetTitle() const { return m_pTitleED->GetText(); }
diff --git a/sfx2/source/appl/panelist.hxx b/sfx2/source/appl/panelist.hxx
index 5e1ed0e97c69..a10360336635 100644
--- a/sfx2/source/appl/panelist.hxx
+++ b/sfx2/source/appl/panelist.hxx
@@ -26,15 +26,15 @@ namespace sfx2
 {
     // source in newhelp.cxx
 
-    void HandleTaskPaneList( Window* pWindow, bool bAddToList );
+    void HandleTaskPaneList( vcl::Window* pWindow, bool bAddToList );
         // pWindow: just a system window or something which is child of a system window
 
-    inline void AddToTaskPaneList( Window* pWindowToBeHandled )
+    inline void AddToTaskPaneList( vcl::Window* pWindowToBeHandled )
     {
         HandleTaskPaneList( pWindowToBeHandled, true );
     }
 
-    inline void RemoveFromTaskPaneList( Window* pWindowToBeHandled )
+    inline void RemoveFromTaskPaneList( vcl::Window* pWindowToBeHandled )
     {
         HandleTaskPaneList( pWindowToBeHandled, false );
     }
diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx
index 94ed20d45e3b..fa14e7dd5f1f 100644
--- a/sfx2/source/appl/sfxhelp.cxx
+++ b/sfx2/source/appl/sfxhelp.cxx
@@ -79,12 +79,12 @@ using namespace ::com::sun::star::system;
 class NoHelpErrorBox : public MessageDialog
 {
 public:
-    NoHelpErrorBox( Window* _pParent );
+    NoHelpErrorBox( vcl::Window* _pParent );
 
     virtual void    RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE;
 };
 
-NoHelpErrorBox::NoHelpErrorBox( Window* _pParent )
+NoHelpErrorBox::NoHelpErrorBox( vcl::Window* _pParent )
     : MessageDialog(_pParent, SfxResId(RID_STR_HLPFILENOTEXIST))
 {
     // Error message: "No help available"
@@ -403,7 +403,7 @@ SfxHelpWindow_Impl* impl_createHelp(Reference< XFrame2 >& rHelpTask   ,
 
     // create all internal windows and sub frames ...
     Reference< ::com::sun::star::awt::XWindow > xParentWindow = xHelpTask->getContainerWindow();
-    Window*                                     pParentWindow = VCLUnoHelper::GetWindow( xParentWindow );
+    vcl::Window*                                     pParentWindow = VCLUnoHelper::GetWindow( xParentWindow );
     SfxHelpWindow_Impl*                         pHelpWindow   = new SfxHelpWindow_Impl( xHelpTask, pParentWindow, WB_DOCKBORDER );
     Reference< ::com::sun::star::awt::XWindow > xHelpWindow   = VCLUnoHelper::GetInterface( pHelpWindow );
 
@@ -441,7 +441,7 @@ SfxHelpWindow_Impl* impl_createHelp(Reference< XFrame2 >& rHelpTask   ,
     return pHelpWindow;
 }
 
-OUString SfxHelp::GetHelpText( const OUString& aCommandURL, const Window* pWindow )
+OUString SfxHelp::GetHelpText( const OUString& aCommandURL, const vcl::Window* pWindow )
 {
     OUString sModuleName = GetHelpModuleName_Impl();
     OUString sHelpText = SfxHelp_Impl::GetHelpText( aCommandURL, sModuleName );
@@ -451,7 +451,7 @@ OUString SfxHelp::GetHelpText( const OUString& aCommandURL, const Window* pWindo
     if (pWindow && sHelpText.isEmpty())
     {
         // no help text found -> try with parent help id.
-        Window* pParent = pWindow->GetParent();
+        vcl::Window* pParent = pWindow->GetParent();
         while ( pParent )
         {
             aNewHelpId = pParent->GetHelpId();
@@ -498,7 +498,7 @@ bool SfxHelp::SearchKeyword( const OUString& rKeyword )
     return Start_Impl( OUString(), NULL, rKeyword );
 }
 
-bool SfxHelp::Start( const OUString& rURL, const Window* pWindow )
+bool SfxHelp::Start( const OUString& rURL, const vcl::Window* pWindow )
 {
     return Start_Impl( rURL, pWindow, OUString() );
 }
@@ -527,7 +527,7 @@ static bool impl_showOnlineHelp( const OUString& rURL )
     return false;
 }
 
-bool SfxHelp::Start_Impl(const OUString& rURL, const Window* pWindow, const OUString& rKeyword)
+bool SfxHelp::Start_Impl(const OUString& rURL, const vcl::Window* pWindow, const OUString& rKeyword)
 {
     OUStringBuffer aHelpRootURL("vnd.sun.star.help://");
     AppendConfigToken(aHelpRootURL, true);
@@ -563,7 +563,7 @@ bool SfxHelp::Start_Impl(const OUString& rURL, const Window* pWindow, const OUSt
             if ( impl_hasHelpInstalled() && pWindow && SfxContentHelper::IsHelpErrorDocument( aHelpURL ) )
             {
                 // no help found -> try with parent help id.
-                Window* pParent = pWindow->GetParent();
+                vcl::Window* pParent = pWindow->GetParent();
                 bool bTriedTabPage = false;
                 while ( pParent )
                 {
@@ -590,7 +590,7 @@ bool SfxHelp::Start_Impl(const OUString& rURL, const Window* pWindow, const OUSt
                             Dialog *pDialog = ((Dialog*)pParent);
                             TabControl *pCtrl = pDialog->hasBuilder() ? pDialog->get<TabControl>("tabcontrol") : NULL;
                             TabPage* pTabPage = pCtrl ? pCtrl->GetTabPage(pCtrl->GetCurPageId()) : NULL;
-                            Window *pTabChild = pTabPage ? pTabPage->GetWindow(WINDOW_FIRSTCHILD) : NULL;
+                            vcl::Window *pTabChild = pTabPage ? pTabPage->GetWindow(WINDOW_FIRSTCHILD) : NULL;
                             if (pTabChild)
                                 pParent = pTabChild;
                         }
@@ -606,7 +606,7 @@ bool SfxHelp::Start_Impl(const OUString& rURL, const Window* pWindow, const OUSt
         if ( impl_showOnlineHelp( aHelpURL ) )
             return true;
 
-        NoHelpErrorBox aErrBox( const_cast< Window* >( pWindow ) );
+        NoHelpErrorBox aErrBox( const_cast< vcl::Window* >( pWindow ) );
         aErrBox.Execute();
         return false;
     }
diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx
index b1f73b57d731..332c32b7c3bd 100644
--- a/sfx2/source/appl/workwin.cxx
+++ b/sfx2/source/appl/workwin.cxx
@@ -541,7 +541,7 @@ void SfxWorkWindow::Sort_Impl()
 
 // constructor for workwin of a Frame
 
-SfxFrameWorkWin_Impl::SfxFrameWorkWin_Impl( Window *pWin, SfxFrame *pFrm, SfxFrame* pMaster )
+SfxFrameWorkWin_Impl::SfxFrameWorkWin_Impl( vcl::Window *pWin, SfxFrame *pFrm, SfxFrame* pMaster )
     : SfxWorkWindow(
         pWin,
         pFrm->GetCurrentViewFrame()->GetBindings(),
@@ -579,7 +579,7 @@ SfxFrameWorkWin_Impl::SfxFrameWorkWin_Impl( Window *pWin, SfxFrame *pFrm, SfxFra
 
 // Constructor of the base class
 
-SfxWorkWindow::SfxWorkWindow( Window *pWin, SfxBindings& rB, SfxWorkWindow* pParentWorkwin ) :
+SfxWorkWindow::SfxWorkWindow( vcl::Window *pWin, SfxBindings& rB, SfxWorkWindow* pParentWorkwin ) :
     pParent( pParentWorkwin ),
     pBindings(&rB),
     pWorkWin (pWin),
@@ -964,7 +964,7 @@ bool SfxWorkWindow::PrepareClose_Impl()
 
 
 
-SfxChild_Impl* SfxWorkWindow::RegisterChild_Impl( Window& rWindow,
+SfxChild_Impl* SfxWorkWindow::RegisterChild_Impl( vcl::Window& rWindow,
                     SfxChildAlignment eAlign, bool bCanGetFocus )
 {
     DBG_ASSERT( aChildren.size() < 255, "too many children" );
@@ -987,7 +987,7 @@ SfxChild_Impl* SfxWorkWindow::RegisterChild_Impl( Window& rWindow,
 
 
 
-void SfxWorkWindow::ReleaseChild_Impl( Window& rWindow )
+void SfxWorkWindow::ReleaseChild_Impl( vcl::Window& rWindow )
 {
 
     SfxChild_Impl *pChild = 0;
@@ -1013,7 +1013,7 @@ void SfxWorkWindow::ReleaseChild_Impl( Window& rWindow )
 
 
 
-SfxChild_Impl* SfxWorkWindow::FindChild_Impl( const Window& rWindow ) const
+SfxChild_Impl* SfxWorkWindow::FindChild_Impl( const vcl::Window& rWindow ) const
 {
 
     SfxChild_Impl *pChild = 0;
@@ -1671,7 +1671,7 @@ void SfxWorkWindow::HidePopups_Impl(bool bHide, bool bParent, sal_uInt16 nId )
         SfxChildWindow *pCW = aChildWins[n]->pWin;
         if (pCW && pCW->GetAlignment() == SFX_ALIGN_NOALIGNMENT && pCW->GetType() != nId)
         {
-            Window *pWin = pCW->GetWindow();
+            vcl::Window *pWin = pCW->GetWindow();
             SfxChild_Impl *pChild = FindChild_Impl(*pWin);
             if (bHide)
             {
@@ -1698,7 +1698,7 @@ void SfxWorkWindow::ConfigChild_Impl(SfxChildIdentifier eChild,
 {
     SfxDockingWindow* pDockWin=0;
     sal_uInt16 nPos = USHRT_MAX;
-    Window *pWin=0;
+    vcl::Window *pWin=0;
     SfxChildWin_Impl *pCW = 0;
 
     if ( eChild == SFX_CHILDWIN_OBJECTBAR )
@@ -2586,8 +2586,8 @@ void SfxWorkWindow::ArrangeAutoHideWindows( SfxSplitWindow *pActSplitWin )
         // size is just being calculated before it is displayed.
         SfxSplitWindow* pSplitWin = pSplit[n];
         bool bDummyWindow = !pSplitWin->IsFadeIn();
-        Window *pDummy = pSplitWin->GetSplitWindow();
-        Window *pWin = bDummyWindow ? pDummy : pSplitWin;
+        vcl::Window *pDummy = pSplitWin->GetSplitWindow();
+        vcl::Window *pWin = bDummyWindow ? pDummy : pSplitWin;
         if ( (pSplitWin->IsPinned() && !bDummyWindow) || (!pWin->IsVisible() && pActSplitWin != pSplitWin) )
             continue;
 
@@ -2731,7 +2731,7 @@ Rectangle SfxWorkWindow::GetFreeArea( bool bAutoHide ) const
         return aClientArea;
 }
 
-void SfxWorkWindow::SetActiveChild_Impl( Window *pChild )
+void SfxWorkWindow::SetActiveChild_Impl( vcl::Window *pChild )
 {
     pActiveChild = pChild;
 }