fdo#82577: Handle Window

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

Change-Id: Ib1beb7ab4ad75562a42aeb252732a073d25eff1a

4 files changed, 15 insertions, 15 deletions

diff --git a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
index 333c165793b7..6de8d0cbe3e0 100644
--- a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
+++ b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
@@ -132,7 +132,7 @@ void AccessibleDocumentViewBase::Init (void)
 
     // Register at VCL Window to be informed of activated and deactivated
     // OLE objects.
-    Window* pWindow = maShapeTreeInfo.GetWindow();
+    vcl::Window* pWindow = maShapeTreeInfo.GetWindow();
     if (pWindow != NULL)
     {
         maWindowLink = LINK(
@@ -143,7 +143,7 @@ void AccessibleDocumentViewBase::Init (void)
         sal_uInt16 nCount = pWindow->GetChildCount();
         for (sal_uInt16 i=0; i<nCount; i++)
         {
-            Window* pChildWindow = pWindow->GetChild (i);
+            vcl::Window* pChildWindow = pWindow->GetChild (i);
             if (pChildWindow &&
                 (AccessibleRole::EMBEDDED_OBJECT
                     ==pChildWindow->GetAccessibleRole()))
@@ -171,8 +171,8 @@ IMPL_LINK(AccessibleDocumentViewBase, WindowChildEventListener,
             {
                 // Window is dying.  Unregister from VCL Window.
                 // This is also attempted in the disposing() method.
-                Window* pWindow = maShapeTreeInfo.GetWindow();
-                Window* pDyingWindow = static_cast<Window*>(
+                vcl::Window* pWindow = maShapeTreeInfo.GetWindow();
+                vcl::Window* pDyingWindow = static_cast<vcl::Window*>(
                     pWindowEvent->GetWindow());
                 if (pWindow==pDyingWindow && pWindow!=NULL && maWindowLink.IsSet())
                 {
@@ -185,7 +185,7 @@ IMPL_LINK(AccessibleDocumentViewBase, WindowChildEventListener,
             case VCLEVENT_WINDOW_SHOW:
             {
                 // A new window has been created.  Is it an OLE object?
-                Window* pChildWindow = static_cast<Window*>(
+                vcl::Window* pChildWindow = static_cast<vcl::Window*>(
                     pWindowEvent->GetData());
                 if (pChildWindow!=NULL
                     && (pChildWindow->GetAccessibleRole()
@@ -200,7 +200,7 @@ IMPL_LINK(AccessibleDocumentViewBase, WindowChildEventListener,
             {
                 // A window has been destroyed.  Has that been an OLE
                 // object?
-                Window* pChildWindow = static_cast<Window*>(
+                vcl::Window* pChildWindow = static_cast<vcl::Window*>(
                     pWindowEvent->GetData());
                 if (pChildWindow!=NULL
                     && (pChildWindow->GetAccessibleRole()
@@ -479,7 +479,7 @@ OUString SAL_CALL
 void AccessibleDocumentViewBase::impl_dispose()
 {
     // Unregister from VCL Window.
-    Window* pWindow = maShapeTreeInfo.GetWindow();
+    vcl::Window* pWindow = maShapeTreeInfo.GetWindow();
     if (maWindowLink.IsSet())
     {
         if (pWindow)
diff --git a/sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx b/sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx
index 03ad4311c42c..aa296df0deab 100644
--- a/sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx
+++ b/sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx
@@ -31,7 +31,7 @@ namespace accessibility
         SdrOutliner&    rOutliner,
         SdrView&        rView,
         OutlinerView& rOutlView,
-        const ::Window& rViewWindow )
+        const vcl::Window& rViewWindow )
         : mrView( rView ),
           mrWindow( rViewWindow ),
           mpOutliner( &rOutliner ),
diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
index c4f818b63657..8d04f48fe315 100644
--- a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
+++ b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
@@ -68,7 +68,7 @@ public:
     Implementation (
         AccessibleSlideSorterView& rAccessibleSlideSorter,
         ::sd::slidesorter::SlideSorter& rSlideSorter,
-        ::Window* pWindow);
+        vcl::Window* pWindow);
     virtual ~Implementation (void);
 
     void RequestUpdateChildren (void);
@@ -96,7 +96,7 @@ private:
     sal_Int32 mnFirstVisibleChild;
     sal_Int32 mnLastVisibleChild;
     bool mbListeningToDocument;
-    ::Window* mpWindow;
+    vcl::Window* mpWindow;
     sal_Int32 mnFocusedIndex;
     bool mbModelChangeLocked;
     ImplSVEvent * mnUpdateChildrenUserEventId;
@@ -110,7 +110,7 @@ private:
 AccessibleSlideSorterView::AccessibleSlideSorterView(
     ::sd::slidesorter::SlideSorter& rSlideSorter,
     const Reference<XAccessible>& rxParent,
-    ::Window* pContentWindow)
+    vcl::Window* pContentWindow)
     : AccessibleSlideSorterViewBase(MutexOwner::maMutex),
       mrSlideSorter(rSlideSorter),
       mxParent(rxParent),
@@ -223,7 +223,7 @@ Reference<XAccessible > SAL_CALL AccessibleSlideSorterView::getAccessibleParent
 
     if (mpContentWindow != NULL)
     {
-        ::Window* pParent = mpContentWindow->GetAccessibleParentWindow();
+        vcl::Window* pParent = mpContentWindow->GetAccessibleParentWindow();
         if (pParent != NULL)
             xParent = pParent->GetAccessible();
     }
@@ -667,7 +667,7 @@ bool AccessibleSlideSorterView::IsDisposed (void)
 AccessibleSlideSorterView::Implementation::Implementation (
     AccessibleSlideSorterView& rAccessibleSlideSorter,
     ::sd::slidesorter::SlideSorter& rSlideSorter,
-    ::Window* pWindow)
+    vcl::Window* pWindow)
     : mrAccessibleSlideSorter(rAccessibleSlideSorter),
       mrSlideSorter(rSlideSorter),
       maPageObjects(),
diff --git a/sd/source/ui/accessibility/AccessibleViewForwarder.cxx b/sd/source/ui/accessibility/AccessibleViewForwarder.cxx
index 3f873f0056f3..929c92da253e 100644
--- a/sd/source/ui/accessibility/AccessibleViewForwarder.cxx
+++ b/sd/source/ui/accessibility/AccessibleViewForwarder.cxx
@@ -84,7 +84,7 @@ Point AccessibleViewForwarder::LogicToPixel (const Point& rPoint) const
     {
         SdrPaintWindow* pPaintWindow = mpView->GetPaintWindow((sal_uInt32)mnWindowId);
         OutputDevice& rOutDev = pPaintWindow->GetOutputDevice();
-        Rectangle aBBox(static_cast<Window&>(rOutDev).GetWindowExtentsRelative(0L));
+        Rectangle aBBox(static_cast<::vcl::Window&>(rOutDev).GetWindowExtentsRelative(0L));
         return rOutDev.LogicToPixel (rPoint) + aBBox.TopLeft();
     }
     else
@@ -114,7 +114,7 @@ Point AccessibleViewForwarder::PixelToLogic (const Point& rPoint) const
     {
         SdrPaintWindow* pPaintWindow = mpView->GetPaintWindow((sal_uInt32)mnWindowId);
         OutputDevice& rOutDev = pPaintWindow->GetOutputDevice();
-        Rectangle aBBox (static_cast<Window&>(rOutDev).GetWindowExtentsRelative(0L));
+        Rectangle aBBox (static_cast<::vcl::Window&>(rOutDev).GetWindowExtentsRelative(0L));
         return rOutDev.PixelToLogic (rPoint - aBBox.TopLeft());
     }
     else