slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionImpl.mm | 8 ++--- slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm | 16 +++++----- 2 files changed, 12 insertions(+), 12 deletions(-)
New commits: commit ddcd1507601634710e78ffffd366d8d0fe6ce166 Author: Stephan Bergmann <sberg...@redhat.com> Date: Tue Feb 25 15:17:26 2014 +0100 loplugin:bodynotinblock, loplugin:literaltoboolconversion Change-Id: I6773a4947900a6b58b556c3bac61cac784562d81 diff --git a/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionImpl.mm b/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionImpl.mm index 72c86ce..00b3bb3 100644 --- a/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionImpl.mm +++ b/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionImpl.mm @@ -163,7 +163,7 @@ void OGLTransitionImpl::applyOverallOperations( double nTime, double SlideWidthS void OGLTransitionImpl::displaySlide( double nTime, ::sal_Int32 glSlideTex, std::vector<Primitive>& primitives, double SlideWidthScale, double SlideHeightScale ) { - //TODO change to foreach + //TODO change to foreach glBindTexture(GL_TEXTURE_2D, glSlideTex); // display slide reflection @@ -179,11 +179,11 @@ void OGLTransitionImpl::displaySlide( double nTime, ::sal_Int32 glSlideTex, std: glTranslated( 0, 2 - surfaceLevel, 0 ); glCullFace(GL_FRONT); - for(unsigned int i(0); i < primitives.size(); ++i) - primitives[i].display(nTime, SlideWidthScale, SlideHeightScale); + for(unsigned int i(0); i < primitives.size(); ++i) + primitives[i].display(nTime, SlideWidthScale, SlideHeightScale); glCullFace(GL_BACK); - slideShadow( nTime, primitives[0], SlideWidthScale, SlideHeightScale ); + slideShadow( nTime, primitives[0], SlideWidthScale, SlideHeightScale ); glPopMatrix(); } diff --git a/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm b/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm index e4b7f22..d48a831 100644 --- a/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm +++ b/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm @@ -405,12 +405,12 @@ bool OGLTransitionerImpl::initWindowFromSlideShowView( const Reference< presenta if( pWindow ) { - pWindow->SetMouseTransparent( sal_True ); + pWindow->SetMouseTransparent( true ); pWindow->SetParentClipMode( PARENTCLIPMODE_NOCLIP ); - pWindow->EnableEraseBackground( sal_False ); + pWindow->EnableEraseBackground( false ); pWindow->SetControlForeground(); pWindow->SetControlBackground(); - pWindow->EnablePaint(sal_False); + pWindow->EnablePaint(false); pWindow->SetPosSizePixel(pPWindow->GetPosPixel(),pPWindow->GetSizePixel()); } @@ -478,9 +478,9 @@ void OGLTransitionerImpl::setSlides( const uno::Reference< rendering::XBitmap >& mbUseEnteringPixmap = false; if( !mbUseLeavingPixmap ) - LeavingBytes = mxLeavingBitmap->getData(SlideBitmapLayout,SlideRect); + LeavingBytes = mxLeavingBitmap->getData(SlideBitmapLayout,SlideRect); if( !mbUseEnteringPixmap ) - EnteringBytes = mxEnteringBitmap->getData(SlideBitmapLayout,SlideRect); + EnteringBytes = mxEnteringBitmap->getData(SlideBitmapLayout,SlideRect); if(GLWin.pOpenGLContext)//if we have a rendering context, let's init the slides GLInitSlides(); @@ -724,7 +724,7 @@ void OGLTransitionerImpl::GLInitSlides() const OGLFormat* pFormat = NULL; if( !mbUseLeavingPixmap || !mbUseEnteringPixmap ) - pFormat = chooseFormats(); + pFormat = chooseFormats(); createTexture( &GLleavingSlide, pTransition->mbUseMipMapLeaving, @@ -778,7 +778,7 @@ void SAL_CALL OGLTransitionerImpl::update( double nTime ) throw (uno::RuntimeExc [context makeCurrentContext]; if(pTransition) - pTransition->display( nTime, GLleavingSlide, GLenteringSlide, + pTransition->display( nTime, GLleavingSlide, GLenteringSlide, SlideSize.Width, SlideSize.Height, static_cast<double>(GLWin.Width), static_cast<double>(GLWin.Height) ); @@ -892,7 +892,7 @@ void OGLTransitionerImpl::disposing() } if (pTransition) - delete pTransition; + delete pTransition; mxLeavingBitmap.clear(); mxEnteringBitmap.clear(); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits