diff options
| author | Oliver Bolte <obo@openoffice.org> | 2006-01-20 11:59:31 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2006-01-20 11:59:31 +0000 |
| commit | 80a841184cd26384ce3a20a8cff949fe70b51c5f (patch) | |
| tree | ccf37384854d018cbca4d1b6d3d648026cd78157 | |
| parent | 29279069c442e24d02164f939b6d1a19acc6946a (diff) | |
INTEGRATION: CWS vcl49 (1.7.246); FILE MERGED
2005/12/14 15:44:29 pl 1.7.246.1: #i56878# use mozilla headers instead of npsdk, use OJI definition
| -rw-r--r-- | extensions/source/plugin/unx/npnapi.cxx | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/extensions/source/plugin/unx/npnapi.cxx b/extensions/source/plugin/unx/npnapi.cxx index 5df12be27ad2..ac357135c2c7 100644 --- a/extensions/source/plugin/unx/npnapi.cxx +++ b/extensions/source/plugin/unx/npnapi.cxx @@ -2,7 +2,7 @@ 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> @@ -66,6 +66,7 @@ static NPError l_NPN_DestroyStream( NPP instance, NPStream* stream, NPError reas return aRet; } +#ifdef OJI static JRIEnv* l_NPN_GetJavaEnv() { // no java in this program @@ -78,6 +79,7 @@ static jref l_NPN_GetJavaPeer( NPP instance ) medDebug( 1, "SNI: NPN_GetJavaPeer\n" ); return NULL; } +#endif 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_MemFlush, l_NPN_ReloadPlugins, + #ifdef OJI l_NPN_GetJavaEnv, l_NPN_GetJavaPeer, + #else + NULL, + NULL, + #endif l_NPN_GetURLNotify, l_NPN_PostURLNotify, l_NPN_GetValue, |