Adapt the previous commit to LibreOffice checker

And fix the coding style a bit.