rpms/openoffice.org/devel workspace.vcl106.patch, NONE, 1.1 openoffice.org.spec, 1.2016, 1.2017 openoffice.org-3.1.1.ooo105613.vcl.a11y.exceptions.patch, 1.1, NONE

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv924

Modified Files:
	openoffice.org.spec 
Added Files:
	workspace.vcl106.patch 
Removed Files:
	openoffice.org-3.1.1.ooo105613.vcl.a11y.exceptions.patch 
Log Message:
track upstream name

workspace.vcl106.patch:
 atkutil.cxx |   13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

--- NEW FILE workspace.vcl106.patch ---
--- vcl.orig/unx/gtk/a11y/atkutil.cxx	2009-10-05 08:06:01.000000000 +0100
+++ vcl/unx/gtk/a11y/atkutil.cxx	2009-10-05 08:10:07.000000000 +0100
@@ -190,7 +190,7 @@
                 if( accessibility::AccessibleStateType::FOCUSED == nState )
                     atk_wrapper_focus_tracker_notify_when_idle( getAccessible(aEvent) );
             }
-            catch(lang::IndexOutOfBoundsException e)
+            catch(const lang::IndexOutOfBoundsException &e)
             {
                 g_warning("Focused object has invalid index in parent");
             }
@@ -546,7 +546,14 @@
         if( g_aWindowList.find(pWindow) == g_aWindowList.end() )
         {
             g_aWindowList.insert(pWindow);
-            aDocumentFocusListener->attachRecursive(xAccessible, xContext, xStateSet);
+            try
+            {
+                aDocumentFocusListener->attachRecursive(xAccessible, xContext, xStateSet);
+            }
+            catch( const uno::Exception &e )
+            {
+                g_warning( "Exception caught processing focus events" );
+            }
         }
 #ifdef ENABLE_TRACING
         else
@@ -577,7 +584,7 @@
             }
         }
     } 
-    catch( uno::Exception e )
+    catch( const uno::Exception &e )
     {
         g_warning( "Exception caught processing menu highlight events" );
     }


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2016
retrieving revision 1.2017
diff -u -p -r1.2016 -r1.2017
--- openoffice.org.spec	5 Oct 2009 11:50:37 -0000	1.2016
+++ openoffice.org.spec	6 Oct 2009 14:48:52 -0000	1.2017
@@ -161,7 +161,7 @@ Patch84: openoffice.org-3.1.1.ooo64671.c
 Patch85: openoffice.org-3.1.1.oooXXXXXX.sal.justcoredump.patch
 Patch86: workspace.aw073.patch
 Patch87: openoffice.org-3.1.1.ooo92671.vcl.coverageformat2.patch
-Patch88: openoffice.org-3.1.1.ooo105613.vcl.a11y.exceptions.patch
+Patch88: workspace.vcl106.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1709,7 +1709,7 @@ cat %{PATCH11} >> svtools/source/dialogs
 %patch85 -p1 -b .oooXXXXXX.sal.justcoredump.patch
 %patch86 -p0 -b .workspace.aw073.patch
 %patch87 -p0 -b .ooo92671.vcl.coverageformat2.patch
-%patch88 -p0 -b .ooo105613.vcl.a11y.exceptions.patch
+%patch88 -p0 -b .workspace.vcl106.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4246,7 +4246,7 @@ fi
 * Mon Oct 05 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.1-19.11-UNRELEASED
 - merge openoffice.org-3.1.1.ooo104157.svx.crashonencryptparse.patch
   into accepted workspace (caolanm)
-- Resolves: rhbz#527177 add openoffice.org-3.1.1.ooo105613.vcl.a11y.exceptions.patch (caolanm)
+- Resolves: rhbz#527177 add workspace.vcl106.patch
 
 * Wed Sep 30 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.1-19.10
 - Resolves: rhbz#461617 gsub coverage format 2 with greater than 1 ranges (caolanm)


--- openoffice.org-3.1.1.ooo105613.vcl.a11y.exceptions.patch DELETED ---