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