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

diff --git a/dbaccess/source/ui/control/ColumnControlWindow.cxx b/dbaccess/source/ui/control/ColumnControlWindow.cxx
index a6d8810f7b0b..a4d44cbc6464 100644
--- a/dbaccess/source/ui/control/ColumnControlWindow.cxx
+++ b/dbaccess/source/ui/control/ColumnControlWindow.cxx
@@ -35,7 +35,7 @@ using namespace ::com::sun::star::sdbc;
 using namespace ::com::sun::star::lang;
 
 // OColumnControlWindow
-OColumnControlWindow::OColumnControlWindow(Window* pParent
+OColumnControlWindow::OColumnControlWindow(vcl::Window* pParent
                                            ,const Reference<XComponentContext>& _rxContext)
             : OFieldDescControl(pParent,NULL)
             , m_xContext(_rxContext)
diff --git a/dbaccess/source/ui/control/FieldControls.cxx b/dbaccess/source/ui/control/FieldControls.cxx
index 3a14cdd3d2cf..9335be836606 100644
--- a/dbaccess/source/ui/control/FieldControls.cxx
+++ b/dbaccess/source/ui/control/FieldControls.cxx
@@ -26,7 +26,7 @@ namespace dbaui {
 
 namespace {
 
-void lcl_setSpecialReadOnly( bool _bReadOnly, Window* _pWin )
+void lcl_setSpecialReadOnly( bool _bReadOnly, vcl::Window* _pWin )
 {
     StyleSettings aSystemStyle = Application::GetSettings().GetStyleSettings();
     const Color& rNewColor = _bReadOnly ? aSystemStyle.GetDialogColor() : aSystemStyle.GetFieldColor();
@@ -36,7 +36,7 @@ void lcl_setSpecialReadOnly( bool _bReadOnly, Window* _pWin )
 
 }
 
-OPropColumnEditCtrl::OPropColumnEditCtrl(Window* pParent,
+OPropColumnEditCtrl::OPropColumnEditCtrl(vcl::Window* pParent,
                                                 rtl::OUString& _rAllowedChars,
                                                 sal_uInt16 nHelpId,
                                                 short nPosition,
@@ -56,7 +56,7 @@ OPropColumnEditCtrl::SetSpecialReadOnly(bool _bReadOnly)
 
 
 
-OPropEditCtrl::OPropEditCtrl(Window* pParent, sal_uInt16 nHelpId, short nPosition, WinBits nWinStyle)
+OPropEditCtrl::OPropEditCtrl(vcl::Window* pParent, sal_uInt16 nHelpId, short nPosition, WinBits nWinStyle)
     :Edit(pParent, nWinStyle)
     ,m_nPos(nPosition)
 {
@@ -78,14 +78,14 @@ OPropNumericEditCtrl::SetSpecialReadOnly(bool _bReadOnly)
 }
 
 
-OPropNumericEditCtrl::OPropNumericEditCtrl(Window* pParent, sal_uInt16 nHelpId, short nPosition, WinBits nWinStyle)
+OPropNumericEditCtrl::OPropNumericEditCtrl(vcl::Window* pParent, sal_uInt16 nHelpId, short nPosition, WinBits nWinStyle)
     :NumericField(pParent, nWinStyle)
     ,m_nPos(nPosition)
 {
     m_strHelpText = ModuleRes(nHelpId);
 }
 
-OPropListBoxCtrl::OPropListBoxCtrl(Window* pParent, sal_uInt16 nHelpId, short nPosition, WinBits nWinStyle)
+OPropListBoxCtrl::OPropListBoxCtrl(vcl::Window* pParent, sal_uInt16 nHelpId, short nPosition, WinBits nWinStyle)
     :ListBox(pParent, nWinStyle)
     ,m_nPos(nPosition)
 {
diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx
index 44bf027627b3..d0c35b7cd759 100644
--- a/dbaccess/source/ui/control/FieldDescControl.cxx
+++ b/dbaccess/source/ui/control/FieldDescControl.cxx
@@ -93,7 +93,7 @@ namespace
 }
 
 // class OFieldDescControl
-OFieldDescControl::OFieldDescControl( Window* pParent, OTableDesignHelpBar* pHelpBar )
+OFieldDescControl::OFieldDescControl( vcl::Window* pParent, OTableDesignHelpBar* pHelpBar )
     :TabPage( pParent, WB_3DLOOK | WB_DIALOGCONTROL )
     ,pHelp( pHelpBar )
     ,pLastFocusWindow(NULL)
@@ -163,11 +163,11 @@ OFieldDescControl::~OFieldDescControl()
 {
 
     {
-        boost::scoped_ptr<Window> aTemp(m_pVertScroll);
+        boost::scoped_ptr<vcl::Window> aTemp(m_pVertScroll);
         m_pVertScroll    = NULL;
     }
     {
-        boost::scoped_ptr<Window> aTemp(m_pHorzScroll);
+        boost::scoped_ptr<vcl::Window> aTemp(m_pHorzScroll);
         m_pHorzScroll    = NULL;
     }
     if ( m_bAdded )
@@ -226,7 +226,7 @@ IMPL_LINK(OFieldDescControl, OnScroll, ScrollBar*, /*pBar*/)
 
 namespace
 {
-    void getMaxXPosition(Window* _pWindow,long& _rnMaxXPosition)
+    void getMaxXPosition(vcl::Window* _pWindow,long& _rnMaxXPosition)
     {
         if (_pWindow)
         {
@@ -1556,7 +1556,7 @@ void OFieldDescControl::GetFocus()
     }
 }
 
-void OFieldDescControl::implFocusLost(Window* _pWhich)
+void OFieldDescControl::implFocusLost(vcl::Window* _pWhich)
 {
     OSL_ENSURE(!_pWhich || IsChild(_pWhich), "OFieldDescControl::implFocusLost : invalid window !");
 
diff --git a/dbaccess/source/ui/control/RelationControl.cxx b/dbaccess/source/ui/control/RelationControl.cxx
index 9082511dded4..35bf2e2f0d00 100644
--- a/dbaccess/source/ui/control/RelationControl.cxx
+++ b/dbaccess/source/ui/control/RelationControl.cxx
@@ -78,7 +78,7 @@ namespace dbaui
         */
         sal_uInt16 getColumnIdent( sal_uInt16 _nColId ) const;
     public:
-        ORelationControl(Window *pParent);
+        ORelationControl(vcl::Window *pParent);
         void SetController(OTableListBoxControl* pController)
         {
             m_pBoxControl = pController;
@@ -127,7 +127,7 @@ namespace dbaui
     };
 
     // class ORelationControl
-    ORelationControl::ORelationControl(Window *pParent)
+    ORelationControl::ORelationControl(vcl::Window *pParent)
         : EditBrowseBox(pParent,
             EBBF_SMART_TAB_TRAVEL | EBBF_NOROWPICTURE,
             WB_TABSTOP | WB_BORDER | BROWSER_AUTOSIZE_LASTCOL)
@@ -138,7 +138,7 @@ namespace dbaui
     {
     }
 
-    extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeORelationControl(Window *pParent, VclBuilder::stringmap &)
+    extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeORelationControl(vcl::Window *pParent, VclBuilder::stringmap &)
     {
         return new ORelationControl(pParent);
     }
diff --git a/dbaccess/source/ui/control/SqlNameEdit.cxx b/dbaccess/source/ui/control/SqlNameEdit.cxx
index 1d4fe29ad2e9..bd3fd01c8f09 100644
--- a/dbaccess/source/ui/control/SqlNameEdit.cxx
+++ b/dbaccess/source/ui/control/SqlNameEdit.cxx
@@ -81,12 +81,12 @@ namespace dbaui
     }
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeOSQLNameEdit(Window *pParent, VclBuilder::stringmap &)
+extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeOSQLNameEdit(vcl::Window *pParent, VclBuilder::stringmap &)
 {
     return new dbaui::OSQLNameEdit(pParent);
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeOSQLNameComboBox(Window *pParent, VclBuilder::stringmap &)
+extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeOSQLNameComboBox(vcl::Window *pParent, VclBuilder::stringmap &)
 {
     return new dbaui::OSQLNameComboBox(pParent);
 }
diff --git a/dbaccess/source/ui/control/TableGrantCtrl.cxx b/dbaccess/source/ui/control/TableGrantCtrl.cxx
index abf2d5f489f4..f334c2b621b1 100644
--- a/dbaccess/source/ui/control/TableGrantCtrl.cxx
+++ b/dbaccess/source/ui/control/TableGrantCtrl.cxx
@@ -46,7 +46,7 @@ const sal_uInt16 COL_DROP       = 8;
 
 
 // OTableGrantControl
-OTableGrantControl::OTableGrantControl( Window* pParent, WinBits nBits)
+OTableGrantControl::OTableGrantControl( vcl::Window* pParent, WinBits nBits)
     :EditBrowseBox( pParent, EBBF_SMART_TAB_TRAVEL | EBBF_NOROWPICTURE, nBits )
     ,m_pCheckCell( NULL )
     ,m_pEdit( NULL )
diff --git a/dbaccess/source/ui/control/VertSplitView.cxx b/dbaccess/source/ui/control/VertSplitView.cxx
index 975cefd84de9..d199b6f32fef 100644
--- a/dbaccess/source/ui/control/VertSplitView.cxx
+++ b/dbaccess/source/ui/control/VertSplitView.cxx
@@ -28,7 +28,7 @@
 using namespace ::dbaui;
 
 // class OSplitterView
-OSplitterView::OSplitterView(Window* _pParent,bool _bVertical) : Window(_pParent,WB_DIALOGCONTROL) // ,WB_BORDER
+OSplitterView::OSplitterView(vcl::Window* _pParent,bool _bVertical) : Window(_pParent,WB_DIALOGCONTROL) // ,WB_BORDER
     ,m_pSplitter( NULL )
     ,m_pLeft(NULL)
     ,m_pRight(NULL)
@@ -183,7 +183,7 @@ void OSplitterView::Resize()
 
 }
 
-void OSplitterView::set(Window* _pRight,Window* _pLeft)
+void OSplitterView::set(vcl::Window* _pRight,Window* _pLeft)
 {
     m_pLeft = _pLeft;
     m_pRight = _pRight;
diff --git a/dbaccess/source/ui/control/charsetlistbox.cxx b/dbaccess/source/ui/control/charsetlistbox.cxx
index 7327a5889f6d..3181a82a53aa 100644
--- a/dbaccess/source/ui/control/charsetlistbox.cxx
+++ b/dbaccess/source/ui/control/charsetlistbox.cxx
@@ -25,7 +25,7 @@
 
 namespace dbaui
 {
-    CharSetListBox::CharSetListBox( Window* _pParent, WinBits _nBits = WB_DROPDOWN )
+    CharSetListBox::CharSetListBox( vcl::Window* _pParent, WinBits _nBits = WB_DROPDOWN )
         : ListBox( _pParent, _nBits )
     {
         SetDropDownLineCount( 20 );
@@ -38,7 +38,7 @@ namespace dbaui
         }
     }
 
-    extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeCharSetListBox(Window *pParent)
+    extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeCharSetListBox(vcl::Window *pParent)
     {
         return new CharSetListBox(pParent);
     }
diff --git a/dbaccess/source/ui/control/curledit.cxx b/dbaccess/source/ui/control/curledit.cxx
index 3c856db50c18..22d8241448ca 100644
--- a/dbaccess/source/ui/control/curledit.cxx
+++ b/dbaccess/source/ui/control/curledit.cxx
@@ -25,7 +25,7 @@
 namespace dbaui
 {
 
-OConnectionURLEdit::OConnectionURLEdit(Window* _pParent, WinBits _nBits,bool _bShowPrefix)
+OConnectionURLEdit::OConnectionURLEdit(vcl::Window* _pParent, WinBits _nBits,bool _bShowPrefix)
     :Edit(_pParent, _nBits)
     ,m_pTypeCollection(NULL)
     ,m_pForcedPrefix(NULL)
@@ -33,7 +33,7 @@ OConnectionURLEdit::OConnectionURLEdit(Window* _pParent, WinBits _nBits,bool _bS
 {
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeConnectionURLEdit(Window *pParent)
+extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeConnectionURLEdit(vcl::Window *pParent)
 {
     return new OConnectionURLEdit(pParent, WB_BORDER, false);
 }
diff --git a/dbaccess/source/ui/control/dbtreelistbox.cxx b/dbaccess/source/ui/control/dbtreelistbox.cxx
index cdc185fb3e4c..71120eca7bc1 100644
--- a/dbaccess/source/ui/control/dbtreelistbox.cxx
+++ b/dbaccess/source/ui/control/dbtreelistbox.cxx
@@ -54,7 +54,7 @@ using namespace ::com::sun::star::view;
 
 #define SPACEBETWEENENTRIES     4
 // class DBTreeListBox
-DBTreeListBox::DBTreeListBox( Window* pParent, WinBits nWinStyle ,bool _bHandleEnterKey)
+DBTreeListBox::DBTreeListBox( vcl::Window* pParent, WinBits nWinStyle ,bool _bHandleEnterKey)
     :SvTreeListBox(pParent,nWinStyle)
     ,m_pDragedEntry(NULL)
     ,m_pActionListener(NULL)
diff --git a/dbaccess/source/ui/control/marktree.cxx b/dbaccess/source/ui/control/marktree.cxx
index 3cb9c7d6c158..d51db97fb548 100644
--- a/dbaccess/source/ui/control/marktree.cxx
+++ b/dbaccess/source/ui/control/marktree.cxx
@@ -28,7 +28,7 @@ namespace dbaui
     using namespace ::com::sun::star::lang;
 
 
-OMarkableTreeListBox::OMarkableTreeListBox( Window* pParent, WinBits nWinStyle )
+OMarkableTreeListBox::OMarkableTreeListBox( vcl::Window* pParent, WinBits nWinStyle )
     : DBTreeListBox(pParent, nWinStyle)
 {
 
diff --git a/dbaccess/source/ui/control/opendoccontrols.cxx b/dbaccess/source/ui/control/opendoccontrols.cxx
index e696386b6f4b..f808ae9ae2e6 100644
--- a/dbaccess/source/ui/control/opendoccontrols.cxx
+++ b/dbaccess/source/ui/control/opendoccontrols.cxx
@@ -156,13 +156,13 @@ namespace dbaui
 
     // OpenButton
 
-    OpenDocumentButton::OpenDocumentButton( Window* _pParent, const sal_Char* _pAsciiModuleName )
+    OpenDocumentButton::OpenDocumentButton( vcl::Window* _pParent, const sal_Char* _pAsciiModuleName )
         :PushButton( _pParent )
     {
         impl_init( _pAsciiModuleName );
     }
 
-    extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeOpenDocumentButton( Window *pParent, VclBuilder::stringmap & )
+    extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeOpenDocumentButton( vcl::Window *pParent, VclBuilder::stringmap & )
     {
         return new OpenDocumentButton( pParent, "com.sun.star.sdb.OfficeDatabaseDocument" );
     }
@@ -186,13 +186,13 @@ namespace dbaui
 
     // OpenDocumentListBox
 
-    OpenDocumentListBox::OpenDocumentListBox( Window* _pParent, const sal_Char* _pAsciiModuleName )
+    OpenDocumentListBox::OpenDocumentListBox( vcl::Window* _pParent, const sal_Char* _pAsciiModuleName )
         :ListBox( _pParent, WB_BORDER | WB_DROPDOWN )
     {
         impl_init( _pAsciiModuleName );
     }
 
-    extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeOpenDocumentListBox( Window *pParent, VclBuilder::stringmap & )
+    extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeOpenDocumentListBox( vcl::Window *pParent, VclBuilder::stringmap & )
     {
         return new OpenDocumentListBox( pParent, "com.sun.star.sdb.OfficeDatabaseDocument" );
     }
diff --git a/dbaccess/source/ui/control/tabletree.cxx b/dbaccess/source/ui/control/tabletree.cxx
index 86dbf17aa0b3..20cacd7db203 100644
--- a/dbaccess/source/ui/control/tabletree.cxx
+++ b/dbaccess/source/ui/control/tabletree.cxx
@@ -65,7 +65,7 @@ namespace DatabaseObject = ::com::sun::star::sdb::application::DatabaseObject;
 namespace DatabaseObjectContainer = ::com::sun::star::sdb::application::DatabaseObjectContainer;
 
 // OTableTreeListBox
-OTableTreeListBox::OTableTreeListBox(Window* pParent, WinBits nWinStyle)
+OTableTreeListBox::OTableTreeListBox(vcl::Window* pParent, WinBits nWinStyle)
     :OMarkableTreeListBox(pParent, nWinStyle)
     ,m_xImageProvider( new ImageProvider )
     ,m_bVirtualRoot(false)
@@ -74,7 +74,7 @@ OTableTreeListBox::OTableTreeListBox(Window* pParent, WinBits nWinStyle)
     implSetDefaultImages();
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeOTableTreeListBox(Window *pParent, VclBuilder::stringmap &rMap)
+extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeOTableTreeListBox(vcl::Window *pParent, VclBuilder::stringmap &rMap)
 {
     WinBits nWinStyle = 0;
     OString sBorder = VclBuilder::extractCustomProperty(rMap);