fdo#82577: Handle Window

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

Change-Id: Ib1beb7ab4ad75562a42aeb252732a073d25eff1a

14 files changed, 39 insertions, 39 deletions

diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 126704867aa8..6a59eee1f002 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -2620,7 +2620,7 @@ void Desktop::HandleAppEvent( const ApplicationEvent& rAppEvent )
                     xStartModule->attachFrame(xBackingFrame);
                     xContainerWindow->setVisible(sal_True);
 
-                    Window* pCompWindow = VCLUnoHelper::GetWindow(xBackingFrame->getComponentWindow());
+                    vcl::Window* pCompWindow = VCLUnoHelper::GetWindow(xBackingFrame->getComponentWindow());
                     if (pCompWindow)
                         pCompWindow->Update();
                 }
@@ -2843,7 +2843,7 @@ void Desktop::ShowBackingComponent(Desktop * progress)
         // set the WB_EXT_DOCUMENT style. Normally, this is done by the TaskCreator service when a "_blank"
         // frame/window is created. Since we do not use the TaskCreator here, we need to mimic its behavior,
         // otherwise documents loaded into this frame will later on miss functionality depending on the style.
-        Window* pContainerWindow = VCLUnoHelper::GetWindow( xContainerWindow );
+        vcl::Window* pContainerWindow = VCLUnoHelper::GetWindow( xContainerWindow );
         SAL_WARN_IF( !pContainerWindow, "desktop.app", "Desktop::Main: no implementation access to the frame's container window!" );
         pContainerWindow->SetExtendedStyle( pContainerWindow->GetExtendedStyle() | WB_EXT_DOCUMENT );
         if (progress != 0)
diff --git a/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx b/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx
index bcdf2320e78f..da831ad9b38f 100644
--- a/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx
@@ -31,12 +31,12 @@
 #include "dp_gui_dependencydialog.hxx"
 #include "dp_gui_shared.hxx"
 
-class Window;
+namespace vcl { class Window; }
 
 using dp_gui::DependencyDialog;
 
 DependencyDialog::DependencyDialog(
-    Window * parent, std::vector< OUString > const & dependencies):
+    vcl::Window * parent, std::vector< OUString > const & dependencies):
     ModalDialog(parent, "Dependencies", "desktop/ui/dependenciesdialog.ui")
 {
     get(m_list, "depListTreeview");
diff --git a/desktop/source/deployment/gui/dp_gui_dependencydialog.hxx b/desktop/source/deployment/gui/dp_gui_dependencydialog.hxx
index e9397e221925..a778ad37630a 100644
--- a/desktop/source/deployment/gui/dp_gui_dependencydialog.hxx
+++ b/desktop/source/deployment/gui/dp_gui_dependencydialog.hxx
@@ -29,14 +29,14 @@
 #include <vcl/fixed.hxx>
 #include <vcl/lstbox.hxx>
 
-class Window;
+namespace vcl { class Window; }
 
 namespace dp_gui {
 
 class DependencyDialog: public ModalDialog {
 public:
     DependencyDialog(
-        Window * parent, std::vector< OUString > const & dependencies);
+        vcl::Window * parent, std::vector< OUString > const & dependencies);
 
     virtual ~DependencyDialog();
 
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
index e5ba333ff85d..e40c2910d468 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
@@ -136,7 +136,7 @@ class ExtBoxWithBtns_Impl : public ExtensionBox_Impl
     DECL_DLLPRIVATE_LINK( HandleRemoveBtn, void * );
 
 public:
-                    ExtBoxWithBtns_Impl(Window* pParent);
+                    ExtBoxWithBtns_Impl(vcl::Window* pParent);
                    virtual ~ExtBoxWithBtns_Impl();
 
     void InitFromDialog(ExtMgrDialog *pParentDialog);
@@ -150,7 +150,7 @@ public:
     void            enableButtons( bool bEnable );
 };
 
-ExtBoxWithBtns_Impl::ExtBoxWithBtns_Impl(Window* pParent)
+ExtBoxWithBtns_Impl::ExtBoxWithBtns_Impl(vcl::Window* pParent)
     : ExtensionBox_Impl(pParent)
     , m_bInterfaceLocked(false)
     , m_pOptionsBtn(NULL)
@@ -195,7 +195,7 @@ void ExtBoxWithBtns_Impl::InitFromDialog(ExtMgrDialog *pParentDialog)
 }
 
 
-extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeExtBoxWithBtns(Window *pParent, VclBuilder::stringmap &)
+extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeExtBoxWithBtns(vcl::Window *pParent, VclBuilder::stringmap &)
 {
     return new ExtBoxWithBtns_Impl(pParent);
 }
