mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

loplugin:bodynotinblock, loplugin:literaltoboolconversion

Browse Source 
Change-Id: I6773a4947900a6b58b556c3bac61cac784562d81
This commit is contained in:
Stephan Bergmann
2014-02-25 15:17:26 +01:00
parent 9d6c36dee3
commit ddcd150760
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionImpl.mm
View File

@@ -163,7 +163,7 @@ void OGLTransitionImpl::applyOverallOperations( double nTime, double SlideWidthS
void OGLTransitionImpl::displaySlide( double nTime, ::sal_Int32 glSlideTex, std::vector<Primitive>& primitives, void OGLTransitionImpl::displaySlide( double nTime, ::sal_Int32 glSlideTex, std::vector<Primitive>& primitives,
double SlideWidthScale, double SlideHeightScale ) double SlideWidthScale, double SlideHeightScale )
{ {
//TODO change to foreach //TODO change to foreach
glBindTexture(GL_TEXTURE_2D, glSlideTex); glBindTexture(GL_TEXTURE_2D, glSlideTex);
// display slide reflection // display slide reflection
@@ -179,11 +179,11 @@ void OGLTransitionImpl::displaySlide( double nTime, ::sal_Int32 glSlideTex, std:
glTranslated( 0, 2 - surfaceLevel, 0 ); glTranslated( 0, 2 - surfaceLevel, 0 );
glCullFace(GL_FRONT); glCullFace(GL_FRONT);
for(unsigned int i(0); i < primitives.size(); ++i) for(unsigned int i(0); i < primitives.size(); ++i)
primitives[i].display(nTime, SlideWidthScale, SlideHeightScale); primitives[i].display(nTime, SlideWidthScale, SlideHeightScale);
glCullFace(GL_BACK); glCullFace(GL_BACK);
slideShadow( nTime, primitives[0], SlideWidthScale, SlideHeightScale ); slideShadow( nTime, primitives[0], SlideWidthScale, SlideHeightScale );
glPopMatrix(); glPopMatrix();
} }

16
slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm
View File

@@ -405,12 +405,12 @@ bool OGLTransitionerImpl::initWindowFromSlideShowView( const Reference< presenta
if( pWindow ) if( pWindow )
{ {
pWindow->SetMouseTransparent( sal_True ); pWindow->SetMouseTransparent( true );
pWindow->SetParentClipMode( PARENTCLIPMODE_NOCLIP ); pWindow->SetParentClipMode( PARENTCLIPMODE_NOCLIP );
pWindow->EnableEraseBackground( sal_False ); pWindow->EnableEraseBackground( false );
pWindow->SetControlForeground(); pWindow->SetControlForeground();
pWindow->SetControlBackground(); pWindow->SetControlBackground();
pWindow->EnablePaint(sal_False); pWindow->EnablePaint(false);
pWindow->SetPosSizePixel(pPWindow->GetPosPixel(),pPWindow->GetSizePixel()); pWindow->SetPosSizePixel(pPWindow->GetPosPixel(),pPWindow->GetSizePixel());
} }
@@ -478,9 +478,9 @@ void OGLTransitionerImpl::setSlides( const uno::Reference< rendering::XBitmap >&
mbUseEnteringPixmap = false; mbUseEnteringPixmap = false;
if( !mbUseLeavingPixmap ) if( !mbUseLeavingPixmap )
LeavingBytes = mxLeavingBitmap->getData(SlideBitmapLayout,SlideRect); LeavingBytes = mxLeavingBitmap->getData(SlideBitmapLayout,SlideRect);
if( !mbUseEnteringPixmap ) 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 if(GLWin.pOpenGLContext)//if we have a rendering context, let's init the slides
GLInitSlides(); GLInitSlides();
@@ -724,7 +724,7 @@ void OGLTransitionerImpl::GLInitSlides()
const OGLFormat* pFormat = NULL; const OGLFormat* pFormat = NULL;
if( !mbUseLeavingPixmap || !mbUseEnteringPixmap ) if( !mbUseLeavingPixmap || !mbUseEnteringPixmap )
pFormat = chooseFormats(); pFormat = chooseFormats();
createTexture( &GLleavingSlide, createTexture( &GLleavingSlide,
pTransition->mbUseMipMapLeaving, pTransition->mbUseMipMapLeaving,
@@ -778,7 +778,7 @@ void SAL_CALL OGLTransitionerImpl::update( double nTime ) throw (uno::RuntimeExc
[context makeCurrentContext]; [context makeCurrentContext];
if(pTransition) if(pTransition)
pTransition->display( nTime, GLleavingSlide, GLenteringSlide, pTransition->display( nTime, GLleavingSlide, GLenteringSlide,
SlideSize.Width, SlideSize.Height, SlideSize.Width, SlideSize.Height,
static_cast<double>(GLWin.Width), static_cast<double>(GLWin.Width),
static_cast<double>(GLWin.Height) ); static_cast<double>(GLWin.Height) );
@@ -892,7 +892,7 @@ void OGLTransitionerImpl::disposing()
} }
if (pTransition) if (pTransition)
delete pTransition; delete pTransition;
mxLeavingBitmap.clear(); mxLeavingBitmap.clear();
mxEnteringBitmap.clear(); mxEnteringBitmap.clear();