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, 9 insertions, 9 deletions

diff --git a/framework/inc/classes/fwktabwindow.hxx b/framework/inc/classes/fwktabwindow.hxx
index 323dc9d8247a..d727db4231ec 100644
--- a/framework/inc/classes/fwktabwindow.hxx
+++ b/framework/inc/classes/fwktabwindow.hxx
@@ -44,7 +44,7 @@ namespace framework
 class FwkTabControl : public TabControl
 {
 public:
-    FwkTabControl(Window* pParent);
+    FwkTabControl(vcl::Window* pParent);
 
     void BroadcastEvent( sal_uLong nEvent );
 };
@@ -63,7 +63,7 @@ private:
 
 public:
     FwkTabPage(
-        Window* pParent,
+        vcl::Window* pParent,
         const OUString& rPageURL,
     const css::uno::Reference< css::awt::XContainerWindowEventHandler >& rEventHdl,
         const css::uno::Reference< css::awt::XContainerWindowProvider >& rProvider );
@@ -93,7 +93,7 @@ struct TabEntry
 
 typedef std::vector< TabEntry* > TabEntryList;
 
-class FwkTabWindow : public Window
+class FwkTabWindow : public vcl::Window
 {
 private:
     FwkTabControl   m_aTabCtrl;
@@ -109,7 +109,7 @@ private:
     DECL_DLLPRIVATE_LINK(DeactivatePageHdl, void *);
 
 public:
-    FwkTabWindow( Window* pParent );
+    FwkTabWindow( vcl::Window* pParent );
     virtual ~FwkTabWindow();
 
     void            AddEventListener( const Link& rEventListener );
diff --git a/framework/inc/helper/vclstatusindicator.hxx b/framework/inc/helper/vclstatusindicator.hxx
index c2102089b99a..634c66a5b1f5 100644
--- a/framework/inc/helper/vclstatusindicator.hxx
+++ b/framework/inc/helper/vclstatusindicator.hxx
@@ -94,8 +94,8 @@ class VCLStatusIndicator : public  ::cppu::WeakImplHelper1< css::task::XStatusIn
 
     private:
 
-        static void impl_recalcLayout(Window* pStatusBar   ,
-                                      Window* pParentWindow);
+        static void impl_recalcLayout(vcl::Window* pStatusBar   ,
+                                      vcl::Window* pParentWindow);
 };
 
 } // namespace framework
diff --git a/framework/inc/uielement/complextoolbarcontroller.hxx b/framework/inc/uielement/complextoolbarcontroller.hxx
index b849233e7102..88084f8d1661 100644
--- a/framework/inc/uielement/complextoolbarcontroller.hxx
+++ b/framework/inc/uielement/complextoolbarcontroller.hxx
@@ -30,7 +30,7 @@
 #include <tools/link.hxx>
 
 class ToolBox;
-class Window;
+namespace vcl { class Window; }
 
 namespace framework
 {
@@ -74,7 +74,7 @@ class ComplexToolbarController : public svt::ToolboxController
         DECL_STATIC_LINK( ComplexToolbarController, Notify_Impl, NotifyInfo* );
 
     protected:
-        static sal_Int32 getFontSizePixel( const Window* pWindow );
+        static sal_Int32 getFontSizePixel( const vcl::Window* pWindow );
         ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > getDispatchFromCommand( const OUString& aCommand ) const;
         void addNotifyInfo( const OUString&                                                        aEventName,
                             const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch >& xDispatch,
diff --git a/framework/inc/uielement/statusbar.hxx b/framework/inc/uielement/statusbar.hxx
index 404107850265..be957eaedfb7 100644
--- a/framework/inc/uielement/statusbar.hxx
+++ b/framework/inc/uielement/statusbar.hxx
@@ -31,7 +31,7 @@ class FrameworkStatusBar : public StatusBar
 {
     public:
 
-        FrameworkStatusBar( Window*           pParent,
+        FrameworkStatusBar( vcl::Window*           pParent,
                             WinBits           nWinBits );
         virtual ~FrameworkStatusBar();