diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-11-28 15:13:42 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-11-29 07:17:37 +0100 |
commit | 21de55596c0fdc2be736c6d0369bd9d3783020be (patch) | |
tree | 07d0f0cd54690e54405fe574c572cb2be74a3336 /basic | |
parent | da9fb5d6d9ebf9363981c370ce937d8848989fcb (diff) |
remove unnecessary "if (!empty()" checks before loops
found with
git grep -n -A4 'if.*!.*empty' | grep -B3 -P
'(\bfor)|(\bwhile)|(\bdo)'
Change-Id: I582235b7cf977a0f9fb4099eb306fdb4a07b5334
Reviewed-on: https://gerrit.libreoffice.org/64169
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'basic')
-rw-r--r-- | basic/source/classes/sb.cxx | 29 |
1 files changed, 13 insertions, 16 deletions
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx index 23fedab3b08b..3eebffa44d3a 100644 --- a/basic/source/classes/sb.cxx +++ b/basic/source/classes/sb.cxx @@ -1149,26 +1149,23 @@ void SbModule::implProcessModuleRunInit( ModuleInitDependencyMap& rMap, ClassMod if( pModule->pClassData != nullptr ) { std::vector< OUString >& rReqTypes = pModule->pClassData->maRequiredTypes; - if( !rReqTypes.empty() ) + for( const auto& rStr : rReqTypes ) { - for( const auto& rStr : rReqTypes ) + // Is required type a class module? + ModuleInitDependencyMap::iterator itFind = rMap.find( rStr ); + if( itFind != rMap.end() ) { - // Is required type a class module? - ModuleInitDependencyMap::iterator itFind = rMap.find( rStr ); - if( itFind != rMap.end() ) + ClassModuleRunInitItem& rParentItem = itFind->second; + if( rParentItem.m_bProcessing ) { - ClassModuleRunInitItem& rParentItem = itFind->second; - if( rParentItem.m_bProcessing ) - { - // TODO: raise error? - OSL_FAIL( "Cyclic module dependency detected" ); - continue; - } + // TODO: raise error? + OSL_FAIL( "Cyclic module dependency detected" ); + continue; + } - if( !rParentItem.m_bRunInitDone ) - { - implProcessModuleRunInit( rMap, rParentItem ); - } + if( !rParentItem.m_bRunInitDone ) + { + implProcessModuleRunInit( rMap, rParentItem ); } } } |