mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INTEGRATION: CWS vcl49 (1.7.246); FILE MERGED

Browse Source 
2005/12/14 15:44:29 pl 1.7.246.1: #i56878# use mozilla headers instead of npsdk, use OJI definition
This commit is contained in:
Oliver Bolte
2006-01-20 11:59:31 +00:00
parent 29279069c4
commit 80a841184c
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
extensions/source/plugin/unx/npnapi.cxx
View File

@@ -2,7 +2,7 @@
Source Code Control System - Header Source Code Control System - Header
$Header: /zpool/svn/migration/cvs_rep_09_09_08/code/extensions/source/plugin/unx/npnapi.cxx,v 1.8 2005-12-21 11:14:16 obo Exp $ $Header: /zpool/svn/migration/cvs_rep_09_09_08/code/extensions/source/plugin/unx/npnapi.cxx,v 1.9 2006-01-20 12:59:31 obo Exp $
*************************************************************************/ *************************************************************************/
#include <plugin/unx/plugcon.hxx> #include <plugin/unx/plugcon.hxx>
@@ -66,6 +66,7 @@ static NPError l_NPN_DestroyStream( NPP instance, NPStream* stream, NPError reas
return aRet; return aRet;
} }
#ifdef OJI
static JRIEnv* l_NPN_GetJavaEnv() static JRIEnv* l_NPN_GetJavaEnv()
{ {
// no java in this program // no java in this program
@@ -78,6 +79,7 @@ static jref l_NPN_GetJavaPeer( NPP instance )
medDebug( 1, "SNI: NPN_GetJavaPeer\n" ); medDebug( 1, "SNI: NPN_GetJavaPeer\n" );
return NULL; return NULL;
} }
#endif
static NPError l_NPN_GetURL( NPP instance, const char* url, const char* window ) static NPError l_NPN_GetURL( NPP instance, const char* url, const char* window )
{ {
@@ -417,8 +419,13 @@ static NPNetscapeFuncs aNetscapeFuncs =
l_NPN_MemFree, l_NPN_MemFree,
l_NPN_MemFlush, l_NPN_MemFlush,
l_NPN_ReloadPlugins, l_NPN_ReloadPlugins,
#ifdef OJI
l_NPN_GetJavaEnv, l_NPN_GetJavaEnv,
l_NPN_GetJavaPeer, l_NPN_GetJavaPeer,
#else
NULL,
NULL,
#endif
l_NPN_GetURLNotify, l_NPN_GetURLNotify,
l_NPN_PostURLNotify, l_NPN_PostURLNotify,
l_NPN_GetValue, l_NPN_GetValue,