Build broken in libreoffice-3.5 branch

Hello guys,

currently the build is broken in nsplugin build:

=============
(1/1) Building module extensions
=============
Entering 
/var/tmp/portage/app-office/libreoffice-3.5.9999/work/libreoffice-core-3.5.9999/extensions/inc

Entering 
/var/tmp/portage/app-office/libreoffice-3.5.9999/work/libreoffice-core-3.5.9999/extensions/source/update/ui

Entering 
/var/tmp/portage/app-office/libreoffice-3.5.9999/work/libreoffice-core-3.5.9999/extensions/source/xmlextract

Entering 
/var/tmp/portage/app-office/libreoffice-3.5.9999/work/libreoffice-core-3.5.9999/extensions/source/nsplugin/source

Compiling: extensions/source/nsplugin/source/so_instance.cxx
Compiling: extensions/source/nsplugin/source/so_main.cxx
Making:    npsoplugin.lib
Compiling: extensions/source/nsplugin/source/npshell.cxx
/var/tmp/portage/app-office/libreoffice-3.5.9999/work/libreoffice-core-3.5.9999/extensions/source/nsplugin/source/npshell.cxx:
In function ‘const char* NPP_GetMIMEDescription()’:
/var/tmp/portage/app-office/libreoffice-3.5.9999/work/libreoffice-core-3.5.9999/extensions/source/nsplugin/source/npshell.cxx:368:28:
error: declaration of C function ‘const char*
NPP_GetMIMEDescription()’ conflicts with
/usr/include/npapi-sdk/npapi.h:788:7: error: previous declaration
‘char* NPP_GetMIMEDescription()’ here
/var/tmp/portage/app-office/libreoffice-3.5.9999/work/libreoffice-core-3.5.9999/extensions/source/nsplugin/source/npshell.cxx:
In function ‘void NPP_StreamAsFile(NPP, NPStream*, const char*)’:
/var/tmp/portage/app-office/libreoffice-3.5.9999/work/libreoffice-core-3.5.9999/extensions/source/nsplugin/source/npshell.cxx:770:38:
warning: ignoring return value of ‘ssize_t write(int, const void*,
size_t)’, declared with attribute warn_unused_result [-Wunused-result]
dmake:  Error code 1, while making '../../../unxlngx6.pro/slo/npshell.obj'

This error is caused due to fact that I have old npapi.h (pre ff9) and
it was supposed to be fixed by this commit:

http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-3-5&id=2ec27f4b250781956aedc27a3a1b304d9e72e2ec

but aparently it is not working as expected.

This issue should be fixed prior tagging.

Cheers

Tom