summaryrefslogtreecommitdiff
path: root/slideshow/source/engine/OGLTrans
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-09-23 11:20:40 +0200
committerNoel Grandin <noel@peralex.com>2014-09-23 14:11:39 +0300
commit827c46e7d75000cb03b0ce21759f9d0825f0c096 (patch)
tree3a84ccc45d54607c61328b18f58f914c1d6ec240 /slideshow/source/engine/OGLTrans
parent7cbbefae224ab85343accb42b03f9431ec693a83 (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/engine/OGLTrans')
-rw-r--r--slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx2
1 files changed, 1 insertions, 1 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");