strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS vcl49 (1.11.60); FILE MERGED

Browse source 
2005/12/14 15:44:28 pl 1.11.60.1: #i56878# use mozilla headers instead of npsdk, use OJI definition
This commit is contained in:
Oliver Bolte 2006-01-20 11:58:17 +00:00
parent a53058d965
commit 0382308333
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
extensions/source/plugin/base/nfuncs.cxx
View file

@ -4,9 +4,9 @@
*
* $RCSfile: nfuncs.cxx,v $
*
* $Revision: 1.12 $
* $Revision: 1.13 $
*
* last change: $Author: obo $ $Date: 2005-12-21 11:13:48 $
* last change: $Author: obo $ $Date: 2006-01-20 12:58:17 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@ -224,6 +224,7 @@ extern "C" {
return NPERR_NO_ERROR;
}
#ifdef OJI
const JRIEnvInterface** SAL_CALL NP_LOADDS NPN_GetJavaEnv()
{
TRACE( "NPN_GetJavaEnv" );
@ -236,6 +237,7 @@ extern "C" {
TRACE( "NPN_GetJavaPeer" );
return NULL;
}
#endif
NPError SAL_CALL NP_LOADDS NPN_GetURL( NPP instance, const char* url, const char* window )
{