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