[Libreoffice-commits] core.git: Branch 'feature/opengl-vcl' - slideshow/source

[Michael Meeks]

 slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit f1840a8bc09e9f6704cd02e93521f9bdb4bbe70b
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Tue Nov 4 09:31:29 2014 +0000

    constify slideshow.
    
    Change-Id: I548f527be4be76a2bda43dcb5ee14e4f50f3b409

diff --git a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
index 2d5d062..22fca91 100644
--- a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
+++ b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
@@ -446,7 +446,7 @@ void OGLTransitionerImpl::impl_prepareSlides()
 
 #if defined( GLX_EXT_texture_from_pixmap )
 
-    GLWindow& rGLWindow(mpContext->getOpenGLWindow());
+    const GLWindow& rGLWindow(mpContext->getOpenGLWindow());
 
     if( GLXEW_EXT_texture_from_pixmap && xLeavingSet.is() && xEnteringSet.is() && mbHasTFPVisual ) {
         Sequence< Any > leaveArgs;
@@ -1218,7 +1218,7 @@ void SAL_CALL OGLTransitionerImpl::update( double nTime ) throw (uno::RuntimeExc
 
     if(mpTransition)
     {
-        GLWindow& rGLWindow(mpContext->getOpenGLWindow());
+        const GLWindow& rGLWindow(mpContext->getOpenGLWindow());
         mpTransition->display( nTime, maLeavingSlideGL, maEnteringSlideGL,
                               maSlideSize.Width, maSlideSize.Height,
                               static_cast<double>(rGLWindow.Width),
@@ -1261,7 +1261,7 @@ void OGLTransitionerImpl::disposeTextures()
     mpContext->makeCurrent();
 
 #if defined( GLX_EXT_texture_from_pixmap )
-    GLWindow& rGLWindow(mpContext->getOpenGLWindow());
+    const GLWindow& rGLWindow(mpContext->getOpenGLWindow());
 
     if( mbUseLeavingPixmap ) {
         glXReleaseTexImageEXT( rGLWindow.dpy, maLeavingPixmapGL, GLX_FRONT_LEFT_EXT );