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

INTEGRATION: CWS vcl77 (1.14.120); FILE MERGED

Browse Source 
2007/03/23 15:08:21 pl 1.14.120.1: #i74221# better behaviout of NPN_GetValue
This commit is contained in:
Ivo Hinkelmann
2007-04-16 13:24:17 +00:00
parent c224a933a5
commit 61bf176058
1 changed files with 31 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
extensions/source/plugin/base/nfuncs.cxx
View File

@@ -4,9 +4,9 @@
* *
* $RCSfile: nfuncs.cxx,v $ * $RCSfile: nfuncs.cxx,v $
* *
* $Revision: 1.14 $ * $Revision: 1.15 $
* *
* last change: $Author: obo $ $Date: 2006-09-16 13:08:14 $ * last change: $Author: ihi $ $Date: 2007-04-16 14:24:17 $
* *
* The Contents of this file are made available subject to * The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
@@ -544,6 +544,33 @@ NPError SAL_CALL NP_LOADDS NPN_GetValue( NPP instance, NPNVariable variable, vo
if( ! pImpl ) if( ! pImpl )
return 0; return 0;
NPError aResult( NPERR_NO_ERROR );
switch( variable )
{
case NPNVxDisplay:
// Unix only, handled in sysdep part
case NPNVxtAppContext:
// Unix only, handled in sysdep part
default:
aResult = NPERR_INVALID_PARAM;
break;
case NPNVjavascriptEnabledBool:
// no javascript
*(NPBool*)value = false;
break;
case NPNVasdEnabledBool:
// no SmartUpdate
*(NPBool*)value = false;
break;
case NPNVisOfflineBool:
// no offline browsing
*(NPBool*)value = false;
break;
}
/*
provisional code should there ever be NPNVariables that we actually
want to query from the PluginContext
::rtl::OUString aValue; ::rtl::OUString aValue;
try try
{ {
@@ -557,8 +584,9 @@ NPError SAL_CALL NP_LOADDS NPN_GetValue( NPP instance, NPNVariable variable, vo
pImpl->leavePluginCallback(); pImpl->leavePluginCallback();
return e.ErrorCode; return e.ErrorCode;
} }
*/
return NPERR_NO_ERROR; return aResult;
} }
void SAL_CALL NP_LOADDS NPN_ReloadPlugins(NPBool reloadPages) void SAL_CALL NP_LOADDS NPN_ReloadPlugins(NPBool reloadPages)