loplugin:flatten in canvas..cui

Change-Id: I208767eaa60d913fe2882403f1f9351eb08256f7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127224
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

3 files changed, 77 insertions, 77 deletions

diff --git a/canvas/inc/spriteredrawmanager.hxx b/canvas/inc/spriteredrawmanager.hxx
index 87c692f6d7dc..cf2b86e0a8cc 100644
--- a/canvas/inc/spriteredrawmanager.hxx
+++ b/canvas/inc/spriteredrawmanager.hxx
@@ -286,64 +286,64 @@ namespace canvas
         {
             // check whether this area contains changed sprites at all
             // (if not, just ignore it)
-            if( areSpritesChanged( rUpdateArea ) )
+            if( !areSpritesChanged( rUpdateArea ) )
+                return;
+
+            // at least one of the sprites actually needs an
+            // update - process whole area.
+
+            // check whether this area could be handled special
+            // (background paint, direct update, scroll, etc.)
+            ::basegfx::B2DRange aMoveStart;
+            ::basegfx::B2DRange aMoveEnd;
+            if( rUpdateArea.maComponentList.empty() )
+            {
+                rFunc.backgroundPaint( rUpdateArea.maTotalBounds );
+            }
+            else
             {
-                // at least one of the sprites actually needs an
-                // update - process whole area.
-
-                // check whether this area could be handled special
-                // (background paint, direct update, scroll, etc.)
-                ::basegfx::B2DRange aMoveStart;
-                ::basegfx::B2DRange aMoveEnd;
-                if( rUpdateArea.maComponentList.empty() )
+                // cache number of sprites in this area (it's a
+                // list, and both isAreaUpdateScroll() and
+                // isAreaUpdateOpaque() need it).
+                const ::std::size_t nNumSprites(
+                    rUpdateArea.maComponentList.size() );
+
+                if( isAreaUpdateScroll( aMoveStart,
+                                        aMoveEnd,
+                                        rUpdateArea,
+                                        nNumSprites ) )
                 {
-                    rFunc.backgroundPaint( rUpdateArea.maTotalBounds );
+                    rFunc.scrollUpdate( aMoveStart,
+                                        aMoveEnd,
+                                        rUpdateArea );
                 }
                 else
                 {
-                    // cache number of sprites in this area (it's a
-                    // list, and both isAreaUpdateScroll() and
-                    // isAreaUpdateOpaque() need it).
-                    const ::std::size_t nNumSprites(
-                        rUpdateArea.maComponentList.size() );
-
-                    if( isAreaUpdateScroll( aMoveStart,
-                                            aMoveEnd,
-                                            rUpdateArea,
+                    // potentially, more than a single sprite
+                    // involved. Have to sort component lists for
+                    // sprite prio.
+                    VectorOfSprites aSortedUpdateSprites;
+                    for (auto const& elem : rUpdateArea.maComponentList)
+                    {
+                        const Sprite::Reference& rSprite( elem.second.getSprite() );
+                        if( rSprite.is() )
+                            aSortedUpdateSprites.push_back( rSprite );
+                    }
+
+                    ::std::sort( aSortedUpdateSprites.begin(),
+                                 aSortedUpdateSprites.end(),
+                                 SpriteWeakOrder() );
+
+                    if( isAreaUpdateOpaque( rUpdateArea,
                                             nNumSprites ) )
                     {
-                        rFunc.scrollUpdate( aMoveStart,
-                                            aMoveEnd,
-                                            rUpdateArea );
+                        rFunc.opaqueUpdate( rUpdateArea.maTotalBounds,
+                                            aSortedUpdateSprites );
                     }
                     else
                     {
-                        // potentially, more than a single sprite
-                        // involved. Have to sort component lists for
-                        // sprite prio.
-                        VectorOfSprites aSortedUpdateSprites;
-                        for (auto const& elem : rUpdateArea.maComponentList)
-                        {
-                            const Sprite::Reference& rSprite( elem.second.getSprite() );
-                            if( rSprite.is() )
-                                aSortedUpdateSprites.push_back( rSprite );
-                        }
-
-                        ::std::sort( aSortedUpdateSprites.begin(),
-                                     aSortedUpdateSprites.end(),
-                                     SpriteWeakOrder() );
-
-                        if( isAreaUpdateOpaque( rUpdateArea,
-                                                nNumSprites ) )
-                        {
-                            rFunc.opaqueUpdate( rUpdateArea.maTotalBounds,
-                                                aSortedUpdateSprites );
-                        }
-                        else
-                        {
-                            rFunc.genericUpdate( rUpdateArea.maTotalBounds,
-                                                 aSortedUpdateSprites );
-                        }
+                        rFunc.genericUpdate( rUpdateArea.maTotalBounds,
+                                             aSortedUpdateSprites );
                     }
                 }
             }
diff --git a/canvas/source/cairo/cairo_canvashelper.cxx b/canvas/source/cairo/cairo_canvashelper.cxx
index 2ee30cfc3740..e9aafabe7e63 100644
--- a/canvas/source/cairo/cairo_canvashelper.cxx
+++ b/canvas/source/cairo/cairo_canvashelper.cxx
@@ -2015,25 +2015,25 @@ constexpr OUStringLiteral PARAMETRICPOLYPOLYGON_IMPLEMENTATION_NAME = u"Canvas::
     {
         SAL_INFO( "canvas.cairo", "CanvasHelper::repaint");
 
-        if( mpCairo )
-        {
-            cairo_save( mpCairo.get() );
+        if( !mpCairo )
+            return true;
 
-            cairo_rectangle( mpCairo.get(), 0, 0, maSize.getX(), maSize.getY() );
-            cairo_clip( mpCairo.get() );
+        cairo_save( mpCairo.get() );
 
-            useStates( viewState, renderState, true );
+        cairo_rectangle( mpCairo.get(), 0, 0, maSize.getX(), maSize.getY() );
+        cairo_clip( mpCairo.get() );
 
-            cairo_matrix_t aMatrix;
+        useStates( viewState, renderState, true );
 
-            cairo_get_matrix( mpCairo.get(), &aMatrix );
-            aMatrix.xx = aMatrix.yy = 1;
-            cairo_set_matrix( mpCairo.get(), &aMatrix );
+        cairo_matrix_t aMatrix;
 
-            cairo_set_source_surface( mpCairo.get(), pSurface->getCairoSurface().get(), 0, 0 );
-            cairo_paint( mpCairo.get() );
-            cairo_restore( mpCairo.get() );
-        }
+        cairo_get_matrix( mpCairo.get(), &aMatrix );
+        aMatrix.xx = aMatrix.yy = 1;
+        cairo_set_matrix( mpCairo.get(), &aMatrix );
+
+        cairo_set_source_surface( mpCairo.get(), pSurface->getCairoSurface().get(), 0, 0 );
+        cairo_paint( mpCairo.get() );
+        cairo_restore( mpCairo.get() );
 
         return true;
     }
diff --git a/canvas/source/tools/canvastools.cxx b/canvas/source/tools/canvastools.cxx
index f6182ae9b7b3..048a99407c68 100644
--- a/canvas/source/tools/canvastools.cxx
+++ b/canvas/source/tools/canvastools.cxx
@@ -1080,25 +1080,25 @@ namespace canvas::tools
         {
             o_rxParams.realloc( 0 );
 
-            if( i_rxCanvas.is() )
+            if( !i_rxCanvas.is() )
+                return o_rxParams;
+
+            try
             {
-                try
-                {
-                    uno::Reference< rendering::XGraphicDevice > xDevice( i_rxCanvas->getDevice(),
-                                                                         uno::UNO_SET_THROW );
+                uno::Reference< rendering::XGraphicDevice > xDevice( i_rxCanvas->getDevice(),
+                                                                     uno::UNO_SET_THROW );
 
-                    uno::Reference< lang::XServiceInfo >  xServiceInfo( xDevice,
-                                                                        uno::UNO_QUERY_THROW );
-                    uno::Reference< beans::XPropertySet > xPropSet( xDevice,
+                uno::Reference< lang::XServiceInfo >  xServiceInfo( xDevice,
                                                                     uno::UNO_QUERY_THROW );
+                uno::Reference< beans::XPropertySet > xPropSet( xDevice,
+                                                                uno::UNO_QUERY_THROW );
 
-                    o_rxParams = { uno::Any(xServiceInfo->getImplementationName()),
-                                   xPropSet->getPropertyValue( "DeviceHandle" ) };
-                }
-                catch( const uno::Exception& )
-                {
-                    // ignore, but return empty sequence
-                }
+                o_rxParams = { uno::Any(xServiceInfo->getImplementationName()),
+                               xPropSet->getPropertyValue( "DeviceHandle" ) };
+            }
+            catch( const uno::Exception& )
+            {
+                // ignore, but return empty sequence
             }
 
             return o_rxParams;