summaryrefslogtreecommitdiff
path: root/slideshow
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-02-25 15:17:26 +0100
committerStephan Bergmann <sbergman@redhat.com>2014-02-25 15:17:54 +0100
commitddcd1507601634710e78ffffd366d8d0fe6ce166 (patch)
tree368526c36812eb5cf6f1d24c93bb285e9419255f /slideshow
parent9d6c36dee3c7bd60f86c286d2fb5e3a00da86c84 (diff)
loplugin:bodynotinblock, loplugin:literaltoboolconversion
Change-Id: I6773a4947900a6b58b556c3bac61cac784562d81
Diffstat (limited to 'slideshow')
-rw-r--r--slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionImpl.mm8
-rw-r--r--slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm16
2 files changed, 12 insertions, 12 deletions
diff --git a/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionImpl.mm b/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionImpl.mm
index 72c86ce88112..00b3bb3808bd 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 e4b7f22279ed..d48a8315cb17 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();