applied most comments from Katarina

Change-Id: I8da44b234ce37747b52fb32c4c13607c06767257
Reviewed-on: https://gerrit.libreoffice.org/36140Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>