...and fix the usual compiler errors that occurred as a result.

Change-Id: I54781d3f01e9f5a87fd008870c825b2d8154fd59
Reviewed-on: https://gerrit.libreoffice.org/24686Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>