fdo#82577: Handle Window

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

Change-Id: Ib1beb7ab4ad75562a42aeb252732a073d25eff1a

10 files changed, 14 insertions, 14 deletions

diff --git a/extensions/source/abpilot/abspilot.cxx b/extensions/source/abpilot/abspilot.cxx
index bfe4cb17e423..45abc6bf7036 100644
--- a/extensions/source/abpilot/abspilot.cxx
+++ b/extensions/source/abpilot/abspilot.cxx
@@ -58,7 +58,7 @@ namespace abp
     //= OAddessBookSourcePilot
 
 
-    OAddessBookSourcePilot::OAddessBookSourcePilot(Window* _pParent, const Reference< XComponentContext >& _rxORB)
+    OAddessBookSourcePilot::OAddessBookSourcePilot(vcl::Window* _pParent, const Reference< XComponentContext >& _rxORB)
         :OAddessBookSourcePilot_Base( _pParent,
             static_cast<sal_uInt32>(WZB_HELP | WZB_FINISH | WZB_CANCEL | WZB_NEXT | WZB_PREVIOUS) )
         ,m_xORB(_rxORB)
diff --git a/extensions/source/abpilot/abspilot.hxx b/extensions/source/abpilot/abspilot.hxx
index 9a83389b193e..cd4e818f41c5 100644
--- a/extensions/source/abpilot/abspilot.hxx
+++ b/extensions/source/abpilot/abspilot.hxx
@@ -47,7 +47,7 @@ namespace abp
     public:
         /// ctor
         OAddessBookSourcePilot(
-            Window* _pParent,
+            vcl::Window* _pParent,
             const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB);
         /// dtor
         virtual ~OAddessBookSourcePilot();
diff --git a/extensions/source/abpilot/admininvokationimpl.cxx b/extensions/source/abpilot/admininvokationimpl.cxx
index 955c10952e17..d924faf64149 100644
--- a/extensions/source/abpilot/admininvokationimpl.cxx
+++ b/extensions/source/abpilot/admininvokationimpl.cxx
@@ -48,7 +48,7 @@ namespace abp
 
     OAdminDialogInvokation::OAdminDialogInvokation(const Reference< XComponentContext >& _rxContext
                     , const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > _xDataSource
-                    , Window* _pMessageParent)
+                    , vcl::Window* _pMessageParent)
         :m_xContext(_rxContext)
         ,m_xDataSource(_xDataSource)
         ,m_pMessageParent(_pMessageParent)
diff --git a/extensions/source/abpilot/admininvokationimpl.hxx b/extensions/source/abpilot/admininvokationimpl.hxx
index 32d895e0a367..e71b5ec55802 100644
--- a/extensions/source/abpilot/admininvokationimpl.hxx
+++ b/extensions/source/abpilot/admininvokationimpl.hxx
@@ -23,7 +23,7 @@
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 
-class Window;
+namespace vcl { class Window; }
 
 namespace abp
 {
@@ -36,13 +36,13 @@ namespace abp
         ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >
                         m_xContext;
         ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xDataSource;
-        Window*         m_pMessageParent;
+        vcl::Window*         m_pMessageParent;
 
     public:
         OAdminDialogInvokation(
             const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext,
             const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > _xDataSource,
-            Window* _pMessageParent
+            vcl::Window* _pMessageParent
         );
 
         bool invokeAdministration( bool _bFixedType );
diff --git a/extensions/source/abpilot/datasourcehandling.cxx b/extensions/source/abpilot/datasourcehandling.cxx
index 8d2f36f9fbbf..b5b3d86eb120 100644
--- a/extensions/source/abpilot/datasourcehandling.cxx
+++ b/extensions/source/abpilot/datasourcehandling.cxx
@@ -502,7 +502,7 @@ namespace abp
     }
 
 
-    bool ODataSource::connect( Window* _pMessageParent )
+    bool ODataSource::connect( vcl::Window* _pMessageParent )
     {
         if ( isConnected( ) )
             // nothing to do
diff --git a/extensions/source/abpilot/datasourcehandling.hxx b/extensions/source/abpilot/datasourcehandling.hxx
index 61b6855e31fa..7515c1516f79 100644
--- a/extensions/source/abpilot/datasourcehandling.hxx
+++ b/extensions/source/abpilot/datasourcehandling.hxx
@@ -32,7 +32,7 @@ namespace com { namespace sun { namespace star {
     }
 } } }
 
-class Window;
+namespace vcl { class Window; }
 
 
 
@@ -157,7 +157,7 @@ namespace abp
                 at all.
             @see isConnected
         */
-        bool    connect( Window* _pMessageParent );
+        bool    connect( vcl::Window* _pMessageParent );
 
         /// returns <TRUE/> if the object has a valid connection, obtained from it's data source
         bool    isConnected( ) const;
diff --git a/extensions/source/abpilot/fieldmappingimpl.cxx b/extensions/source/abpilot/fieldmappingimpl.cxx
index 8717ea75413b..99c93ef2c58e 100644
--- a/extensions/source/abpilot/fieldmappingimpl.cxx
+++ b/extensions/source/abpilot/fieldmappingimpl.cxx
@@ -69,7 +69,7 @@ namespace abp
 
 
 
-        bool invokeDialog( const Reference< XComponentContext >& _rxORB, class Window* _pParent,
+        bool invokeDialog( const Reference< XComponentContext >& _rxORB, class vcl::Window* _pParent,
             const Reference< XPropertySet >& _rxDataSource, AddressSettings& _rSettings )
         {
             _rSettings.aFieldMapping.clear();
diff --git a/extensions/source/abpilot/fieldmappingimpl.hxx b/extensions/source/abpilot/fieldmappingimpl.hxx
index df5e71ae5052..7ac1e5fb7fb3 100644
--- a/extensions/source/abpilot/fieldmappingimpl.hxx
+++ b/extensions/source/abpilot/fieldmappingimpl.hxx
@@ -36,7 +36,7 @@ namespace com { namespace sun { namespace star {
         class XPropertySet;
     }
 } } }
-class Window;
+namespace vcl { class Window; }
 
 
 namespace abp
@@ -61,7 +61,7 @@ namespace abp
         */
         bool invokeDialog(
             const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB,
-            class Window* _pParent,
+            class vcl::Window* _pParent,
             const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxDataSource,
             AddressSettings& _rSettings
         );
diff --git a/extensions/source/abpilot/unodialogabp.cxx b/extensions/source/abpilot/unodialogabp.cxx
index 1ed507b60dc2..063bac1f8846 100644
--- a/extensions/source/abpilot/unodialogabp.cxx
+++ b/extensions/source/abpilot/unodialogabp.cxx
@@ -152,7 +152,7 @@ namespace abp
     }
 
 
-    Dialog* OABSPilotUno::createDialog(Window* _pParent)
+    Dialog* OABSPilotUno::createDialog(vcl::Window* _pParent)
     {
         return new OAddessBookSourcePilot(_pParent, m_aContext );
     }
diff --git a/extensions/source/abpilot/unodialogabp.hxx b/extensions/source/abpilot/unodialogabp.hxx
index 845423d07954..ff58b6e9a456 100644
--- a/extensions/source/abpilot/unodialogabp.hxx
+++ b/extensions/source/abpilot/unodialogabp.hxx
@@ -84,7 +84,7 @@ namespace abp
         using OABSPilotUno_DBase::execute;
     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;
     };