and flatten some members, no need to allocate separate object

Change-Id: I9f6b7ee89af935608424a88d9343d8bbebaaada1
Reviewed-on: https://gerrit.libreoffice.org/48513Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>