and fix the fallout

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