From 5509d639d0b245415f647690619de5a5163ca620 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 5 Feb 2019 14:16:28 +0200 Subject: loplugin:flatten in slideshow Change-Id: I826a43b36e35f9145c971b3608b6f56d27ff5f81 Reviewed-on: https://gerrit.libreoffice.org/67405 Tested-by: Jenkins Reviewed-by: Noel Grandin --- slideshow/source/engine/slide/layermanager.cxx | 38 +++++++------- slideshow/source/engine/slide/shapemanagerimpl.cxx | 58 +++++++++++----------- slideshow/source/engine/slide/slideanimations.cxx | 22 ++++---- 3 files changed, 59 insertions(+), 59 deletions(-) (limited to 'slideshow/source/engine/slide') diff --git a/slideshow/source/engine/slide/layermanager.cxx b/slideshow/source/engine/slide/layermanager.cxx index b5235840c0a8..2fa5a139151e 100644 --- a/slideshow/source/engine/slide/layermanager.cxx +++ b/slideshow/source/engine/slide/layermanager.cxx @@ -664,27 +664,27 @@ namespace slideshow const LayerShapeMap::const_iterator& aEndLayerShapes ) { const bool bLayerExists( maLayers.size() > nCurrLayerIndex ); - if( bLayerExists ) - { - const LayerSharedPtr& rLayer( maLayers.at(nCurrLayerIndex) ); - const bool bLayerResized( rLayer->commitBounds() ); - rLayer->setPriority( basegfx::B1DRange(nCurrLayerIndex, - nCurrLayerIndex+1) ); + if( !bLayerExists ) + return; - if( bLayerResized ) - { - // need to re-render whole layer - start from - // clean state - rLayer->clearContent(); + const LayerSharedPtr& rLayer( maLayers.at(nCurrLayerIndex) ); + const bool bLayerResized( rLayer->commitBounds() ); + rLayer->setPriority( basegfx::B1DRange(nCurrLayerIndex, + nCurrLayerIndex+1) ); - // render and remove from update set - while( aFirstLayerShape != aEndLayerShapes ) - { - maUpdateShapes.erase(aFirstLayerShape->first); - aFirstLayerShape->first->render(); - ++aFirstLayerShape; - } - } + if( !bLayerResized ) + return; + + // need to re-render whole layer - start from + // clean state + rLayer->clearContent(); + + // render and remove from update set + while( aFirstLayerShape != aEndLayerShapes ) + { + maUpdateShapes.erase(aFirstLayerShape->first); + aFirstLayerShape->first->render(); + ++aFirstLayerShape; } } diff --git a/slideshow/source/engine/slide/shapemanagerimpl.cxx b/slideshow/source/engine/slide/shapemanagerimpl.cxx index e6a3bea58c1e..d498e50cf90f 100644 --- a/slideshow/source/engine/slide/shapemanagerimpl.cxx +++ b/slideshow/source/engine/slide/shapemanagerimpl.cxx @@ -51,46 +51,46 @@ ShapeManagerImpl::ShapeManagerImpl( EventMultiplexer& rMultiplexer, void ShapeManagerImpl::activate() { - if( !mbEnabled ) - { - mbEnabled = true; + if( mbEnabled ) + return; - // register this handler on EventMultiplexer. - // Higher prio (overrides other engine handlers) - mrMultiplexer.addMouseMoveHandler( shared_from_this(), 2.0 ); - mrMultiplexer.addClickHandler( shared_from_this(), 2.0 ); - mrMultiplexer.addShapeListenerHandler( shared_from_this() ); + mbEnabled = true; - // clone listener map - uno::Reference xDummyListener; - for( const auto& rListener : mrGlobalListenersMap ) - listenerAdded( xDummyListener, rListener.first ); + // register this handler on EventMultiplexer. + // Higher prio (overrides other engine handlers) + mrMultiplexer.addMouseMoveHandler( shared_from_this(), 2.0 ); + mrMultiplexer.addClickHandler( shared_from_this(), 2.0 ); + mrMultiplexer.addShapeListenerHandler( shared_from_this() ); - // clone cursor map - for( const auto& rListener : mrGlobalCursorMap ) - cursorChanged( rListener.first, rListener.second ); + // clone listener map + uno::Reference xDummyListener; + for( const auto& rListener : mrGlobalListenersMap ) + listenerAdded( xDummyListener, rListener.first ); - if( mpLayerManager ) - mpLayerManager->activate(); - } + // clone cursor map + for( const auto& rListener : mrGlobalCursorMap ) + cursorChanged( rListener.first, rListener.second ); + + if( mpLayerManager ) + mpLayerManager->activate(); } void ShapeManagerImpl::deactivate() { - if( mbEnabled ) - { - mbEnabled = false; + if( !mbEnabled ) + return; + + mbEnabled = false; - if( mpLayerManager ) - mpLayerManager->deactivate(); + if( mpLayerManager ) + mpLayerManager->deactivate(); - maShapeListenerMap.clear(); - maShapeCursorMap.clear(); + maShapeListenerMap.clear(); + maShapeCursorMap.clear(); - mrMultiplexer.removeShapeListenerHandler( shared_from_this() ); - mrMultiplexer.removeMouseMoveHandler( shared_from_this() ); - mrMultiplexer.removeClickHandler( shared_from_this() ); - } + mrMultiplexer.removeShapeListenerHandler( shared_from_this() ); + mrMultiplexer.removeMouseMoveHandler( shared_from_this() ); + mrMultiplexer.removeClickHandler( shared_from_this() ); } void ShapeManagerImpl::dispose() diff --git a/slideshow/source/engine/slide/slideanimations.cxx b/slideshow/source/engine/slide/slideanimations.cxx index 8c6be3eeb99f..2264b4600f56 100644 --- a/slideshow/source/engine/slide/slideanimations.cxx +++ b/slideshow/source/engine/slide/slideanimations.cxx @@ -45,18 +45,18 @@ namespace slideshow SlideAnimations::~SlideAnimations() COVERITY_NOEXCEPT_FALSE { - if( mpRootNode ) + if( !mpRootNode ) + return; + + SHOW_NODE_TREE( mpRootNode ); + + try + { + mpRootNode->dispose(); + } + catch (uno::Exception &) { - SHOW_NODE_TREE( mpRootNode ); - - try - { - mpRootNode->dispose(); - } - catch (uno::Exception &) - { - SAL_WARN( "slideshow", comphelper::anyToString(cppu::getCaughtException() ) ); - } + SAL_WARN( "slideshow", comphelper::anyToString(cppu::getCaughtException() ) ); } } -- cgit