summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2004-10-13 08:03:01 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2004-10-13 08:03:01 +0000
commit1fb43c3780fcd6105ecdfddbf8f503e25c93404e (patch)
treef95e7ced46d0f6a6313b726268fca3fabbc6cc3d
parent0280102296b1702380a450bc141c71e2d565566a (diff)
INTEGRATION: CWS vcl27 (1.6.110); FILE MERGED
2004/09/13 15:19:30 pl 1.6.110.1: #i34123# plugin improvements
-rw-r--r--extensions/source/plugin/unx/npnapi.cxx20
1 files changed, 19 insertions, 1 deletions
diff --git a/extensions/source/plugin/unx/npnapi.cxx b/extensions/source/plugin/unx/npnapi.cxx
index caf02012296d..ce814b3d6ca6 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.6 2004-03-17 10:15:31 obo Exp $
+ $Header: /zpool/svn/migration/cvs_rep_09_09_08/code/extensions/source/plugin/unx/npnapi.cxx,v 1.7 2004-10-13 09:03:01 hr Exp $
*************************************************************************/
#include <plugin/unx/plugcon.hxx>
@@ -769,3 +769,21 @@ IMPL_LINK( PluginConnector, WorkOnNewMessageHdl, Mediator*, pMediator )
return 0;
}
+void LoadAdditionalLibs( const char* pPluginLib )
+{
+ void *pLib;
+ medDebug( 1, "LoadAdditionalLibs %s\n", pPluginLib );
+
+ if( ! strncmp( pPluginLib, "libflashplayer.so", 17 ) )
+ {
+ /* #b4951312# flash 7 implicitly assumes a gtk application
+ * if the API version is greater or equal to 12 (probably
+ * because they think they run in mozilla then). In that
+ * case they try to find gtk within the process and crash
+ * when they don't find it.
+ */
+ aNetscapeFuncs.version = 11;
+ aPluginFuncs.version = 11;
+ }
+}
+