fdo#82577: Handle Window

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

Change-Id: Ib1beb7ab4ad75562a42aeb252732a073d25eff1a

5 files changed, 10 insertions, 10 deletions

diff --git a/framework/source/helper/persistentwindowstate.cxx b/framework/source/helper/persistentwindowstate.cxx
index 1a9e07e2173b..2c1d3038beb1 100644
--- a/framework/source/helper/persistentwindowstate.cxx
+++ b/framework/source/helper/persistentwindowstate.cxx
@@ -230,7 +230,7 @@ OUString PersistentWindowState::implst_getWindowStateFromWindow(const css::uno::
         // SOLAR SAFE -> ------------------------
         SolarMutexGuard aSolarGuard;
 
-        Window* pWindow = VCLUnoHelper::GetWindow(xWindow);
+        vcl::Window* pWindow = VCLUnoHelper::GetWindow(xWindow);
         // check for system window is necessary to guarantee correct pointer cast!
         if (
             (pWindow                  ) &&
@@ -261,7 +261,7 @@ void PersistentWindowState::implst_setWindowStateOnWindow(const css::uno::Refere
     // SOLAR SAFE -> ------------------------
     SolarMutexGuard aSolarGuard;
 
-    Window* pWindow = VCLUnoHelper::GetWindow(xWindow);
+    vcl::Window* pWindow = VCLUnoHelper::GetWindow(xWindow);
     if (!pWindow)
         return;
 
diff --git a/framework/source/helper/statusindicatorfactory.cxx b/framework/source/helper/statusindicatorfactory.cxx
index a2338d44c787..b0b5f3d9c060 100644
--- a/framework/source/helper/statusindicatorfactory.cxx
+++ b/framework/source/helper/statusindicatorfactory.cxx
@@ -374,7 +374,7 @@ void StatusIndicatorFactory::implts_makeParentVisibleIfAllowed()
     impl_showProgress();
 
     SolarMutexGuard aSolarGuard;
-    Window* pWindow = VCLUnoHelper::GetWindow(xParentWindow);
+    vcl::Window* pWindow = VCLUnoHelper::GetWindow(xParentWindow);
     if ( pWindow )
     {
         bool bForceFrontAndFocus(officecfg::Office::Common::View::NewDocumentHandling::ForceFocusAndToFront::get(xContext));
diff --git a/framework/source/helper/tagwindowasmodified.cxx b/framework/source/helper/tagwindowasmodified.cxx
index 4200de514b30..8048b084d276 100644
--- a/framework/source/helper/tagwindowasmodified.cxx
+++ b/framework/source/helper/tagwindowasmodified.cxx
@@ -89,7 +89,7 @@ void SAL_CALL TagWindowAsModified::modified(const css::lang::EventObject& aEvent
     // SYNCHRONIZED ->
     SolarMutexGuard aSolarGuard;
 
-    Window* pWindow = VCLUnoHelper::GetWindow(xWindow);
+    vcl::Window* pWindow = VCLUnoHelper::GetWindow(xWindow);
     if ( ! pWindow)
         return;
 
diff --git a/framework/source/helper/titlebarupdate.cxx b/framework/source/helper/titlebarupdate.cxx
index cd7ef0f3a9ea..abd968674c08 100644
--- a/framework/source/helper/titlebarupdate.cxx
+++ b/framework/source/helper/titlebarupdate.cxx
@@ -179,7 +179,7 @@ void TitleBarUpdate::impl_updateApplicationID(const css::uno::Reference< css::fr
     // VCL SYNCHRONIZED ->
     SolarMutexGuard aSolarGuard;
 
-    Window* pWindow = (VCLUnoHelper::GetWindow( xWindow ));
+    vcl::Window* pWindow = (VCLUnoHelper::GetWindow( xWindow ));
     if (
         ( pWindow                                 ) &&
         ( pWindow->GetType() == WINDOW_WORKWINDOW )
@@ -296,7 +296,7 @@ void TitleBarUpdate::impl_updateIcon(const css::uno::Reference< css::frame::XFra
     // VCL SYNCHRONIZED ->
     SolarMutexGuard aSolarGuard;
 
-    Window* pWindow = (VCLUnoHelper::GetWindow( xWindow ));
+    vcl::Window* pWindow = (VCLUnoHelper::GetWindow( xWindow ));
     if (
         ( pWindow                                 ) &&
         ( pWindow->GetType() == WINDOW_WORKWINDOW )
@@ -330,7 +330,7 @@ void TitleBarUpdate::impl_updateTitle(const css::uno::Reference< css::frame::XFr
     // VCL SYNCHRONIZED ->
     SolarMutexGuard aSolarGuard;
 
-    Window* pWindow = (VCLUnoHelper::GetWindow( xWindow ));
+    vcl::Window* pWindow = (VCLUnoHelper::GetWindow( xWindow ));
     if (
         ( pWindow                                 ) &&
         ( pWindow->GetType() == WINDOW_WORKWINDOW )
diff --git a/framework/source/helper/vclstatusindicator.cxx b/framework/source/helper/vclstatusindicator.cxx
index a2b062509571..856ad02b02fc 100644
--- a/framework/source/helper/vclstatusindicator.cxx
+++ b/framework/source/helper/vclstatusindicator.cxx
@@ -46,7 +46,7 @@ void SAL_CALL VCLStatusIndicator::start(const OUString& sText ,
 {
     SolarMutexGuard aSolarGuard;
 
-    Window* pParentWindow = VCLUnoHelper::GetWindow(m_xParentWindow);
+    vcl::Window* pParentWindow = VCLUnoHelper::GetWindow(m_xParentWindow);
     if (!m_pStatusBar)
         m_pStatusBar = new StatusBar(pParentWindow, WB_3DLOOK|WB_BORDER);
 
@@ -127,8 +127,8 @@ void SAL_CALL VCLStatusIndicator::setValue(sal_Int32 nValue)
         m_pStatusBar->SetProgressValue(nPercent);
 }
 
-void VCLStatusIndicator::impl_recalcLayout(Window* pStatusBar   ,
-                                           Window* pParentWindow)
+void VCLStatusIndicator::impl_recalcLayout(vcl::Window* pStatusBar   ,
+                                           vcl::Window* pParentWindow)
 {
     if (
         (!pStatusBar   ) ||