fdo#82577: Handle Window

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

Change-Id: Ib1beb7ab4ad75562a42aeb252732a073d25eff1a

3 files changed, 7 insertions, 7 deletions

diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx
index 621d6ffce871..144368b54b79 100644
--- a/framework/source/services/frame.cxx
+++ b/framework/source/services/frame.cxx
@@ -822,7 +822,7 @@ void SAL_CALL Frame::initialize( const css::uno::Reference< css::awt::XWindow >&
     m_xContainerWindow = xWindow;
 
     // if window is initially visible, we will never get a windowShowing event
-    Window* pWindow = VCLUnoHelper::GetWindow(xWindow);
+    vcl::Window* pWindow = VCLUnoHelper::GetWindow(xWindow);
     if (pWindow && pWindow->IsVisible())
         m_bIsHidden = false;
 
@@ -1506,7 +1506,7 @@ sal_Bool SAL_CALL Frame::setComponent(  const   css::uno::Reference< css::awt::X
     css::uno::Reference< css::awt::XWindow >       xContainerWindow    = m_xContainerWindow;
     css::uno::Reference< css::awt::XWindow >       xOldComponentWindow = m_xComponentWindow;
     css::uno::Reference< css::frame::XController > xOldController      = m_xController;
-    Window*                                        pOwnWindow = VCLUnoHelper::GetWindow( xContainerWindow );
+    vcl::Window*                                        pOwnWindow = VCLUnoHelper::GetWindow( xContainerWindow );
     bool                                       bHadFocus           = pOwnWindow->HasChildPathFocus();
     bool                                       bWasConnected       = m_bConnected;
     aReadLock.clear();
@@ -2410,13 +2410,13 @@ void SAL_CALL Frame::windowDeactivated( const css::lang::EventObject& aEvent ) t
         // Only if no activation is done, deactivations have to be processed if the activated window
         // is a parent window of the last active Window!
         SolarMutexClearableGuard aSolarGuard;
-        Window* pFocusWindow = Application::GetFocusWindow();
+        vcl::Window* pFocusWindow = Application::GetFocusWindow();
         if  ( xContainerWindow.is() && xParent.is() &&
               !css::uno::Reference< css::frame::XDesktop >( xParent, css::uno::UNO_QUERY ).is()
             )
         {
             css::uno::Reference< css::awt::XWindow >  xParentWindow   = xParent->getContainerWindow();
-            Window*                                   pParentWindow   = VCLUnoHelper::GetWindow( xParentWindow    );
+            vcl::Window*                                   pParentWindow   = VCLUnoHelper::GetWindow( xParentWindow    );
             //#i70261#: dialogs opened from an OLE object will cause a deactivate on the frame of the OLE object
             // on Solaris/Linux at that time pFocusWindow is still NULL because the focus handling is different; right after
             // the deactivation the focus will be set into the dialog!
@@ -2969,7 +2969,7 @@ void Frame::implts_setIconOnWindow()
         /* SAFE AREA ----------------------------------------------------------------------------------------------- */
         {
             SolarMutexGuard aSolarGuard;
-            Window* pWindow = (VCLUnoHelper::GetWindow( xContainerWindow ));
+            vcl::Window* pWindow = (VCLUnoHelper::GetWindow( xContainerWindow ));
             if(
                 ( pWindow            != NULL              ) &&
                 ( pWindow->GetType() == WINDOW_WORKWINDOW )
diff --git a/framework/source/services/tabwindowservice.cxx b/framework/source/services/tabwindowservice.cxx
index f445406c0cdb..b7d7b1b5849b 100644
--- a/framework/source/services/tabwindowservice.cxx
+++ b/framework/source/services/tabwindowservice.cxx
@@ -522,7 +522,7 @@ FwkTabWindow* TabWindowService::mem_TabWin ()
 
     if ( ! m_xTabWin.is ())
     {
-        Window* pFakeParent = dynamic_cast< Window* >(Application::GetDefaultDevice ());
+        vcl::Window* pFakeParent = dynamic_cast< vcl::Window* >(Application::GetDefaultDevice ());
 
         m_pTabWin = new FwkTabWindow (pFakeParent);
         m_xTabWin = VCLUnoHelper::GetInterface (m_pTabWin);
diff --git a/framework/source/services/taskcreatorsrv.cxx b/framework/source/services/taskcreatorsrv.cxx
index 6d3195b0adee..0e30ef563722 100644
--- a/framework/source/services/taskcreatorsrv.cxx
+++ b/framework/source/services/taskcreatorsrv.cxx
@@ -218,7 +218,7 @@ void TaskCreatorService::implts_applyDocStyleToWindow(const css::uno::Reference<
 {
     // SYNCHRONIZED ->
     SolarMutexGuard aSolarGuard;
-    Window* pVCLWindow = VCLUnoHelper::GetWindow(xWindow);
+    vcl::Window* pVCLWindow = VCLUnoHelper::GetWindow(xWindow);
     if (pVCLWindow)
         pVCLWindow->SetExtendedStyle(WB_EXT_DOCUMENT);
     // <- SYNCHRONIZED