@@ -581,7 +581,7 @@ bool DialogHelper::IsSharedPkgMgr( const uno::Reference< deployment::XPackage >
 
 
 bool DialogHelper::continueOnSharedExtension( const uno::Reference< deployment::XPackage > &xPackage,
-                                              Window *pParent,
+                                              vcl::Window *pParent,
                                               const sal_uInt16 nResID,
                                               bool &bHadWarning )
 {
@@ -662,7 +662,7 @@ void DialogHelper::PostUserEvent( const Link& rLink, void* pCaller )
 }
 
 //                             ExtMgrDialog
-ExtMgrDialog::ExtMgrDialog(Window *pParent, TheExtensionManager *pManager)
+ExtMgrDialog::ExtMgrDialog(vcl::Window *pParent, TheExtensionManager *pManager)
     : ModelessDialog(pParent, "ExtensionManagerDialog", "desktop/ui/extensionmanager.ui")
     , DialogHelper(pManager->getContext(), (Dialog*) this)
     , m_sAddPackages(getResourceString(RID_STR_ADD_PACKAGES))
@@ -1153,7 +1153,7 @@ bool ExtMgrDialog::Close()
 }
 
 //UpdateRequiredDialog
-UpdateRequiredDialog::UpdateRequiredDialog(Window *pParent, TheExtensionManager *pManager)
+UpdateRequiredDialog::UpdateRequiredDialog(vcl::Window *pParent, TheExtensionManager *pManager)
     : ModalDialog(pParent, "UpdateRequiredDialog", "desktop/ui/updaterequireddialog.ui")
     , DialogHelper(pManager->getContext(), (Dialog*) this)
     , m_sAddPackages(getResourceString(RID_STR_ADD_PACKAGES))
@@ -1560,7 +1560,7 @@ void UpdateRequiredDialog::disableAllEntries()
 
 //                             ShowLicenseDialog
 
