rpms/openoffice.org/FC-5 openoffice.org.spec, 1.658, 1.659 workspace.atkbridge.patch, 1.13, 1.14
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Wed May 10 12:20:45 UTC 2006
Author: caolanm
Update of /cvs/dist/rpms/openoffice.org/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv26244
Modified Files:
openoffice.org.spec workspace.atkbridge.patch
Log Message:
rh#191206# move to latest atkbridge
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-5/openoffice.org.spec,v
retrieving revision 1.658
retrieving revision 1.659
diff -u -r1.658 -r1.659
--- openoffice.org.spec 2 May 2006 07:43:42 -0000 1.658
+++ openoffice.org.spec 10 May 2006 12:20:41 -0000 1.659
@@ -1,6 +1,6 @@
%define oootag OOB680
%define ooomilestone 5
-%define rh_rpm_release 9
+%define rh_rpm_release 10
%define build_fc5 1
@@ -3253,6 +3253,9 @@
%{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
%changelog
+* Wed Apr 26 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.2-5.10
+- rh#191206# update workspace.atkbridge to final version
+
* Wed Apr 26 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.2-5.9
- avoid the patch backup in final rpms
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 | 115 +
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 | 620 +++++++
gsl/vcl/unx/gtk/a11y/atktextattributes.cxx | 572 ++++++
gsl/vcl/unx/gtk/a11y/atktextattributes.hxx | 60
gsl/vcl/unx/gtk/a11y/atkutil.cxx | 643 +++++++
gsl/vcl/unx/gtk/a11y/atkutil.hxx | 45
gsl/vcl/unx/gtk/a11y/atkvalue.cxx | 152 +
gsl/vcl/unx/gtk/a11y/atkwindow.cxx | 169 ++
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, 7027 insertions(+), 136 deletions(-)
Index: workspace.atkbridge.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-5/workspace.atkbridge.patch,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- workspace.atkbridge.patch 10 Apr 2006 13:25:30 -0000 1.13
+++ workspace.atkbridge.patch 10 May 2006 12:20:41 -0000 1.14
@@ -44,10 +44,10 @@
// -----------
Index: gsl/vcl/inc/svapp.hxx
-diff -u gsl/vcl/inc/svapp.hxx:1.35 gsl/vcl/inc/svapp.hxx:1.35.12.1
---- gsl/vcl/inc/svapp.hxx:1.35 Fri Sep 9 04:29:11 2005
-+++ gsl/vcl/inc/svapp.hxx Thu Oct 20 00:07:01 2005
-@@ -349,7 +349,7 @@
+diff -u gsl/vcl/inc/svapp.hxx:1.36 gsl/vcl/inc/svapp.hxx:1.35.12.2
+--- gsl/vcl/inc/svapp.hxx:1.36 Fri Apr 7 08:28:31 2006
++++ gsl/vcl/inc/svapp.hxx Thu Apr 13 03:10:38 2006
+@@ -348,7 +348,7 @@
static void AddKeyListener( const Link& rKeyListener );
static void RemoveKeyListener( const Link& rKeyListener );
static void ImplCallEventListeners( ULONG nEvent, Window* pWin, void* pData );
@@ -76,10 +76,10 @@
+vc vcl\util nmake - all vc_util vc__plug.u vc__appa.u vc__appm.m vc__appu.u vc__appw.w vc__gdim.m vc__gdiu.u vc__gdiw.w vc__srcm.m vc__srcu.u vc__srcw.w vc__wina.u vc__winm.m vc__winu.u vc__winw.w vc__du.u vc__gtka.u vc__gtky.u vc__gtkw.u vc__gtkg.u vc__kde.u vc_app vc_ctrl vc_gdi vc_hlp vc_src vc_win vc_glyphs NULL
vc vcl\workben nmake - all vc_wrkb vc_util NULL
Index: gsl/vcl/source/app/svapp.cxx
-diff -u gsl/vcl/source/app/svapp.cxx:1.61 gsl/vcl/source/app/svapp.cxx:1.58.10.7
---- gsl/vcl/source/app/svapp.cxx:1.61 Tue Feb 7 02:21:10 2006
-+++ gsl/vcl/source/app/svapp.cxx Thu Feb 16 05:51:32 2006
-@@ -867,7 +867,7 @@
+diff -u gsl/vcl/source/app/svapp.cxx:1.62 gsl/vcl/source/app/svapp.cxx:1.58.10.8
+--- gsl/vcl/source/app/svapp.cxx:1.62 Fri Apr 7 08:29:41 2006
++++ gsl/vcl/source/app/svapp.cxx Thu Apr 13 03:11:31 2006
+@@ -875,7 +875,7 @@
// -----------------------------------------------------------------------
@@ -88,7 +88,7 @@
{
ImplSVData* pSVData = ImplGetSVData();
-@@ -1227,7 +1227,7 @@
+@@ -1235,7 +1235,7 @@
{
long nRet = 0;
ImplSVData* pSVData = ImplGetSVData();
@@ -97,7 +97,7 @@
while( pWin )
{
if( pWin->ImplGetWindow()->IsTopWindow() )
-@@ -1243,7 +1243,7 @@
+@@ -1251,7 +1251,7 @@
{
long nIdx = 0;
ImplSVData* pSVData = ImplGetSVData();
@@ -106,7 +106,7 @@
while( pWin )
{
if( pWin->ImplGetWindow()->IsTopWindow() )
-@@ -1868,10 +1868,12 @@
+@@ -1876,10 +1876,12 @@
BOOL InitAccessBridge( BOOL bShowCancel, BOOL &rCancelled )
{
@@ -121,7 +121,7 @@
if( !bRet && bShowCancel && !rCancelled )
{
// disable accessibility if the user chooses to continue
-@@ -1881,7 +1883,7 @@
+@@ -1889,7 +1891,7 @@
aSettings.SetMiscSettings( aMisc );
Application::SetSettings( aSettings );
}
@@ -131,10 +131,10 @@
return bRet;
}
Index: gsl/vcl/source/window/menu.cxx
-diff -u gsl/vcl/source/window/menu.cxx:1.132 gsl/vcl/source/window/menu.cxx:1.127.12.6
---- gsl/vcl/source/window/menu.cxx:1.132 Thu Jan 26 10:10:24 2006
-+++ gsl/vcl/source/window/menu.cxx Mon Jan 30 08:17:33 2006
-@@ -577,7 +577,6 @@
+diff -u gsl/vcl/source/window/menu.cxx:1.133 gsl/vcl/source/window/menu.cxx:1.127.12.7
+--- gsl/vcl/source/window/menu.cxx:1.133 Fri Apr 7 08:34:24 2006
++++ gsl/vcl/source/window/menu.cxx Thu Apr 13 03:14:51 2006
+@@ -574,7 +574,6 @@
USHORT GetPosInParent() const { return nPosInParent; }
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible();
@@ -142,7 +142,7 @@
};
// To get the transparent mouse-over look, the closer is actually a toolbox
-@@ -1112,6 +1111,13 @@
+@@ -1109,6 +1108,13 @@
{
VclMenuEvent aEvent( this, nEvent, nPos );
@@ -156,7 +156,7 @@
if ( !maEventListeners.empty() )
maEventListeners.Call( &aEvent );
-@@ -2884,7 +2890,20 @@
+@@ -2881,7 +2887,20 @@
return FALSE;
}
@@ -178,7 +178,7 @@
// -----------
// - MenuBar -
-@@ -4406,9 +4425,11 @@
+@@ -4403,9 +4422,11 @@
else
{
StopExecute();
@@ -191,7 +191,7 @@
}
}
break;
-@@ -4622,16 +4643,10 @@
+@@ -4619,16 +4640,10 @@
{
::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > xAcc;
@@ -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 Mon Apr 10 05:20:26 2006
+--- /dev/null Wed May 10 05:10:01 2006
+++ gsl/vcl/unx/gtk/a11y/TODO Tue May 31 07:08:21 2005
@@ -0,0 +1,49 @@
+cws 'atkbridge'
@@ -265,7 +265,7 @@
+ + 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.8
---- /dev/null Mon Apr 10 05:20:26 2006
+--- /dev/null Wed May 10 05:10:01 2006
+++ gsl/vcl/unx/gtk/a11y/atkaction.cxx Fri Mar 31 04:19:38 2006
@@ -0,0 +1,283 @@
+/*************************************************************************
@@ -552,10 +552,10 @@
+ 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.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 @@
+diff -u /dev/null gsl/vcl/unx/gtk/a11y/atkbridge.cxx:1.1.2.5
+--- /dev/null Wed May 10 05:10:01 2006
++++ gsl/vcl/unx/gtk/a11y/atkbridge.cxx Tue Apr 11 01:45:10 2006
+@@ -0,0 +1,115 @@
+/*************************************************************************
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
@@ -622,7 +622,6 @@
+ }
+
+ /* 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 */
@@ -632,8 +631,15 @@
+ Dl_info dl_info;
+ int ret = dladdr( sym, &dl_info );
+ g_return_if_fail( ret != 0 );
++
++ char path[PATH_MAX];
++ if( NULL == realpath(dl_info.dli_fname, path) )
++ {
++ perror( "unable to resolve libspi.so.0" );
++ return;
++ }
+
-+ const char * cp = strrchr(dl_info.dli_fname, '/');
++ const char * cp = strrchr(path, '/');
+ if( cp != NULL )
+ ++cp;
+ else
@@ -667,7 +673,7 @@
+
Index: gsl/vcl/unx/gtk/a11y/atkcomponent.cxx
diff -u /dev/null gsl/vcl/unx/gtk/a11y/atkcomponent.cxx:1.1.2.9
---- /dev/null Mon Apr 10 05:20:26 2006
+--- /dev/null Wed May 10 05:10:01 2006
+++ gsl/vcl/unx/gtk/a11y/atkcomponent.cxx Fri Mar 31 04:19:39 2006
@@ -0,0 +1,387 @@
+/*************************************************************************
@@ -1059,7 +1065,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 Mon Apr 10 05:20:26 2006
+--- /dev/null Wed May 10 05:10:01 2006
+++ gsl/vcl/unx/gtk/a11y/atkeditabletext.cxx Wed Feb 15 02:59:21 2006
@@ -0,0 +1,207 @@
+/*************************************************************************
@@ -1271,7 +1277,7 @@
+}
Index: gsl/vcl/unx/gtk/a11y/atkfactory.cxx
diff -u /dev/null gsl/vcl/unx/gtk/a11y/atkfactory.cxx:1.1.2.12
---- /dev/null Mon Apr 10 05:20:26 2006
+--- /dev/null Wed May 10 05:10:01 2006
+++ gsl/vcl/unx/gtk/a11y/atkfactory.cxx Fri Mar 31 04:19:39 2006
@@ -0,0 +1,174 @@
+/*************************************************************************
@@ -1450,7 +1456,7 @@
+
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 Mon Apr 10 05:20:26 2006
+--- /dev/null Wed May 10 05:10:01 2006
+++ gsl/vcl/unx/gtk/a11y/atkfactory.hxx Thu Jan 5 06:06:31 2006
@@ -0,0 +1,49 @@
+/*************************************************************************
@@ -1504,7 +1510,7 @@
+#endif
Index: gsl/vcl/unx/gtk/a11y/atkhypertext.cxx
diff -u /dev/null gsl/vcl/unx/gtk/a11y/atkhypertext.cxx:1.1.2.10
---- /dev/null Mon Apr 10 05:20:26 2006
+--- /dev/null Wed May 10 05:10:01 2006
+++ gsl/vcl/unx/gtk/a11y/atkhypertext.cxx Fri Mar 31 04:19:39 2006
@@ -0,0 +1,296 @@
+/*************************************************************************
@@ -1805,7 +1811,7 @@
+}
Index: gsl/vcl/unx/gtk/a11y/atkimage.cxx
diff -u /dev/null gsl/vcl/unx/gtk/a11y/atkimage.cxx:1.1.2.5
---- /dev/null Mon Apr 10 05:20:26 2006
+--- /dev/null Wed May 10 05:10:01 2006
+++ gsl/vcl/unx/gtk/a11y/atkimage.cxx Fri Mar 31 04:19:39 2006
@@ -0,0 +1,143 @@
+/*************************************************************************
@@ -1953,7 +1959,7 @@
+}
Index: gsl/vcl/unx/gtk/a11y/atklistener.cxx
diff -u /dev/null gsl/vcl/unx/gtk/a11y/atklistener.cxx:1.1.2.20
---- /dev/null Mon Apr 10 05:20:26 2006
+--- /dev/null Wed May 10 05:10:01 2006
+++ gsl/vcl/unx/gtk/a11y/atklistener.cxx Fri Mar 31 06:09:17 2006
@@ -0,0 +1,474 @@
+/*************************************************************************
@@ -2432,7 +2438,7 @@
+}
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 Mon Apr 10 05:20:26 2006
+--- /dev/null Wed May 10 05:10:01 2006
+++ gsl/vcl/unx/gtk/a11y/atklistener.hxx Wed Feb 15 02:59:24 2006
@@ -0,0 +1,92 @@
+/*************************************************************************
@@ -2529,7 +2535,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 Mon Apr 10 05:20:26 2006
+--- /dev/null Wed May 10 05:10:01 2006
+++ gsl/vcl/unx/gtk/a11y/atkselection.cxx Wed Feb 15 02:59:24 2006
@@ -0,0 +1,200 @@
+/*************************************************************************
@@ -2734,7 +2740,7 @@
+}
Index: gsl/vcl/unx/gtk/a11y/atktable.cxx
diff -u /dev/null gsl/vcl/unx/gtk/a11y/atktable.cxx:1.1.2.8
---- /dev/null Mon Apr 10 05:20:26 2006
+--- /dev/null Wed May 10 05:10:01 2006
+++ gsl/vcl/unx/gtk/a11y/atktable.cxx Fri Mar 31 04:19:39 2006
@@ -0,0 +1,726 @@
+/*************************************************************************
@@ -3464,10 +3470,10 @@
+ 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.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 @@
+diff -u /dev/null gsl/vcl/unx/gtk/a11y/atktext.cxx:1.1.2.19
+--- /dev/null Wed May 10 05:10:01 2006
++++ gsl/vcl/unx/gtk/a11y/atktext.cxx Fri Apr 28 05:35:46 2006
+@@ -0,0 +1,620 @@
+/*************************************************************************
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
@@ -3510,6 +3516,12 @@
+#include <com/sun/star/accessibility/TextSegment.hpp>
+#include <com/sun/star/accessibility/XAccessibleText.hpp>
+
++// #define ENABLE_TRACING
++
++#ifdef ENABLE_TRACING
++#include <stdio.h>
++#endif
++
+using namespace ::com::sun::star;
+
+static sal_Int16
@@ -3550,21 +3562,31 @@
+ switch(boundary_type)
+ {
+ case ATK_TEXT_BOUNDARY_CHAR:
++ case ATK_TEXT_BOUNDARY_LINE_START:
++ case ATK_TEXT_BOUNDARY_LINE_END:
++ case ATK_TEXT_BOUNDARY_SENTENCE_START:
+ start = rTextSegment.SegmentStart;
+ end = rTextSegment.SegmentEnd;
+ aString = rTextSegment.SegmentText;
+ break;
-+
++
++ // the OOo break iterator behaves as SENTENCE_START
++ case ATK_TEXT_BOUNDARY_SENTENCE_END:
++ if( rTextSegment.SegmentStart > 0 )
++ start = rTextSegment.SegmentStart - 1;
++ if( rTextSegment.SegmentEnd > 0 )
++ end = rTextSegment.SegmentEnd - 1;
++ aString = pText->getTextRange(start, end);
++ break;
++
+ case ATK_TEXT_BOUNDARY_WORD_START:
-+ case ATK_TEXT_BOUNDARY_SENTENCE_START:
-+ case ATK_TEXT_BOUNDARY_LINE_START:
+ start = rTextSegment.SegmentStart;
+
+ // Determine the start index of the next segment
+ aTextSegment = pText->getTextBehindIndex(rTextSegment.SegmentEnd,
+ text_type_from_boundary(boundary_type));
+ if( aTextSegment.SegmentText.getLength() > 0 )
-+ end = aTextSegment.SegmentStart - 1;
++ end = aTextSegment.SegmentStart;
+ else
+ end = pText->getCharacterCount();
+
@@ -3572,15 +3594,13 @@
+ break;
+
+ case ATK_TEXT_BOUNDARY_WORD_END:
-+ case ATK_TEXT_BOUNDARY_SENTENCE_END:
-+ case ATK_TEXT_BOUNDARY_LINE_END:
+ end = rTextSegment.SegmentEnd;
+
+ // Determine the end index of the previous segment
+ aTextSegment = pText->getTextBeforeIndex(rTextSegment.SegmentStart,
+ text_type_from_boundary(boundary_type));
+ if( aTextSegment.SegmentText.getLength() > 0 )
-+ start = aTextSegment.SegmentEnd + 1;
++ start = aTextSegment.SegmentEnd;
+ else
+ start = 0;
+
@@ -3594,6 +3614,13 @@
+
+ *start_offset = start;
+ *end_offset = end;
++
++#ifdef ENABLE_TRACING
++ fprintf(stderr, "adjust_boundaries( %d, %d, %d ) returns %d, %d\n",
++ rTextSegment.SegmentStart, rTextSegment.SegmentEnd, boundary_type,
++ start, end);
++#endif
++
+ return OUStringToGChar(aString);
+}
+
@@ -3628,7 +3655,9 @@
+ gint end_offset)
+{
+ gchar * ret = NULL;
-+
++
++ g_return_val_if_fail( (end_offset == -1) || (end_offset >= start_offset), NULL );
++
+ try {
+ accessibility::XAccessibleText* pText = getText( text );
+ if( pText )
@@ -3644,6 +3673,9 @@
+ g_warning( "Exception in getText()" );
+ }
+
++#ifdef ENABLE_TRACING
++ fprintf(stderr, "text_wrapper_get_text( %d,%d ) returns %s\n", start_offset, end_offset, ret);
++#endif
+ return ret;
+}
+
@@ -3735,16 +3767,22 @@
+static gint
+text_wrapper_get_caret_offset (AtkText *text)
+{
++ gint offset = -1;
++
+ try {
+ accessibility::XAccessibleText* pText = getText( text );
+ if( pText )
-+ return pText->getCaretPosition();
++ offset = pText->getCaretPosition();
+ }
+ catch(const uno::Exception& e) {
+ g_warning( "Exception in getCaretPosition()" );
+ }
+
-+ return -1;
++#ifdef ENABLE_TRACING
++ fprintf(stderr, "get_caret_offset(%p) returns %d\n", text, offset);
++#endif
++
++ return offset;
+}
+
+static gboolean
@@ -3801,15 +3839,39 @@
+ return pSet;
+}
+
++/*****************************************************************************/
++
+static AtkAttributeSet *
-+text_wrapper_get_default_attributes( AtkText * )
++text_wrapper_get_default_attributes( AtkText *text )
+{
-+ // currently there is no way to determine the default values. Maybe getCharacterAttributes
-+ // should return default and direct values ??
-+ g_warning( "FIXME: get_default_attributes unimplemented - needs new UNO API semantic" );
-+ return NULL;
++ AtkAttributeSet *pSet = NULL;
++
++ try {
++ accessibility::XAccessibleText* pText = getText( text );
++ if( pText )
++ {
++ uno::Sequence< beans::PropertyValue > aAttributeList =
++ pText->getCharacterAttributes( 0, uno::Sequence< rtl::OUString > () );
++
++ pSet = attribute_set_new_from_property_values( aAttributeList, beans::PropertyState_DEFAULT_VALUE );
++ }
++ }
++ catch(const uno::Exception& e) {
++
++ g_warning( "Exception in get_default_attributes()" );
++
++ if( pSet )
++ {
++ atk_attribute_set_free( pSet );
++ pSet = NULL;
++ }
++ }
++
++ return pSet;
+}
+
++/*****************************************************************************/
++
+static void
+text_wrapper_get_character_extents( AtkText *text,
+ gint offset,
@@ -3839,6 +3901,11 @@
+ *y = aRect.Y + origin_y;
+ *width = aRect.Width;
+ *height = aRect.Height;
++
++#ifdef ENABLE_TRACING
++ fprintf(stderr, "get_character_extents(%d, %d) returns: %d,%d,%d,%d ",
++ offset, coords, *x, *y, *width, *height);
++#endif
+ }
+ }
+ catch(const uno::Exception& e) {
@@ -3849,16 +3916,22 @@
+static gint
+text_wrapper_get_character_count (AtkText *text)
+{
++ gint rv = 0;
++
+ try {
+ accessibility::XAccessibleText* pText = getText( text );
+ if( pText )
-+ return pText->getCharacterCount();
++ rv = pText->getCharacterCount();
+ }
+ catch(const uno::Exception& e) {
+ g_warning( "Exception in getCharacterCount" );
+ }
+
-+ return 0;
++#ifdef ENABLE_TRACING
++ fprintf(stderr, "get_character_count(%p) returns: %d\n", text, rv);
++#endif
++
++ return rv;
+}
+
+static gint
@@ -3895,16 +3968,22 @@
+static gint
+text_wrapper_get_n_selections (AtkText *text)
+{
++ gint rv = 0;
++
+ try {
+ accessibility::XAccessibleText* pText = getText( text );
+ if( pText )
-+ return ( pText->getSelectionEnd() > pText->getSelectionStart() ) ? 1 : 0;
++ rv = ( pText->getSelectionEnd() > pText->getSelectionStart() ) ? 1 : 0;
+ }
+ catch(const uno::Exception& e) {
+ g_warning( "Exception in getSelectionEnd() or getSelectionStart()" );
+ }
-+
-+ return 0;
++
++#ifdef ENABLE_TRACING
++ fprintf(stderr, "get_n_selections(%p) returns %d\n", text, rv);
++#endif
++
++ return rv;
+}
+
+static gchar *
@@ -4017,7 +4096,7 @@
+}
Index: gsl/vcl/unx/gtk/a11y/atktextattributes.cxx
diff -u /dev/null gsl/vcl/unx/gtk/a11y/atktextattributes.cxx:1.1.2.3
---- /dev/null Mon Apr 10 05:20:26 2006
+--- /dev/null Wed May 10 05:10:01 2006
+++ gsl/vcl/unx/gtk/a11y/atktextattributes.cxx Fri Mar 31 04:19:40 2006
@@ -0,0 +1,572 @@
+/*************************************************************************
@@ -4594,7 +4673,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 Mon Apr 10 05:20:26 2006
+--- /dev/null Wed May 10 05:10:01 2006
+++ gsl/vcl/unx/gtk/a11y/atktextattributes.hxx Thu Dec 22 00:24:30 2005
@@ -0,0 +1,60 @@
+/*************************************************************************
@@ -4658,10 +4737,10 @@
+
+#endif
Index: gsl/vcl/unx/gtk/a11y/atkutil.cxx
-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 @@
+diff -u /dev/null gsl/vcl/unx/gtk/a11y/atkutil.cxx:1.1.2.17
+--- /dev/null Wed May 10 05:10:01 2006
++++ gsl/vcl/unx/gtk/a11y/atkutil.cxx Thu Apr 27 07:47:54 2006
+@@ -0,0 +1,643 @@
+/*************************************************************************
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
@@ -4740,7 +4819,12 @@
+#include "atkutil.hxx"
+
+#include <set>
++
++// #define ENABLE_TRACING
++
++#ifdef ENABLE_TRACING
+#include <stdio.h>
++#endif
+
+using namespace ::com::sun::star;
+
@@ -4754,6 +4838,11 @@
+atk_wrapper_focus_idle_handler (gpointer data)
+{
+ vos::OGuard aGuard( Application::GetSolarMutex() );
++
++#ifdef ENABLE_TRACING
++ fprintf(stderr, "%s focus event for %p\n",
++ (data == last_focused_object) ? "notifying" : "ignoring" , data );
++#endif
+
+ if( data == last_focused_object )
+ atk_focus_tracker_notify( ATK_OBJECT( data ) );
@@ -4775,7 +4864,7 @@
+
+ if( rAccessible.is() )
+ accessible = atk_object_wrapper_ref( rAccessible );
-+
++
+ last_focused_object = accessible;
+ g_idle_add (atk_wrapper_focus_idle_handler, accessible);
+}
@@ -4886,7 +4975,7 @@
+ attachRecursive(xAccessible);
+ }
+*/
-+ fprintf(stderr, "Invalidate all children called\n" );
++ g_warning( "Invalidate all children called\n" );
+ break;
+ default:
+ break;
@@ -5093,8 +5182,12 @@
+ if( ! xStateSet.is() )
+ return;
+
++/* the UNO ToolBox wrapper does not (yet?) support XAccessibleSelection, so we
++ * need to add listeners to the children instead of re-using the tabpage stuff
++ */
+ if( xStateSet->contains(accessibility::AccessibleStateType::FOCUSED) &&
-+ ( pWindow->GetType() != WINDOW_TREELISTBOX ) )
++ ( pWindow->GetType() != WINDOW_TREELISTBOX ) &&
++ ( pWindow->GetType() != WINDOW_TOOLBOX ) )
+ {
+ atk_wrapper_focus_tracker_notify_when_idle( xAccessible );
+ }
@@ -5105,6 +5198,10 @@
+ g_aWindowList.insert(pWindow);
+ aDocumentFocusListener->attachRecursive(xAccessible, xContext, xStateSet);
+ }
++#ifdef ENABLE_TRACING
++ else
++ fprintf(stderr, "Window %p already in the list\n", pWindow );
++#endif
+ }
+}
+
@@ -5161,9 +5258,6 @@
+ case VCLEVENT_WINDOW_GETFOCUS:
+ handle_get_focus(static_cast< ::VclWindowEvent const * >(pEvent));
+ break;
-+ case VCLEVENT_WINDOW_DEACTIVATE:
-+ atk_wrapper_focus_tracker_notify_when_idle(NULL);
-+ break;
+ case VCLEVENT_WINDOW_LOSEFOCUS:
+// fprintf(stderr, "got VCLEVENT_WINDOW_LOSEFOCUS for %p\n",
+// static_cast< ::VclWindowEvent const * >(pEvent)->GetWindow());
@@ -5190,9 +5284,11 @@
+ handle_menu_highlighted(static_cast< ::VclMenuEvent const * >(pEvent));
+ break;
+
++// case VCLEVENT_TOOLBOX_HIGHLIGHT: - does not work due missing XAccessibleSelection support
+ case VCLEVENT_TABPAGE_ACTIVATE:
+ handle_tabpage_activated(static_cast< ::VclWindowEvent const * >(pEvent)->GetWindow());
+ break;
++
+ default:
+ //fprintf(stderr, "got event %d \n", pEvent->GetId());
+ break;
@@ -5290,7 +5386,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 Mon Apr 10 05:20:26 2006
+--- /dev/null Wed May 10 05:10:01 2006
+++ gsl/vcl/unx/gtk/a11y/atkutil.hxx Thu Jan 5 06:06:32 2006
@@ -0,0 +1,45 @@
+/*************************************************************************
@@ -5340,7 +5436,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 Mon Apr 10 05:20:26 2006
+--- /dev/null Wed May 10 05:10:01 2006
+++ gsl/vcl/unx/gtk/a11y/atkvalue.cxx Wed Feb 15 02:59:25 2006
@@ -0,0 +1,152 @@
+/*************************************************************************
@@ -5496,10 +5592,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.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 @@
+diff -u /dev/null gsl/vcl/unx/gtk/a11y/atkwindow.cxx:1.1.2.7
+--- /dev/null Wed May 10 05:10:01 2006
++++ gsl/vcl/unx/gtk/a11y/atkwindow.cxx Thu Apr 27 07:47:54 2006
+@@ -0,0 +1,169 @@
+/*************************************************************************
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
@@ -5544,6 +5640,22 @@
+static void (* window_real_initialize) (AtkObject *obj, gpointer data);
+static G_CONST_RETURN gchar* (* window_real_get_name) (AtkObject *accessible);
+
++static gint
++ooo_window_wrapper_clear_focus(gpointer)
++{
++ atk_focus_tracker_notify( NULL );
++ return FALSE;
++}
++
++/*****************************************************************************/
++
++static gboolean
++ooo_window_wrapper_real_focus_gtk (GtkWidget *, GdkEventFocus *)
++{
++ g_idle_add( ooo_window_wrapper_clear_focus, NULL );
++ return FALSE;
++}
++
+/*****************************************************************************/
+
+static void
@@ -5561,6 +5673,10 @@
+ */
+ g_object_set_data( G_OBJECT( data ), "ooo:tooltip-accessible", obj );
+ }
++
++ g_signal_connect_after( GTK_WIDGET( data ), "focus-out-event",
++ G_CALLBACK (ooo_window_wrapper_real_focus_gtk),
++ NULL);
+}
+
+/*****************************************************************************/
@@ -5651,7 +5767,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 Mon Apr 10 05:20:26 2006
+--- /dev/null Wed May 10 05:10:01 2006
+++ gsl/vcl/unx/gtk/a11y/atkwindow.hxx Thu Jan 5 06:06:34 2006
@@ -0,0 +1,45 @@
+/*************************************************************************
@@ -5701,7 +5817,7 @@
+#endif
Index: gsl/vcl/unx/gtk/a11y/atkwrapper.cxx
diff -u /dev/null gsl/vcl/unx/gtk/a11y/atkwrapper.cxx:1.1.2.22
---- /dev/null Mon Apr 10 05:20:26 2006
+--- /dev/null Wed May 10 05:10:01 2006
+++ gsl/vcl/unx/gtk/a11y/atkwrapper.cxx Fri Mar 31 04:19:40 2006
@@ -0,0 +1,820 @@
+/*************************************************************************
@@ -6526,7 +6642,7 @@
+}
Index: gsl/vcl/unx/gtk/a11y/atkwrapper.hxx
diff -u /dev/null gsl/vcl/unx/gtk/a11y/atkwrapper.hxx:1.1.2.9
---- /dev/null Mon Apr 10 05:20:26 2006
+--- /dev/null Wed May 10 05:10:01 2006
+++ gsl/vcl/unx/gtk/a11y/atkwrapper.hxx Fri Mar 31 04:19:40 2006
@@ -0,0 +1,125 @@
+/*************************************************************************
@@ -6656,7 +6772,7 @@
+#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.13
---- /dev/null Mon Apr 10 05:20:26 2006
+--- /dev/null Wed May 10 05:10:01 2006
+++ gsl/vcl/unx/gtk/a11y/makefile.mk Fri Mar 31 06:09:18 2006
@@ -0,0 +1,102 @@
+#*************************************************************************
@@ -6836,9 +6952,9 @@
return pInstance;
}
Index: gsl/vcl/unx/gtk/window/gtkframe.cxx
-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
+diff -u gsl/vcl/unx/gtk/window/gtkframe.cxx:1.45 gsl/vcl/unx/gtk/window/gtkframe.cxx:1.28.6.21
+--- gsl/vcl/unx/gtk/window/gtkframe.cxx:1.45 Thu Apr 6 08:40:19 2006
++++ gsl/vcl/unx/gtk/window/gtkframe.cxx Thu Apr 13 03:15:28 2006
@@ -45,6 +45,7 @@
#include <floatwin.hxx>
#include <salprn.h>
@@ -7032,7 +7148,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 Mon Apr 10 05:20:28 2006
+--- /dev/null Wed May 10 05:10:01 2006
+++ gsl/vcl/unx/inc/plugins/gtk/atkbridge.hxx Thu Jan 12 05:57:32 2006
@@ -0,0 +1,45 @@
+/*************************************************************************
@@ -7116,10 +7232,10 @@
#endif //_VCL_GTKFRAME_HXX
Index: gsl/vcl/util/makefile.mk
-diff -u gsl/vcl/util/makefile.mk:1.77 gsl/vcl/util/makefile.mk:1.65.110.11
---- gsl/vcl/util/makefile.mk:1.77 Mon Dec 19 09:21:56 2005
-+++ gsl/vcl/util/makefile.mk Thu Feb 16 03:08:19 2006
-@@ -357,8 +357,10 @@
+diff -u gsl/vcl/util/makefile.mk:1.78 gsl/vcl/util/makefile.mk:1.65.110.12
+--- gsl/vcl/util/makefile.mk:1.78 Fri Apr 7 08:36:14 2006
++++ gsl/vcl/util/makefile.mk Thu Apr 13 03:18:03 2006
+@@ -358,8 +358,10 @@
LIB4TARGET=$(SLB)$/igtk_plug_
LIB4FILES=\
$(SLB)$/gtkapp.lib\
@@ -7437,9 +7553,9 @@
/*
Index: graphics/svx/source/accessibility/AccessibleContextBase.cxx
-diff -u graphics/svx/source/accessibility/AccessibleContextBase.cxx:1.21 graphics/svx/source/accessibility/AccessibleContextBase.cxx:1.21.172.1
---- graphics/svx/source/accessibility/AccessibleContextBase.cxx:1.21 Thu Sep 8 13:13:15 2005
-+++ graphics/svx/source/accessibility/AccessibleContextBase.cxx Tue Dec 6 03:51:38 2005
+diff -u graphics/svx/source/accessibility/AccessibleContextBase.cxx:1.22 graphics/svx/source/accessibility/AccessibleContextBase.cxx:1.21.172.2
+--- graphics/svx/source/accessibility/AccessibleContextBase.cxx:1.22 Wed Apr 19 06:46:25 2006
++++ graphics/svx/source/accessibility/AccessibleContextBase.cxx Tue May 2 01:39:45 2006
@@ -108,6 +108,7 @@
if (pStateSet != NULL)
{
@@ -7877,10 +7993,10 @@
| (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 @@
+diff -u graphics/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx:1.22 graphics/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx:1.21.14.2
+--- graphics/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx:1.22 Thu Apr 6 09:26:52 2006
++++ graphics/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx Thu Apr 13 02:51:26 2006
+@@ -111,7 +111,7 @@
pWindow->SetUseDropScroll (false);
// Change the winbits so that the active window accepts the focus.
pWindow->SetStyle ((pWindow->GetStyle() & ~WB_DIALOGCONTROL) | WB_TABSTOP);
@@ -7889,7 +8005,7 @@
SetPool( &GetDoc()->GetPool() );
-@@ -266,6 +266,8 @@
+@@ -267,6 +267,8 @@
CreateView());
DBG_ASSERT (mpSlideSorterView.get()!=NULL,
"Can not create view for slide browser");
More information about the fedora-cvs-commits
mailing list