and perhaps avoid memory leaks (see https://bugs.documentfoundation.org/show_bug.cgi?id=114457)

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