...needs some more modifications to make it work with clang-cl

Change-Id: I6e2f8c9651b0532e21ec5acf94e8bae0a0f8f06e
Reviewed-on: https://gerrit.libreoffice.org/69808
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>