This addresses some cppcheck warnings.

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