rpms/openoffice.org/devel openoffice.org-2.0.2.ooo62318.extensions.mozab.patch, NONE, 1.1 .cvsignore, 1.96, 1.97 openoffice.org.spec, 1.621, 1.622 sources, 1.154, 1.155 workspace.atkbridge.patch, 1.6, 1.7
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Mon Feb 20 11:43:48 UTC 2006
Author: caolanm
Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16963
Modified Files:
.cvsignore openoffice.org.spec sources
workspace.atkbridge.patch
Added Files:
openoffice.org-2.0.2.ooo62318.extensions.mozab.patch
Log Message:
next release candidate
openoffice.org-2.0.2.ooo62318.extensions.mozab.patch:
extensions/source/abpilot/makefile.mk | 4 +++-
source/abpilot/makefile.mk | 0
2 files changed, 3 insertions(+), 1 deletion(-)
--- NEW FILE openoffice.org-2.0.2.ooo62318.extensions.mozab.patch ---
Index: source/abpilot/makefile.mk
===================================================================
RCS file: /cvs/util/extensions/source/abpilot/makefile.mk,v
retrieving revision 1.9
diff -u -r1.9 makefile.mk
--- openoffice.org.orig/extensions/source/abpilot/makefile.mk 19 Dec 2005 17:27:56 -0000 1.9
+++ openoffice.org/extensions/source/abpilot/makefile.mk 20 Feb 2006 11:35:26 -0000
@@ -69,8 +69,10 @@
$(EXCEPTIONSFILES)
-.IF "WITH_MOZILLA" != ""
+.IF "$(WITH_MOZILLA)" != "NO"
+.IF "$(SYSTEM_MOZILLA)" != "YES"
CDEFS+=-DWITH_MOZILLA
+.ENDIF
.ENDIF
SRS1NAME=$(TARGET)
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/.cvsignore,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- .cvsignore 15 Feb 2006 08:30:43 -0000 1.96
+++ .cvsignore 20 Feb 2006 11:43:43 -0000 1.97
@@ -157,3 +157,4 @@
redhat-templates.tar.gz
Tigert-templates.tar.gz
OOB680_m1.tar.bz2
+OOB680_m2.tar.bz2
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.621
retrieving revision 1.622
diff -u -r1.621 -r1.622
--- openoffice.org.spec 16 Feb 2006 14:33:08 -0000 1.621
+++ openoffice.org.spec 20 Feb 2006 11:43:43 -0000 1.622
@@ -1,6 +1,6 @@
%define oootag OOB680
-%define ooomilestone 1
-%define rh_rpm_release 2
+%define ooomilestone 2
+%define rh_rpm_release 1
%define build_fc5 1
%define build_fc4 0
@@ -204,6 +204,7 @@
Patch36: openoffice.org-2.0.2.ooo61875.sd.compile.patch
Patch37: openoffice.org-2.0.2-ooo61841.vcl.honourfontconfigoverrides.patch
Patch38: openoffice.org-2.0.2.ooo62030.solenv._version.patch
+Patch39: openoffice.org-2.0.2.ooo62318.extensions.mozab.patch
%define instdir %{_libdir}/openoffice.org2.0
@@ -848,7 +849,7 @@
%patch23 -p1 -b .ooo54479.systemicu.patch
%endif
%patch24 -p1 -b .ooo54959.negativeindent.sw.patch
-%patch25 -p1 -b .workspace.atkbridge.patch
+%patch25 -p0 -b .workspace.atkbridge.patch
%patch26 -p1 -b .ooo56651.sw.rtfcrash.patch
%patch27 -p0 -b .workspace.jaxpapi.patch
%patch28 -p1 -b .workspace.systemjava.patch
@@ -864,6 +865,7 @@
%patch36 -p1 -b .ooo61875.sd.compile.patch
%patch37 -p1 -b .ooo61841.vcl.honourfontconfigoverrides.patch
%patch38 -p1 -b .ooo62030.solenv._version.patch
+%patch39 -p1 -b .ooo62318.extensions.mozab.patch
%if %{includingexternals}
#start ludicrous workaround
@@ -905,7 +907,7 @@
export CC=gcc4
export CXX=g++4
%endif
-%configure --with-java=%{gij} --disable-crashdump --disable-epm --disable-qadevooo --disable-odk --disable-fontooo --disable-mathmldtd --disable-pasf --enable-symbols --enable-openldap --enable-evolution2 --enable-xsltproc --with-system-libs --with-system-python --with-system-mozilla --with-system-boost --with-system-odbc-headers --with-system-sane-header --with-system-xrender-headers --with-system-libxslt --without-system-mspack --without-fonts --without-nas --without-gpc --with-images=industrial %{extraflags} %{withlang}
+%configure --with-java=%{gij} --disable-crashdump --disable-epm --disable-qadevooo --disable-odk --disable-fontooo --disable-mathmldtd --disable-pasf --enable-symbols --enable-openldap --enable-evolution2 --enable-xsltproc --with-system-libs --with-system-python --with-system-mozilla --with-system-boost --with-system-odbc-headers --with-system-sane-header --with-system-xrender-headers --with-system-libxslt --without-system-mspack --without-fonts --without-nas --without-gpc --enable-atkbridge --with-images=industrial %{extraflags} %{withlang}
cd ..
./bootstrap
source Linux*Env.Set.sh
@@ -3353,11 +3355,7 @@
%{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
%changelog
-* Thu Feb 16 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.2-1.2
-- update and split evo patches to match upstream segmentation
-
-* Mon Feb 13 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.2-1.1
-- 2.0.2 previews
+* Mon Feb 20 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.2-2.1
- hunspell replaces myspell
- Catalan help documentation available
- add sestatus details to crash_reporter
@@ -3393,6 +3391,9 @@
- rh#178670# drop PROT_EXEC
- add openoffice.org-2.0.2-ooo61841.vcl.honourfontconfigoverrides.patch for rh#179692#
- add openoffice.org-2.0.2.ooo62030.solenv._version.patch
+- rh#181876# update workspace.atkbridge.patch
+- update and split evo patches to match upstream segmentation
+- ooo#62318# mozab not available with system mozilla
* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1:2.0.1.1-11.2.2
- bump again for double-long bug on ppc(64)
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/sources,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -r1.154 -r1.155
--- sources 15 Feb 2006 11:46:07 -0000 1.154
+++ sources 20 Feb 2006 11:43:44 -0000 1.155
@@ -6,7 +6,7 @@
b54bcc9fdb23389e961b281508d9110c documentation.openoffice.org-templates.tar.gz
8bc013e30e432ce3927e402e9aaa8c9f redhat-templates.tar.gz
1b4d9a03ebb4c864015620153afb77c6 Tigert-templates.tar.gz
-7d819e432c243e299d75196890c58f24 OOB680_m1.tar.bz2
fae552b2b9d556920b930a97a2e3e9ab openoffice.org-myspell-contrib.tar.gz
0c5e6d8ded4e9489ac1870f56e324f36 openoffice.org-simple-crash_report.sh
0fc9c0b585e2c92a7ac05adebeb4caf2 GSI_ga.sdf
+fe9bcbc54e3b23ba1c28a418c696f2b2 OOB680_m2.tar.bz2
workspace.atkbridge.patch:
comphelper/source/misc/accessiblewrapper.cxx | 6
config_office/configure.in | 18
config_office/set_soenv.in | 4
fpicker/source/unx/gnome/FPentry.cxx | 3
svtools/source/Accessibility/accessibleiconchoicectrlentry.cxx | 1
svtools/source/Accessibility/accessiblelistboxentry.cxx | 1
svtools/source/Accessibility/accessibletabbar.cxx | 9
svtools/source/Accessibility/accessibletabbarpage.cxx | 21
svtools/source/Accessibility/accessibletabbarpagelist.cxx | 31
svtools/source/brwbox/brwbox3.cxx | 3
svtools/source/contnr/svtabbx.cxx | 3
svtools/source/control/valueacc.cxx | 2
svtools/source/edit/textwindowaccessibility.cxx | 2
svx/source/accessibility/AccessibleContextBase.cxx | 1
svx/source/accessibility/AccessibleControlShape.cxx | 1
svx/source/accessibility/AccessibleEditableTextPara.cxx | 1
svx/source/accessibility/AccessibleFrameSelector.cxx | 3
svx/source/accessibility/AccessibleImageBullet.cxx | 1
svx/source/accessibility/GraphCtlAccessibleContext.cxx | 1
svx/source/accessibility/charmapacc.cxx | 8
svx/source/accessibility/svxrectctaccessiblecontext.cxx | 2
toolkit/source/awt/accessiblemenubasecomponent.cxx | 15
toolkit/source/awt/accessiblemenucomponent.cxx | 3
toolkit/source/awt/accessiblemenuitemcomponent.cxx | 3
toolkit/source/awt/vclxaccessiblecomponent.cxx | 10
toolkit/source/awt/vclxaccessiblelistitem.cxx | 1
toolkit/source/awt/vclxaccessiblemenuitem.cxx | 8
toolkit/source/awt/vclxaccessiblestatusbaritem.cxx | 1
toolkit/source/awt/vclxaccessibletabpage.cxx | 1
toolkit/source/awt/vclxaccessibletoolboxitem.cxx | 19
vcl/inc/menu.hxx | 3
vcl/inc/svapp.hxx | 2
vcl/prj/build.lst | 3
vcl/source/app/makefile.mk | 4
vcl/source/app/svapp.cxx | 17
vcl/source/window/menu.cxx | 35
vcl/unx/gtk/a11y/TODO | 49
vcl/unx/gtk/a11y/atkaction.cxx | 287 +++
vcl/unx/gtk/a11y/atkbridge.cxx | 56
vcl/unx/gtk/a11y/atkcomponent.cxx | 362 ++++
vcl/unx/gtk/a11y/atkeditabletext.cxx | 207 ++
vcl/unx/gtk/a11y/atkfactory.cxx | 166 ++
vcl/unx/gtk/a11y/atkfactory.hxx | 49
vcl/unx/gtk/a11y/atkhypertext.cxx | 295 +++
vcl/unx/gtk/a11y/atkimage.cxx | 144 +
vcl/unx/gtk/a11y/atklistener.cxx | 470 +++++
vcl/unx/gtk/a11y/atklistener.hxx | 92 +
vcl/unx/gtk/a11y/atkselection.cxx | 200 ++
vcl/unx/gtk/a11y/atktable.cxx | 594 +++++++
vcl/unx/gtk/a11y/atktext.cxx | 547 ++++++
vcl/unx/gtk/a11y/atktextattributes.cxx | 572 +++++++
vcl/unx/gtk/a11y/atktextattributes.hxx | 60
vcl/unx/gtk/a11y/atkutil.cxx | 580 +++++++
vcl/unx/gtk/a11y/atkutil.hxx | 45
vcl/unx/gtk/a11y/atkvalue.cxx | 152 +
vcl/unx/gtk/a11y/atkwindow.cxx | 112 +
vcl/unx/gtk/a11y/atkwindow.hxx | 45
vcl/unx/gtk/a11y/atkwrapper.cxx | 809 ++++++++++
vcl/unx/gtk/a11y/atkwrapper.hxx | 125 +
vcl/unx/gtk/a11y/makefile.mk | 101 +
vcl/unx/gtk/app/gtkinst.cxx | 26
vcl/unx/gtk/app/makefile.mk | 4
vcl/unx/gtk/window/gtkframe.cxx | 133 +
vcl/unx/gtk/window/makefile.mk | 4
vcl/unx/inc/plugins/gtk/atkbridge.hxx | 45
vcl/unx/inc/plugins/gtk/gtkframe.hxx | 24
vcl/util/makefile.mk | 5
67 files changed, 6550 insertions(+), 57 deletions(-)
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.6 -r 1.7 workspace.atkbridge.patch
Index: workspace.atkbridge.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/workspace.atkbridge.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- workspace.atkbridge.patch 15 Feb 2006 08:30:44 -0000 1.6
+++ workspace.atkbridge.patch 20 Feb 2006 11:43:44 -0000 1.7
@@ -1,32 +1,608 @@
-Index: source/misc/accessiblewrapper.cxx
-===================================================================
-RCS file: /cvs/util/comphelper/source/misc/accessiblewrapper.cxx,v
-retrieving revision 1.9
-retrieving revision 1.8.156.2
-diff -u -p -r1.9 -r1.8.156.2
---- openoffice.org.orig/comphelper/source/misc/accessiblewrapper.cxx 8 Sep 2005 02:48:04 -0000 1.9
-+++ openoffice.org/comphelper/source/misc/accessiblewrapper.cxx 21 Sep 2005 05:53:29 -0000 1.8.156.2
-@@ -150,6 +150,11 @@ namespace comphelper
- const Reference< XAccessible >& _rxKey, sal_Bool _bCreate )
+diff -Nur m154/comphelper/source/misc/accessiblewrapper.cxx atkbridge/comphelper/source/misc/accessiblewrapper.cxx
+--- comphelper/source/misc/accessiblewrapper.cxx 2005-09-08 04:48:04.000000000 +0200
++++ comphelper/source/misc/accessiblewrapper.cxx 2005-09-21 07:53:29.000000000 +0200
+@@ -151,6 +151,12 @@
{
Reference< XAccessible > xValue;
-+
+
+ if( !_rxKey.is() )
+ {
++// fprintf( stderr, "It was this path that was crashing stuff\n" );
+ return xValue;
+ }
-
++
// do we have this child in the cahce?
AccessibleMap::const_iterator aPos = m_aChildrenMap.find( _rxKey );
-Index: prj/build.lst
-===================================================================
-RCS file: /cvs/gsl/vcl/prj/build.lst,v
-retrieving revision 1.42
-retrieving revision 1.41.72.2
-diff -u -p -r1.42 -r1.41.72.2
---- openoffice.org.orig/vcl/prj/build.lst 30 Aug 2005 09:37:21 -0000 1.42
-+++ openoffice.org/vcl/prj/build.lst 21 Sep 2005 07:13:26 -0000 1.41.72.2
-@@ -18,6 +18,7 @@ vc vcl\unx\source\gdi nmake - u vc_
+ if ( m_aChildrenMap.end() != aPos )
+diff -Nur m154/config_office/configure.in atkbridge/config_office/configure.in
+--- config_office/configure.in 2006-01-20 14:28:25.000000000 +0100
++++ config_office/configure.in 2006-01-30 16:07:32.000000000 +0100
+@@ -142,6 +142,11 @@
+ [ --enable-vctk Tell configure to check for the MS VC Toolkit 2003.
+ ( This is experimental! )
+ ],,)
++AC_ARG_ENABLE(atkbridge,
++[ --enable-atkbridge Enable support for direct ATK accessibility bridge
++ under UNIX, instead of via the existing Java bridge
++ ( This is experimental! )
++],,)
+ AC_ARG_ENABLE(gtk,
+ [ --disable-gtk Determines whether to use Gtk+ vclplug on platforms
+ where Gtk+ is available.
+@@ -3847,6 +3852,19 @@
+ AC_MSG_RESULT([$R])
+ fi
+
++AC_MSG_CHECKING([Whether ATK bridge can be built])
++EXPERIMENTAL_ATKBRIDGE=
++if test "x$enable_atkbridge" = "xyes"; then
++ if test "x$ENABLE_GTK" != "xTRUE"; then
++ AC_MSG_ERROR([ATK bridge requires gtk+])
++ else
++ AC_MSG_RESULT([yes])
++ fi
++
++ EXPERIMENTAL_ATKBRIDGE=TRUE
++fi
++AC_SUBST(EXPERIMENTAL_ATKBRIDGE)
++
+ dnl ===================================================================
+ dnl Gnome VFS check
+ dnl ===================================================================
+diff -Nur m154/config_office/set_soenv.in atkbridge/config_office/set_soenv.in
+--- config_office/set_soenv.in 2006-01-13 17:37:16.000000000 +0100
++++ config_office/set_soenv.in 2006-01-30 16:07:51.000000000 +0100
+@@ -1519,6 +1519,10 @@
+ ToFile( "ENABLE_KAB", "@ENABLE_KAB@", "e" );
+ ToFile( "MOC", "@MOC@", "e" );
+ ToFile( "PSPRINT", "TRUE", "e" );
++
++# Experimental pieces
++ToFile( "EXPERIMENTAL_ATKBRIDGE", "@EXPERIMENTAL_ATKBRIDGE@", "e" );
++
+ # [ed] 5/14/02 If we're building Aqua graphics, insert a C macro to indicate this.
+ # There may be a better way to do this, like splitting unxmacxp into two, but
+ # hopefully this hack will work for now...
+diff -Nur m154/fpicker/source/unx/gnome/FPentry.cxx atkbridge/fpicker/source/unx/gnome/FPentry.cxx
+--- fpicker/source/unx/gnome/FPentry.cxx 2005-09-09 01:34:31.000000000 +0200
++++ fpicker/source/unx/gnome/FPentry.cxx 2005-12-07 15:37:07.000000000 +0100
+@@ -158,8 +158,7 @@
+ {
+ 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;
+diff -Nur m154/svtools/source/Accessibility/accessibleiconchoicectrlentry.cxx atkbridge/svtools/source/Accessibility/accessibleiconchoicectrlentry.cxx
+--- svtools/source/Accessibility/accessibleiconchoicectrlentry.cxx 2005-09-08 16:25:23.000000000 +0200
++++ svtools/source/Accessibility/accessibleiconchoicectrlentry.cxx 2005-12-06 09:41:55.000000000 +0100
+@@ -441,6 +441,7 @@
+ pStateSetHelper->AddState( AccessibleStateType::TRANSIENT );
+ pStateSetHelper->AddState( AccessibleStateType::SELECTABLE );
+ pStateSetHelper->AddState( AccessibleStateType::ENABLED );
++ pStateSetHelper->AddState( AccessibleStateType::SENSITIVE );
+ if ( IsShowing_Impl() )
+ {
+ pStateSetHelper->AddState( AccessibleStateType::SHOWING );
+diff -Nur m154/svtools/source/Accessibility/accessiblelistboxentry.cxx atkbridge/svtools/source/Accessibility/accessiblelistboxentry.cxx
+--- svtools/source/Accessibility/accessiblelistboxentry.cxx 2005-09-08 16:25:58.000000000 +0200
++++ svtools/source/Accessibility/accessiblelistboxentry.cxx 2005-12-06 09:41:55.000000000 +0100
+@@ -503,6 +503,7 @@
+ pStateSetHelper->AddState( AccessibleStateType::TRANSIENT );
+ pStateSetHelper->AddState( AccessibleStateType::SELECTABLE );
+ pStateSetHelper->AddState( AccessibleStateType::ENABLED );
++ pStateSetHelper->AddState( AccessibleStateType::SENSITIVE );
+ if ( getListBox()->IsInplaceEditingEnabled() )
+ pStateSetHelper->AddState( AccessibleStateType::EDITABLE );
+ if ( IsShowing_Impl() )
+diff -Nur m154/svtools/source/Accessibility/accessibletabbar.cxx atkbridge/svtools/source/Accessibility/accessibletabbar.cxx
+--- svtools/source/Accessibility/accessibletabbar.cxx 2005-09-27 14:54:20.000000000 +0200
++++ svtools/source/Accessibility/accessibletabbar.cxx 2005-12-06 09:41:56.000000000 +0100
+@@ -148,6 +148,8 @@
+ {
+ case VCLEVENT_WINDOW_ENABLED:
+ {
++ aNewValue <<= AccessibleStateType::SENSITIVE;
++ NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue );
+ aNewValue <<= AccessibleStateType::ENABLED;
+ NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue );
+ }
+@@ -156,6 +158,8 @@
+ {
+ aOldValue <<= AccessibleStateType::ENABLED;
+ NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue );
++ aOldValue <<= AccessibleStateType::SENSITIVE;
++ NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue );
+ }
+ break;
+ case VCLEVENT_WINDOW_GETFOCUS:
+@@ -205,7 +209,10 @@
+ if ( m_pTabBar )
+ {
+ if ( m_pTabBar->IsEnabled() )
+- rStateSet.AddState( AccessibleStateType::ENABLED );
++ {
++ rStateSet.AddState( AccessibleStateType::ENABLED );
++ rStateSet.AddState( AccessibleStateType::SENSITIVE );
++ }
+
+ rStateSet.AddState( AccessibleStateType::FOCUSABLE );
+
+diff -Nur m154/svtools/source/Accessibility/accessibletabbarpage.cxx atkbridge/svtools/source/Accessibility/accessibletabbarpage.cxx
+--- svtools/source/Accessibility/accessibletabbarpage.cxx 2005-09-08 16:26:46.000000000 +0200
++++ svtools/source/Accessibility/accessibletabbarpage.cxx 2005-12-06 09:41:56.000000000 +0100
+@@ -150,13 +150,21 @@
+ {
+ if ( m_bEnabled != bEnabled )
+ {
+- Any aOldValue, aNewValue;
++ Any aOldValue[2], aNewValue[2];
+ if ( m_bEnabled )
+- aOldValue <<= AccessibleStateType::ENABLED;
+- else
+- aNewValue <<= AccessibleStateType::ENABLED;
++ {
++ aOldValue[0] <<= AccessibleStateType::SENSITIVE;
++ aOldValue[1] <<= AccessibleStateType::ENABLED;
++ }
++ else
++ {
++
++ aNewValue[0] <<= AccessibleStateType::ENABLED;
++ aNewValue[1] <<= AccessibleStateType::SENSITIVE;
++ }
+ m_bEnabled = bEnabled;
+- NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue );
++ NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue[0], aNewValue[0] );
++ NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue[1], aNewValue[1] );
+ }
+ }
+
+@@ -211,7 +219,10 @@
+ void AccessibleTabBarPage::FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet )
+ {
+ if ( IsEnabled() )
++ {
+ rStateSet.AddState( AccessibleStateType::ENABLED );
++ rStateSet.AddState( AccessibleStateType::SENSITIVE );
[...6850 lines suppressed...]
-+ // FIXME: handle this internally
-+ else if( pWindow->GetAccessibleRole() == accessibility::AccessibleRole::WINDOW )
-+ {
-+ Window *pChild = pWindow->GetChild( 0 );
-+ if( pChild )
-+ {
-+ uno::Reference< accessibility::XAccessible > xAccessible(pChild->GetAccessible( bCreate ));
-+ if( xAccessible.is() )
-+ {
-+// uno::Reference< accessibility::XAccessibleContext > xContext(xAccessible->getAccessibleContext());
-+// if( xContext.is() &&
-+// xContext->getAccessibleRole() == accessibility::AccessibleRole::POPUP_MENU )
-+// {
-+ return xAccessible;
-+// }
-+ }
-+ }
-+ }
-+ else
-+ {
-+ return pWindow->GetAccessible( bCreate );
-+ }
++ pWindow = pWindow->GetAccessibleChildWindow( 0 );
++ g_return_val_if_fail( pWindow != NULL, NULL );
+ }
++ // replace the top-level role Dialog with something more appropriate ..
++ else if( pWindow->GetAccessibleRole() == accessibility::AccessibleRole::DIALOG )
++ pWindow->SetAccessibleRole(accessibility::AccessibleRole::OPTION_PANE);
+
-+ return uno::Reference< accessibility::XAccessible >();
++ return pWindow->GetAccessible( bCreate );
+}
+
++#endif // EXPERIMENTAL_ATKBRIDGE
++
void GtkSalFrame::Init( SalFrame* pParent, ULONG nStyle )
{
if( nStyle & SAL_FRAME_STYLE_DEFAULT ) // ensure default style
-@@ -473,7 +665,8 @@ void GtkSalFrame::Init( SalFrame* pParen
- nStyle &= ~SAL_FRAME_STYLE_FLOAT;
+@@ -590,6 +721,8 @@
}
-- m_pWindow = GTK_WINDOW( gtk_widget_new( GTK_TYPE_WINDOW, "type", ((nStyle & SAL_FRAME_STYLE_FLOAT) && ! (nStyle & SAL_FRAME_STYLE_OWNERDRAWDECORATION)) ? GTK_WINDOW_POPUP : GTK_WINDOW_TOPLEVEL, "visible", FALSE, NULL ) );
-+ m_pWindow = createWindow( this, nStyle );
+ m_pWindow = GTK_WINDOW( gtk_widget_new( GTK_TYPE_WINDOW, "type", ((nStyle & SAL_FRAME_STYLE_FLOAT) && ! (nStyle & SAL_FRAME_STYLE_OWNERDRAWDECORATION)) ? GTK_WINDOW_POPUP : GTK_WINDOW_TOPLEVEL, "visible", FALSE, NULL ) );
++ g_object_set_data( G_OBJECT( m_pWindow ), "SalFrame", this );
+
m_pParent = static_cast<GtkSalFrame*>(pParent);
m_pForeignParent = NULL;
m_aForeignParentWindow = None;
-Index: unx/inc/plugins/gtk/atkfactory.hxx
-===================================================================
-RCS file: unx/inc/plugins/gtk/atkfactory.hxx
-diff -N unx/inc/plugins/gtk/atkfactory.hxx
---- /dev/null 1 Jan 1970 00:00:00 -0000
-+++ openoffice.org/vcl/unx/inc/plugins/gtk/atkfactory.hxx 28 Sep 2005 07:24:17 -0000 1.1.2.2
-@@ -0,0 +1,51 @@
+diff -Nur m154/vcl/unx/gtk/window/makefile.mk atkbridge/vcl/unx/gtk/window/makefile.mk
+--- vcl/unx/gtk/window/makefile.mk 2005-09-09 14:38:24.000000000 +0200
++++ vcl/unx/gtk/window/makefile.mk 2005-11-04 15:56:29.000000000 +0100
+@@ -49,6 +49,10 @@
+
+ # --- Files --------------------------------------------------------
+
++.IF "$(EXPERIMENTAL_ATKBRIDGE)" != ""
++CFLAGS += -DEXPERIMENTAL_ATKBRIDGE
++.ENDIF
++
+ .IF "$(GUIBASE)"!="unx"
+
+ dummy:
+diff -Nur m154/vcl/unx/inc/plugins/gtk/atkbridge.hxx atkbridge/vcl/unx/inc/plugins/gtk/atkbridge.hxx
+--- vcl/unx/inc/plugins/gtk/atkbridge.hxx 1970-01-01 01:00:00.000000000 +0100
++++ vcl/unx/inc/plugins/gtk/atkbridge.hxx 2006-01-12 14:57:32.000000000 +0100
+@@ -0,0 +1,45 @@
+/*************************************************************************
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
@@ -4052,78 +7303,70 @@
+ *
+ ************************************************************************/
+
-+#ifndef __ATK_FACTORY_HXX__
-+#define __ATK_FACTORY_HXX__
-+
-+#include <atk/atk.h>
++#ifndef __ATK_BRIDGE_HXX__
++#define __ATK_BRIDGE_HXX__
+
-+void RegisterAtkFactory( GType nWindowType );
++#ifndef _VCL_DLLAPI_H
++#include <dllapi.h>
++#endif
+
-+extern "C" {
-+
-+#define GAIL_WINDOW_WRAPPER_FACTORY_TYPE (gail_window_wrapper_factory_get_type())
-+
-+ GType gail_window_wrapper_factory_get_type (void);
-+
-+}; // extern "C"
++void VCL_DLLPUBLIC InitAtkBridge(void);
+
+#endif
-Index: unx/inc/plugins/gtk/gtkframe.hxx
-===================================================================
-RCS file: /cvs/gsl/vcl/unx/inc/plugins/gtk/gtkframe.hxx,v
-retrieving revision 1.17
-retrieving revision 1.14.22.5
-diff -u -p -r1.17 -r1.14.22.5
---- openoffice.org.orig/vcl/unx/inc/plugins/gtk/gtkframe.hxx 9 Sep 2005 12:51:27 -0000 1.17
-+++ openoffice.org/vcl/unx/inc/plugins/gtk/gtkframe.hxx 28 Sep 2005 07:24:18 -0000 1.14.22.5
-@@ -43,6 +43,9 @@
+diff -Nur m154/vcl/unx/inc/plugins/gtk/gtkframe.hxx atkbridge/vcl/unx/inc/plugins/gtk/gtkframe.hxx
+--- vcl/unx/inc/plugins/gtk/gtkframe.hxx 2006-01-19 19:27:42.000000000 +0100
++++ vcl/unx/inc/plugins/gtk/gtkframe.hxx 2006-01-30 17:21:20.000000000 +0100
+@@ -43,6 +43,11 @@
#include <gdk/gdkkeysyms.h>
#include <postx.h>
-+#include <com/sun/star/uno/Reference.hxx>
-+#include <com/sun/star/accessibility/XAccessible.hdl>
++#ifdef EXPERIMENTAL_ATKBRIDGE
++# include <com/sun/star/uno/Reference.hxx>
++# include <com/sun/star/accessibility/XAccessible.hdl>
++#endif // EXPERIMENTAL_ATKBRIDGE
+
#ifndef _SV_SALFRAME_HXX
#include <salframe.hxx>
#endif
-@@ -351,6 +354,11 @@ public:
+@@ -355,7 +360,26 @@
virtual bool SetPluginParent( SystemParentData* pNewParent );
virtual void SetBackgroundBitmap( SalBitmap* );
+
++#ifdef EXPERIMENTAL_ATKBRIDGE
+ static GtkSalFrame *getFromWindow( GtkWindow *pWindow );
+ ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > getAccessible( bool bCreate = true );
+
+ static AtkRole GetAtkRole( GtkWindow* window );
++#endif // EXPERIMENTAL_ATKBRIDGE
};
-Index: util/makefile.mk
-===================================================================
-RCS file: /cvs/gsl/vcl/util/makefile.mk,v
-retrieving revision 1.74
-retrieving revision 1.65.110.6
-diff -u -p -r1.74 -r1.65.110.6
---- openoffice.org.orig/vcl/util/makefile.mk 9 Sep 2005 13:53:03 -0000 1.74
-+++ openoffice.org/vcl/util/makefile.mk 21 Sep 2005 09:56:00 -0000 1.65.110.6
-@@ -352,6 +352,7 @@ PKGCONFIG_MODULES=gtk+-2.0 gthread-2.0
-
- LIB4TARGET=$(SLB)$/igtk_plug_
- LIB4FILES=\
-+ $(SLB)$/gtka11y.lib\
++#ifdef EXPERIMENTAL_ATKBRIDGE
++
++#define OOO_TYPE_FIXED ooo_fixed_get_type()
++
++extern "C" {
++
++GType ooo_fixed_get_type( void );
++
++} // extern "C"
++
++#endif // EXPERIMENTAL_ATKBRIDGE
++
+ #endif //_VCL_GTKFRAME_HXX
+diff -Nur m154/vcl/util/makefile.mk atkbridge/vcl/util/makefile.mk
+--- vcl/util/makefile.mk 2005-12-19 18:21:56.000000000 +0100
++++ vcl/util/makefile.mk 2006-01-09 14:02:58.000000000 +0100
+@@ -359,6 +359,11 @@
$(SLB)$/gtkapp.lib\
$(SLB)$/gtkgdi.lib\
$(SLB)$/gtkwin.lib
---- SRC680_m130/desktop/scripts/soffice.gail.sh 2005-09-30 15:34:21.000000000 +0100
-+++ SRC680_m130/desktop/scripts/soffice.sh 2005-09-30 15:34:56.000000000 +0100
-@@ -36,6 +36,10 @@
-
- if [ -z $SAL_USE_VCLPLUGIN ]; then export SAL_USE_VCLPLUGIN=gtk; fi
- export SAL_ENABLE_NATIVE_XFONTS=0
-+if [ true == `gconftool-2 -g "/desktop/gnome/interface/accessibility"` ]; then
-+export GTK_MODULES="gail:atk-bridge $GTK_MODULES"
-+fi
-+export SAL_IGNOREXERRORS=true
- #
- # STAR_PROFILE_LOCKING_DISABLED=1
- # export STAR_PROFILE_LOCKING_DISABLED
++
++.IF "$(EXPERIMENTAL_ATKBRIDGE)" != ""
++LIB4FILES+= $(SLB)$/gtka11y.lib
++.ENDIF
++
+ SHL4TARGET=vclplug_gtk$(UPD)$(DLLPOSTFIX)
+ SHL4IMPLIB=igtk_plug_
+ SHL4LIBS=$(LIB4TARGET)
More information about the fedora-cvs-commits
mailing list