Regression from:
https://cgit.freedesktop.org/libreoffice/core/commit/?id=3ff0c23b54ba4e7a534693ba25a3ffb27d1c18e1

+ some slight simplification

Change-Id: Ifa9d4d7d27e80217f778f3625ef4437828600dd3
Reviewed-on: https://gerrit.libreoffice.org/72922
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>