Make it fill the Hatch struct in all three cases, and only write it in one place, for consistency. Change-Id: Ibf4eb97e1c7046a5fe7397509fff9560140b5eef Signed-off-by: Mike Kaganski <mike.kaganski@collabora.com> Reviewed-on: https://gerrit.collaboraoffice.com/c/online/+/13683 Reviewed-by: Noel Grandin <noel.grandin@collabora.com> Tested-by: Jenkins CPCI <releng@collaboraoffice.com> (cherry picked from commit f14a9a4d3d45b08da075aa5a34b8d7daa5cae6a4) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/211597 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>