Simplifies the implementation, removing boilerplate. Change-Id: I4e54547df46feed01613ebe0766c53be3c06de17 Reviewed-on: https://gerrit.collaboraoffice.com/c/core/+/246 Tested-by: Jenkins CPCI <releng@collaboraoffice.com> Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com> (cherry picked from commit 5368ec1c2b6a1d67f4b23c2ce75482993ca263f0) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/205665 Tested-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>