and fix a couple of usages that have crept in

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