diff options
author | Oliver Bolte <obo@openoffice.org> | 2008-07-25 08:11:44 +0000 |
---|---|---|
committer | Oliver Bolte <obo@openoffice.org> | 2008-07-25 08:11:44 +0000 |
commit | b31e5809f5b560babe9c860a432e2f301a9e12ad (patch) | |
tree | 934bc9fca4f310a6c42a8e1403944b91ea6cfd3d /vcl/unx/gtk/a11y/atkwindow.cxx | |
parent | c7251af143185427b4cbb8b780b62215905f16dc (diff) |
INTEGRATION: CWS aqua11y02 (1.8.6); FILE MERGED
2008/06/06 10:19:20 obr 1.8.6.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/atkwindow.cxx')
-rw-r--r-- | vcl/unx/gtk/a11y/atkwindow.cxx | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/vcl/unx/gtk/a11y/atkwindow.cxx b/vcl/unx/gtk/a11y/atkwindow.cxx index 044621e83913..5961556e85d7 100644 --- a/vcl/unx/gtk/a11y/atkwindow.cxx +++ b/vcl/unx/gtk/a11y/atkwindow.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: atkwindow.cxx,v $ - * $Revision: 1.8 $ + * $Revision: 1.9 $ * * This file is part of OpenOffice.org. * @@ -47,7 +47,6 @@ extern "C" { static void (* window_real_initialize) (AtkObject *obj, gpointer data) = NULL; static void (* window_real_finalize) (GObject *obj) = NULL; -static G_CONST_RETURN gchar* (* window_real_get_name) (AtkObject *accessible) = NULL; static void init_from_window( AtkObject *accessible, Window *pWindow ) @@ -197,7 +196,7 @@ ooo_window_wrapper_class_init (AtkObjectClass *klass, gpointer) /* * Patch the gobject vtable of GailWindow to refer to our instance of - * "initialize" and "get_name". + * "initialize". */ data = g_type_class_peek_parent( klass ); @@ -268,6 +267,5 @@ void restore_gail_window_vtable (void) atk_class = ATK_OBJECT_CLASS (data); atk_class->initialize = window_real_initialize; - atk_class->get_name = window_real_get_name; } |