fdo#82577: Handle Window

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

Change-Id: Ib1beb7ab4ad75562a42aeb252732a073d25eff1a

21 files changed, 29 insertions, 29 deletions

diff --git a/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx b/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx
index c6d98828b4eb..cf90db45463b 100644
--- a/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx
+++ b/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx
@@ -63,7 +63,7 @@ namespace dbaui
         virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const SAL_OVERRIDE;
     protected:
     // OGenericUnoDialog overridables
-        virtual Dialog* createDialog(Window* _pParent) SAL_OVERRIDE;
+        virtual Dialog* createDialog(vcl::Window* _pParent) SAL_OVERRIDE;
     };
 
     OAdvancedSettingsDialog::OAdvancedSettingsDialog(const Reference< XComponentContext >& _rxORB)
@@ -119,7 +119,7 @@ namespace dbaui
         describeProperties(aProps);
         return new ::cppu::OPropertyArrayHelper(aProps);
     }
-    Dialog* OAdvancedSettingsDialog::createDialog(Window* _pParent)
+    Dialog* OAdvancedSettingsDialog::createDialog(vcl::Window* _pParent)
     {
         AdvancedSettingsDialog* pDlg = new AdvancedSettingsDialog(_pParent, m_pDatasourceItems, m_aContext, m_aInitialSelection);
         return pDlg;
diff --git a/dbaccess/source/ui/uno/ColumnControl.cxx b/dbaccess/source/ui/uno/ColumnControl.cxx
index a91c0949c3d3..fe7a24e969c6 100644
--- a/dbaccess/source/ui/uno/ColumnControl.cxx
+++ b/dbaccess/source/ui/uno/ColumnControl.cxx
@@ -65,7 +65,7 @@ void SAL_CALL OColumnControl::createPeer(const Reference< XToolkit >& /*rToolkit
     {
         mbCreatingPeer = true;
 
-        Window* pParentWin = NULL;
+        vcl::Window* pParentWin = NULL;
         if (rParentPeer.is())
         {
             VCLXWindow* pParent = VCLXWindow::GetImplementation(rParentPeer);
diff --git a/dbaccess/source/ui/uno/ColumnPeer.cxx b/dbaccess/source/ui/uno/ColumnPeer.cxx
index 2de839f8382b..1422c629b3a1 100644
--- a/dbaccess/source/ui/uno/ColumnPeer.cxx
+++ b/dbaccess/source/ui/uno/ColumnPeer.cxx
@@ -31,7 +31,7 @@ using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::sdbc;
 
-OColumnPeer::OColumnPeer(Window* _pParent,const Reference<XComponentContext>& _rxContext)
+OColumnPeer::OColumnPeer(vcl::Window* _pParent,const Reference<XComponentContext>& _rxContext)
     :m_pActFieldDescr(NULL)
 {
     osl_atomic_increment( &m_refCount );
diff --git a/dbaccess/source/ui/uno/ColumnPeer.hxx b/dbaccess/source/ui/uno/ColumnPeer.hxx
index 6ce446c385d7..5e15a10ed344 100644
--- a/dbaccess/source/ui/uno/ColumnPeer.hxx
+++ b/dbaccess/source/ui/uno/ColumnPeer.hxx
@@ -33,7 +33,7 @@ namespace dbaui
         ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>        m_xColumn;
     public:
 
-        OColumnPeer(Window* _pParent
+        OColumnPeer(vcl::Window* _pParent
                     ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxContext);
 
         void setColumn(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xColumn);
diff --git a/dbaccess/source/ui/uno/DBTypeWizDlg.cxx b/dbaccess/source/ui/uno/DBTypeWizDlg.cxx
index ef1d0cde8bf0..bc1873982ea0 100644
--- a/dbaccess/source/ui/uno/DBTypeWizDlg.cxx
+++ b/dbaccess/source/ui/uno/DBTypeWizDlg.cxx
@@ -92,7 +92,7 @@ Reference<XPropertySetInfo>  SAL_CALL ODBTypeWizDialog::getPropertySetInfo() thr
     return new ::cppu::OPropertyArrayHelper(aProps);
 }
 
-Dialog* ODBTypeWizDialog::createDialog(Window* _pParent)
+Dialog* ODBTypeWizDialog::createDialog(vcl::Window* _pParent)
 {
     ODbTypeWizDialog* pDlg = new ODbTypeWizDialog(_pParent, m_pDatasourceItems, m_aContext, m_aInitialSelection);
     return pDlg;
diff --git a/dbaccess/source/ui/uno/DBTypeWizDlg.hxx b/dbaccess/source/ui/uno/DBTypeWizDlg.hxx
index 3958b98f8e9e..4a3a265a6a68 100644
--- a/dbaccess/source/ui/uno/DBTypeWizDlg.hxx
+++ b/dbaccess/source/ui/uno/DBTypeWizDlg.hxx
@@ -55,7 +55,7 @@ public:
     virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const SAL_OVERRIDE;
 protected:
 // OGenericUnoDialog overridables
-    virtual Dialog* createDialog(Window* _pParent) SAL_OVERRIDE;
+    virtual Dialog* createDialog(vcl::Window* _pParent) SAL_OVERRIDE;
 };
 
 }   // namespace dbaui
diff --git a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx
index ddc72538b3ec..a6db1563e1d3 100644
--- a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx
+++ b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx
@@ -106,7 +106,7 @@ Reference<XPropertySetInfo>  SAL_CALL ODBTypeWizDialogSetup::getPropertySetInfo(
     return new ::cppu::OPropertyArrayHelper(aProps);
 }
 
-Dialog* ODBTypeWizDialogSetup::createDialog(Window* _pParent)
+Dialog* ODBTypeWizDialogSetup::createDialog(vcl::Window* _pParent)
 {
     return new ODbTypeWizDialogSetup(_pParent, m_pDatasourceItems, m_aContext, m_aInitialSelection);
 }
diff --git a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx
index e5a2b0945a65..8ed555e4014a 100644
--- a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx
+++ b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx
@@ -58,7 +58,7 @@ public:
     virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const SAL_OVERRIDE;
 protected:
 // OGenericUnoDialog overridables
-    virtual Dialog* createDialog(Window* _pParent) SAL_OVERRIDE;
+    virtual Dialog* createDialog(vcl::Window* _pParent) SAL_OVERRIDE;
     virtual void executedDialog(sal_Int16 _nExecutionResult) SAL_OVERRIDE;
 };
 
diff --git a/dbaccess/source/ui/uno/TableFilterDlg.cxx b/dbaccess/source/ui/uno/TableFilterDlg.cxx
index 0a2d346700ff..9f284263bb1e 100644
--- a/dbaccess/source/ui/uno/TableFilterDlg.cxx
+++ b/dbaccess/source/ui/uno/TableFilterDlg.cxx
@@ -92,7 +92,7 @@ Reference<XPropertySetInfo>  SAL_CALL OTableFilterDialog::getPropertySetInfo() t
     return new ::cppu::OPropertyArrayHelper(aProps);
 }
 
-Dialog* OTableFilterDialog::createDialog(Window* _pParent)
+Dialog* OTableFilterDialog::createDialog(vcl::Window* _pParent)
 {
     OTableSubscriptionDialog* pDlg = new OTableSubscriptionDialog(_pParent, m_pDatasourceItems, m_aContext, m_aInitialSelection);
     return pDlg;
diff --git a/dbaccess/source/ui/uno/TableFilterDlg.hxx b/dbaccess/source/ui/uno/TableFilterDlg.hxx
index 1dc2bface661..408457ea8cc1 100644
--- a/dbaccess/source/ui/uno/TableFilterDlg.hxx
+++ b/dbaccess/source/ui/uno/TableFilterDlg.hxx
@@ -55,7 +55,7 @@ public:
     virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const SAL_OVERRIDE;
 protected:
 // OGenericUnoDialog overridables
-    virtual Dialog* createDialog(Window* _pParent) SAL_OVERRIDE;
+    virtual Dialog* createDialog(vcl::Window* _pParent) SAL_OVERRIDE;
 };
 
 }   // namespace dbaui
diff --git a/dbaccess/source/ui/uno/UserSettingsDlg.cxx b/dbaccess/source/ui/uno/UserSettingsDlg.cxx
index 4ab1a5fa57db..e66d888c25a1 100644
--- a/dbaccess/source/ui/uno/UserSettingsDlg.cxx
+++ b/dbaccess/source/ui/uno/UserSettingsDlg.cxx
@@ -92,7 +92,7 @@ Reference<XPropertySetInfo>  SAL_CALL OUserSettingsDialog::getPropertySetInfo()
     return new ::cppu::OPropertyArrayHelper(aProps);
 }
 
-Dialog* OUserSettingsDialog::createDialog(Window* _pParent)
+Dialog* OUserSettingsDialog::createDialog(vcl::Window* _pParent)
 {
     OUserAdminDlg* pDlg = new OUserAdminDlg(_pParent, m_pDatasourceItems, m_aContext, m_aInitialSelection, m_xActiveConnection);
     return pDlg;
diff --git a/dbaccess/source/ui/uno/UserSettingsDlg.hxx b/dbaccess/source/ui/uno/UserSettingsDlg.hxx
index f0440cfb5d95..043fa1a52410 100644
--- a/dbaccess/source/ui/uno/UserSettingsDlg.hxx
+++ b/dbaccess/source/ui/uno/UserSettingsDlg.hxx
@@ -55,7 +55,7 @@ public:
     virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const SAL_OVERRIDE;
 protected:
 // OGenericUnoDialog overridables
-    virtual Dialog* createDialog(Window* _pParent) SAL_OVERRIDE;
+    virtual Dialog* createDialog(vcl::Window* _pParent) SAL_OVERRIDE;
 };
 
 }   // namespace dbaui
diff --git a/dbaccess/source/ui/uno/admindlg.cxx b/dbaccess/source/ui/uno/admindlg.cxx
index e14a46fcf8ae..f2f52d656174 100644
--- a/dbaccess/source/ui/uno/admindlg.cxx
+++ b/dbaccess/source/ui/uno/admindlg.cxx
@@ -92,7 +92,7 @@ Reference<XPropertySetInfo>  SAL_CALL ODataSourcePropertyDialog::getPropertySetI
     return new ::cppu::OPropertyArrayHelper(aProps);
 }
 
-Dialog* ODataSourcePropertyDialog::createDialog(Window* _pParent)
+Dialog* ODataSourcePropertyDialog::createDialog(vcl::Window* _pParent)
 {
 
     ODbAdminDialog* pDialog = new ODbAdminDialog(_pParent, m_pDatasourceItems, m_aContext);
diff --git a/dbaccess/source/ui/uno/admindlg.hxx b/dbaccess/source/ui/uno/admindlg.hxx
index 352251e31ec3..c791129851f3 100644
--- a/dbaccess/source/ui/uno/admindlg.hxx
+++ b/dbaccess/source/ui/uno/admindlg.hxx
@@ -55,7 +55,7 @@ public:
     virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const SAL_OVERRIDE;
 protected:
 // OGenericUnoDialog overridables
-    virtual Dialog* createDialog(Window* _pParent) SAL_OVERRIDE;
+    virtual Dialog* createDialog(vcl::Window* _pParent) SAL_OVERRIDE;
 };
 
 }   // namespace dbaui
diff --git a/dbaccess/source/ui/uno/composerdialogs.cxx b/dbaccess/source/ui/uno/composerdialogs.cxx
index e5584465a520..7cf58cdec9d8 100644
--- a/dbaccess/source/ui/uno/composerdialogs.cxx
+++ b/dbaccess/source/ui/uno/composerdialogs.cxx
@@ -77,7 +77,7 @@ namespace dbaui
 
     IMPLEMENT_PROPERTYCONTAINER_DEFAULTS( ComposerDialog )
 
-    Dialog* ComposerDialog::createDialog(Window* _pParent)
+    Dialog* ComposerDialog::createDialog(vcl::Window* _pParent)
     {
         // obtain all the objects needed for the dialog
         Reference< XConnection > xConnection;
@@ -140,7 +140,7 @@ namespace dbaui
         return static_cast< XServiceInfo* >(new RowsetFilterDialog( comphelper::getComponentContext(_rxORB)));
     }
 
-    Dialog* RowsetFilterDialog::createComposerDialog( Window* _pParent, const Reference< XConnection >& _rxConnection, const Reference< XNameAccess >& _rxColumns )
+    Dialog* RowsetFilterDialog::createComposerDialog( vcl::Window* _pParent, const Reference< XConnection >& _rxConnection, const Reference< XNameAccess >& _rxColumns )
     {
         return new DlgFilterCrit( _pParent, m_aContext, _rxConnection, m_xComposer, _rxColumns );
     }
@@ -188,7 +188,7 @@ namespace dbaui
         return static_cast< XServiceInfo* >(new RowsetOrderDialog( comphelper::getComponentContext(_rxORB)));
     }
 
-    Dialog* RowsetOrderDialog::createComposerDialog( Window* _pParent, const Reference< XConnection >& _rxConnection, const Reference< XNameAccess >& _rxColumns )
+    Dialog* RowsetOrderDialog::createComposerDialog( vcl::Window* _pParent, const Reference< XConnection >& _rxConnection, const Reference< XNameAccess >& _rxColumns )
     {
         return new DlgOrderCrit( _pParent, _rxConnection, m_xComposer, _rxColumns );
     }
diff --git a/dbaccess/source/ui/uno/composerdialogs.hxx b/dbaccess/source/ui/uno/composerdialogs.hxx
index 9d3b8580107a..4eb6fe8c2de1 100644
--- a/dbaccess/source/ui/uno/composerdialogs.hxx
+++ b/dbaccess/source/ui/uno/composerdialogs.hxx
@@ -63,14 +63,14 @@ namespace dbaui
     protected:
         // own overridables
         virtual Dialog* createComposerDialog(
-            Window* _pParent,
+            vcl::Window* _pParent,
             const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection,
             const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rxColumns
         ) = 0;
 
     private:
         // OGenericUnoDialog overridables
-        virtual Dialog* createDialog(Window* _pParent) SAL_OVERRIDE;
+        virtual Dialog* createDialog(vcl::Window* _pParent) SAL_OVERRIDE;
     };
 
     // RowsetFilterDialog
@@ -86,7 +86,7 @@ namespace dbaui
     protected:
         // own overridables
         virtual Dialog* createComposerDialog(
-            Window* _pParent,
+            vcl::Window* _pParent,
             const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection,
             const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rxColumns
         ) SAL_OVERRIDE;
@@ -111,7 +111,7 @@ namespace dbaui
     protected:
         // own overridables
         virtual Dialog* createComposerDialog(
-            Window* _pParent,
+            vcl::Window* _pParent,
             const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection,
             const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rxColumns
         ) SAL_OVERRIDE;
diff --git a/dbaccess/source/ui/uno/copytablewizard.cxx b/dbaccess/source/ui/uno/copytablewizard.cxx
index 49dd9aef75c2..1f6f0b8cdb2b 100644
--- a/dbaccess/source/ui/uno/copytablewizard.cxx
+++ b/dbaccess/source/ui/uno/copytablewizard.cxx
@@ -193,7 +193,7 @@ namespace dbaui
         virtual ~CopyTableWizard();
 
         // OGenericUnoDialog overridables
-        virtual Dialog* createDialog( Window* _pParent ) SAL_OVERRIDE;
+        virtual Dialog* createDialog( vcl::Window* _pParent ) SAL_OVERRIDE;
         virtual void executedDialog( sal_Int16 _nExecutionResult ) SAL_OVERRIDE;
 
     private:
@@ -1521,7 +1521,7 @@ void SAL_CALL CopyTableWizard::initialize( const Sequence< Any >& _rArguments )
     return new ::cppu::OPropertyArrayHelper( aProps );
 }
 
-Dialog* CopyTableWizard::createDialog( Window* _pParent )
+Dialog* CopyTableWizard::createDialog( vcl::Window* _pParent )
 {
     OSL_PRECOND( isInitialized(), "CopyTableWizard::createDialog: not initialized!" );
         // this should have been prevented in ::execute already
diff --git a/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx b/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx
index 6e81e7667789..d0c4969b57fb 100644
--- a/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx
+++ b/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx
@@ -104,7 +104,7 @@ namespace dbaui
 
     protected:
         // OGenericUnoDialog overridables
-        virtual Dialog* createDialog( Window* _pParent ) SAL_OVERRIDE;
+        virtual Dialog* createDialog( vcl::Window* _pParent ) SAL_OVERRIDE;
         virtual void implInitialize( const com::sun::star::uno::Any& _rValue ) SAL_OVERRIDE;
     protected:
         using OTextConnectionSettingsDialog_BASE::getFastPropertyValue;
@@ -204,7 +204,7 @@ namespace dbaui
         return new ::cppu::OPropertyArrayHelper( aProps );
     }
 
-    Dialog* OTextConnectionSettingsDialog::createDialog(Window* _pParent)
+    Dialog* OTextConnectionSettingsDialog::createDialog(vcl::Window* _pParent)
     {
         return new TextConnectionSettingsDialog( _pParent, *m_pDatasourceItems );
     }
diff --git a/dbaccess/source/ui/uno/unoDirectSql.cxx b/dbaccess/source/ui/uno/unoDirectSql.cxx
index bc58efbae59e..9c214d5a4dce 100644
--- a/dbaccess/source/ui/uno/unoDirectSql.cxx
+++ b/dbaccess/source/ui/uno/unoDirectSql.cxx
@@ -78,7 +78,7 @@ namespace dbaui
 
     IMPLEMENT_PROPERTYCONTAINER_DEFAULTS( ODirectSQLDialog )
 
-    Dialog* ODirectSQLDialog::createDialog(Window* _pParent)
+    Dialog* ODirectSQLDialog::createDialog(vcl::Window* _pParent)
     {
         // obtain all the objects needed for the dialog
         Reference< XConnection > xConnection = m_xActiveConnection;
diff --git a/dbaccess/source/ui/uno/unoDirectSql.hxx b/dbaccess/source/ui/uno/unoDirectSql.hxx
index 4fa7ec69ff81..43844874009e 100644
--- a/dbaccess/source/ui/uno/unoDirectSql.hxx
+++ b/dbaccess/source/ui/uno/unoDirectSql.hxx
@@ -57,7 +57,7 @@ namespace dbaui
 
     protected:
         // OGenericUnoDialog overridables
-        virtual Dialog* createDialog(Window* _pParent) SAL_OVERRIDE;
+        virtual Dialog* createDialog(vcl::Window* _pParent) SAL_OVERRIDE;
         virtual void implInitialize(const com::sun::star::uno::Any& _rValue) SAL_OVERRIDE;
     };
 
diff --git a/dbaccess/source/ui/uno/unosqlmessage.cxx b/dbaccess/source/ui/uno/unosqlmessage.cxx
index 9235528c52a4..7ba1725b0b16 100644
--- a/dbaccess/source/ui/uno/unosqlmessage.cxx
+++ b/dbaccess/source/ui/uno/unosqlmessage.cxx
@@ -141,7 +141,7 @@ Reference<XPropertySetInfo>  SAL_CALL OSQLMessageDialog::getPropertySetInfo() th
     return new ::cppu::OPropertyArrayHelper(aProps);
 }
 
-Dialog* OSQLMessageDialog::createDialog(Window* _pParent)
+Dialog* OSQLMessageDialog::createDialog(vcl::Window* _pParent)
 {
     if ( m_aException.hasValue() )
         return new OSQLMessageBox( _pParent, SQLExceptionInfo( m_aException ), WB_OK | WB_DEF_OK, m_sHelpURL );