fdo#82577: Handle Window

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

Change-Id: Ib1beb7ab4ad75562a42aeb252732a073d25eff1a

8 files changed, 16 insertions, 16 deletions

diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx
index 96ee1a44b88a..dfa6774cb25f 100644
--- a/dbaccess/source/ui/browser/brwctrlr.cxx
+++ b/dbaccess/source/ui/browser/brwctrlr.cxx
@@ -722,7 +722,7 @@ void SbaXDataBrowserController::describeSupportedFeatures()
     implDescribeSupportedFeature( ".uno:FormSlots/insertRecord",    ID_BROWSER_INSERT_ROW,  CommandGroup::INSERT );
 }
 
-bool SbaXDataBrowserController::Construct(Window* pParent)
+bool SbaXDataBrowserController::Construct(vcl::Window* pParent)
 {
     // create/initialize the form and the grid model
     m_xRowSet = CreateForm();
diff --git a/dbaccess/source/ui/browser/brwview.cxx b/dbaccess/source/ui/browser/brwview.cxx
index 6be18a14ae17..9292887c63e3 100644
--- a/dbaccess/source/ui/browser/brwview.cxx
+++ b/dbaccess/source/ui/browser/brwview.cxx
@@ -65,7 +65,7 @@ namespace
 
 // UnoDataBrowserView
 
-UnoDataBrowserView::UnoDataBrowserView( Window* pParent,
+UnoDataBrowserView::UnoDataBrowserView( vcl::Window* pParent,
                                         IController& _rController,
                                         const Reference< ::com::sun::star::uno::XComponentContext >& _rxContext)
     :ODataView(pParent,_rController,_rxContext)
@@ -161,7 +161,7 @@ void UnoDataBrowserView::setTreeView(DBTreeView* _pTreeView)
     {
         if (m_pTreeView)
         {
-            boost::scoped_ptr<Window> aTemp(m_pTreeView);
+            boost::scoped_ptr<vcl::Window> aTemp(m_pTreeView);
             m_pTreeView = NULL;
         }
         m_pTreeView = _pTreeView;
diff --git a/dbaccess/source/ui/browser/dataview.cxx b/dbaccess/source/ui/browser/dataview.cxx
index ec220d3b562a..bf06baa5ebbe 100644
--- a/dbaccess/source/ui/browser/dataview.cxx
+++ b/dbaccess/source/ui/browser/dataview.cxx
@@ -59,7 +59,7 @@ namespace dbaui
         }
     };
 
-    ODataView::ODataView(   Window* pParent,
+    ODataView::ODataView(   vcl::Window* pParent,
                             IController& _rController,
                             const Reference< XComponentContext >& _rxContext,
                             WinBits nStyle)
diff --git a/dbaccess/source/ui/browser/dbtreeview.cxx b/dbaccess/source/ui/browser/dbtreeview.cxx
index e769f378ebd2..2d140c3b1326 100644
--- a/dbaccess/source/ui/browser/dbtreeview.cxx
+++ b/dbaccess/source/ui/browser/dbtreeview.cxx
@@ -31,7 +31,7 @@ using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
 
 // class DBTreeView
-DBTreeView::DBTreeView( Window* pParent, WinBits nBits)
+DBTreeView::DBTreeView( vcl::Window* pParent, WinBits nBits)
                     :   Window( pParent, nBits )
                     , m_pTreeListBox(NULL)
 {
@@ -53,7 +53,7 @@ DBTreeView::~DBTreeView()
             m_pTreeListBox->GetModel()->RemoveView(m_pTreeListBox);
             m_pTreeListBox->DisconnectFromModel();
         }
-        boost::scoped_ptr<Window> aTemp(m_pTreeListBox);
+        boost::scoped_ptr<vcl::Window> aTemp(m_pTreeListBox);
         m_pTreeListBox = NULL;
     }
 }
diff --git a/dbaccess/source/ui/browser/dbtreeview.hxx b/dbaccess/source/ui/browser/dbtreeview.hxx
index b084411f63e1..99bf4416ce8c 100644
--- a/dbaccess/source/ui/browser/dbtreeview.hxx
+++ b/dbaccess/source/ui/browser/dbtreeview.hxx
@@ -28,7 +28,7 @@ namespace dbaui
     class DBTreeListBox;
     // - DBTreeView -
 
