diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-10-13 08:03:22 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-10-13 08:03:22 +0000 |
| commit | 2a7c9de49ee36db2ba19154c754e81502f343238 (patch) | |
| tree | cebb87702b8a397ceaa4270a405cd4a5ea5715dd /extensions/source/plugin | |
| parent | 1fb43c3780fcd6105ecdfddbf8f503e25c93404e (diff) | |
INTEGRATION: CWS vcl27 (1.8.110); FILE MERGED
2004/09/16 13:34:46 pl 1.8.110.2: ##b4951312# remove XInitThreads as we don't need it anymore and some implementations of Xt tend to internal deadlocks if XInitThreads is used
2004/09/13 15:19:30 pl 1.8.110.1: #i34123# plugin improvements
Diffstat (limited to 'extensions/source/plugin')
| -rw-r--r-- | extensions/source/plugin/unx/npwrap.cxx | 27 |
1 files changed, 6 insertions, 21 deletions
diff --git a/extensions/source/plugin/unx/npwrap.cxx b/extensions/source/plugin/unx/npwrap.cxx index 77773c98448d..ddb7ba787610 100644 --- a/extensions/source/plugin/unx/npwrap.cxx +++ b/extensions/source/plugin/unx/npwrap.cxx @@ -2,9 +2,9 @@ * * $RCSfile: npwrap.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: obo $ $Date: 2004-03-17 10:16:01 $ + * last change: $Author: hr $ $Date: 2004-10-13 09:03:22 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -75,6 +75,8 @@ Display* pAppDisplay = NULL; extern void* pPluginLib; extern NPError (*pNP_Shutdown)(); +void LoadAdditionalLibs(const char*); + XtAppContext app_context; Widget topLevel = NULL, topBox = NULL; int wakeup_fd[2] = { 0, 0 }; @@ -136,10 +138,11 @@ IMPL_LINK( PluginConnector, NewMessageHdl, Mediator*, pMediator ) Widget createSubWidget( char* pPluginText, Widget shell, XLIB_Window aParentWindow ) { Widget newWidget = XtVaCreateManagedWidget( - "drawingArea", #if defined USE_MOTIF + "drawingArea", xmDrawingAreaWidgetClass, #else + "", labelWidgetClass, #endif shell, @@ -206,22 +209,6 @@ static void CheckPlugin( const char* pPath ) dlclose( pLib ); } -static void LoadAdditionalLibs( const char* pPluginLib ) -{ - void *pLib; -#if 0 // defined GCC -#define OPEN_FLAGS (RTLD_LAZY | RTLD_GLOBAL) - medDebug( 1, "LoadAdditionalLibs %s\n", pPluginLib ); - if( ! strncmp( pPluginLib, "rpnp.so", 7 ) || - ! strncmp( pPluginLib, "libflashplayer.so", 17 ) - ) - { - pLib = dlopen( "libg++.so.2.7.2", OPEN_FLAGS ); - medDebug( !pLib, "dlopen of libg++.so.2.7.2 failed because of:\n\t%s\n", dlerror() ); - } -#endif -} - #if OSL_DEBUG_LEVEL > 1 && defined LINUX #include <execinfo.h> #endif @@ -276,8 +263,6 @@ int main( int argc, char **argv) nAppArguments = argc; pAppArguments = argv; - XInitThreads(); - XSetErrorHandler( plugin_x_error_handler ); if( pipe( wakeup_fd ) ) |