- also use std::make_unique
- also avoid multiple declarations in a single statement

Change-Id: Ib5429730fcf14131b7b68628a8724a812dcc018f
Reviewed-on: https://gerrit.libreoffice.org/66479
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>