fixes at https://gerrit.libreoffice.org/c/core/+/88523 and https://gerrit.libreoffice.org/c/core/+/88524