fdo#82577: Handle Window

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

Change-Id: Ib1beb7ab4ad75562a42aeb252732a073d25eff1a

11 files changed, 41 insertions, 41 deletions

diff --git a/forms/source/richtext/richtextcontrol.cxx b/forms/source/richtext/richtextcontrol.cxx
index 5ca9cac35c8e..58d2f6939af3 100644
--- a/forms/source/richtext/richtextcontrol.cxx
+++ b/forms/source/richtext/richtextcontrol.cxx
@@ -134,7 +134,7 @@ namespace frm
         }
 
 
-        static void adjustTwoStateWinBit( Window* _pWindow, const Any& _rValue, WinBits _nFlag, bool _bInvert = false )
+        static void adjustTwoStateWinBit( vcl::Window* _pWindow, const Any& _rValue, WinBits _nFlag, bool _bInvert = false )
         {
             WinBits nBits = _pWindow->GetStyle();
             implAdjustTwoStateFlag( _rValue, nBits, _nFlag, _bInvert );
@@ -197,7 +197,7 @@ namespace frm
             mbCreatingPeer = true;
 
             // determine the VLC window for the parent
-            Window* pParentWin = NULL;
+            vcl::Window* pParentWin = NULL;
             if ( _rParentPeer.is() )
             {
                 VCLXWindow* pParentXWin = VCLXWindow::GetImplementation( _rParentPeer );
@@ -300,7 +300,7 @@ namespace frm
     // ORichTextPeer
 
 
-    ORichTextPeer* ORichTextPeer::Create( const Reference< XControlModel >& _rxModel, Window* _pParentWindow, WinBits _nStyle )
+    ORichTextPeer* ORichTextPeer::Create( const Reference< XControlModel >& _rxModel, vcl::Window* _pParentWindow, WinBits _nStyle )
     {
         DBG_TESTSOLARMUTEX();
 
diff --git a/forms/source/richtext/richtextcontrol.hxx b/forms/source/richtext/richtextcontrol.hxx
index 38dabbf593eb..e81e5b9afe40 100644
--- a/forms/source/richtext/richtextcontrol.hxx
+++ b/forms/source/richtext/richtextcontrol.hxx
@@ -97,7 +97,7 @@ namespace frm
         */
         static ORichTextPeer* Create(
             const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >&         _rxModel,
-            Window* _pParentWindow,
+            vcl::Window* _pParentWindow,
             WinBits _nStyle
         );
 
diff --git a/forms/source/richtext/richtextimplcontrol.hxx b/forms/source/richtext/richtextimplcontrol.hxx
index 3795a49ac11b..8153fd201042 100644
--- a/forms/source/richtext/richtextimplcontrol.hxx
+++ b/forms/source/richtext/richtextimplcontrol.hxx
@@ -29,7 +29,7 @@
 
 class EditView;
 class EditStatus;
-class Window;
+namespace vcl { class Window; }
 class SvxScriptSetItem;
 
 namespace frm
@@ -67,7 +67,7 @@ namespace frm
         struct GrantAccess { friend class RichTextControl; private: GrantAccess() { } };
         inline EditView*        getView( const GrantAccess& ) const     { return m_pView; }
         inline RichTextEngine*  getEngine( const GrantAccess& ) const   { return m_pEngine; }
-        inline Window*          getViewport( const GrantAccess& ) const { return m_pViewport; }
+        inline vcl::Window*          getViewport( const GrantAccess& ) const { return m_pViewport; }
 
     public:
         RichTextControlImpl( Control* _pAntiImpl, RichTextEngine* _pEngine,
diff --git a/forms/source/richtext/richtextvclcontrol.cxx b/forms/source/richtext/richtextvclcontrol.cxx
index 54c00b4ba290..5b293b34fcd2 100644
--- a/forms/source/richtext/richtextvclcontrol.cxx
+++ b/forms/source/richtext/richtextvclcontrol.cxx
@@ -41,7 +41,7 @@
 namespace frm
 {
 
-    RichTextControl::RichTextControl( RichTextEngine* _pEngine, Window* _pParent, WinBits _nStyle,
+    RichTextControl::RichTextControl( RichTextEngine* _pEngine, vcl::Window* _pParent, WinBits _nStyle,
         ITextAttributeListener* _pTextAttribListener, ITextSelectionListener* _pSelectionListener )
         :Control( _pParent, implInitStyle( _nStyle ) )
         ,m_pImpl( NULL )
@@ -314,7 +314,7 @@ namespace frm
     }
 
 
-    Window& RichTextControl::getViewport() const
+    vcl::Window& RichTextControl::getViewport() const
     {
         return *m_pImpl->getViewport( RichTextControlImpl::GrantAccess() );
     }
diff --git a/forms/source/richtext/richtextvclcontrol.hxx b/forms/source/richtext/richtextvclcontrol.hxx
index 2c1ab680a3bf..4e3123d0b75a 100644
--- a/forms/source/richtext/richtextvclcontrol.hxx
+++ b/forms/source/richtext/richtextvclcontrol.hxx
@@ -45,7 +45,7 @@ namespace frm
     public:
         RichTextControl(
             RichTextEngine* _pEngine,
-            Window* _pParent,
+            vcl::Window* _pParent,
             WinBits _nStyle,
             ITextAttributeListener* _pTextAttribListener,
             ITextSelectionListener* _pSelectionListener
@@ -116,7 +116,7 @@ namespace frm
 
     private:
         EditEngine&  getEngine() const;
-        Window&      getViewport() const;
+        vcl::Window&      getViewport() const;
     };
 
 
diff --git a/forms/source/richtext/richtextviewport.cxx b/forms/source/richtext/richtextviewport.cxx
index b18995f6af9d..440b3a43f82f 100644
--- a/forms/source/richtext/richtextviewport.cxx
+++ b/forms/source/richtext/richtextviewport.cxx
@@ -24,7 +24,7 @@
 namespace frm
 {
 
-    RichTextViewPort::RichTextViewPort( Window* _pParent )
+    RichTextViewPort::RichTextViewPort( vcl::Window* _pParent )
         :Control ( _pParent )
         ,m_pView(NULL)
         ,m_bHideInactiveSelection( true )
diff --git a/forms/source/richtext/richtextviewport.hxx b/forms/source/richtext/richtextviewport.hxx
index fdd4bb005999..a6250a894545 100644
--- a/forms/source/richtext/richtextviewport.hxx
+++ b/forms/source/richtext/richtextviewport.hxx
@@ -34,7 +34,7 @@ namespace frm
         bool        m_bHideInactiveSelection;
 
     public:
-        RichTextViewPort( Window* _pParent );
+        RichTextViewPort( vcl::Window* _pParent );
 
         void    setView( EditView& _rView );
 
diff --git a/forms/source/solar/component/navbarcontrol.cxx b/forms/source/solar/component/navbarcontrol.cxx
index 274851f58824..5f056420a601 100644
--- a/forms/source/solar/component/navbarcontrol.cxx
+++ b/forms/source/solar/component/navbarcontrol.cxx
@@ -129,7 +129,7 @@ namespace frm
             mbCreatingPeer = true;
 
             // determine the VLC window for the parent
-            Window* pParentWin = NULL;
+            vcl::Window* pParentWin = NULL;
             if ( _rParentPeer.is() )
             {
                 VCLXWindow* pParentXWin = VCLXWindow::GetImplementation( _rParentPeer );
@@ -230,7 +230,7 @@ namespace frm
 
 
     ONavigationBarPeer* ONavigationBarPeer::Create( const Reference< XComponentContext >& _rxORB,
-        Window* _pParentWindow, const Reference< XControlModel >& _rxModel )
+        vcl::Window* _pParentWindow, const Reference< XControlModel >& _rxModel )
     {
         DBG_TESTSOLARMUTEX();
 
diff --git a/forms/source/solar/component/navbarcontrol.hxx b/forms/source/solar/component/navbarcontrol.hxx
index 57e5af6754b4..b511418fcf1d 100644
--- a/forms/source/solar/component/navbarcontrol.hxx
+++ b/forms/source/solar/component/navbarcontrol.hxx
@@ -91,7 +91,7 @@ namespace frm
         */
         static ONavigationBarPeer* Create(
             const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB,
-            Window* _pParentWindow,
+            vcl::Window* _pParentWindow,
             const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& _rxModel
         );
 
diff --git a/forms/source/solar/control/navtoolbar.cxx b/forms/source/solar/control/navtoolbar.cxx
index f51c81cd58d4..7b332a24e79a 100644
--- a/forms/source/solar/control/navtoolbar.cxx
+++ b/forms/source/solar/control/navtoolbar.cxx
@@ -101,7 +101,7 @@ namespace frm
         const IFeatureDispatcher*   m_pDispatcher;
 
     public:
-        ImplNavToolBar( Window* _pParent )
+        ImplNavToolBar( vcl::Window* _pParent )
             :ToolBox( _pParent, WB_3DLOOK )
             ,m_pDispatcher( NULL )
         {
@@ -132,7 +132,7 @@ namespace frm
         }
     }
 
-    NavigationToolBar::NavigationToolBar( Window* _pParent, WinBits _nStyle, const PCommandImageProvider& _pImageProvider,
+    NavigationToolBar::NavigationToolBar( vcl::Window* _pParent, WinBits _nStyle, const PCommandImageProvider& _pImageProvider,
             const PCommandDescriptionProvider& _pDescriptionProvider )
         :Window( _pParent, _nStyle )
         ,m_pDispatcher( NULL )
@@ -147,7 +147,7 @@ namespace frm
 
     NavigationToolBar::~NavigationToolBar( )
     {
-        for (   ::std::vector< Window* >::iterator loopChildWins = m_aChildWins.begin();
+        for (   ::std::vector< vcl::Window* >::iterator loopChildWins = m_aChildWins.begin();
                 loopChildWins != m_aChildWins.end();
                 ++loopChildWins
             )
@@ -224,7 +224,7 @@ namespace frm
         DBG_ASSERT( m_pToolbar->GetItemPos( (sal_uInt16)_nFeatureId ) != TOOLBOX_ITEM_NOTFOUND,
             "NavigationToolBar::checkFeature: invalid id!" );
 
-        Window* pItemWindow = m_pToolbar->GetItemWindow( (sal_uInt16)_nFeatureId );
+        vcl::Window* pItemWindow = m_pToolbar->GetItemWindow( (sal_uInt16)_nFeatureId );
         if ( pItemWindow )
             pItemWindow->SetText( _rText );
         else
@@ -296,7 +296,7 @@ namespace frm
 
                 if ( pSupportedFeatures->bItemWindow )
                 {
-                    Window* pItemWindow = NULL;
+                    vcl::Window* pItemWindow = NULL;
                     if ( FormFeature::MoveAbsolute == pSupportedFeatures->nId )
                     {
                         pItemWindow = new RecordPositionInput( m_pToolbar );
@@ -558,14 +558,14 @@ namespace frm
         for ( sal_uInt16 item = 0; item < m_pToolbar->GetItemCount(); ++item )
         {
             sal_uInt16 nItemId = m_pToolbar->GetItemId( item );
-            Window* pItemWindow = m_pToolbar->GetItemWindow( nItemId );
+            vcl::Window* pItemWindow = m_pToolbar->GetItemWindow( nItemId );
             if ( pItemWindow )
                 (this->*_handler)( nItemId, pItemWindow, _pParam );
         }
     }
 
 
-    void NavigationToolBar::setItemBackground( sal_uInt16 /* _nItemId */, Window* _pItemWindow, const void* _pColor ) const
+    void NavigationToolBar::setItemBackground( sal_uInt16 /* _nItemId */, vcl::Window* _pItemWindow, const void* _pColor ) const
     {
         if ( _pColor )
             _pItemWindow->SetControlBackground( *static_cast< const Color* >( _pColor ) );
@@ -574,7 +574,7 @@ namespace frm
     }
 
 
-    void NavigationToolBar::setTextLineColor( sal_uInt16 /* _nItemId */, Window* _pItemWindow, const void* _pColor ) const
+    void NavigationToolBar::setTextLineColor( sal_uInt16 /* _nItemId */, vcl::Window* _pItemWindow, const void* _pColor ) const
     {
         if ( _pColor )
             _pItemWindow->SetTextLineColor( *static_cast< const Color* >( _pColor ) );
@@ -583,14 +583,14 @@ namespace frm
     }
 #if 0
 
-    void NavigationToolBar::setItemWindowZoom( sal_uInt16 /* _nItemId */, Window* _pItemWindow, const void* /* _pParam */ ) const
+    void NavigationToolBar::setItemWindowZoom( sal_uInt16 /* _nItemId */, vcl::Window* _pItemWindow, const void* /* _pParam */ ) const
     {
         _pItemWindow->SetZoom( GetZoom() );
         _pItemWindow->SetZoomedPointFont( IsControlFont() ? GetControlFont() : GetPointFont() );
     }
 #endif
 
-    void NavigationToolBar::setItemControlFont( sal_uInt16 /* _nItemId */, Window* _pItemWindow, const void* /* _pParam */ ) const
+    void NavigationToolBar::setItemControlFont( sal_uInt16 /* _nItemId */, vcl::Window* _pItemWindow, const void* /* _pParam */ ) const
     {
         if ( IsControlFont() )
             _pItemWindow->SetControlFont( GetControlFont() );
@@ -599,7 +599,7 @@ namespace frm
     }
 
 
-    void NavigationToolBar::setItemControlForeground( sal_uInt16 /* _nItemId */, Window* _pItemWindow, const void* /* _pParam */ ) const
+    void NavigationToolBar::setItemControlForeground( sal_uInt16 /* _nItemId */, vcl::Window* _pItemWindow, const void* /* _pParam */ ) const
     {
         if ( IsControlForeground() )
             _pItemWindow->SetControlForeground( GetControlForeground() );
@@ -609,7 +609,7 @@ namespace frm
     }
 
 
-    void NavigationToolBar::adjustItemWindowWidth( sal_uInt16 _nItemId, Window* _pItemWindow, const void* /* _pParam */ ) const
+    void NavigationToolBar::adjustItemWindowWidth( sal_uInt16 _nItemId, vcl::Window* _pItemWindow, const void* /* _pParam */ ) const
     {
         OUString sItemText;
         switch ( _nItemId )
@@ -639,12 +639,12 @@ namespace frm
     }
 
 
-    void NavigationToolBar::enableItemRTL( sal_uInt16 /*_nItemId*/, Window* _pItemWindow, const void* _pIsRTLEnabled ) const
+    void NavigationToolBar::enableItemRTL( sal_uInt16 /*_nItemId*/, vcl::Window* _pItemWindow, const void* _pIsRTLEnabled ) const
     {
         _pItemWindow->EnableRTL( *static_cast< const sal_Bool* >( _pIsRTLEnabled ) );
     }
 
-    RecordPositionInput::RecordPositionInput( Window* _pParent )
+    RecordPositionInput::RecordPositionInput( vcl::Window* _pParent )
         :NumericField( _pParent, WB_BORDER | WB_VCENTER )
         ,m_pDispatcher( NULL )
     {
diff --git a/forms/source/solar/inc/navtoolbar.hxx b/forms/source/solar/inc/navtoolbar.hxx
index 1c0800759b7a..5be47c86c5f1 100644
--- a/forms/source/solar/inc/navtoolbar.hxx
+++ b/forms/source/solar/inc/navtoolbar.hxx
@@ -36,7 +36,7 @@ namespace frm
 
     class ImplNavToolBar;
 
-    class NavigationToolBar : public Window
+    class NavigationToolBar : public vcl::Window
     {
     public:
         enum ImageSize
@@ -61,11 +61,11 @@ namespace frm
                                         m_pDescriptionProvider;
         ImageSize                       m_eImageSize;
         ImplNavToolBar*                 m_pToolbar;
-        ::std::vector< Window* >        m_aChildWins;
+        ::std::vector< vcl::Window* >        m_aChildWins;
 
     public:
         NavigationToolBar(
-            Window* _pParent,
+            vcl::Window* _pParent,
             WinBits _nStyle,
             const ::boost::shared_ptr< const ICommandImageProvider >& _pImageProvider,
             const ::boost::shared_ptr< const ICommandDescriptionProvider >& _pDescriptionProvider
@@ -137,18 +137,18 @@ namespace frm
         void updateFeatureStates( );
 
         // iterating through item windows
-        typedef void (NavigationToolBar::*ItemWindowHandler) (sal_uInt16, Window*, const void*) const;
+        typedef void (NavigationToolBar::*ItemWindowHandler) (sal_uInt16, vcl::Window*, const void*) const;
         void    forEachItemWindow( ItemWindowHandler _handler, const void* _pParam );
 
-        void setItemBackground( sal_uInt16 /* _nItemId */, Window* _pItemWindow, const void* _pColor ) const;
-        void setTextLineColor( sal_uInt16 /* _nItemId */, Window* _pItemWindow, const void* _pColor ) const;
+        void setItemBackground( sal_uInt16 /* _nItemId */, vcl::Window* _pItemWindow, const void* _pColor ) const;
+        void setTextLineColor( sal_uInt16 /* _nItemId */, vcl::Window* _pItemWindow, const void* _pColor ) const;
 #if 0
-        void setItemWindowZoom( sal_uInt16 /* _nItemId */, Window* _pItemWindow, const void* /* _pParam */ ) const;
+        void setItemWindowZoom( sal_uInt16 /* _nItemId */, vcl::Window* _pItemWindow, const void* /* _pParam */ ) const;
 #endif
-        void setItemControlFont( sal_uInt16 /* _nItemId */, Window* _pItemWindow, const void* /* _pParam */ ) const;
-        void setItemControlForeground( sal_uInt16 /* _nItemId */, Window* _pItemWindow, const void* /* _pParam */ ) const;
-        void adjustItemWindowWidth( sal_uInt16 _nItemId, Window* _pItemWindow, const void* /* _pParam */ ) const;
-        void enableItemRTL( sal_uInt16 /*_nItemId*/, Window* _pItemWindow, const void* _pIsRTLEnabled ) const;
+        void setItemControlFont( sal_uInt16 /* _nItemId */, vcl::Window* _pItemWindow, const void* /* _pParam */ ) const;
+        void setItemControlForeground( sal_uInt16 /* _nItemId */, vcl::Window* _pItemWindow, const void* /* _pParam */ ) const;
+        void adjustItemWindowWidth( sal_uInt16 _nItemId, vcl::Window* _pItemWindow, const void* /* _pParam */ ) const;
+        void enableItemRTL( sal_uInt16 /*_nItemId*/, vcl::Window* _pItemWindow, const void* _pIsRTLEnabled ) const;
     };
 
     class RecordPositionInput : public NumericField
@@ -157,7 +157,7 @@ namespace frm
         const IFeatureDispatcher*   m_pDispatcher;
 
     public:
-        RecordPositionInput( Window* _pParent );
+        RecordPositionInput( vcl::Window* _pParent );
         virtual ~RecordPositionInput();
 
         /** sets the dispatcher which is to be used for the features