diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-04-14 14:55:22 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-04-14 16:35:38 +0200 |
commit | 11785217594d863efb518aa8b8f2910cdcb9c59d (patch) | |
tree | d8460fe0e3a9ee4212d7bd964c2fd3ee0d9074b4 /canvas | |
parent | 14471a694271777440c19916055d659337c0fb8d (diff) |
loplugin:buriedassign in c*
Change-Id: Id14fed7e5c0f588ad3c927f12251432d12c1a7c8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92190
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'canvas')
-rw-r--r-- | canvas/source/factory/cf_service.cxx | 24 | ||||
-rw-r--r-- | canvas/source/tools/canvastools.cxx | 5 |
2 files changed, 16 insertions, 13 deletions
diff --git a/canvas/source/factory/cf_service.cxx b/canvas/source/factory/cf_service.cxx index 86dbc2f12aeb..936c99885f20 100644 --- a/canvas/source/factory/cf_service.cxx +++ b/canvas/source/factory/cf_service.cxx @@ -321,13 +321,13 @@ Reference<XInterface> CanvasFactory::lookupAndUse( // try to reuse last working implementation for given service name const CacheVector::iterator aEnd(m_aCachedImplementations.end()); - CacheVector::iterator aMatch; - if( (aMatch=std::find_if( + auto aMatch = std::find_if( m_aCachedImplementations.begin(), aEnd, [&serviceName](CachePair const& cp) { return serviceName == cp.first; } - )) != aEnd) { + ); + if( aMatch != aEnd ) { Reference<XInterface> xCanvas( use( aMatch->second, args, xContext ) ); if(xCanvas.is()) return xCanvas; @@ -335,35 +335,35 @@ Reference<XInterface> CanvasFactory::lookupAndUse( // lookup in available service list const AvailVector::const_iterator aAvailEnd(m_aAvailableImplementations.end()); - AvailVector::const_iterator aAvailImplsMatch; - if( (aAvailImplsMatch=std::find_if( + auto aAvailImplsMatch = std::find_if( m_aAvailableImplementations.begin(), aAvailEnd, [&serviceName](AvailPair const& ap) { return serviceName == ap.first; } - )) == aAvailEnd ) { + ); + if( aAvailImplsMatch == aAvailEnd ) { return Reference<XInterface>(); } const AvailVector::const_iterator aAAEnd(m_aAAImplementations.end()); - AvailVector::const_iterator aAAImplsMatch; - if( (aAAImplsMatch=std::find_if( + auto aAAImplsMatch = std::find_if( m_aAAImplementations.begin(), aAAEnd, [&serviceName](AvailPair const& ap) { return serviceName == ap.first; } - )) == aAAEnd) { + ); + if( aAAImplsMatch == aAAEnd ) { return Reference<XInterface>(); } const AvailVector::const_iterator aAccelEnd(m_aAcceleratedImplementations.end()); - AvailVector::const_iterator aAccelImplsMatch; - if( (aAccelImplsMatch=std::find_if( + auto aAccelImplsMatch = std::find_if( m_aAcceleratedImplementations.begin(), aAccelEnd, [&serviceName](AvailPair const& ap) { return serviceName == ap.first; } - )) == aAccelEnd ) { + ); + if( aAccelImplsMatch == aAccelEnd ) { return Reference<XInterface>(); } diff --git a/canvas/source/tools/canvastools.cxx b/canvas/source/tools/canvastools.cxx index 957a7bb90b0a..30f92f484967 100644 --- a/canvas/source/tools/canvastools.cxx +++ b/canvas/source/tools/canvastools.cxx @@ -911,7 +911,10 @@ namespace canvas::tools const ::basegfx::B2DHomMatrix& i_transformation ) { if( i_srcRect.isEmpty() ) - return o_transform=i_transformation; + { + o_transform = i_transformation; + return o_transform; + } // transform by given transformation ::basegfx::B2DRectangle aTransformedRect; |