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