diff options
author | RĂ¼diger Timm <rt@openoffice.org> | 2006-05-05 09:22:27 +0000 |
---|---|---|
committer | RĂ¼diger Timm <rt@openoffice.org> | 2006-05-05 09:22:27 +0000 |
commit | 57f332a89aa5aade66a4460bb8b00da8bd78b6d8 (patch) | |
tree | ebea2f487d23b34075424a446f9ff5c49bb66028 /fpicker/source | |
parent | 9a243a32dd0f93740dab9c79a7d040e47bdc7711 (diff) |
INTEGRATION: CWS atkbridge (1.4.26); FILE MERGED
2005/12/07 14:37:07 obr 1.4.26.1: #i42429# has been fixed in at-spi rev. 1.6.6
Diffstat (limited to 'fpicker/source')
-rw-r--r-- | fpicker/source/unx/gnome/FPentry.cxx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/fpicker/source/unx/gnome/FPentry.cxx b/fpicker/source/unx/gnome/FPentry.cxx index 5a93f778d5..9e02de60df 100644 --- a/fpicker/source/unx/gnome/FPentry.cxx +++ b/fpicker/source/unx/gnome/FPentry.cxx @@ -4,9 +4,9 @@ * * $RCSfile: FPentry.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: rt $ $Date: 2005-09-08 23:34:31 $ + * last change: $Author: rt $ $Date: 2006-05-05 10:22:27 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -158,8 +158,7 @@ void* SAL_CALL component_getFactory( { if ( /* crude gtkplug check */ !g_type_from_name( "GdkDisplay" ) || - /* old version */ !( gtk_major_version >= 2 && gtk_minor_version >= 4 ) || - /* #i42429# */ Application::GetSettings().GetMiscSettings().GetEnableATToolSupport() + /* old version */ !( gtk_major_version >= 2 && gtk_minor_version >= 4 ) ) { return 0; |