...also simplify a lot some functions calls.

Change-Id: I07029055a7cbe0d1ea2e6c891e6c7347e3a370a9
Reviewed-on: https://gerrit.libreoffice.org/1767Reviewed-by: Olivier Hallot <olivier.hallot@alta.org.br>
Tested-by: Olivier Hallot <olivier.hallot@alta.org.br>