This fixes and extends dad7c221 .

Change-Id: I29352d4b4809aa254e832a932bfeb595d065565b
Reviewed-on: https://gerrit.libreoffice.org/67368
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>