and simplify, most places can just leave it alone

Change-Id: Id938ec12d21ef244a15b5e5a72626c5ad0d0e124
Reviewed-on: https://gerrit.libreoffice.org/55499Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>