summaryrefslogtreecommitdiff
path: root/slideshow/source/engine/slide/layermanager.cxx
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2019-02-05 14:16:28 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2019-02-05 14:43:11 +0100
commit5509d639d0b245415f647690619de5a5163ca620 (patch)
treee0374f0997f2155249ec0c6fca60caf40077d59a /slideshow/source/engine/slide/layermanager.cxx
parentab99c08defad5431bbd0b456e3854d749ec0173e (diff)
loplugin:flatten in slideshow
Change-Id: I826a43b36e35f9145c971b3608b6f56d27ff5f81 Reviewed-on: https://gerrit.libreoffice.org/67405 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'slideshow/source/engine/slide/layermanager.cxx')
-rw-r--r--slideshow/source/engine/slide/layermanager.cxx38
1 files changed, 19 insertions, 19 deletions
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;
}
}