fdo#82577: Handle Window

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

Change-Id: Ib1beb7ab4ad75562a42aeb252732a073d25eff1a

6 files changed, 25 insertions, 25 deletions

diff --git a/svx/source/sdr/contact/sdrmediawindow.cxx b/svx/source/sdr/contact/sdrmediawindow.cxx
index 57ae8d38b8fb..3313eedf53a2 100644
--- a/svx/source/sdr/contact/sdrmediawindow.cxx
+++ b/svx/source/sdr/contact/sdrmediawindow.cxx
@@ -30,7 +30,7 @@ namespace sdr { namespace contact {
 // - SdrMediaWindow -
 
 
-SdrMediaWindow::SdrMediaWindow( Window* pParent, ViewObjectContactOfSdrMediaObj& rViewObjContact ) :
+SdrMediaWindow::SdrMediaWindow( vcl::Window* pParent, ViewObjectContactOfSdrMediaObj& rViewObjContact ) :
     ::avmedia::MediaWindow( pParent, false ),
     mrViewObjectContactOfSdrMediaObj( rViewObjContact )
 {
@@ -46,7 +46,7 @@ SdrMediaWindow::~SdrMediaWindow()
 
 void SdrMediaWindow::MouseMove( const MouseEvent& rMEvt )
 {
-    Window* pWindow = mrViewObjectContactOfSdrMediaObj.getWindow();
+    vcl::Window* pWindow = mrViewObjectContactOfSdrMediaObj.getWindow();
 
     if( pWindow && getWindow() )
     {
@@ -62,7 +62,7 @@ void SdrMediaWindow::MouseMove( const MouseEvent& rMEvt )
 
 void SdrMediaWindow::MouseButtonDown( const MouseEvent& rMEvt )
 {
-    Window* pWindow = mrViewObjectContactOfSdrMediaObj.getWindow();
+    vcl::Window* pWindow = mrViewObjectContactOfSdrMediaObj.getWindow();
 
     if( pWindow && getWindow() )
     {
@@ -77,7 +77,7 @@ void SdrMediaWindow::MouseButtonDown( const MouseEvent& rMEvt )
 
 void SdrMediaWindow::MouseButtonUp( const MouseEvent& rMEvt )
 {
-    Window* pWindow = mrViewObjectContactOfSdrMediaObj.getWindow();
+    vcl::Window* pWindow = mrViewObjectContactOfSdrMediaObj.getWindow();
 
     if( pWindow && getWindow() )
     {
@@ -92,7 +92,7 @@ void SdrMediaWindow::MouseButtonUp( const MouseEvent& rMEvt )
 
 void SdrMediaWindow::KeyInput( const KeyEvent& rKEvt )
 {
-    Window* pWindow = mrViewObjectContactOfSdrMediaObj.getWindow();
+    vcl::Window* pWindow = mrViewObjectContactOfSdrMediaObj.getWindow();
 
     if( pWindow )
         pWindow->KeyInput( rKEvt );
@@ -102,7 +102,7 @@ void SdrMediaWindow::KeyInput( const KeyEvent& rKEvt )
 
 void SdrMediaWindow::KeyUp( const KeyEvent& rKEvt )
 {
-    Window* pWindow = mrViewObjectContactOfSdrMediaObj.getWindow();
+    vcl::Window* pWindow = mrViewObjectContactOfSdrMediaObj.getWindow();
 
     if( pWindow )
         pWindow->KeyUp( rKEvt );
@@ -112,7 +112,7 @@ void SdrMediaWindow::KeyUp( const KeyEvent& rKEvt )
 
 void SdrMediaWindow::Command( const CommandEvent& rCEvt )
 {
-    Window* pWindow = mrViewObjectContactOfSdrMediaObj.getWindow();
+    vcl::Window* pWindow = mrViewObjectContactOfSdrMediaObj.getWindow();
 
     if( pWindow && getWindow() )
     {
@@ -127,7 +127,7 @@ void SdrMediaWindow::Command( const CommandEvent& rCEvt )
 
 sal_Int8 SdrMediaWindow::AcceptDrop( const AcceptDropEvent& rEvt )
 {
-    Window*     pWindow = mrViewObjectContactOfSdrMediaObj.getWindow();
+    vcl::Window*     pWindow = mrViewObjectContactOfSdrMediaObj.getWindow();
     sal_Int8    nRet = DND_ACTION_NONE;
 
     if( pWindow )
@@ -147,7 +147,7 @@ sal_Int8 SdrMediaWindow::AcceptDrop( const AcceptDropEvent& rEvt )
 
 sal_Int8 SdrMediaWindow::ExecuteDrop( const ExecuteDropEvent& rEvt )
 {
-    Window*     pWindow = mrViewObjectContactOfSdrMediaObj.getWindow();
+    vcl::Window*     pWindow = mrViewObjectContactOfSdrMediaObj.getWindow();
     sal_Int8    nRet = DND_ACTION_NONE;
 
     if( pWindow )
@@ -167,7 +167,7 @@ sal_Int8 SdrMediaWindow::ExecuteDrop( const ExecuteDropEvent& rEvt )
 
 void SdrMediaWindow::StartDrag( sal_Int8 nAction, const Point& rPosPixel )
 {
-    Window* pWindow = mrViewObjectContactOfSdrMediaObj.getWindow();
+    vcl::Window* pWindow = mrViewObjectContactOfSdrMediaObj.getWindow();
 
     if( pWindow )
     {
diff --git a/svx/source/sdr/contact/sdrmediawindow.hxx b/svx/source/sdr/contact/sdrmediawindow.hxx
index 6416bad6cb8c..3bf306413884 100644
--- a/svx/source/sdr/contact/sdrmediawindow.hxx
+++ b/svx/source/sdr/contact/sdrmediawindow.hxx
@@ -34,7 +34,7 @@ class SdrMediaWindow : public ::avmedia::MediaWindow
 {
 public:
 
-                            SdrMediaWindow( Window* pParent, ViewObjectContactOfSdrMediaObj& rViewObjContact );
+                            SdrMediaWindow( vcl::Window* pParent, ViewObjectContactOfSdrMediaObj& rViewObjContact );
                             virtual ~SdrMediaWindow();
 
         virtual void        MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE;
diff --git a/svx/source/sdr/contact/viewcontactofunocontrol.cxx b/svx/source/sdr/contact/viewcontactofunocontrol.cxx
index 537a34a76478..4f68e3bd29d8 100644
--- a/svx/source/sdr/contact/viewcontactofunocontrol.cxx
+++ b/svx/source/sdr/contact/viewcontactofunocontrol.cxx
@@ -83,7 +83,7 @@ namespace sdr { namespace contact {
 
 
     Reference< XControl > ViewContactOfUnoControl::getTemporaryControlForWindow(
-        const Window& _rWindow, Reference< XControlContainer >& _inout_ControlContainer ) const
+        const vcl::Window& _rWindow, Reference< XControlContainer >& _inout_ControlContainer ) const
     {
         SdrUnoObj* pUnoObject = dynamic_cast< SdrUnoObj* >( TryToGetSdrObject() );
         OSL_ENSURE( pUnoObject, "ViewContactOfUnoControl::getTemporaryControlForDevice: no SdrUnoObj!" );
diff --git a/svx/source/sdr/contact/viewobjectcontactofopenglobj.cxx b/svx/source/sdr/contact/viewobjectcontactofopenglobj.cxx
index ff71c14bde19..68d7ba130b2f 100644
--- a/svx/source/sdr/contact/viewobjectcontactofopenglobj.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofopenglobj.cxx
@@ -34,16 +34,16 @@ ViewObjectContactOfOpenGLObj::~ViewObjectContactOfOpenGLObj()
 {
 }
 
-Window* ViewObjectContactOfOpenGLObj::getWindow() const
+vcl::Window* ViewObjectContactOfOpenGLObj::getWindow() const
 {
-    Window* pRetval = 0;
+    vcl::Window* pRetval = 0;
 
     boost::optional<const OutputDevice&> oPageOutputDev = getPageViewOutputDevice();
     if( oPageOutputDev )
     {
         if(OUTDEV_WINDOW == oPageOutputDev->GetOutDevType())
         {
-            pRetval = static_cast< Window* >(&const_cast<OutputDevice&>(oPageOutputDev.get()));
+            pRetval = static_cast< vcl::Window* >(&const_cast<OutputDevice&>(oPageOutputDev.get()));
         }
     }
 
diff --git a/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx b/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx
index 79873095ca46..961821e5b595 100644
--- a/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx
@@ -39,7 +39,7 @@ ViewObjectContactOfSdrMediaObj::ViewObjectContactOfSdrMediaObj( ObjectContact& r
     mpMediaWindow( NULL )
 {
 #if HAVE_FEATURE_AVMEDIA
-    Window* pWindow = getWindow();
+    vcl::Window* pWindow = getWindow();
 
     if( pWindow )
     {
@@ -60,16 +60,16 @@ ViewObjectContactOfSdrMediaObj::~ViewObjectContactOfSdrMediaObj()
 
 
 
-Window* ViewObjectContactOfSdrMediaObj::getWindow() const
+vcl::Window* ViewObjectContactOfSdrMediaObj::getWindow() const
 {
-    Window* pRetval = 0;
+    vcl::Window* pRetval = 0;
 
     boost::optional<const OutputDevice&> oPageOutputDev = getPageViewOutputDevice();
     if( oPageOutputDev )
     {
         if(OUTDEV_WINDOW == oPageOutputDev->GetOutDevType())
         {
-            pRetval = static_cast< Window* >(&const_cast<OutputDevice&>(oPageOutputDev.get()));
+            pRetval = static_cast< vcl::Window* >(&const_cast<OutputDevice&>(oPageOutputDev.get()));
         }
     }
 
diff --git a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
index bc22a54aefd2..096da89be126 100644
--- a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
@@ -260,7 +260,7 @@ namespace sdr { namespace contact {
         Reference< XWindowPeer > xPeer( m_xControl->getPeer() );
         if ( xPeer.is() )
         {
-            Window* pWindow = VCLUnoHelper::GetWindow( xPeer );
+            vcl::Window* pWindow = VCLUnoHelper::GetWindow( xPeer );
             OSL_ENSURE( pWindow, "ControlHolder::invalidate: no implementation access!" );
             if ( pWindow )
                 pWindow->Invalidate();
@@ -273,7 +273,7 @@ namespace sdr { namespace contact {
         // no check whether we're valid, this is the responsibility of the caller
 
         // Argh. Why does XView have a setZoom only, but not a getZoom?
-        Window* pWindow = VCLUnoHelper::GetWindow( m_xControl->getPeer() );
+        vcl::Window* pWindow = VCLUnoHelper::GetWindow( m_xControl->getPeer() );
         OSL_ENSURE( pWindow, "ControlHolder::getZoom: no implementation access!" );
 
         ::basegfx::B2DVector aZoom( 1, 1 );
@@ -434,10 +434,10 @@ namespace sdr { namespace contact {
     {
         if ( !m_rControlContainer.is() )
         {
-            const Window* pWindow = dynamic_cast< const Window* >( &_rDevice );
+            const vcl::Window* pWindow = dynamic_cast< const vcl::Window* >( &_rDevice );
             OSL_ENSURE( pWindow, "InvisibleControlViewAccess::getControlContainer: expected to be called for a window only!" );
             if ( pWindow )
-                m_rControlContainer = VCLUnoHelper::CreateControlContainer( const_cast< Window* >( pWindow ) );
+                m_rControlContainer = VCLUnoHelper::CreateControlContainer( const_cast< vcl::Window* >( pWindow ) );
         }
         return m_rControlContainer;
     }
@@ -1067,7 +1067,7 @@ namespace sdr { namespace contact {
         m_xContainer.set(_rPageView.getControlContainer( _rDevice ), css::uno::UNO_QUERY);
         DBG_ASSERT( (   m_xContainer.is()                                           // either have a XControlContainer
                     ||  (   ( !_rPageView.getControlContainer( _rDevice ).is() )    // or don't have any container,
-                        &&  ( dynamic_cast< const Window* >( &_rDevice ) == NULL )  // which is allowed for non-Window instances only
+                        &&  ( dynamic_cast< const vcl::Window* >( &_rDevice ) == NULL )  // which is allowed for non-Window instances only
                         )
                     ),
             "ViewObjectContactOfUnoControl_Impl::impl_ensureControl_nothrow: no XContainer at the ControlContainer!" );
@@ -1628,7 +1628,7 @@ namespace sdr { namespace contact {
 
 
     Reference< XControl > ViewObjectContactOfUnoControl::getTemporaryControlForWindow(
-        const Window& _rWindow, Reference< XControlContainer >& _inout_ControlContainer, const SdrUnoObj& _rUnoObject )
+        const vcl::Window& _rWindow, Reference< XControlContainer >& _inout_ControlContainer, const SdrUnoObj& _rUnoObject )
     {
         ControlHolder aControl;