Change-Id: Ief207205b3f05dd0ed92a2d1d30e265cbdb914e3
(cherry picked from commit 5aff1349)

-1 -> Z_ERRNO for clarity

Change-Id: I29aa8531646f416a72b89f7571b757c39705c31a
(cherry picked from commit 8cb69cc8)
Reviewed-on: https://gerrit.libreoffice.org/16826Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>