rpms/openoffice.org/devel openoffice.org-2.0.4.ooo70361.vcl.atkfilechooser.patch, 1.2, 1.3

[fedora-cvs-commits at redhat.com]

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14604

Modified Files:
	openoffice.org-2.0.4.ooo70361.vcl.atkfilechooser.patch 
Log Message:
update to upstream fix

openoffice.org-2.0.4.ooo70361.vcl.atkfilechooser.patch:
 unx/gtk/a11y/atkwindow.cxx      |    0 
 unx/gtk/window/gtkframe.cxx     |    0 
 vcl/unx/gtk/a11y/atkwindow.cxx  |    8 +++++++-
 vcl/unx/gtk/window/gtkframe.cxx |    6 ++++--
 4 files changed, 11 insertions(+), 3 deletions(-)

Index: openoffice.org-2.0.4.ooo70361.vcl.atkfilechooser.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-2.0.4.ooo70361.vcl.atkfilechooser.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openoffice.org-2.0.4.ooo70361.vcl.atkfilechooser.patch	17 Oct 2006 09:00:04 -0000	1.2
+++ openoffice.org-2.0.4.ooo70361.vcl.atkfilechooser.patch	23 Oct 2006 10:21:36 -0000	1.3
@@ -1,19 +1,53 @@
-Index: unx/gtk/window/gtkframe.cxx
+Index: unx/gtk/a11y/atkwindow.cxx
 ===================================================================
-RCS file: /cvs/gsl/vcl/unx/gtk/window/gtkframe.cxx,v
-retrieving revision 1.53.4.1
-diff -u -r1.53.4.1 gtkframe.cxx
---- openoffice.org.orig/vcl/unx/gtk/window/gtkframe.cxx	10 Aug 2006 14:53:49 -0000	1.53.4.1
-+++ openoffice.org/vcl/unx/gtk/window/gtkframe.cxx	17 Oct 2006 08:58:46 -0000
-@@ -647,6 +650,11 @@
- AtkRole
- GtkSalFrame::GetAtkRole( GtkWindow* window )
+RCS file: /cvs/gsl/vcl/unx/gtk/a11y/atkwindow.cxx,v
+retrieving revision 1.4
+diff -u -r1.4 atkwindow.cxx
+--- openoffice.org.orig/vcl/unx/gtk/a11y/atkwindow.cxx	17 Sep 2006 12:28:42 -0000	1.4
++++ openoffice.org/vcl/unx/gtk/a11y/atkwindow.cxx	23 Oct 2006 09:55:43 -0000
+@@ -67,7 +67,13 @@
+ ooo_window_wrapper_real_initialize(AtkObject *obj, gpointer data)
  {
-+    if (GTK_IS_FILE_CHOOSER_DIALOG(window))
-+	return ATK_ROLE_FILE_CHOOSER;
-+    else if (GTK_IS_DIALOG(window))
-+	return ATK_ROLE_DIALOG;
+     window_real_initialize(obj, data);
+-    obj->role = GtkSalFrame::GetAtkRole( GTK_WINDOW( data ) );
 +
-     static AtkRole aDefaultRole = ATK_ROLE_INVALID;
++    /* GetAtkRole returns ATK_ROLE_INVALID for all non VCL windows, i.e.
++     * native Gtk+ file picker etc.
++     */
++    AtkRole newRole = GtkSalFrame::GetAtkRole( GTK_WINDOW( data ) );
++    if( newRole != ATK_ROLE_INVALID )
++        obj->role = newRole;
      
-     // Special role for sub-menu and combo-box popups that are exposed directly
+     if( obj->role == ATK_ROLE_TOOL_TIP )
+     {
+Index: unx/gtk/window/gtkframe.cxx
+===================================================================
+RCS file: /cvs/gsl/vcl/unx/gtk/window/gtkframe.cxx,v
+retrieving revision 1.55
+diff -u -r1.55 gtkframe.cxx
+--- openoffice.org.orig/vcl/unx/gtk/window/gtkframe.cxx	17 Sep 2006 12:30:17 -0000	1.55
++++ openoffice.org/vcl/unx/gtk/window/gtkframe.cxx	23 Oct 2006 09:55:44 -0000
+@@ -657,11 +657,13 @@
+     if( aDefaultRole == ATK_ROLE_INVALID )
+         aDefaultRole = atk_role_register( "redundant object" );
+     
+-    AtkRole role = aDefaultRole;
++    AtkRole role = ATK_ROLE_INVALID;
+     
+     GtkSalFrame * pFrame = getFromWindow( window );
+     if( pFrame )
+     {
++        role = aDefaultRole;
++
+         Window *pWindow = static_cast <Window *> (pFrame->GetInstance());
+         if( pWindow )
+         {
+@@ -710,7 +712,7 @@
+             }
+         }
+     }
+-    
++
+     return role;
+ }
+