-    class DBTreeView : public Window
+    class DBTreeView : public vcl::Window
     {
     private:
         DBTreeListBox*  m_pTreeListBox;
@@ -37,7 +37,7 @@ namespace dbaui
         virtual void Resize() SAL_OVERRIDE;
     public:
 
-        DBTreeView( Window* pParent,
+        DBTreeView( vcl::Window* pParent,
                 WinBits nBits );
         virtual ~DBTreeView();
 
diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx b/dbaccess/source/ui/browser/genericcontroller.cxx
index c06a5047ccd2..c8526427cbf3 100644
--- a/dbaccess/source/ui/browser/genericcontroller.cxx
+++ b/dbaccess/source/ui/browser/genericcontroller.cxx
@@ -226,7 +226,7 @@ OGenericUnoController::~OGenericUnoController()
 
 }
 
-bool OGenericUnoController::Construct(Window* /*pParent*/)
+bool OGenericUnoController::Construct(vcl::Window* /*pParent*/)
 {
     OSL_ENSURE( getView(), "the view is NULL!" );
 
@@ -297,7 +297,7 @@ void SAL_CALL OGenericUnoController::initialize( const Sequence< Any >& aArgumen
 
         xParent = xFrame->getContainerWindow();
         VCLXWindow* pParentComponent = VCLXWindow::GetImplementation(xParent);
-        Window* pParentWin = pParentComponent ? pParentComponent->GetWindow() : NULL;
+        vcl::Window* pParentWin = pParentComponent ? pParentComponent->GetWindow() : NULL;
         if (!pParentWin)
         {
             throw IllegalArgumentException("Parent window is null", *this, 1 );
@@ -318,7 +318,7 @@ void SAL_CALL OGenericUnoController::initialize( const Sequence< Any >& aArgumen
     catch(Exception&)
     {
         // no one clears my view if I won't
-        boost::scoped_ptr<Window> aTemp(m_pView);
+        boost::scoped_ptr<vcl::Window> aTemp(m_pView);
         m_pView = NULL;
         throw;
     }
diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx
index 2d7d9c1804c2..125b881af63c 100644
--- a/dbaccess/source/ui/browser/sbagrid.cxx
+++ b/dbaccess/source/ui/browser/sbagrid.cxx
@@ -145,7 +145,7 @@ SbaXGridControl::~SbaXGridControl()
 {
 }
 
-FmXGridPeer* SbaXGridControl::imp_CreatePeer(Window* pParent)
+FmXGridPeer* SbaXGridControl::imp_CreatePeer(vcl::Window* pParent)
 {
     FmXGridPeer* pReturn = new SbaXGridPeer(m_xContext);
 
@@ -549,7 +549,7 @@ SbaXGridPeer* SbaXGridPeer::getImplementation(const Reference< XInterface >& _rx
     return NULL;
 }
 
-FmGridControl* SbaXGridPeer::imp_CreateControl(Window* pParent, WinBits nStyle)
+FmGridControl* SbaXGridPeer::imp_CreateControl(vcl::Window* pParent, WinBits nStyle)
 {
     return new SbaGridControl( m_xContext, pParent, this, nStyle);
 }
@@ -706,7 +706,7 @@ void SbaGridHeader::PostExecuteColumnContextMenu(sal_uInt16 nColId, const PopupM
 
 // SbaGridControl
 SbaGridControl::SbaGridControl(Reference< XComponentContext > _rM,
-                               Window* pParent, FmXGridPeer* _pPeer, WinBits nBits)
+                               vcl::Window* pParent, FmXGridPeer* _pPeer, WinBits nBits)
     :FmGridControl(_rM,pParent, _pPeer, nBits)
     ,m_pMasterListener(NULL)
     ,m_nAsyncDropEvent(0)
diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx
index a088b29feaf6..6d59880cf35b 100644
--- a/dbaccess/source/ui/browser/unodatbr.cxx
+++ b/dbaccess/source/ui/browser/unodatbr.cxx
@@ -325,7 +325,7 @@ void SAL_CALL SbaTableQueryBrowser::disposing()
     SbaXDataBrowserController::disposing();
 }
 
-bool SbaTableQueryBrowser::Construct(Window* pParent)
+bool SbaTableQueryBrowser::Construct(vcl::Window* pParent)
 {
     if ( !SbaXDataBrowserController::Construct( pParent ) )
         return false;
@@ -1339,7 +1339,7 @@ void SbaTableQueryBrowser::implCheckExternalSlot( sal_uInt16 _nId )
     if ( !m_xMainToolbar.is() )
         return;
 
-    Window* pToolboxWindow = VCLUnoHelper::GetWindow( m_xMainToolbar );
+    vcl::Window* pToolboxWindow = VCLUnoHelper::GetWindow( m_xMainToolbar );
     ToolBox* pToolbox = dynamic_cast< ToolBox* >( pToolboxWindow );
     OSL_ENSURE( pToolbox, "SbaTableQueryBrowser::implCheckExternalSlot: cannot obtain the toolbox window!" );