This is a cleanup to https://gerrit.libreoffice.org/#/c/21233/

Change-Id: I731b9cb8e64fb07e8d0a6d89e4f420e2e4570a8e
Reviewed-on: https://gerrit.libreoffice.org/21279Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Michael Meeks <michael.meeks@collabora.com>