Signed-off-by: Michael Stahl <michael.stahl@collabora.com> Change-Id: I9d6f200cc5a146f46dca64af270b77d0ce6abf6b Reviewed-on: https://gerrit.collaboraoffice.com/c/online/+/8174 Tested-by: Jenkins CPCI <releng@collaboraoffice.com> Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com> (cherry picked from commit 52ba487c3d84a89a027c3130bc86afdcfe57a860) Reviewed-on: https://gerrit.collaboraoffice.com/c/core/+/8261 Reviewed-by: Stephan Bergmann <stephan.bergmann@collabora.com> (cherry picked from commit 63ab1f905bddbac4871a246d61aa59d09f122e5c) Reviewed-on: https://gerrit.collaboraoffice.com/c/core/+/8277 (cherry picked from commit 396747a0e319943e7d411b0d6bc8d8abcc3e4f19) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/209276 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> Tested-by: Jenkins