Fix the build.
Merge branch 'msoffice' of https://github.com/PavelBastov/opencbs into msoffice