fdo#82577: Handle Window

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

Change-Id: Ib1beb7ab4ad75562a42aeb252732a073d25eff1a

13 files changed, 18 insertions, 18 deletions

diff --git a/sw/source/uibase/sidebar/PageColumnControl.cxx b/sw/source/uibase/sidebar/PageColumnControl.cxx
index f2a5f3857bee..2748f65f45de 100644
--- a/sw/source/uibase/sidebar/PageColumnControl.cxx
+++ b/sw/source/uibase/sidebar/PageColumnControl.cxx
@@ -32,7 +32,7 @@
 namespace sw { namespace sidebar {
 
 PageColumnControl::PageColumnControl(
-    Window* pParent,
+    vcl::Window* pParent,
     PagePropertyPanel& rPanel,
     const sal_uInt16 nColumnType,
     const bool bLandscape )
diff --git a/sw/source/uibase/sidebar/PageColumnControl.hxx b/sw/source/uibase/sidebar/PageColumnControl.hxx
index c53fdf95974c..a5ddcda8ed1b 100644
--- a/sw/source/uibase/sidebar/PageColumnControl.hxx
+++ b/sw/source/uibase/sidebar/PageColumnControl.hxx
@@ -39,7 +39,7 @@ class PageColumnControl
 {
 public:
     PageColumnControl(
-        Window* pParent,
+        vcl::Window* pParent,
         PagePropertyPanel& rPanel,
         const sal_uInt16 nColumnType,
         const bool bLandscape );
diff --git a/sw/source/uibase/sidebar/PageMarginControl.cxx b/sw/source/uibase/sidebar/PageMarginControl.cxx
index 52a16a24d146..e44215dbf1d9 100644
--- a/sw/source/uibase/sidebar/PageMarginControl.cxx
+++ b/sw/source/uibase/sidebar/PageMarginControl.cxx
@@ -39,7 +39,7 @@
 namespace sw { namespace sidebar {
 
 PageMarginControl::PageMarginControl(
-    Window* pParent,
+    vcl::Window* pParent,
     PagePropertyPanel& rPanel,
     const SvxLongLRSpaceItem& aPageLRMargin,
     const SvxLongULSpaceItem& aPageULMargin,
diff --git a/sw/source/uibase/sidebar/PageMarginControl.hxx b/sw/source/uibase/sidebar/PageMarginControl.hxx
index 041e884aa70c..253a56b18278 100644
--- a/sw/source/uibase/sidebar/PageMarginControl.hxx
+++ b/sw/source/uibase/sidebar/PageMarginControl.hxx
@@ -51,7 +51,7 @@ class PageMarginControl
 {
 public:
     PageMarginControl(
-        Window* pParent,
+        vcl::Window* pParent,
         PagePropertyPanel& rPanel,
         const SvxLongLRSpaceItem& aPageLRMargin,
         const SvxLongULSpaceItem& aPageULMargin,
diff --git a/sw/source/uibase/sidebar/PageOrientationControl.cxx b/sw/source/uibase/sidebar/PageOrientationControl.cxx
index 53236610a167..1d7e5a225cc8 100644
--- a/sw/source/uibase/sidebar/PageOrientationControl.cxx
+++ b/sw/source/uibase/sidebar/PageOrientationControl.cxx
@@ -29,7 +29,7 @@
 namespace sw { namespace sidebar {
 
 PageOrientationControl::PageOrientationControl(
-    Window* pParent,
+    vcl::Window* pParent,
     PagePropertyPanel& rPanel,
     const bool bLandscape )
     : ::svx::sidebar::PopupControl( pParent, SW_RES(RID_POPUP_SWPAGE_ORIENTATION) )
diff --git a/sw/source/uibase/sidebar/PageOrientationControl.hxx b/sw/source/uibase/sidebar/PageOrientationControl.hxx
index 6e8d44f65d48..b829cc47e61d 100644
--- a/sw/source/uibase/sidebar/PageOrientationControl.hxx
+++ b/sw/source/uibase/sidebar/PageOrientationControl.hxx
@@ -34,7 +34,7 @@ class PageOrientationControl
 {
 public:
     PageOrientationControl(
-        Window* pParent,
+        vcl::Window* pParent,
         PagePropertyPanel& rPanel,
         const bool bLandscape );
     virtual ~PageOrientationControl(void);
diff --git a/sw/source/uibase/sidebar/PagePropertyPanel.cxx b/sw/source/uibase/sidebar/PagePropertyPanel.cxx
index 39f13a54f445..6b4f2743b01f 100644
--- a/sw/source/uibase/sidebar/PagePropertyPanel.cxx
+++ b/sw/source/uibase/sidebar/PagePropertyPanel.cxx
@@ -84,7 +84,7 @@ namespace {
 namespace sw { namespace sidebar {
 
 PagePropertyPanel* PagePropertyPanel::Create (
-    Window* pParent,
+    vcl::Window* pParent,
     const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame>& rxFrame,
     SfxBindings* pBindings)
 {
@@ -102,7 +102,7 @@ PagePropertyPanel* PagePropertyPanel::Create (
 }
 
 PagePropertyPanel::PagePropertyPanel(
-            Window* pParent,
+            vcl::Window* pParent,
             const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame>& rxFrame,
             SfxBindings* pBindings)
     : PanelLayout(pParent, "PagePropertyPanel", "modules/swriter/ui/sidebarpage.ui", rxFrame)
diff --git a/sw/source/uibase/sidebar/PagePropertyPanel.hxx b/sw/source/uibase/sidebar/PagePropertyPanel.hxx
index 876f13e344e3..76a9a0f7cb2c 100644
--- a/sw/source/uibase/sidebar/PagePropertyPanel.hxx
+++ b/sw/source/uibase/sidebar/PagePropertyPanel.hxx
@@ -56,7 +56,7 @@ namespace sw { namespace sidebar {
     {
     public:
         static PagePropertyPanel* Create(
-            Window* pParent,
+            vcl::Window* pParent,
             const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame>& rxFrame,
             SfxBindings* pBindings );
 
@@ -99,7 +99,7 @@ namespace sw { namespace sidebar {
 
     private:
         PagePropertyPanel(
-            Window* pParent,
+            vcl::Window* pParent,
             const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame>& rxFrame,
             SfxBindings* pBindings );
         virtual ~PagePropertyPanel(void);
diff --git a/sw/source/uibase/sidebar/PageSizeControl.cxx b/sw/source/uibase/sidebar/PageSizeControl.cxx
index 5e5cd9ddd825..31d6eaba3bb0 100644
--- a/sw/source/uibase/sidebar/PageSizeControl.cxx
+++ b/sw/source/uibase/sidebar/PageSizeControl.cxx
@@ -36,7 +36,7 @@
 namespace sw { namespace sidebar {
 
 PageSizeControl::PageSizeControl(
-    Window* pParent,
+    vcl::Window* pParent,
     PagePropertyPanel& rPanel,
     const Paper ePaper,
     const bool bLandscape,
diff --git a/sw/source/uibase/sidebar/PageSizeControl.hxx b/sw/source/uibase/sidebar/PageSizeControl.hxx
index a15550c160b6..2fba0461ae7b 100644
--- a/sw/source/uibase/sidebar/PageSizeControl.hxx
+++ b/sw/source/uibase/sidebar/PageSizeControl.hxx
@@ -42,7 +42,7 @@ class PageSizeControl
 {
 public:
     PageSizeControl(
-        Window* pParent,
+        vcl::Window* pParent,
         PagePropertyPanel& rPanel,
         const Paper ePaper,
         const bool bLandscape,
diff --git a/sw/source/uibase/sidebar/SwPanelFactory.cxx b/sw/source/uibase/sidebar/SwPanelFactory.cxx
index ea2491fff572..f2c085ecbf30 100644
--- a/sw/source/uibase/sidebar/SwPanelFactory.cxx
+++ b/sw/source/uibase/sidebar/SwPanelFactory.cxx
@@ -88,7 +88,7 @@ Reference<ui::XUIElement> SAL_CALL SwPanelFactory::createUIElement (
     const sal_uInt64 nBindingsValue (aArguments.getOrDefault("SfxBindings", sal_uInt64(0)));
     SfxBindings* pBindings = reinterpret_cast<SfxBindings*>(nBindingsValue);
 
-    ::Window* pParentWindow = VCLUnoHelper::GetWindow(xParentWindow);
+    vcl::Window* pParentWindow = VCLUnoHelper::GetWindow(xParentWindow);
     if ( ! xParentWindow.is() || pParentWindow==NULL)
         throw RuntimeException(
             "PanelFactory::createUIElement called without ParentWindow",
@@ -123,7 +123,7 @@ Reference<ui::XUIElement> SAL_CALL SwPanelFactory::createUIElement (
     }
     else if (DoesResourceEndWith("/NavigatorPanel"))
     {
-        Window* pPanel = new SwNavigationPI(pBindings, NULL, pParentWindow);
+        vcl::Window* pPanel = new SwNavigationPI(pBindings, NULL, pParentWindow);
         xElement = sfx2::sidebar::SidebarPanelBase::Create(
             rsResourceURL,
             xFrame,
diff --git a/sw/source/uibase/sidebar/WrapPropertyPanel.cxx b/sw/source/uibase/sidebar/WrapPropertyPanel.cxx
index afac9912ae1e..76b9a79dd38b 100644
--- a/sw/source/uibase/sidebar/WrapPropertyPanel.cxx
+++ b/sw/source/uibase/sidebar/WrapPropertyPanel.cxx
@@ -43,7 +43,7 @@ const char UNO_WRAPIDEAL[] = ".uno:WrapIdeal";
 namespace sw { namespace sidebar {
 
 WrapPropertyPanel* WrapPropertyPanel::Create (
-    Window* pParent,
+    vcl::Window* pParent,
     const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rxFrame,
     SfxBindings* pBindings)
 {
@@ -61,7 +61,7 @@ WrapPropertyPanel* WrapPropertyPanel::Create (
 }
 
 WrapPropertyPanel::WrapPropertyPanel(
-    Window* pParent,
+    vcl::Window* pParent,
     const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rxFrame,
     SfxBindings* pBindings )
     : PanelLayout(pParent, "WrapPropertyPanel", "modules/swriter/ui/sidebarwrap.ui", rxFrame)
diff --git a/sw/source/uibase/sidebar/WrapPropertyPanel.hxx b/sw/source/uibase/sidebar/WrapPropertyPanel.hxx
index 27bff8143680..d1c53394021f 100644
--- a/sw/source/uibase/sidebar/WrapPropertyPanel.hxx
+++ b/sw/source/uibase/sidebar/WrapPropertyPanel.hxx
@@ -36,7 +36,7 @@ namespace sw { namespace sidebar {
     {
     public:
         static WrapPropertyPanel* Create(
-            Window* pParent,
+            vcl::Window* pParent,
             const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame>& rxFrame,
             SfxBindings* pBindings );
 
@@ -49,7 +49,7 @@ namespace sw { namespace sidebar {
 
     private:
         WrapPropertyPanel(
-            Window* pParent,
+            vcl::Window* pParent,
             const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rxFrame,
             SfxBindings* pBindings );