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

Change-Id: I497c326272b2f02737ca3765720d6815b735423b
Reviewed-on: https://gerrit.libreoffice.org/24735Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>