another stab at this

Change-Id: I893f4b4a211a85718bf51bfbdb3e8bdb1df0066c
Reviewed-on: https://gerrit.libreoffice.org/37405Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>