Reviewed-on: https://gerrit.libreoffice.org/31069Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
(cherry picked from commit 29a9e97d)
(cherry picked from commit 330dc55f)

Change-Id: Ia03f7cccb256d825daa4dc6f4c0598448e46e6cf