mainly by using for-range loops + some algo simplifications

Change-Id: I25b02676527d551985434e07e7dc5f2927d4955e
Reviewed-on: https://gerrit.libreoffice.org/51377Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>