and convert usage of it

Change-Id: I2e3a71ec94492e5482bdf720d256e67adaf3f095
Reviewed-on: https://gerrit.libreoffice.org/26951Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>