diff options
| author | Noel Grandin <noel@peralex.com> | 2014-09-23 11:20:40 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-09-23 14:11:39 +0300 |
| commit | 827c46e7d75000cb03b0ce21759f9d0825f0c096 (patch) | |
| tree | 3a84ccc45d54607c61328b18f58f914c1d6ec240 /slideshow/source | |
| parent | 7cbbefae224ab85343accb42b03f9431ec693a83 (diff) | |
fdo#82577: Handle Window
Put the VCL Window class in the vcl namespace. Avoids clash with the X11
Window typedef.
Change-Id: Ib1beb7ab4ad75562a42aeb252732a073d25eff1a
Diffstat (limited to 'slideshow/source')
3 files changed, 5 insertions, 5 deletions
diff --git a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx index b28c0f19090f..2d5d062a568e 100644 --- a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx +++ b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx @@ -371,7 +371,7 @@ bool OGLTransitionerImpl::initWindowFromSlideShowView( const Reference< presenta mpContext = boost::make_shared<OpenGLContext>(); mpContext->requestLegacyContext(); - if( !mpContext->init( reinterpret_cast< Window* >( aVal ) ) ) + if( !mpContext->init( reinterpret_cast< vcl::Window* >( aVal ) ) ) return false; SAL_INFO("slideshow", "created the context"); diff --git a/slideshow/source/engine/shapes/viewmediashape.cxx b/slideshow/source/engine/shapes/viewmediashape.cxx index fd3c507365b3..83cb7b74828e 100644 --- a/slideshow/source/engine/shapes/viewmediashape.cxx +++ b/slideshow/source/engine/shapes/viewmediashape.cxx @@ -449,7 +449,7 @@ namespace slideshow rVCLDeviceParams[ 1 ] >>= aVal; - Window* pWindow = reinterpret_cast< Window* >( aVal ); + vcl::Window* pWindow = reinterpret_cast< vcl::Window* >( aVal ); if( pWindow ) { @@ -472,7 +472,7 @@ namespace slideshow #else if( avmedia::IsModel(rMimeType) ) { - mpEventHandlerParent.reset(new Window(pWindow, WB_NOBORDER|WB_NODIALOGCONTROL)); + mpEventHandlerParent.reset(new vcl::Window(pWindow, WB_NOBORDER|WB_NODIALOGCONTROL)); mpEventHandlerParent->SetPosSizePixel( Point( aAWTRect.X, aAWTRect.Y ), Size( aAWTRect.Width, aAWTRect.Height ) ); mpEventHandlerParent->EnablePaint(false); diff --git a/slideshow/source/engine/shapes/viewmediashape.hxx b/slideshow/source/engine/shapes/viewmediashape.hxx index dc726f65e726..6d06a14f6d60 100644 --- a/slideshow/source/engine/shapes/viewmediashape.hxx +++ b/slideshow/source/engine/shapes/viewmediashape.hxx @@ -30,7 +30,7 @@ #include "viewlayer.hxx" class SystemChildWindow; -class Window; +namespace vcl { class Window; } namespace com { namespace sun { namespace star { namespace drawing { class XShape; @@ -148,7 +148,7 @@ namespace slideshow const OUString& rMimeType ); ViewLayerSharedPtr mpViewLayer; ::std::auto_ptr< SystemChildWindow > mpMediaWindow; - boost::scoped_ptr< Window > mpEventHandlerParent; + boost::scoped_ptr< ::vcl::Window > mpEventHandlerParent; mutable ::com::sun::star::awt::Point maWindowOffset; mutable ::basegfx::B2DRectangle maBounds; |