rpms/openoffice.org/FC-5 openoffice.org.spec, 1.651, 1.652 workspace.atkbridge.patch, 1.12, 1.13
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Mon Apr 10 13:25:34 UTC 2006
- Previous message (by thread): rpms/libvirt/devel .cvsignore, 1.5, 1.6 libvirt.spec, 1.6, 1.7 sources, 1.5, 1.6
- Next message (by thread): rpms/yelp/FC-5 .cvsignore, 1.25, 1.26 sources, 1.25, 1.26 yelp.spec, 1.55, 1.56
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: caolanm
Update of /cvs/dist/rpms/openoffice.org/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv8698
Modified Files:
openoffice.org.spec workspace.atkbridge.patch
Log Message:
mirror a11y fixes to fc5
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-5/openoffice.org.spec,v
retrieving revision 1.651
retrieving revision 1.652
diff -u -r1.651 -r1.652
--- openoffice.org.spec 29 Mar 2006 10:49:34 -0000 1.651
+++ openoffice.org.spec 10 Apr 2006 13:25:30 -0000 1.652
@@ -1,6 +1,6 @@
%define oootag OOB680
%define ooomilestone 5
-%define rh_rpm_release 7
+%define rh_rpm_release 8
%define build_fc5 1
@@ -159,7 +159,6 @@
Patch34: openoffice.org-2.0.2.ooo62030.solenv._version.patch
Patch35: openoffice.org-2.0.2.oooXXXXX.config_office.noppds.patch
Patch36: openoffice.org-2.0.2.ooo63155.sfx2.badscript.patch
-Patch37: openoffice.org-2.0.2.ooo63583.sd.accessibility.patch
%define instdir %{_libdir}/openoffice.org2.0
@@ -805,7 +804,6 @@
%patch34 -p1 -b .ooo62030.solenv._version.patch
%patch35 -p1 -b .oooXXXXX.config_office.noppds.patch
%patch36 -p1 -b .ooo63155.sfx2.badscript.patch
-%patch37 -p1 -b .ooo63583.sd.accessibility.patch
%if %{includingexternals}
#start ludicrous workaround
@@ -3245,6 +3243,9 @@
%{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
%changelog
+* Mon Apr 10 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.2-5.8
+- rh#188053# a11y fixes
+
* Wed Mar 29 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.2-5.7
- ooo#59997# replacement opens___.ttf updated
- drop integrated openoffice.org-2.0.0.ooo56651.sw.rtfcrash.patch
workspace.atkbridge.patch:
graphics/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx | 4
graphics/svx/source/accessibility/AccessibleContextBase.cxx | 1
graphics/svx/source/accessibility/AccessibleControlShape.cxx | 1
graphics/svx/source/accessibility/AccessibleEditableTextPara.cxx | 1
graphics/svx/source/accessibility/AccessibleFrameSelector.cxx | 3
graphics/svx/source/accessibility/AccessibleImageBullet.cxx | 1
graphics/svx/source/accessibility/ChildrenManagerImpl.cxx | 47
graphics/svx/source/accessibility/GraphCtlAccessibleContext.cxx | 1
graphics/svx/source/accessibility/charmapacc.cxx | 8
graphics/svx/source/accessibility/svxrectctaccessiblecontext.cxx | 2
gsl/fpicker/source/unx/gnome/FPentry.cxx | 3
gsl/toolkit/source/awt/accessiblemenubasecomponent.cxx | 15
gsl/toolkit/source/awt/accessiblemenucomponent.cxx | 3
gsl/toolkit/source/awt/accessiblemenuitemcomponent.cxx | 3
gsl/toolkit/source/awt/vclxaccessiblecomponent.cxx | 10
gsl/toolkit/source/awt/vclxaccessiblelistitem.cxx | 1
gsl/toolkit/source/awt/vclxaccessiblemenuitem.cxx | 8
gsl/toolkit/source/awt/vclxaccessiblestatusbaritem.cxx | 1
gsl/toolkit/source/awt/vclxaccessibletabpage.cxx | 1
gsl/toolkit/source/awt/vclxaccessibletoolboxitem.cxx | 19
gsl/toolkit/source/awt/vclxwindow.cxx | 80
gsl/vcl/inc/menu.hxx | 3
gsl/vcl/inc/svapp.hxx | 2
gsl/vcl/prj/build.lst | 3
gsl/vcl/source/app/svapp.cxx | 14
gsl/vcl/source/window/menu.cxx | 35
gsl/vcl/unx/gtk/a11y/TODO | 49
gsl/vcl/unx/gtk/a11y/atkaction.cxx | 283 +++
gsl/vcl/unx/gtk/a11y/atkbridge.cxx | 109 +
gsl/vcl/unx/gtk/a11y/atkcomponent.cxx | 387 ++++
gsl/vcl/unx/gtk/a11y/atkeditabletext.cxx | 207 ++
gsl/vcl/unx/gtk/a11y/atkfactory.cxx | 174 ++
gsl/vcl/unx/gtk/a11y/atkfactory.hxx | 49
gsl/vcl/unx/gtk/a11y/atkhypertext.cxx | 296 +++
gsl/vcl/unx/gtk/a11y/atkimage.cxx | 143 +
gsl/vcl/unx/gtk/a11y/atklistener.cxx | 474 +++++
gsl/vcl/unx/gtk/a11y/atklistener.hxx | 92 +
gsl/vcl/unx/gtk/a11y/atkselection.cxx | 200 ++
gsl/vcl/unx/gtk/a11y/atktable.cxx | 726 ++++++++
gsl/vcl/unx/gtk/a11y/atktext.cxx | 547 ++++++
gsl/vcl/unx/gtk/a11y/atktextattributes.cxx | 572 ++++++
gsl/vcl/unx/gtk/a11y/atktextattributes.hxx | 60
gsl/vcl/unx/gtk/a11y/atkutil.cxx | 626 +++++++
gsl/vcl/unx/gtk/a11y/atkutil.hxx | 45
gsl/vcl/unx/gtk/a11y/atkvalue.cxx | 152 +
gsl/vcl/unx/gtk/a11y/atkwindow.cxx | 149 +
gsl/vcl/unx/gtk/a11y/atkwindow.hxx | 45
gsl/vcl/unx/gtk/a11y/atkwrapper.cxx | 820 ++++++++++
gsl/vcl/unx/gtk/a11y/atkwrapper.hxx | 125 +
gsl/vcl/unx/gtk/a11y/makefile.mk | 102 +
gsl/vcl/unx/gtk/app/gtkinst.cxx | 42
gsl/vcl/unx/gtk/window/gtkframe.cxx | 142 +
gsl/vcl/unx/inc/plugins/gtk/atkbridge.hxx | 45
gsl/vcl/unx/inc/plugins/gtk/gtkframe.hxx | 16
gsl/vcl/util/makefile.mk | 2
util/comphelper/source/misc/accessiblewrapper.cxx | 6
util/svtools/source/Accessibility/accessibleiconchoicectrlentry.cxx | 1
util/svtools/source/Accessibility/accessiblelistboxentry.cxx | 1
util/svtools/source/Accessibility/accessibletabbar.cxx | 9
util/svtools/source/Accessibility/accessibletabbarpage.cxx | 21
util/svtools/source/Accessibility/accessibletabbarpagelist.cxx | 31
util/svtools/source/Accessibility/accessibletablistboxtable.cxx | 19
util/svtools/source/brwbox/brwbox3.cxx | 3
util/svtools/source/contnr/svtabbx.cxx | 3
util/svtools/source/control/valueacc.cxx | 2
util/svtools/source/edit/textwindowaccessibility.cxx | 2
66 files changed, 6911 insertions(+), 136 deletions(-)
Index: workspace.atkbridge.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-5/workspace.atkbridge.patch,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- workspace.atkbridge.patch 27 Mar 2006 19:08:19 -0000 1.12
+++ workspace.atkbridge.patch 10 Apr 2006 13:25:30 -0000 1.13
@@ -211,7 +211,7 @@
MenuBarWindow::MenuBarWindow( Window* pParent ) :
Index: gsl/vcl/unx/gtk/a11y/TODO
diff -u /dev/null gsl/vcl/unx/gtk/a11y/TODO:1.1.2.6
---- /dev/null Thu Mar 23 06:49:08 2006
+--- /dev/null Mon Apr 10 05:20:26 2006
+++ gsl/vcl/unx/gtk/a11y/TODO Tue May 31 07:08:21 2005
@@ -0,0 +1,49 @@
+cws 'atkbridge'
@@ -264,10 +264,10 @@
+ + HyperLink 'link_activated', HyperText 'link_selected' (?)
+ + tooltips create new toplevels with broken roles.
Index: gsl/vcl/unx/gtk/a11y/atkaction.cxx
-diff -u /dev/null gsl/vcl/unx/gtk/a11y/atkaction.cxx:1.1.2.7
---- /dev/null Thu Mar 23 06:49:08 2006
-+++ gsl/vcl/unx/gtk/a11y/atkaction.cxx Wed Feb 15 02:59:20 2006
-@@ -0,0 +1,287 @@
+diff -u /dev/null gsl/vcl/unx/gtk/a11y/atkaction.cxx:1.1.2.8
+--- /dev/null Mon Apr 10 05:20:26 2006
++++ gsl/vcl/unx/gtk/a11y/atkaction.cxx Fri Mar 31 04:19:38 2006
+@@ -0,0 +1,283 @@
+/*************************************************************************
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
@@ -385,8 +385,7 @@
+}
+
+static G_CONST_RETURN gchar *
-+action_wrapper_get_description (AtkAction *action,
-+ gint i)
++action_wrapper_get_description (AtkAction *, gint)
+{
+ // GAIL implement this only for cells
+ g_warning( "Not implemented: get_description()" );
@@ -394,8 +393,7 @@
+}
+
+static G_CONST_RETURN gchar *
-+action_wrapper_get_localized_name (AtkAction *action,
-+ gint i)
++action_wrapper_get_localized_name (AtkAction *, gint)
+{
+ // GAIL doesn't implement this as well
+ g_warning( "Not implemented: get_localized_name()" );
@@ -533,9 +531,7 @@
+}
+
+static gboolean
-+action_wrapper_set_description (AtkAction *action,
-+ gint i,
-+ const gchar *desc)
++action_wrapper_set_description (AtkAction *, gint, const gchar *)
+{
+ return FALSE;
+}
@@ -549,17 +545,17 @@
+
+ iface->do_action = action_wrapper_do_action;
+ iface->get_n_actions = action_wrapper_get_n_actions;
-+// iface->get_description = action_wrapper_get_description;
++ iface->get_description = action_wrapper_get_description;
+ iface->get_keybinding = action_wrapper_get_keybinding;
+ iface->get_name = action_wrapper_get_name;
-+// iface->get_localized_name = action_wrapper_get_localized_name;
++ iface->get_localized_name = action_wrapper_get_localized_name;
+ iface->set_description = action_wrapper_set_description;
+}
Index: gsl/vcl/unx/gtk/a11y/atkbridge.cxx
-diff -u /dev/null gsl/vcl/unx/gtk/a11y/atkbridge.cxx:1.1.2.2
---- /dev/null Thu Mar 23 06:49:08 2006
-+++ gsl/vcl/unx/gtk/a11y/atkbridge.cxx Wed Feb 15 02:59:21 2006
-@@ -0,0 +1,56 @@
+diff -u /dev/null gsl/vcl/unx/gtk/a11y/atkbridge.cxx:1.1.2.4
+--- /dev/null Mon Apr 10 05:20:26 2006
++++ gsl/vcl/unx/gtk/a11y/atkbridge.cxx Fri Mar 31 04:19:39 2006
+@@ -0,0 +1,109 @@
+/*************************************************************************
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
@@ -602,8 +598,61 @@
+#include "atkutil.hxx"
+#include "atkwindow.hxx"
+
++#include <stdio.h>
++
++#if ! ( defined AIX || defined HPUX ) // these have no dl* functions
++#include <dlfcn.h>
++#endif
++
+void InitAtkBridge(void)
+{
++ unsigned int major, minor, micro;
++
++ /* check gail minimum version requirements */
++ if( sscanf( atk_get_toolkit_version(), "%u.%u.%u", &major, &minor, µ) < 3 )
++ {
++ g_warning( "unable to parse gail version number" );
++ return;
++ }
++
++ if( ( (major << 16) | (minor << 8) | micro ) < ( (1 << 16) | 8 << 8 | 6 ) )
++ {
++ g_warning( "libgail >= 1.8.6 required for accessibility support" );
++ return;
++ }
++
++ /* get at-spi version by checking the libspi.so version number */
++
++#if ! ( defined AIX || defined HPUX ) // these have no dl* functions
++
++ /* libspi should be mapped by loading libatk-bridge.so already */
++ void * sym = dlsym( RTLD_DEFAULT, "spi_accessible_new" );
++ g_return_if_fail( sym != NULL );
++
++ Dl_info dl_info;
++ int ret = dladdr( sym, &dl_info );
++ g_return_if_fail( ret != 0 );
++
++ const char * cp = strrchr(dl_info.dli_fname, '/');
++ if( cp != NULL )
++ ++cp;
++ else
++ cp = dl_info.dli_fname;
++
++ if( sscanf( cp, "libspi.so.%u.%u.%u", &major, &minor, µ) < 3 )
++ {
++ g_warning( "unable to parse at-spi version number: %s", cp );
++ return;
++ }
++
++ if( ( (major << 16) | (minor << 8) | micro ) < ( 10 << 8 | 6 ) )
++ {
++ g_warning( "at-spi >= 1.7 required for accessibility support" );
++ return;
++ }
++
++#endif // ! ( defined AIX || defined HPUX )
++
+ /* Initialize the AtkUtilityWrapper class */
+ g_type_class_unref( g_type_class_ref( OOO_TYPE_ATK_UTIL ) );
+
@@ -617,10 +666,10 @@
+}
+
Index: gsl/vcl/unx/gtk/a11y/atkcomponent.cxx
-diff -u /dev/null gsl/vcl/unx/gtk/a11y/atkcomponent.cxx:1.1.2.8
---- /dev/null Thu Mar 23 06:49:08 2006
-+++ gsl/vcl/unx/gtk/a11y/atkcomponent.cxx Wed Feb 15 02:58:57 2006
-@@ -0,0 +1,397 @@
+diff -u /dev/null gsl/vcl/unx/gtk/a11y/atkcomponent.cxx:1.1.2.9
+--- /dev/null Mon Apr 10 05:20:26 2006
++++ gsl/vcl/unx/gtk/a11y/atkcomponent.cxx Fri Mar 31 04:19:39 2006
+@@ -0,0 +1,387 @@
+/*************************************************************************
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
@@ -693,7 +742,7 @@
+{
+ awt::Point aOrigin( 0, 0 );
+ if( t == ATK_XY_SCREEN )
-+ awt::Point aOrigin = pComponent->getLocationOnScreen();
++ aOrigin = pComponent->getLocationOnScreen();
+
+#ifdef ENABLE_TRACING
+ fprintf(stderr, "coordinates ( %u, %u ) translated to: ( %u, %u )\n",
@@ -871,12 +920,7 @@
+/*****************************************************************************/
+
+static gboolean
-+component_wrapper_set_extents (AtkComponent *component,
-+ gint x,
-+ gint y,
-+ gint width,
-+ gint height,
-+ AtkCoordType coord_type)
++component_wrapper_set_extents (AtkComponent *, gint, gint, gint, gint, AtkCoordType)
+{
+ g_warning( "AtkComponent::set_extents unimplementable" );
+ return FALSE;
@@ -885,10 +929,7 @@
+/*****************************************************************************/
+
+static gboolean
-+component_wrapper_set_position (AtkComponent *component,
-+ gint x,
-+ gint y,
-+ AtkCoordType coord_type)
++component_wrapper_set_position (AtkComponent *, gint, gint, AtkCoordType)
+{
+ g_warning( "AtkComponent::set_position unimplementable" );
+ return FALSE;
@@ -897,9 +938,7 @@
+/*****************************************************************************/
+
+static gboolean
-+component_wrapper_set_size (AtkComponent *component,
-+ gint width,
-+ gint height)
++component_wrapper_set_size (AtkComponent *, gint, gint)
+{
+ g_warning( "AtkComponent::set_size unimplementable" );
+ return FALSE;
@@ -948,7 +987,7 @@
+/*****************************************************************************/
+
+static gint
-+component_wrapper_get_mdi_zorder (AtkComponent *component)
++component_wrapper_get_mdi_zorder (AtkComponent *)
+{
+ // only needed for ATK_LAYER_MDI (not used) or ATK_LAYER_WINDOW (inherited from GAIL)
+ return G_MININT;
@@ -970,7 +1009,7 @@
+ signal_id = g_signal_lookup( "focus-event", ATK_TYPE_OBJECT );
+
+ ret = g_signal_handler_find( component, match_type, signal_id, 0, NULL,
-+ (gpointer) handler, NULL);
++ (gpointer) &handler, NULL);
+ if (!ret)
+ {
+ return g_signal_connect_closure_by_id (component,
@@ -1020,7 +1059,7 @@
+}
Index: gsl/vcl/unx/gtk/a11y/atkeditabletext.cxx
diff -u /dev/null gsl/vcl/unx/gtk/a11y/atkeditabletext.cxx:1.1.2.7
---- /dev/null Thu Mar 23 06:49:08 2006
+--- /dev/null Mon Apr 10 05:20:26 2006
+++ gsl/vcl/unx/gtk/a11y/atkeditabletext.cxx Wed Feb 15 02:59:21 2006
@@ -0,0 +1,207 @@
+/*************************************************************************
@@ -1231,10 +1270,10 @@
+ iface->set_run_attributes = editable_text_wrapper_set_run_attributes;
+}
Index: gsl/vcl/unx/gtk/a11y/atkfactory.cxx
-diff -u /dev/null gsl/vcl/unx/gtk/a11y/atkfactory.cxx:1.1.2.10
---- /dev/null Thu Mar 23 06:49:08 2006
-+++ gsl/vcl/unx/gtk/a11y/atkfactory.cxx Thu Mar 23 06:45:26 2006
-@@ -0,0 +1,168 @@
+diff -u /dev/null gsl/vcl/unx/gtk/a11y/atkfactory.cxx:1.1.2.12
+--- /dev/null Mon Apr 10 05:20:26 2006
++++ gsl/vcl/unx/gtk/a11y/atkfactory.cxx Fri Mar 31 04:19:39 2006
+@@ -0,0 +1,174 @@
+/*************************************************************************
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
@@ -1285,7 +1324,7 @@
+ */
+
+static AtkStateSet *
-+noop_wrapper_ref_state_set( AtkObject *pObject )
++noop_wrapper_ref_state_set( AtkObject * )
+{
+ AtkStateSet *state_set = atk_state_set_new();
+ atk_state_set_add_state( state_set, ATK_STATE_DEFUNCT );
@@ -1317,6 +1356,7 @@
+ sizeof (AtkObjectWrapper),
+ 0,
+ (GInstanceInitFunc) NULL,
++ NULL
+ } ;
+
+ type = g_type_register_static (ATK_TYPE_OBJECT, "OOoAtkNoOpObj", &typeInfo, (GTypeFlags)0) ;
@@ -1361,7 +1401,12 @@
+ GtkSalFrame* pFrame = GtkSalFrame::getFromWindow( GTK_WINDOW( parent_widget ) );
+ g_return_val_if_fail( pFrame != NULL, NULL );
+
-+ AtkObject* parent_accessible = (AtkObject *) g_object_get_data(G_OBJECT( parent_widget ), "Accessible");
++ /* HACK: if the parent gtk window has an accessible already assigned, use
++ * this one to avoid endless recursion (see atkwindow.cxx).
++ */
++ AtkObject* parent_accessible = (AtkObject *) g_object_get_data(G_OBJECT( parent_widget ),
++ "ooo:tooltip-accessible");
++
+ if( ! parent_accessible )
+ parent_accessible = gtk_widget_get_accessible(parent_widget);
+
@@ -1401,11 +1446,11 @@
+ return t;
+}
+
-+}; // extern C
++} // extern C
+
Index: gsl/vcl/unx/gtk/a11y/atkfactory.hxx
diff -u /dev/null gsl/vcl/unx/gtk/a11y/atkfactory.hxx:1.1.2.1
---- /dev/null Thu Mar 23 06:49:08 2006
+--- /dev/null Mon Apr 10 05:20:26 2006
+++ gsl/vcl/unx/gtk/a11y/atkfactory.hxx Thu Jan 5 06:06:31 2006
@@ -0,0 +1,49 @@
+/*************************************************************************
@@ -1458,10 +1503,10 @@
+
+#endif
Index: gsl/vcl/unx/gtk/a11y/atkhypertext.cxx
-diff -u /dev/null gsl/vcl/unx/gtk/a11y/atkhypertext.cxx:1.1.2.9
---- /dev/null Thu Mar 23 06:49:08 2006
-+++ gsl/vcl/unx/gtk/a11y/atkhypertext.cxx Tue Mar 7 00:49:02 2006
-@@ -0,0 +1,295 @@
+diff -u /dev/null gsl/vcl/unx/gtk/a11y/atkhypertext.cxx:1.1.2.10
+--- /dev/null Mon Apr 10 05:20:26 2006
++++ gsl/vcl/unx/gtk/a11y/atkhypertext.cxx Fri Mar 31 04:19:39 2006
+@@ -0,0 +1,296 @@
+/*************************************************************************
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
@@ -1602,14 +1647,15 @@
+ }
+ return 0;
+}
++
+static guint
-+hyper_link_link_state( AtkHyperlink *pLink )
++hyper_link_link_state( AtkHyperlink * )
+{
+ g_warning( "FIXME: hyper_link_link_state unimplemented" );
+ return 0;
+}
+static gboolean
-+hyper_link_is_selected_link( AtkHyperlink *pLink )
++hyper_link_is_selected_link( AtkHyperlink * )
+{
+ g_warning( "FIXME: hyper_link_is_selected_link unimplemented" );
+ return FALSE;
@@ -1758,10 +1804,10 @@
+ iface->get_link_index = hypertext_get_link_index;
+}
Index: gsl/vcl/unx/gtk/a11y/atkimage.cxx
-diff -u /dev/null gsl/vcl/unx/gtk/a11y/atkimage.cxx:1.1.2.4
---- /dev/null Thu Mar 23 06:49:08 2006
-+++ gsl/vcl/unx/gtk/a11y/atkimage.cxx Wed Feb 15 02:59:23 2006
-@@ -0,0 +1,144 @@
+diff -u /dev/null gsl/vcl/unx/gtk/a11y/atkimage.cxx:1.1.2.5
+--- /dev/null Mon Apr 10 05:20:26 2006
++++ gsl/vcl/unx/gtk/a11y/atkimage.cxx Fri Mar 31 04:19:39 2006
+@@ -0,0 +1,143 @@
+/*************************************************************************
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
@@ -1887,8 +1933,7 @@
+}
+
+static gboolean
-+image_set_image_description( AtkImage *image,
-+ const gchar *description )
++image_set_image_description( AtkImage *, const gchar * )
+{
+ g_warning ("FIXME: no set image description");
+ return FALSE;
@@ -1907,9 +1952,9 @@
+ iface->get_image_size = image_get_image_size;
+}
Index: gsl/vcl/unx/gtk/a11y/atklistener.cxx
-diff -u /dev/null gsl/vcl/unx/gtk/a11y/atklistener.cxx:1.1.2.17
---- /dev/null Thu Mar 23 06:49:08 2006
-+++ gsl/vcl/unx/gtk/a11y/atklistener.cxx Wed Mar 1 04:00:16 2006
+diff -u /dev/null gsl/vcl/unx/gtk/a11y/atklistener.cxx:1.1.2.20
+--- /dev/null Mon Apr 10 05:20:26 2006
++++ gsl/vcl/unx/gtk/a11y/atklistener.cxx Fri Mar 31 06:09:17 2006
@@ -0,0 +1,474 @@
+/*************************************************************************
+ *
@@ -1989,7 +2034,7 @@
+/*****************************************************************************/
+
+// XEventListener implementation
-+void AtkListener::disposing( const lang::EventObject& aEvent ) throw (uno::RuntimeException)
++void AtkListener::disposing( const lang::EventObject& ) throw (uno::RuntimeException)
+{
+ if( mpAccessible )
+ {
@@ -2154,8 +2199,6 @@
+// XAccessibleEventListener
+void AtkListener::notifyEvent( const accessibility::AccessibleEventObject& aEvent ) throw( uno::RuntimeException )
+{
-+ AtkPropertyValues aValues = { NULL };
-+
+ if( !mpAccessible )
+ return;
+
@@ -2209,9 +2252,10 @@
+ atk_object_notify_state_change( mpAccessible, eRealState, bState );
+ break;
+ }
-+
++
+ case accessibility::AccessibleEventId::BOUNDRECT_CHANGED:
+
++#ifdef HAS_ATKRECTANGLE
+ if( ATK_IS_COMPONENT( mpAccessible ) )
+ {
+ AtkRectangle rect;
@@ -2227,6 +2271,7 @@
+ }
+ else
+ g_warning( "bounds_changed event for object not implementing AtkComponent\n");
++#endif
+
+ break;
+
@@ -2381,13 +2426,13 @@
+ break;
+
+ default:
-+ g_warning( "Unknown event notification" );
++ g_warning( "Unknown event notification %d", aEvent.EventId );
+ break;
+ }
+}
Index: gsl/vcl/unx/gtk/a11y/atklistener.hxx
diff -u /dev/null gsl/vcl/unx/gtk/a11y/atklistener.hxx:1.1.2.7
---- /dev/null Thu Mar 23 06:49:08 2006
+--- /dev/null Mon Apr 10 05:20:26 2006
+++ gsl/vcl/unx/gtk/a11y/atklistener.hxx Wed Feb 15 02:59:24 2006
@@ -0,0 +1,92 @@
+/*************************************************************************
@@ -2484,7 +2529,7 @@
+
Index: gsl/vcl/unx/gtk/a11y/atkselection.cxx
diff -u /dev/null gsl/vcl/unx/gtk/a11y/atkselection.cxx:1.1.2.6
---- /dev/null Thu Mar 23 06:49:08 2006
+--- /dev/null Mon Apr 10 05:20:26 2006
+++ gsl/vcl/unx/gtk/a11y/atkselection.cxx Wed Feb 15 02:59:24 2006
@@ -0,0 +1,200 @@
+/*************************************************************************
@@ -2688,10 +2733,10 @@
+ iface->select_all_selection = selection_select_all_selection;
+}
Index: gsl/vcl/unx/gtk/a11y/atktable.cxx
-diff -u /dev/null gsl/vcl/unx/gtk/a11y/atktable.cxx:1.1.2.7
---- /dev/null Thu Mar 23 06:49:08 2006
-+++ gsl/vcl/unx/gtk/a11y/atktable.cxx Wed Feb 15 02:58:28 2006
-@@ -0,0 +1,737 @@
+diff -u /dev/null gsl/vcl/unx/gtk/a11y/atktable.cxx:1.1.2.8
+--- /dev/null Mon Apr 10 05:20:26 2006
++++ gsl/vcl/unx/gtk/a11y/atktable.cxx Fri Mar 31 04:19:39 2006
+@@ -0,0 +1,726 @@
+/*************************************************************************
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
@@ -3146,7 +3191,7 @@
+ if( pTable )
+ {
+ // FIXME: Summary ??
-+ AtkObject* summary;
++// AtkObject* summary;
+ return atk_object_wrapper_conditional_ref( pTable->getAccessibleSummary() );
+ }
+ }
@@ -3302,19 +3347,16 @@
+/*****************************************************************************/
+
+static gboolean
-+table_wrapper_add_row_selection( AtkTable *table,
-+ gint row )
++table_wrapper_add_row_selection( AtkTable *, gint )
+{
+ g_warning( "FIXME: no simple analogue for add_row_selection" );
+ return 0;
+}
+
-+
+/*****************************************************************************/
+
+static gboolean
-+table_wrapper_remove_row_selection( AtkTable *table,
-+ gint row )
++table_wrapper_remove_row_selection( AtkTable *, gint )
+{
+ g_warning( "FIXME: no simple analogue for remove_row_selection" );
+ return 0;
@@ -3323,37 +3365,32 @@
+/*****************************************************************************/
+
+static gboolean
-+table_wrapper_add_column_table( AtkTable *table,
-+ gint column )
++table_wrapper_add_column_selection( AtkTable *, gint )
+{
-+ g_warning( "FIXME: no simple analogue for add_column_table" );
++ g_warning( "FIXME: no simple analogue for add_column_selection" );
+ return 0;
+}
+
+/*****************************************************************************/
+
+static gboolean
-+table_wrapper_remove_column_table( AtkTable *table,
-+ gint column)
++table_wrapper_remove_column_selection( AtkTable *, gint )
+{
-+ g_warning( "FIXME: no simple analogue for remove_column_table" );
++ g_warning( "FIXME: no simple analogue for remove_column_selection" );
+ return 0;
+}
+
+/*****************************************************************************/
+
+static void
-+table_wrapper_set_caption( AtkTable *table,
-+ AtkObject *caption )
++table_wrapper_set_caption( AtkTable *, AtkObject * )
+{ // meaningless helper
+}
+
+/*****************************************************************************/
+
+static void
-+table_wrapper_set_column_description( AtkTable *table,
-+ gint column,
-+ const gchar *description )
++table_wrapper_set_column_description( AtkTable *, gint, const gchar * )
+{ // meaningless helper
+}
+
@@ -3361,9 +3398,7 @@
+/*****************************************************************************/
+
+static void
-+table_wrapper_set_column_header( AtkTable *table,
-+ gint column,
-+ AtkObject *header )
++table_wrapper_set_column_header( AtkTable *, gint, AtkObject * )
+{ // meaningless helper
+}
+
@@ -3371,26 +3406,21 @@
+/*****************************************************************************/
+
+static void
-+table_wrapper_set_row_description( AtkTable *table,
-+ gint row,
-+ const gchar *description )
++table_wrapper_set_row_description( AtkTable *, gint, const gchar * )
+{ // meaningless helper
+}
+
+/*****************************************************************************/
+
+static void
-+table_wrapper_set_row_header( AtkTable *table,
-+ gint row,
-+ AtkObject *header )
++table_wrapper_set_row_header( AtkTable *, gint, AtkObject * )
+{ // meaningless helper
+}
+
+/*****************************************************************************/
+
+static void
-+table_wrapper_set_summary( AtkTable *table,
-+ AtkObject *accessible )
++table_wrapper_set_summary( AtkTable *, AtkObject * )
+{ // meaningless helper
+}
+
@@ -3414,6 +3444,10 @@
+ iface->get_selected_rows = table_wrapper_get_selected_rows;
+ iface->add_row_selection = table_wrapper_add_row_selection;
+ iface->remove_row_selection = table_wrapper_remove_row_selection;
++ iface->add_column_selection = table_wrapper_add_column_selection;
++ iface->remove_column_selection = table_wrapper_remove_column_selection;
++ iface->get_selected_columns = table_wrapper_get_selected_columns;
++ iface->is_column_selected = table_wrapper_is_column_selected;
+ iface->get_column_extent_at = table_wrapper_get_column_extent_at;
+ iface->get_row_extent_at = table_wrapper_get_row_extent_at;
+ iface->get_row_header = table_wrapper_get_row_header;
@@ -3430,9 +3464,9 @@
+ iface->set_column_description = table_wrapper_set_column_description;
+}
Index: gsl/vcl/unx/gtk/a11y/atktext.cxx
-diff -u /dev/null gsl/vcl/unx/gtk/a11y/atktext.cxx:1.1.2.12
---- /dev/null Thu Mar 23 06:49:08 2006
-+++ gsl/vcl/unx/gtk/a11y/atktext.cxx Wed Feb 15 02:59:25 2006
+diff -u /dev/null gsl/vcl/unx/gtk/a11y/atktext.cxx:1.1.2.13
+--- /dev/null Mon Apr 10 05:20:26 2006
++++ gsl/vcl/unx/gtk/a11y/atktext.cxx Fri Mar 31 04:19:40 2006
@@ -0,0 +1,547 @@
+/*************************************************************************
+ *
@@ -3768,7 +3802,7 @@
+}
+
+static AtkAttributeSet *
-+text_wrapper_get_default_attributes( AtkText *text )
++text_wrapper_get_default_attributes( AtkText * )
+{
+ // currently there is no way to determine the default values. Maybe getCharacterAttributes
+ // should return default and direct values ??
@@ -3947,7 +3981,7 @@
+ try {
+ accessibility::XAccessibleText* pText = getText( text );
+ if( pText )
-+ return pText->setSelection( 0, 0 ); // ?
++ return pText->setSelection( start_offset, end_offset );
+ }
+ catch(const uno::Exception& e) {
+ g_warning( "Exception in setSelection()" );
@@ -3982,9 +4016,9 @@
+ iface->get_offset_at_point = text_wrapper_get_offset_at_point;
+}
Index: gsl/vcl/unx/gtk/a11y/atktextattributes.cxx
-diff -u /dev/null gsl/vcl/unx/gtk/a11y/atktextattributes.cxx:1.1.2.2
---- /dev/null Thu Mar 23 06:49:08 2006
-+++ gsl/vcl/unx/gtk/a11y/atktextattributes.cxx Tue Feb 14 04:42:40 2006
+diff -u /dev/null gsl/vcl/unx/gtk/a11y/atktextattributes.cxx:1.1.2.3
+--- /dev/null Mon Apr 10 05:20:26 2006
++++ gsl/vcl/unx/gtk/a11y/atktextattributes.cxx Fri Mar 31 04:19:40 2006
@@ -0,0 +1,572 @@
+/*************************************************************************
+ *
@@ -4045,13 +4079,13 @@
+/*****************************************************************************/
+
+static gchar*
-+NullString(const uno::Any& rAny)
++NullString(const uno::Any&)
+{
+ return NULL;
+}
+
+static bool
-+InvalidValue( uno::Any& rAny, const gchar * value )
++InvalidValue( uno::Any&, const gchar * )
+{
+ return false;
+}
@@ -4081,7 +4115,7 @@
+static gchar*
+Long2String(const uno::Any& rAny)
+{
-+ return g_strdup_printf( "%d", rAny.get<sal_Int32>() );
++ return g_strdup_printf( "%ld", rAny.get<sal_Int32>() );
+}
+
+static bool
@@ -4089,7 +4123,7 @@
+{
+ sal_Int32 lval;
+
-+ if( 1 != sscanf( value, "%d", &lval ) )
++ if( 1 != sscanf( value, "%ld", &lval ) )
+ return false;
+
+ rAny = uno::makeAny( lval );
@@ -4103,7 +4137,7 @@
+{
+ sal_Int32 nColor = rAny.get<sal_Int32>();
+
-+ if( nColor != 0xFFFFFFFF ) // AUTOMATIC
++ if( nColor != -1 ) // AUTOMATIC
+ {
+ sal_uInt8 blue = nColor & 0xFF;
+ sal_uInt8 green = (nColor >> 8) & 0xFF;
@@ -4118,9 +4152,9 @@
+static bool
+String2Color( uno::Any& rAny, const gchar * value )
+{
-+ sal_uInt8 red, green, blue;
++ int red, green, blue;
+
-+ if( 3 != sscanf( value, "%u,%u,%u", &red, &green, &blue ) )
++ if( 3 != sscanf( value, "%d,%d,%d", &red, &green, &blue ) )
+ return false;
+
+ sal_Int32 nColor = (sal_Int32) blue | ( (sal_Int32) green << 8 ) | ( ( sal_Int32 ) red << 16 );
@@ -4364,7 +4398,7 @@
+MarginHeight2Pixel(const uno::Any& rAny)
+{
+ Size aMargin = LogicToPixel( 0, rAny.get<sal_Int32>() );
-+ return g_strdup_printf( "%d", aMargin.getHeight() );
++ return g_strdup_printf( "%ld", aMargin.getHeight() );
+}
+
+static bool
@@ -4372,7 +4406,7 @@
+{
+ sal_Int32 nHeight;
+
-+ if( 1 != sscanf( value, "%d", &nHeight ) )
++ if( 1 != sscanf( value, "%ld", &nHeight ) )
+ return false;
+
+ Size aMargin = PixelToLogic( 0, nHeight );
@@ -4384,7 +4418,7 @@
+MarginWidth2Pixel(const uno::Any& rAny)
+{
+ Size aMargin = LogicToPixel( rAny.get<sal_Int32>(), 0 );
-+ return g_strdup_printf( "%d", aMargin.getWidth() );
++ return g_strdup_printf( "%ld", aMargin.getWidth() );
+}
+
+static bool
@@ -4392,7 +4426,7 @@
+{
+ sal_Int32 nWidth;
+
-+ if( 1 != sscanf( value, "%d", &nWidth ) )
++ if( 1 != sscanf( value, "%ld", &nWidth ) )
+ return false;
+
+ Size aMargin = PixelToLogic( nWidth, 0 );
@@ -4560,7 +4594,7 @@
+
Index: gsl/vcl/unx/gtk/a11y/atktextattributes.hxx
diff -u /dev/null gsl/vcl/unx/gtk/a11y/atktextattributes.hxx:1.1.2.1
---- /dev/null Thu Mar 23 06:49:08 2006
+--- /dev/null Mon Apr 10 05:20:26 2006
+++ gsl/vcl/unx/gtk/a11y/atktextattributes.hxx Thu Dec 22 00:24:30 2005
@@ -0,0 +1,60 @@
+/*************************************************************************
@@ -4624,10 +4658,10 @@
+
+#endif
Index: gsl/vcl/unx/gtk/a11y/atkutil.cxx
-diff -u /dev/null gsl/vcl/unx/gtk/a11y/atkutil.cxx:1.1.2.14
---- /dev/null Thu Mar 23 06:49:08 2006
-+++ gsl/vcl/unx/gtk/a11y/atkutil.cxx Fri Mar 3 03:07:09 2006
-@@ -0,0 +1,625 @@
+diff -u /dev/null gsl/vcl/unx/gtk/a11y/atkutil.cxx:1.1.2.15
+--- /dev/null Mon Apr 10 05:20:26 2006
++++ gsl/vcl/unx/gtk/a11y/atkutil.cxx Fri Mar 31 04:19:40 2006
+@@ -0,0 +1,626 @@
+/*************************************************************************
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
@@ -4975,7 +5009,7 @@
+/*****************************************************************************/
+
+void DocumentFocusListener::detachRecursive(
-+ const uno::Reference< accessibility::XAccessible >& xAccessible,
++ const uno::Reference< accessibility::XAccessible >&,
+ const uno::Reference< accessibility::XAccessibleContext >& xContext,
+ const uno::Reference< accessibility::XAccessibleStateSet >& xStateSet
+) throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
@@ -5104,7 +5138,7 @@
+
+/*****************************************************************************/
+
-+long WindowEventHandler(void * not_used, ::VclSimpleEvent const * pEvent)
++long WindowEventHandler(void *, ::VclSimpleEvent const * pEvent)
+{
+ switch (pEvent->GetId())
+ {
@@ -5198,7 +5232,7 @@
+ */
+
+static void
-+ooo_atk_util_class_init (AtkUtilClass *klass)
++ooo_atk_util_class_init (AtkUtilClass *)
+{
+ AtkUtilClass *atk_class;
+ gpointer data;
@@ -5245,6 +5279,7 @@
+ type_query.instance_size,
+ 0,
+ (GInstanceInitFunc) NULL,
++ NULL
+ } ;
+
+ type = g_type_register_static (parent_type, "OOoUtil", &typeInfo, (GTypeFlags)0) ;
@@ -5255,7 +5290,7 @@
+
Index: gsl/vcl/unx/gtk/a11y/atkutil.hxx
diff -u /dev/null gsl/vcl/unx/gtk/a11y/atkutil.hxx:1.1.2.4
---- /dev/null Thu Mar 23 06:49:08 2006
+--- /dev/null Mon Apr 10 05:20:26 2006
+++ gsl/vcl/unx/gtk/a11y/atkutil.hxx Thu Jan 5 06:06:32 2006
@@ -0,0 +1,45 @@
+/*************************************************************************
@@ -5305,7 +5340,7 @@
+#endif
Index: gsl/vcl/unx/gtk/a11y/atkvalue.cxx
diff -u /dev/null gsl/vcl/unx/gtk/a11y/atkvalue.cxx:1.1.2.4
---- /dev/null Thu Mar 23 06:49:08 2006
+--- /dev/null Mon Apr 10 05:20:26 2006
+++ gsl/vcl/unx/gtk/a11y/atkvalue.cxx Wed Feb 15 02:59:25 2006
@@ -0,0 +1,152 @@
+/*************************************************************************
@@ -5461,10 +5496,10 @@
+ iface->set_current_value = value_wrapper_set_current_value;
+}
Index: gsl/vcl/unx/gtk/a11y/atkwindow.cxx
-diff -u /dev/null gsl/vcl/unx/gtk/a11y/atkwindow.cxx:1.1.2.4
---- /dev/null Thu Mar 23 06:49:08 2006
-+++ gsl/vcl/unx/gtk/a11y/atkwindow.cxx Thu Mar 23 06:45:26 2006
-@@ -0,0 +1,145 @@
+diff -u /dev/null gsl/vcl/unx/gtk/a11y/atkwindow.cxx:1.1.2.6
+--- /dev/null Mon Apr 10 05:20:26 2006
++++ gsl/vcl/unx/gtk/a11y/atkwindow.cxx Fri Mar 31 04:19:40 2006
+@@ -0,0 +1,149 @@
+/*************************************************************************
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
@@ -5519,9 +5554,12 @@
+
+ if( obj->role == ATK_ROLE_TOOL_TIP )
+ {
-+ // Avoid endless loop when get_name this is called from
-+ // gail_window_new () context
-+ g_object_set_data( G_OBJECT( data ), "Accessible", obj );
++ /* HACK: Avoid endless loop when get_name is called from
++ * gail_window_new() context, which leads to the code path
++ * showing up in wrapper_factory_create_accessible with no
++ * accessible assigned to the GtkWindow yet.
++ */
++ g_object_set_data( G_OBJECT( data ), "ooo:tooltip-accessible", obj );
+ }
+}
+
@@ -5603,6 +5641,7 @@
+ type_query.instance_size,
+ 0,
+ (GInstanceInitFunc) NULL,
++ NULL
+ } ;
+
+ type = g_type_register_static (parent_type, "OOoWindowAtkObject", &typeInfo, (GTypeFlags)0) ;
@@ -5612,7 +5651,7 @@
+}
Index: gsl/vcl/unx/gtk/a11y/atkwindow.hxx
diff -u /dev/null gsl/vcl/unx/gtk/a11y/atkwindow.hxx:1.1.2.1
---- /dev/null Thu Mar 23 06:49:08 2006
+--- /dev/null Mon Apr 10 05:20:26 2006
+++ gsl/vcl/unx/gtk/a11y/atkwindow.hxx Thu Jan 5 06:06:34 2006
@@ -0,0 +1,45 @@
+/*************************************************************************
@@ -5661,10 +5700,10 @@
+
+#endif
Index: gsl/vcl/unx/gtk/a11y/atkwrapper.cxx
-diff -u /dev/null gsl/vcl/unx/gtk/a11y/atkwrapper.cxx:1.1.2.21
---- /dev/null Thu Mar 23 06:49:08 2006
-+++ gsl/vcl/unx/gtk/a11y/atkwrapper.cxx Wed Feb 15 02:58:57 2006
-@@ -0,0 +1,819 @@
+diff -u /dev/null gsl/vcl/unx/gtk/a11y/atkwrapper.cxx:1.1.2.22
+--- /dev/null Mon Apr 10 05:20:26 2006
++++ gsl/vcl/unx/gtk/a11y/atkwrapper.cxx Fri Mar 31 04:19:40 2006
+@@ -0,0 +1,820 @@
+/*************************************************************************
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
@@ -5812,14 +5851,17 @@
+ return type;
+}
+
++
+AtkStateType mapAtkState( sal_Int16 nState )
+{
++ AtkStateType type = ATK_STATE_INVALID;
++
+ // A perfect / complete mapping ...
+ switch( nState )
+ {
+#define MAP_DIRECT( a ) \
-+ case accessibility::AccessibleStateType::a: \
-+ return ATK_STATE_##a; break
++ case accessibility::AccessibleStateType::a: \
++ type = ATK_STATE_##a; break
+
+ MAP_DIRECT( INVALID );
+ MAP_DIRECT( ACTIVE );
@@ -5852,21 +5894,24 @@
+ MAP_DIRECT( VISIBLE );
+ // a spelling error ...
+ case accessibility::AccessibleStateType::DEFUNC:
-+ return ATK_STATE_DEFUNCT; break;
++ type = ATK_STATE_DEFUNCT; break;
+ case accessibility::AccessibleStateType::MULTI_SELECTABLE:
-+ return ATK_STATE_MULTISELECTABLE; break;
++ type = ATK_STATE_MULTISELECTABLE; break;
+ default:
-+ return ATK_STATE_INVALID;
+ break;
+ }
++
++ return type;
+}
+
+static AtkRole mapToAtkRole( sal_Int16 nRole )
+{
++ AtkRole role = ATK_ROLE_UNKNOWN;
++
+ switch( nRole )
+ {
+#define MAP(a,b) \
-+ case a: return b; break
++ case a: role = b; break
+
+ MAP( ::accessibility::AccessibleRole::UNKNOWN, ATK_ROLE_UNKNOWN );
+ MAP( ::accessibility::AccessibleRole::ALERT, ATK_ROLE_ALERT );
@@ -5937,6 +5982,8 @@
+ MAP( ::accessibility::AccessibleRole::VIEW_PORT, ATK_ROLE_VIEWPORT );
+ MAP( ::accessibility::AccessibleRole::WINDOW, ATK_ROLE_WINDOW );
+#undef MAP
++ default:
++ break;
+ }
+/* Roles unimplemented by OO.o / a11y:
+ ATK_ROLE_INVALID, ATK_ROLE_ACCEL_LABEL, ATK_ROLE_ANIMATION,
@@ -5946,15 +5993,9 @@
+ ATK_ROLE_TERMINAL, ATK_ROLE_TREE_TABLE, ATK_ROLE_RULER,
+ ATK_ROLE_APPLICATION, ATK_ROLE_AUTOCOMPLETE, ATK_ROLE_EDITBAR */
+
-+ return ATK_ROLE_UNKNOWN;
++ return role;
+}
+
-+static gchar *
-+mapToGChar( rtl::OUString aString )
-+{
-+ rtl::OString aUtf8 = rtl::OUStringToOString( aString, RTL_TEXTENCODING_UTF8 );
-+ return g_strdup( aUtf8 );
-+}
+
+static accessibility::XAccessibleContext*
+ getContext( AtkObject* obj ) throw (uno::RuntimeException)
@@ -6112,11 +6153,11 @@
+ sal_uInt32 nTargetCount = aRelation.TargetSet.getLength();
+ AtkObject **pTargets = (AtkObject **) alloca( nTargetCount * sizeof(AtkObject *) );
+
-+ for( sal_uInt32 n = 0; n < nTargetCount; n++ )
++ for( sal_uInt32 i = 0; i < nTargetCount; i++ )
+ {
+ uno::Reference< accessibility::XAccessible > xAccessible(
-+ aRelation.TargetSet[n], uno::UNO_QUERY );
-+ pTargets[n] = atk_object_wrapper_ref( xAccessible );
++ aRelation.TargetSet[i], uno::UNO_QUERY );
++ pTargets[i] = atk_object_wrapper_ref( xAccessible );
+ }
+
+ AtkRelation *pRel = atk_relation_new
@@ -6147,13 +6188,11 @@
+ uno::Reference< accessibility::XAccessibleStateSet > xStateSet =
+ pContext->getAccessibleStateSet();
+
-+ uno::Sequence< sal_Int16 > aStates;
-+
+ if( xStateSet.is() )
+ {
+ uno::Sequence< sal_Int16 > aStates = xStateSet->getStates();
+
-+ for( sal_uInt32 n = 0; n < aStates.getLength(); n++ )
++ for( sal_Int32 n = 0; n < aStates.getLength(); n++ )
+ atk_state_set_add_state( pSet, mapAtkState( aStates[n] ) );
+
+ // We need to emulate FOCUS state for menus, menu-items etc.
@@ -6218,7 +6257,7 @@
+
+static void
+atk_object_wrapper_init (AtkObjectWrapper *wrapper,
-+ AtkObjectWrapperClass *klass)
++ AtkObjectWrapperClass)
+{
+ wrapper->mpAction = NULL;
+ wrapper->mpComponent = NULL;
@@ -6251,6 +6290,7 @@
+ sizeof (AtkObjectWrapper),
+ 0,
+ (GInstanceInitFunc) atk_object_wrapper_init,
++ NULL
+ } ;
+ type = g_type_register_static (ATK_TYPE_OBJECT,
+ "OOoAtkObj",
@@ -6361,17 +6401,17 @@
+ sizeof( AtkObjectWrapperClass ),
+ NULL, NULL, NULL, NULL, NULL,
+ sizeof( AtkObjectWrapper ),
-+ 0, NULL
++ 0, NULL, NULL
+ } ;
+ nType = g_type_register_static( ATK_TYPE_OBJECT_WRAPPER,
+ aTypeName, &aTypeInfo, (GTypeFlags)0 ) ;
+
-+ for( int i = 0; i < aTypeTableSize; i++ )
-+ if( bTypes[i] )
++ for( int j = 0; j < aTypeTableSize; j++ )
++ if( bTypes[j] )
+ {
+ GInterfaceInfo aIfaceInfo = { NULL, NULL, NULL };
-+ aIfaceInfo.interface_init = aTypeTable[i].aInit;
-+ g_type_add_interface_static (nType, aTypeTable[i].aGetGIfaceType(),
++ aIfaceInfo.interface_init = aTypeTable[j].aInit;
++ g_type_add_interface_static (nType, aTypeTable[j].aGetGIfaceType(),
+ &aIfaceInfo);
+ }
+ }
@@ -6485,9 +6525,9 @@
+ RELEASE( wrapper->mpValue )
+}
Index: gsl/vcl/unx/gtk/a11y/atkwrapper.hxx
-diff -u /dev/null gsl/vcl/unx/gtk/a11y/atkwrapper.hxx:1.1.2.8
---- /dev/null Thu Mar 23 06:49:08 2006
-+++ gsl/vcl/unx/gtk/a11y/atkwrapper.hxx Wed Feb 15 02:59:26 2006
+diff -u /dev/null gsl/vcl/unx/gtk/a11y/atkwrapper.hxx:1.1.2.9
+--- /dev/null Mon Apr 10 05:20:26 2006
++++ gsl/vcl/unx/gtk/a11y/atkwrapper.hxx Fri Mar 31 04:19:40 2006
@@ -0,0 +1,125 @@
+/*************************************************************************
+ *
@@ -6598,7 +6638,7 @@
+void textIfaceInit(AtkTextIface *iface);
+void valueIfaceInit(AtkValueIface *iface);
+
-+}; // extern "C"
++} // extern "C"
+
+#define ATK_TYPE_OBJECT_WRAPPER atk_object_wrapper_get_type()
+#define ATK_OBJECT_WRAPPER(obj) \
@@ -6615,10 +6655,10 @@
+
+#endif /* __ATK_WRAPPER_HXX__ */
Index: gsl/vcl/unx/gtk/a11y/makefile.mk
-diff -u /dev/null gsl/vcl/unx/gtk/a11y/makefile.mk:1.1.2.12
---- /dev/null Thu Mar 23 06:49:08 2006
-+++ gsl/vcl/unx/gtk/a11y/makefile.mk Thu Feb 16 22:09:46 2006
-@@ -0,0 +1,96 @@
+diff -u /dev/null gsl/vcl/unx/gtk/a11y/makefile.mk:1.1.2.13
+--- /dev/null Mon Apr 10 05:20:26 2006
++++ gsl/vcl/unx/gtk/a11y/makefile.mk Fri Mar 31 06:09:18 2006
+@@ -0,0 +1,102 @@
+#*************************************************************************
+#
+# OpenOffice.org - a multi-platform office productivity suite
@@ -6685,6 +6725,12 @@
+
+CFLAGS+=-DVERSION=\"$(UPD)$(LAST_MINOR)\"
+
++ATKVERSION:=$(shell $(PKGCONFIG) --modversion atk | $(AWK) -v num=true -f $(SOLARENV)$/bin$/getcompver.awk)
++
++.IF $(ATKVERSION) >= "000100070000"
++CFLAGS+=-DHAS_ATKRECTANGLE
++.ENDIF
++
+LIB1TARGET=$(SLB)$/$(TARGET).lib
+LIB1OBJFILES=\
+ $(SLO)$/atkaction.obj \
@@ -6790,9 +6836,9 @@
return pInstance;
}
Index: gsl/vcl/unx/gtk/window/gtkframe.cxx
-diff -u gsl/vcl/unx/gtk/window/gtkframe.cxx:1.42 gsl/vcl/unx/gtk/window/gtkframe.cxx:1.28.6.19
---- gsl/vcl/unx/gtk/window/gtkframe.cxx:1.42 Wed Jan 25 03:40:22 2006
-+++ gsl/vcl/unx/gtk/window/gtkframe.cxx Fri Feb 17 03:10:57 2006
+diff -u gsl/vcl/unx/gtk/window/gtkframe.cxx:1.43 gsl/vcl/unx/gtk/window/gtkframe.cxx:1.28.6.20
+--- gsl/vcl/unx/gtk/window/gtkframe.cxx:1.43 Wed Mar 22 02:40:30 2006
++++ gsl/vcl/unx/gtk/window/gtkframe.cxx Tue Mar 28 03:34:26 2006
@@ -45,6 +45,7 @@
#include <floatwin.hxx>
#include <salprn.h>
@@ -6986,7 +7032,7 @@
m_aForeignParentWindow = None;
Index: gsl/vcl/unx/inc/plugins/gtk/atkbridge.hxx
diff -u /dev/null gsl/vcl/unx/inc/plugins/gtk/atkbridge.hxx:1.1.2.3
---- /dev/null Thu Mar 23 06:49:08 2006
+--- /dev/null Mon Apr 10 05:20:28 2006
+++ gsl/vcl/unx/inc/plugins/gtk/atkbridge.hxx Thu Jan 12 05:57:32 2006
@@ -0,0 +1,45 @@
+/*************************************************************************
@@ -7453,6 +7499,74 @@
}
catch( const uno::Exception& ) {}
}
+Index: graphics/svx/source/accessibility/ChildrenManagerImpl.cxx
+diff -u graphics/svx/source/accessibility/ChildrenManagerImpl.cxx:1.33 graphics/svx/source/accessibility/ChildrenManagerImpl.cxx:1.33.172.1
+--- graphics/svx/source/accessibility/ChildrenManagerImpl.cxx:1.33 Thu Sep 8 13:20:26 2005
++++ graphics/svx/source/accessibility/ChildrenManagerImpl.cxx Thu Mar 30 00:27:45 2006
+@@ -537,34 +537,45 @@
+
+ void ChildrenManagerImpl::ClearAccessibleShapeList (void)
+ {
++ // Copy the list of (visible) shapes to local lists and clear the
++ // originals.
++ ChildDescriptorListType aLocalVisibleChildren;
++ aLocalVisibleChildren.swap(maVisibleChildren);
++ AccessibleShapeList aLocalAccessibleShapes;
++ aLocalAccessibleShapes.swap(maAccessibleShapes);
++
++ // Tell the listeners that all children are gone.
++ mrContext.CommitChange (
++ AccessibleEventId::INVALIDATE_ALL_CHILDREN,
++ uno::Any(),
++ uno::Any());
++
++ // There are no accessible shapes left so the index assigned to new
++ // accessible shapes can be reset.
++ mnNewNameIndex = 1;
++
++ // Now the objects in the local lists can be safely disposed without
++ // having problems with callers that want to update their child lists.
++
+ // Clear the list of visible accessible objects. Objects not created on
+ // demand for XShapes are treated below.
+- ChildDescriptorListType::iterator I,aEnd = maVisibleChildren.end();
+- for (I=maVisibleChildren.begin(); I != aEnd; ++I)
++ ChildDescriptorListType::iterator I,aEnd = aLocalVisibleChildren.end();
++ for (I=aLocalVisibleChildren.begin(); I != aEnd; ++I)
+ if ( I->mxAccessibleShape.is() && I->mxShape.is() )
+- I->disposeAccessibleObject(mrContext);
+-
+- maVisibleChildren.clear ();
+-
++ {
++ ::comphelper::disposeComponent(I->mxAccessibleShape);
++ I->mxAccessibleShape = NULL;
++ }
+
+ // Dispose all objects in the accessible shape list.
+- AccessibleShapeList::iterator J,aEnd2 = maAccessibleShapes.end();
+- for (J=maAccessibleShapes.begin(); J != aEnd2; ++J)
++ AccessibleShapeList::iterator J,aEnd2 = aLocalAccessibleShapes.end();
++ for (J=aLocalAccessibleShapes.begin(); J != aEnd2; ++J)
+ if (J->is())
+ {
+- mrContext.CommitChange (
+- AccessibleEventId::CHILD,
+- uno::Any(),
+- uno::makeAny (*J));
+-
+ // Dispose the object.
+ ::comphelper::disposeComponent(*J);
++ *J = NULL;
+ }
+- maAccessibleShapes.clear ();
+-
+- // Now that no accessible shapes remain we can reset the index assigned
+- // to new accessible shapes.
+- mnNewNameIndex = 1;
+ }
+
+
Index: graphics/svx/source/accessibility/GraphCtlAccessibleContext.cxx
diff -u graphics/svx/source/accessibility/GraphCtlAccessibleContext.cxx:1.18 graphics/svx/source/accessibility/GraphCtlAccessibleContext.cxx:1.18.168.1
--- graphics/svx/source/accessibility/GraphCtlAccessibleContext.cxx:1.18 Thu Sep 8 13:21:42 2005
@@ -7762,3 +7876,25 @@
<< ::css::accessibility::AccessibleStateType::FOCUSABLE)
| (static_cast< ::sal_Int64 >(1)
<< ::css::accessibility::AccessibleStateType::MULTI_LINE);
+Index: graphics/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
+diff -u graphics/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx:1.21 graphics/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx:1.21.14.1
+--- graphics/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx:1.21 Tue Mar 21 09:31:22 2006
++++ graphics/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx Thu Mar 30 00:45:28 2006
+@@ -110,7 +110,7 @@
+ pWindow->SetUseDropScroll (false);
+ // Change the winbits so that the active window accepts the focus.
+ pWindow->SetStyle ((pWindow->GetStyle() & ~WB_DIALOGCONTROL) | WB_TABSTOP);
+- pWindow->Show();
++ pWindow->Hide();
+
+
+ SetPool( &GetDoc()->GetPool() );
+@@ -266,6 +266,8 @@
+ CreateView());
+ DBG_ASSERT (mpSlideSorterView.get()!=NULL,
+ "Can not create view for slide browser");
++
++ mpView = mpSlideSorterView.get();
+
+ mpSlideSorterController
+ = ::std::auto_ptr<controller::SlideSorterController>(
- Previous message (by thread): rpms/libvirt/devel .cvsignore, 1.5, 1.6 libvirt.spec, 1.6, 1.7 sources, 1.5, 1.6
- Next message (by thread): rpms/yelp/FC-5 .cvsignore, 1.25, 1.26 sources, 1.25, 1.26 yelp.spec, 1.55, 1.56
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list