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/include/sfx2/sidebar/ControlFactory.hxx b/include/sfx2/sidebar/ControlFactory.hxx
index aebb0b348eb4..a078e00c20c2 100644
--- a/include/sfx2/sidebar/ControlFactory.hxx
+++ b/include/sfx2/sidebar/ControlFactory.hxx
@@ -39,9 +39,9 @@ class SFX2_DLLPUBLIC ControlFactory
 public:
     /** Create the menu button for the task bar.
     */
-    static CheckBox* CreateMenuButton (Window* pParentWindow);
+    static CheckBox* CreateMenuButton (vcl::Window* pParentWindow);
 
-    static ImageRadioButton* CreateTabItem (Window* pParentWindow);
+    static ImageRadioButton* CreateTabItem (vcl::Window* pParentWindow);
 };
 
 
diff --git a/include/sfx2/sidebar/ILayoutableWindow.hxx b/include/sfx2/sidebar/ILayoutableWindow.hxx
index a6c65e1a1293..5f482786e7a8 100644
--- a/include/sfx2/sidebar/ILayoutableWindow.hxx
+++ b/include/sfx2/sidebar/ILayoutableWindow.hxx
@@ -24,7 +24,7 @@
 #include <sal/types.h>
 #include <com/sun/star/ui/LayoutSize.hpp>
 
-class Window;
+namespace vcl { class Window; }
 
 namespace sfx2 { namespace sidebar {
 
diff --git a/include/sfx2/sidebar/SidebarChildWindow.hxx b/include/sfx2/sidebar/SidebarChildWindow.hxx
index defc03c75fcf..50caeb6114c0 100644
--- a/include/sfx2/sidebar/SidebarChildWindow.hxx
+++ b/include/sfx2/sidebar/SidebarChildWindow.hxx
@@ -35,14 +35,14 @@ class SFX2_DLLPUBLIC SidebarChildWindow
 {
 public:
     SidebarChildWindow(
-        Window* pParent,
+        vcl::Window* pParent,
         sal_uInt16 nId,
         SfxBindings* pBindings,
         SfxChildWinInfo* pInfo);
 
     SFX_DECL_CHILDWINDOW_WITHID(SidebarChildWindow);
 
-    static sal_Int32 GetDefaultWidth (Window* pWindow);
+    static sal_Int32 GetDefaultWidth (vcl::Window* pWindow);
 };
 
 
diff --git a/include/sfx2/sidebar/SidebarPanelBase.hxx b/include/sfx2/sidebar/SidebarPanelBase.hxx
index 537c085280f4..6215f6d03e64 100644
--- a/include/sfx2/sidebar/SidebarPanelBase.hxx
+++ b/include/sfx2/sidebar/SidebarPanelBase.hxx
@@ -35,7 +35,7 @@
 #include <boost/function.hpp>
 
 
-class Window;
+namespace vcl { class Window; }
 
 namespace sfx2 { namespace sidebar {
 
@@ -61,7 +61,7 @@ public:
     static css::uno::Reference<css::ui::XUIElement> Create (
         const ::rtl::OUString& rsResourceURL,
         const css::uno::Reference<css::frame::XFrame>& rxFrame,
-        Window* pControl,
+        vcl::Window* pControl,
         const css::ui::LayoutSize& rLayoutSize);
 
     // XContextChangeEventListener
@@ -103,7 +103,7 @@ protected:
     SidebarPanelBase (
         const ::rtl::OUString& rsResourceURL,
         const css::uno::Reference<css::frame::XFrame>& rxFrame,
-        Window* pWindow,
+        vcl::Window* pWindow,
         const css::ui::LayoutSize& rLayoutSize);
     virtual ~SidebarPanelBase (void);
 
@@ -111,7 +111,7 @@ protected:
         throw (css::uno::RuntimeException) SAL_OVERRIDE;
 
 private:
-    Window* mpControl;
+    vcl::Window* mpControl;
     const ::rtl::OUString msResourceURL;
     const css::ui::LayoutSize maLayoutSize;
 };
diff --git a/include/sfx2/sidebar/SidebarToolBox.hxx b/include/sfx2/sidebar/SidebarToolBox.hxx
index 8bcc6be00f82..0a6f37fa8463 100644
--- a/include/sfx2/sidebar/SidebarToolBox.hxx
+++ b/include/sfx2/sidebar/SidebarToolBox.hxx
@@ -39,7 +39,7 @@ class SFX2_DLLPUBLIC SidebarToolBox
     : public ToolBox
 {
 public:
-    SidebarToolBox(Window* pParentWindow);
+    SidebarToolBox(vcl::Window* pParentWindow);
     virtual ~SidebarToolBox (void);
 
     using ToolBox::InsertItem;