diff options
| author | Oliver Bolte <obo@openoffice.org> | 2008-07-25 08:10:25 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2008-07-25 08:10:25 +0000 |
| commit | 42f70e32418744d89cd53e0987d4a0989832b1aa (patch) | |
| tree | 04dd3f8ceb9487f5f8283fe6edaa431b4efe1d67 /vcl/unx/gtk/a11y/atkbridge.cxx | |
| parent | f2b1d25316c287a540b5636bbcc13bf98f1e5680 (diff) | |
INTEGRATION: CWS aqua11y02 (1.8.34); FILE MERGED
2008/06/19 11:30:45 obr 1.8.34.2: linux build fixes
2008/06/06 10:19:20 obr 1.8.34.1: #i85292# wrapper now cache the name, suppress unload of gtk plugin when atk-bridge module gets loaded as the shutdown symbol is no longer in global address space
Diffstat (limited to 'vcl/unx/gtk/a11y/atkbridge.cxx')
| -rw-r--r-- | vcl/unx/gtk/a11y/atkbridge.cxx | 24 |
1 files changed, 1 insertions, 23 deletions
diff --git a/vcl/unx/gtk/a11y/atkbridge.cxx b/vcl/unx/gtk/a11y/atkbridge.cxx index 1d3497492a09..c8db1538a3a0 100644 --- a/vcl/unx/gtk/a11y/atkbridge.cxx +++ b/vcl/unx/gtk/a11y/atkbridge.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: atkbridge.cxx,v $ - * $Revision: 1.8 $ + * $Revision: 1.9 $ * * This file is part of OpenOffice.org. * @@ -37,13 +37,8 @@ #include "atkfactory.hxx" #include "atkutil.hxx" #include "atkwindow.hxx" - #include <stdio.h> -#if ! ( defined AIX || defined HPUX ) // these have no dl* functions -#include <dlfcn.h> -#endif - bool InitAtkBridge(void) { const char* pVersion = atk_get_toolkit_version(); @@ -85,22 +80,5 @@ bool InitAtkBridge(void) void DeInitAtkBridge() { restore_gail_window_vtable(); - - /* shutdown atk-bridge Gtk+ module here, otherwise it is done in an atexit handler - * where the VCL Gtk+ plugin might already be unloaded - */ - -#if ! ( defined AIX || defined HPUX ) // these have no dl* functions -#if defined __SUNPRO_CC // disable warning: Cannot cast from void* to void(*)() -#pragma disable_warn -#endif - void (* shutdown) ( void ) = (void (*) (void)) dlsym( RTLD_DEFAULT, "gnome_accessibility_module_shutdown"); -#if defined __SUNPRO_CC -#pragma enable_warn -#endif - - if( shutdown ) - shutdown(); -#endif // ! ( defined AIX || defined HPUX ) } |