rpms/openoffice.org/devel openoffice.org-1.9.130.oooXXXXX.sysui.linkforce.patch, NONE, 1.1 openoffice.org.spec, 1.497, 1.498 workspace.atkbridge.patch, 1.2, 1.3
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Fri Sep 30 14:39:35 UTC 2005
- Previous message (by thread): rpms/gtk2/devel gtk2.spec,1.92,1.93
- Next message (by thread): rpms/stunnel/devel stunnel-4.12-sample.patch, NONE, 1.1 .cvsignore, 1.13, 1.14 sources, 1.13, 1.14 stunnel.spec, 1.28, 1.29 stunnel-4.08-sample.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: caolanm
Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16907
Modified Files:
openoffice.org.spec workspace.atkbridge.patch
Added Files:
openoffice.org-1.9.130.oooXXXXX.sysui.linkforce.patch
Log Message:
tum te tum
openoffice.org-1.9.130.oooXXXXX.sysui.linkforce.patch:
debian/makefile.mk | 2 +-
mandriva/makefile.mk | 2 +-
redhat/makefile.mk | 2 +-
suse/makefile.mk | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
--- NEW FILE openoffice.org-1.9.130.oooXXXXX.sysui.linkforce.patch ---
diff -ru SRC680_m130/sysui.orig/desktop/debian/makefile.mk SRC680_m130/sysui/desktop/debian/makefile.mk
--- SRC680_m130/sysui.orig/desktop/debian/makefile.mk 2005-09-30 11:26:58.000000000 +0100
+++ SRC680_m130/sysui/desktop/debian/makefile.mk 2005-09-30 11:28:16.000000000 +0100
@@ -165,7 +165,7 @@
%.desktop :
@$(MKDIRHIER) $(@:d)
- @ln -s -f $(subst,$(UNIXFILENAME)-, /etc/$(UNIXFILENAME)/share/xdg/$(@:f)) $@
+ @ln -sf $(subst,$(UNIXFILENAME)-, /etc/$(UNIXFILENAME)/share/xdg/$(@:f)) $@
%/Office :
@$(MKDIRHIER) $@
diff -ru SRC680_m130/sysui.orig/desktop/mandriva/makefile.mk SRC680_m130/sysui/desktop/mandriva/makefile.mk
--- SRC680_m130/sysui.orig/desktop/mandriva/makefile.mk 2005-09-30 11:26:58.000000000 +0100
+++ SRC680_m130/sysui/desktop/mandriva/makefile.mk 2005-09-30 11:28:02.000000000 +0100
@@ -156,7 +156,7 @@
%.desktop :
@$(MKDIRHIER) $(@:d)
- @ln -s $(subst,$(UNIXFILENAME)-, /etc/$(UNIXFILENAME)/share/xdg/$(@:f)) $@
+ @ln -sf $(subst,$(UNIXFILENAME)-, /etc/$(UNIXFILENAME)/share/xdg/$(@:f)) $@
# --- icons --------------------------------------------------------
diff -ru SRC680_m130/sysui.orig/desktop/redhat/makefile.mk SRC680_m130/sysui/desktop/redhat/makefile.mk
--- SRC680_m130/sysui.orig/desktop/redhat/makefile.mk 2005-09-30 11:26:58.000000000 +0100
+++ SRC680_m130/sysui/desktop/redhat/makefile.mk 2005-09-30 11:28:30.000000000 +0100
@@ -159,7 +159,7 @@
%.desktop :
@$(MKDIRHIER) $(@:d)
- @ln -s -f $(subst,$(UNIXFILENAME)-, /etc/$(UNIXFILENAME)/share/xdg/$(@:f)) $@
+ @ln -sf $(subst,$(UNIXFILENAME)-, /etc/$(UNIXFILENAME)/share/xdg/$(@:f)) $@
# --- icons --------------------------------------------------------
diff -ru SRC680_m130/sysui.orig/desktop/suse/makefile.mk SRC680_m130/sysui/desktop/suse/makefile.mk
--- SRC680_m130/sysui.orig/desktop/suse/makefile.mk 2005-09-30 11:26:58.000000000 +0100
+++ SRC680_m130/sysui/desktop/suse/makefile.mk 2005-09-30 11:28:22.000000000 +0100
@@ -157,7 +157,7 @@
%.desktop :
@$(MKDIRHIER) $(@:d)
- @ln -s -f $(subst,$(UNIXFILENAME)-, /etc/$(UNIXFILENAME)/share/xdg/$(@:f)) $@
+ @ln -sf $(subst,$(UNIXFILENAME)-, /etc/$(UNIXFILENAME)/share/xdg/$(@:f)) $@
# --- icons --------------------------------------------------------
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.497
retrieving revision 1.498
diff -u -r1.497 -r1.498
--- openoffice.org.spec 29 Sep 2005 17:12:53 -0000 1.497
+++ openoffice.org.spec 30 Sep 2005 14:39:30 -0000 1.498
@@ -209,6 +209,7 @@
Patch59: openoffice.org-1.9.130.ooo54959.negativeindent.sw.patch
Patch60: workspace.cmcfixes19.patch
Patch61: workspace.atkbridge.patch
+Patch62: openoffice.org-1.9.130.oooXXXXX.sysui.linkforce.patch
%define instdir %{_libdir}/openoffice.org2.0
@@ -885,6 +886,7 @@
%patch59 -p1 -b .ooo54959.negativeindent.sw.patch
%patch60 -p1 -b .workspace.cmcfixes19.patch
%patch61 -p1 -b .workspace.atkbridge.patch
+%patch62 -p1 -b .oooXXXXX.sysui.linkforce.patch
%if %{includingexternals}
#start ludicrous workaround
workspace.atkbridge.patch:
SRC680_m130/desktop/scripts/soffice.sh | 1
comphelper/source/misc/accessiblewrapper.cxx | 5
openoffice.org/vcl/unx/gtk/a11y/TODO | 49 +
openoffice.org/vcl/unx/gtk/a11y/atkaction.cxx | 93 ++
openoffice.org/vcl/unx/gtk/a11y/atkcomponent.cxx | 206 +++++
openoffice.org/vcl/unx/gtk/a11y/atkeditabletext.cxx | 96 ++
openoffice.org/vcl/unx/gtk/a11y/atkfactory.cxx | 203 +++++
openoffice.org/vcl/unx/gtk/a11y/atkhypertext.cxx | 230 ++++++
openoffice.org/vcl/unx/gtk/a11y/atkimage.cxx | 59 +
openoffice.org/vcl/unx/gtk/a11y/atklistener.cxx | 387 ++++++++++
openoffice.org/vcl/unx/gtk/a11y/atklistener.hxx | 88 ++
openoffice.org/vcl/unx/gtk/a11y/atkselection.cxx | 120 +++
openoffice.org/vcl/unx/gtk/a11y/atktable.cxx | 331 ++++++++
openoffice.org/vcl/unx/gtk/a11y/atktext.cxx | 226 ++++++
openoffice.org/vcl/unx/gtk/a11y/atkutil.cxx | 425 +++++++++++
openoffice.org/vcl/unx/gtk/a11y/atkutil.hxx | 45 +
openoffice.org/vcl/unx/gtk/a11y/atkvalue.cxx | 69 +
openoffice.org/vcl/unx/gtk/a11y/atkwrapper.cxx | 676 ++++++++++++++++++
openoffice.org/vcl/unx/gtk/a11y/atkwrapper.hxx | 84 ++
openoffice.org/vcl/unx/gtk/a11y/makefile.mk | 108 ++
openoffice.org/vcl/unx/inc/plugins/gtk/atkfactory.hxx | 51 +
vcl/prj/build.lst | 3
vcl/source/app/svapp.cxx | 10
vcl/source/window/menu.cxx | 9
vcl/unx/gtk/app/gtkinst.cxx | 1
vcl/unx/gtk/window/gtkframe.cxx | 193 +++++
vcl/unx/inc/plugins/gtk/gtkframe.hxx | 8
vcl/util/makefile.mk | 1
28 files changed, 3762 insertions(+), 15 deletions(-)
Index: workspace.atkbridge.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/workspace.atkbridge.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- workspace.atkbridge.patch 30 Sep 2005 08:36:23 -0000 1.2
+++ workspace.atkbridge.patch 30 Sep 2005 14:39:30 -0000 1.3
@@ -178,7 +178,7 @@
diff -N unx/gtk/a11y/atkaction.cxx
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openoffice.org/vcl/unx/gtk/a11y/atkaction.cxx 21 Apr 2005 14:59:22 -0000 1.1.2.1
-@@ -0,0 +1,94 @@
+@@ -0,0 +1,93 @@
+#include <com/sun/star/accessibility/XAccessibleKeyBinding.hpp>
+
+static uno::Reference< accessibility::XAccessibleAction >
@@ -209,7 +209,6 @@
+ TRY_START
+ sal_Int32 nActions = 0;
+ nActions = getAction( action )->getAccessibleActionCount();
-+ fprintf( stderr, "GetnActions returns %d", nActions );
+ return nActions;
+ TRY_END_RETURN( 0 )
+}
@@ -492,7 +491,7 @@
diff -N unx/gtk/a11y/atkeditabletext.cxx
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openoffice.org/vcl/unx/gtk/a11y/atkeditabletext.cxx 22 Apr 2005 14:53:17 -0000 1.1.2.2
-@@ -0,0 +1,99 @@
+@@ -0,0 +1,96 @@
+static uno::Reference< accessibility::XAccessibleEditableText >
+ getEditableText( AtkEditableText *pEditableText )
+{
@@ -553,7 +552,6 @@
+ gint nEndPos )
+{
+ TRY_START
-+ fprintf( stderr, "EditableText delete text %d %d\n", nStartPos, nEndPos );
+ getEditableText( pText )->deleteText( nStartPos, nEndPos );
+ TRY_END
+}
@@ -563,7 +561,6 @@
+ gint nPosition )
+{
+ TRY_START
-+ fprintf( stderr, "EditableText paste text %d %d\n", nPosition );
+ getEditableText( pText )->pasteText( nPosition );
+ TRY_END
+}
@@ -576,7 +573,6 @@
+ // FIXME: this looks pretty sucky to me ...
+ editable_text_wrapper_cut_text( pText, nStartPos, nEndPos );
+ editable_text_wrapper_paste_text( pText, nStartPos );
-+ fprintf( stderr, "EditableText copy %d %d\n", nStartPos, nEndPos );
+}
+
+static void
@@ -598,7 +594,7 @@
diff -N unx/gtk/a11y/atkfactory.cxx
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openoffice.org/vcl/unx/gtk/a11y/atkfactory.cxx 28 Sep 2005 07:24:12 -0000 1.1.2.4
-@@ -0,0 +1,204 @@
+@@ -0,0 +1,203 @@
+/*************************************************************************
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
@@ -796,7 +792,6 @@
+ AtkRegistry *pReg = atk_get_default_registry();
+ if( pReg )
+ {
-+ g_warning( "Registering factory" );
+ atk_registry_set_factory_type
+ ( pReg, nWindowType,
+ wrapper_factory_get_type() );
@@ -2299,7 +2294,7 @@
diff -N unx/gtk/a11y/atkutil.cxx
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openoffice.org/vcl/unx/gtk/a11y/atkutil.cxx 28 Sep 2005 07:24:13 -0000 1.1.2.3
-@@ -0,0 +1,439 @@
+@@ -0,0 +1,425 @@
+/*************************************************************************
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
@@ -2378,8 +2373,6 @@
+
+ if( pObj )
+ {
-+ fprintf(stderr, "emitting focus_event for %p (%p)\n", pObj, rAccessible.get());
-+
+ atk_focus_tracker_notify( pObj );
+ g_object_unref( pObj );
+ }
@@ -2439,16 +2432,10 @@
+void DocumentFocusListener::disposing( const lang::EventObject& aEvent )
+ throw (uno::RuntimeException)
+{
-+ fprintf(stderr, "In DocumentFocusListener::disposing (%p)\n", this);
-+ fprintf(stderr, "m_aRefList has %d entries\n", m_aRefList.size());
-+
+ // Unref the object here, but do not remove as listener since the object
+ // might no longer be in a state that safely allows this.
+ if( aEvent.Source.is() )
+ m_aRefList.erase(aEvent.Source);
-+
-+ fprintf(stderr, "m_aRefList has %d entries\n", m_aRefList.size());
-+
+}
+
+/*****************************************************************************/
@@ -2486,7 +2473,6 @@
+ attachRecursive(xAccessible);
+ }
+*/
-+ fprintf(stderr, "Invalidate all children called\n" );
+ break;
+ default:
+ break;
@@ -2662,20 +2648,15 @@
+
+ if(xStateSet->contains(accessibility::AccessibleStateType::FOCUSED))
+ {
-+ fprintf(stderr, "Window %p is focused\n", pWindow);
+ atk_wrapper_focus_tracker_notify( xAccessible );
+ }
+ else
+ {
-+ fprintf(stderr, "Window %p is not focused\n", pWindow);
+ if( g_aWindowList.find(pWindow) == g_aWindowList.end() )
+ {
+ g_aWindowList.insert(pWindow);
+ aDocumentFocusListener->attachRecursive(xAccessible, xContext, xStateSet);
-+ fprintf(stderr, "Window %p inserted\n", pWindow );
+ }
-+ else
-+ fprintf(stderr, "Window %p already in the list \n", pWindow);
+ }
+}
+
@@ -3869,7 +3850,7 @@
gtk_container_add( GTK_CONTAINER(m_pWindow), GTK_WIDGET(m_pFixedContainer) );
gtk_widget_show( GTK_WIDGET(m_pFixedContainer) );
-@@ -465,6 +510,153 @@ static void lcl_set_accept_focus( GtkWin
+@@ -465,6 +510,149 @@ static void lcl_set_accept_focus( GtkWin
}
}
@@ -3913,10 +3894,6 @@
+ // FIXME - we should really sub-class instead of doing
+ // tens of expensive signal connections ... and this:
+
-+ static int nCount = 0;
-+ if( eType == GTK_WINDOW_TOPLEVEL )
-+ fprintf( stderr, "Create toplevel %d\n", ++nCount );
-+
+ pWindow = GTK_WINDOW( g_object_new( ooo_window_get_type(),
+ "type", eType, "visible", FALSE, NULL ) );
+
@@ -4137,3 +4114,13 @@
$(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
+@@ -35,6 +35,7 @@
+ #*************************************************************************
+
+ if [ -z $SAL_USE_VCLPLUGIN ]; then export SAL_USE_VCLPLUGIN=gtk; fi
++if [ $GNOME_ACCESSIBILITY ]; then export GTK_MODULES=gail:atk-bridge; fi
+
+ #
+ # STAR_PROFILE_LOCKING_DISABLED=1
- Previous message (by thread): rpms/gtk2/devel gtk2.spec,1.92,1.93
- Next message (by thread): rpms/stunnel/devel stunnel-4.12-sample.patch, NONE, 1.1 .cvsignore, 1.13, 1.14 sources, 1.13, 1.14 stunnel.spec, 1.28, 1.29 stunnel-4.08-sample.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list