diff options
| author | Oliver Bolte <obo@openoffice.org> | 2005-04-22 10:35:36 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2005-04-22 10:35:36 +0000 |
| commit | 63bdef68c1f89ec6f4ec52a4925b97f15b4c1394 (patch) | |
| tree | cc83169373082507dc368e676271ca910d875d6e /vcl/unx | |
| parent | 82c51399022c9e1098926f5fd2f54e21f2d3144f (diff) | |
INTEGRATION: CWS a11yshowstop (1.7.106); FILE MERGED
2005/04/21 10:24:23 pl 1.7.106.1: #i47797# make java accessibility brigde work again
Diffstat (limited to 'vcl/unx')
| -rw-r--r-- | vcl/unx/gtk/app/gtkinst.cxx | 30 |
1 files changed, 27 insertions, 3 deletions
diff --git a/vcl/unx/gtk/app/gtkinst.cxx b/vcl/unx/gtk/app/gtkinst.cxx index 8e6359da0544..65054b7317c5 100644 --- a/vcl/unx/gtk/app/gtkinst.cxx +++ b/vcl/unx/gtk/app/gtkinst.cxx @@ -2,9 +2,9 @@ * * $RCSfile: gtkinst.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: kz $ $Date: 2005-01-13 18:08:47 $ + * last change: $Author: obo $ $Date: 2005-04-22 11:35:36 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -66,8 +66,10 @@ #include <plugins/gtk/gtkframe.hxx> #include <plugins/gtk/gtkobject.hxx> +#include <rtl/strbuf.hxx> + #if OSL_DEBUG_LEVEL > 1 -#include <cstdio> +#include <stdio.h> #endif GtkHookedYieldMutex::GtkHookedYieldMutex() @@ -163,6 +165,28 @@ extern "C" #endif return NULL; } + /* #i47797# as long as we do not have a working atk bridge + * prevent atk from interfering with the java accessibility bridge + */ + #if ! defined HAVE_ATK_ACCESSIBILITY_BRIDGE + const gchar* pGtkModules = g_getenv( "GTK_MODULES" ); + if( pGtkModules ) + { + rtl::OString aModules( pGtkModules ); + rtl::OStringBuffer aModulesOut( aModules.getLength() ); + sal_Int32 nIndex = 0; + while( nIndex >= 0 ) + { + rtl::OString aToken = aModules.getToken( 0, ':', nIndex ); + if( aToken.equals( "gail" ) || + aToken.equals( "atk-bridge" ) ) + continue; + aModulesOut.append( ':' ); + aModulesOut.append( aToken ); + } + g_setenv( "GTK_MODULES", aModulesOut.getStr(), TRUE ); + } + #endif GtkYieldMutex *pYieldMutex; |