-ShowLicenseDialog::ShowLicenseDialog( Window * pParent,
+ShowLicenseDialog::ShowLicenseDialog( vcl::Window * pParent,
                                       const uno::Reference< deployment::XPackage > &xPackage )
     : ModalDialog(pParent, "ShowLicenseDialog", "desktop/ui/showlicensedialog.ui")
 {
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.hxx b/desktop/source/deployment/gui/dp_gui_dialog2.hxx
index df9622dd5025..36e40e1b62af 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.hxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.hxx
@@ -84,7 +84,7 @@ public:
     static OUString getResourceString( sal_uInt16 id );
     static bool     IsSharedPkgMgr( const ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage > &);
     static bool     continueOnSharedExtension( const ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage > &,
-                                               Window *pParent,
+                                               vcl::Window *pParent,
                                                const sal_uInt16 nResID,
                                                bool &bHadWarning );
 
@@ -138,7 +138,7 @@ class ExtMgrDialog : public ModelessDialog,
     DECL_DLLPRIVATE_LINK( startProgress, void * );
 
 public:
-                    ExtMgrDialog( Window * pParent, TheExtensionManager *pManager );
+                    ExtMgrDialog( vcl::Window * pParent, TheExtensionManager *pManager );
     virtual        ~ExtMgrDialog();
 
     virtual bool    Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
@@ -209,7 +209,7 @@ class UpdateRequiredDialog : public ModalDialog,
     void            disableAllEntries();
 
 public:
-                    UpdateRequiredDialog( Window * pParent, TheExtensionManager *pManager );
+                    UpdateRequiredDialog( vcl::Window * pParent, TheExtensionManager *pManager );
     virtual        ~UpdateRequiredDialog();
 
     virtual short   Execute() SAL_OVERRIDE;
@@ -241,7 +241,7 @@ class ShowLicenseDialog : public ModalDialog
 {
     VclMultiLineEdit* m_pLicenseText;
 public:
-    ShowLicenseDialog(Window * pParent, const css::uno::Reference< css::deployment::XPackage > &xPackage);
+    ShowLicenseDialog(vcl::Window * pParent, const css::uno::Reference< css::deployment::XPackage > &xPackage);
 };
 
 
diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
index 8e7225629bb2..4894fabecb82 100644
--- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
@@ -175,7 +175,7 @@ ExtensionRemovedListener::~ExtensionRemovedListener()
 
 
 // ExtensionBox_Impl
-ExtensionBox_Impl::ExtensionBox_Impl(Window* pParent) :
+ExtensionBox_Impl::ExtensionBox_Impl(vcl::Window* pParent) :
     IExtensionListBox( pParent, WB_BORDER | WB_TABSTOP | WB_CHILDDLGCTRL ),
     m_bHasScrollBar( false ),
     m_bHasActive( false ),
@@ -837,7 +837,7 @@ Size ExtensionBox_Impl::GetOptimalSize() const
     return LogicToPixel(Size(250, 150), MAP_APPFONT);
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeExtensionBox(Window *pParent, VclBuilder::stringmap &)
+extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeExtensionBox(vcl::Window *pParent, VclBuilder::stringmap &)
 {
     return new ExtensionBox_Impl(pParent);
 }
diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx
index e94eb41554b9..79be76e05c11 100644
--- a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx
+++ b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx
@@ -182,7 +182,7 @@ class ExtensionBox_Impl : public ::svt::IExtensionListBox
 
     void Init();
 public:
-    ExtensionBox_Impl(Window* pParent);
+    ExtensionBox_Impl(vcl::Window* pParent);
     virtual ~ExtensionBox_Impl();
 
     virtual void    MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE;
diff --git a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx
index 218a9977c5b0..b8b5ba94e6e5 100644
--- a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx
+++ b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx
@@ -49,7 +49,7 @@ namespace dp_gui {
 //                             TheExtensionManager
 
 
-TheExtensionManager::TheExtensionManager( Window *pParent,
+TheExtensionManager::TheExtensionManager( vcl::Window *pParent,
                                           const uno::Reference< uno::XComponentContext > &xContext ) :
     m_xContext( xContext ),
     m_pParent( pParent ),
@@ -488,7 +488,7 @@ void TheExtensionManager::modified( ::lang::EventObject const & /*rEvt*/ )
         return s_ExtMgr;
     }
 
-    Window* pParent = DIALOG_NO_PARENT;
+    vcl::Window* pParent = DIALOG_NO_PARENT;
     if (xParent.is())
         pParent = VCLUnoHelper::GetWindow(xParent);
 
diff --git a/desktop/source/deployment/gui/dp_gui_theextmgr.hxx b/desktop/source/deployment/gui/dp_gui_theextmgr.hxx
index 0d1352eb102e..f5e1665e31a4 100644
--- a/desktop/source/deployment/gui/dp_gui_theextmgr.hxx
+++ b/desktop/source/deployment/gui/dp_gui_theextmgr.hxx
@@ -53,7 +53,7 @@ private:
     ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XExtensionManager > m_xExtensionManager;
     ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >    m_xNameAccessNodes;
 
-    Window                  *m_pParent;
+    vcl::Window             *m_pParent;
     ExtMgrDialog            *m_pExtMgrDialog;
     UpdateRequiredDialog    *m_pUpdReqDialog;
     ExtensionCmdQueue       *m_pExecuteCmdQueue;
@@ -63,7 +63,7 @@ private:
 public:
     static ::rtl::Reference<TheExtensionManager> s_ExtMgr;
 
-         TheExtensionManager( Window * pParent,
+         TheExtensionManager( vcl::Window * pParent,
                               const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &xContext );
         virtual ~TheExtensionManager();
 
diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
index adcc1657f8aa..01420bf6d7ca 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
@@ -116,7 +116,7 @@
 
 class KeyEvent;
 class MouseEvent;
-class Window;
+namespace vcl { class Window; }
 namespace com { namespace sun { namespace star { namespace uno {
     class XComponentContext;
 } } } }
@@ -487,7 +487,7 @@ bool UpdateDialog::Thread::update(
 // UpdateDialog ----------------------------------------------------------
 UpdateDialog::UpdateDialog(
     uno::Reference< uno::XComponentContext > const & context,
-    Window * parent,
+    vcl::Window * parent,
                            const std::vector<uno::Reference< deployment::XPackage > > &vExtensionList,
     std::vector< dp_gui::UpdateData > * updateData):
     ModalDialog(parent, "UpdateDialog", "desktop/ui/updatedialog.ui"),
@@ -589,7 +589,7 @@ short UpdateDialog::Execute() {
     return ModalDialog::Execute();
 }
 
-UpdateDialog::CheckListBox::CheckListBox( Window* pParent, UpdateDialog & dialog):
+UpdateDialog::CheckListBox::CheckListBox( vcl::Window* pParent, UpdateDialog & dialog):
     SvxCheckListBox( pParent, WinBits(WB_BORDER) ),
     m_ignoreUpdate( DPGUI_RESSTR( RID_DLG_UPDATE_IGNORE ) ),
     m_ignoreAllUpdates( DPGUI_RESSTR( RID_DLG_UPDATE_IGNORE_ALL ) ),
diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.hxx b/desktop/source/deployment/gui/dp_gui_updatedialog.hxx
index e5365498b635..de861673fb29 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedialog.hxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedialog.hxx
@@ -45,7 +45,7 @@ class Image;
 class KeyEvent;
 class MouseEvent;
 class ResId;
-class Window;
+namespace vcl { class Window; }
 
 namespace com { namespace sun { namespace star {
     namespace deployment { class XExtensionManager;
@@ -79,7 +79,7 @@ public:
     */
     UpdateDialog(
         com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > const & context,
-        Window * parent,
+        vcl::Window * parent,
         const std::vector< com::sun::star::uno::Reference<
         com::sun::star::deployment::XPackage > > & vExtensionList,
         std::vector< dp_gui::UpdateData > * updateData);
@@ -109,7 +109,7 @@ private:
     class CheckListBox: public SvxCheckListBox {
     public:
         CheckListBox(
-            Window* pParent, UpdateDialog & dialog);
+            vcl::Window* pParent, UpdateDialog & dialog);
 
         virtual ~CheckListBox();
 
diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
index 1a2cef33a0e6..501cdd04cc8a 100644
--- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
@@ -70,7 +70,7 @@
 
 #include <vector>
 
-class Window;
+namespace vcl { class Window; }
 
 namespace cssu = ::com::sun::star::uno;
 
@@ -200,7 +200,7 @@ void UpdateInstallDialog::Thread::execute()
 }
 
 UpdateInstallDialog::UpdateInstallDialog(
-    Window * parent,
+    vcl::Window * parent,
     std::vector<dp_gui::UpdateData> & aVecUpdateData,
     cssu::Reference< cssu::XComponentContext > const & xCtx):
     ModalDialog(
diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx
index 434b1a188afa..3bad18abe96d 100644
--- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx
+++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx
@@ -37,7 +37,7 @@ namespace com { namespace sun { namespace star { namespace uno {
     class XComponentContext;
 }}}}
 
-class Window;
+namespace vcl { class Window; }
 
 namespace dp_gui {
 
@@ -56,7 +56,7 @@ public:
        @param parent
        the parent window, may be null
     */
-    UpdateInstallDialog(Window * parent, std::vector<UpdateData> & aVecUpdateData,
+    UpdateInstallDialog(vcl::Window * parent, std::vector<UpdateData> & aVecUpdateData,
         ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xCtx);
 
     virtual ~UpdateInstallDialog();
diff --git a/desktop/source/deployment/gui/license_dialog.cxx b/desktop/source/deployment/gui/license_dialog.cxx
index 183504801d00..ff375208630d 100644
--- a/desktop/source/deployment/gui/license_dialog.cxx
+++ b/desktop/source/deployment/gui/license_dialog.cxx
@@ -55,7 +55,7 @@ class LicenseView : public MultiLineEdit, public SfxListener
     Link            maScrolledHdl;
 
 public:
-    LicenseView( Window* pParent, WinBits nStyle );
+    LicenseView( vcl::Window* pParent, WinBits nStyle );
     virtual ~LicenseView();
 
     void ScrollDown( ScrollType eScroll );
@@ -94,7 +94,7 @@ struct LicenseDialogImpl : public ModalDialog
     bool m_bLicenseRead;
 
     LicenseDialogImpl(
-        Window * pParent,
+        vcl::Window * pParent,
         css::uno::Reference< css::uno::XComponentContext > const & xContext,
         const OUString & sExtensionName,
         const OUString & sLicenseText);
@@ -103,7 +103,7 @@ struct LicenseDialogImpl : public ModalDialog
 
 };
 
-LicenseView::LicenseView( Window* pParent, WinBits nStyle )
+LicenseView::LicenseView( vcl::Window* pParent, WinBits nStyle )
     : MultiLineEdit( pParent, nStyle )
 {
     SetLeftMargin( 5 );
@@ -111,7 +111,7 @@ LicenseView::LicenseView( Window* pParent, WinBits nStyle )
     StartListening( *GetTextEngine() );
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeLicenseView(Window *pParent, VclBuilder::stringmap &rMap)
+extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeLicenseView(vcl::Window *pParent, VclBuilder::stringmap &rMap)
 {
     WinBits nWinStyle = WB_CLIPCHILDREN|WB_LEFT;
     OString sBorder = VclBuilder::extractCustomProperty(rMap);
@@ -182,7 +182,7 @@ void LicenseView::Notify( SfxBroadcaster&, const SfxHint& rHint )
 
 
 LicenseDialogImpl::LicenseDialogImpl(
-    Window * pParent,
+    vcl::Window * pParent,
     cssu::Reference< cssu::XComponentContext > const & xContext,
     const OUString & sExtensionName,
     const OUString & sLicenseText)