cfr. Change 9479 on master

Change-Id: I5d2a1b37d80137e6b8fd080d8c2d73372ad0512c
Reviewed-on: https://gerrit.libreoffice.org/9479Reviewed-by: Lionel Elie Mamane <lionel@mamane.lu>
Tested-by: Lionel Elie Mamane <lionel@mamane.lu>
(cherry picked from commit c3fe2934)
Reviewed-on: https://gerrit.libreoffice.org/9541Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>