diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-02-08 13:54:53 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-02-09 21:04:42 +0100 |
| commit | 45f4de6d333aa3fa5873cf8e1146286c74960557 (patch) | |
| tree | 463a497d6132e44d82294772be4aa3f487ad13e7 /slideshow | |
| parent | 34f333445c54c87f3afe777fa467f7a2bb122208 (diff) | |
loplugin:indentation in sfx2..slideshow
Change-Id: I3bd23a8f6237d0887a4782b6179a413dd2f03e02
Reviewed-on: https://gerrit.libreoffice.org/67564
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'slideshow')
| -rw-r--r-- | slideshow/source/engine/opengl/TransitionImpl.cxx | 18 | ||||
| -rw-r--r-- | slideshow/source/engine/shapes/shapeimporter.cxx | 2 | ||||
| -rw-r--r-- | slideshow/source/engine/slide/targetpropertiescreator.cxx | 2 | ||||
| -rw-r--r-- | slideshow/source/engine/slide/userpaintoverlay.cxx | 4 | ||||
| -rw-r--r-- | slideshow/source/inc/tools.hxx | 2 |
5 files changed, 14 insertions, 14 deletions
diff --git a/slideshow/source/engine/opengl/TransitionImpl.cxx b/slideshow/source/engine/opengl/TransitionImpl.cxx index f73237e16baf..62127de1d93e 100644 --- a/slideshow/source/engine/opengl/TransitionImpl.cxx +++ b/slideshow/source/engine/opengl/TransitionImpl.cxx @@ -1467,12 +1467,12 @@ int permutation256 [256]= { void initPermTexture(GLuint *texID) { CHECK_GL_ERROR(); - glGenTextures(1, texID); - glBindTexture(GL_TEXTURE_2D, *texID); + glGenTextures(1, texID); + glBindTexture(GL_TEXTURE_2D, *texID); - static bool initialized = false; - static unsigned char permutation2D[256*256*4]; - if( !initialized ) { + static bool initialized = false; + static unsigned char permutation2D[256*256*4]; + if( !initialized ) { int x, y; for( y=0; y < 256; y++ ) @@ -1480,11 +1480,11 @@ void initPermTexture(GLuint *texID) permutation2D[x*4 + y*1024] = permutation256[(y + permutation256[x]) & 0xff]; initialized = true; - } + } - glTexImage2D( GL_TEXTURE_2D, 0, GL_RGBA, 256, 256, 0, GL_RGBA, GL_UNSIGNED_BYTE, permutation2D ); - glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST ); - glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST ); + glTexImage2D( GL_TEXTURE_2D, 0, GL_RGBA, 256, 256, 0, GL_RGBA, GL_UNSIGNED_BYTE, permutation2D ); + glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST ); + glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST ); CHECK_GL_ERROR(); } diff --git a/slideshow/source/engine/shapes/shapeimporter.cxx b/slideshow/source/engine/shapes/shapeimporter.cxx index d556edd24aaf..67cd654f3e63 100644 --- a/slideshow/source/engine/shapes/shapeimporter.cxx +++ b/slideshow/source/engine/shapes/shapeimporter.cxx @@ -476,7 +476,7 @@ ShapeSharedPtr ShapeImporter::importShape() // throw (ShapeLoadFailedException) uno::Reference< drawing::XLayerManager > xLayerManager(xNameAccess, uno::UNO_QUERY); - xDrawnInSlideshow = xLayerManager->getLayerForShape(xCurrShape); + xDrawnInSlideshow = xLayerManager->getLayerForShape(xCurrShape); } OUString const shapeType( xCurrShape->getShapeType()); diff --git a/slideshow/source/engine/slide/targetpropertiescreator.cxx b/slideshow/source/engine/slide/targetpropertiescreator.cxx index a50b81f276d9..c76fd6a1b1a4 100644 --- a/slideshow/source/engine/slide/targetpropertiescreator.cxx +++ b/slideshow/source/engine/slide/targetpropertiescreator.cxx @@ -306,7 +306,7 @@ namespace internal //xAnimateNode->getAttributeName(), "visibility", uno::makeAny( bVisible ) ) ) ); - break; + break; } } } diff --git a/slideshow/source/engine/slide/userpaintoverlay.cxx b/slideshow/source/engine/slide/userpaintoverlay.cxx index 9dc527a10727..fbad7fdd7fc0 100644 --- a/slideshow/source/engine/slide/userpaintoverlay.cxx +++ b/slideshow/source/engine/slide/userpaintoverlay.cxx @@ -171,8 +171,8 @@ namespace slideshow repaintWithoutPolygons(); maPolygons.clear(); } - mbIsEraseAllModeActivated=false; - return true; + mbIsEraseAllModeActivated=false; + return true; } bool eraseInkWidthChanged( sal_Int32 rEraseInkSize ) override diff --git a/slideshow/source/inc/tools.hxx b/slideshow/source/inc/tools.hxx index 8ed353d5d503..0a15008e797e 100644 --- a/slideshow/source/inc/tools.hxx +++ b/slideshow/source/inc/tools.hxx @@ -389,7 +389,7 @@ namespace slideshow css::uno::UNO_QUERY_THROW ); rFunctor( xChildNode ); } - return true; + return true; } catch( css::uno::Exception& ) { |