+ some more conservative changes

Change-Id: I28ca18b962ffe42ca8b2938de606b30d2692855c
Reviewed-on: https://gerrit.libreoffice.org/63194Reviewed-by: Sophie Gautier <gautier.sophie@gmail.com>
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>