This patch also is for tdf#98505 and tdf#84657

Change-Id: I6bc125ace035b2c8126f013a63bcc9498b06e08c
Reviewed-on: https://gerrit.libreoffice.org/49219Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>