[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/openoffice.org/FC-6 openoffice.org-2.0.4.ooo69620.vcl.atkcombo.patch, NONE, 1.1 openoffice.org.spec, 1.892, 1.893



Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.0.4.ooo69620.vcl.atkcombo.patch 
Log Message:
openoffice.org-2.0.4.ooo69620.vcl.atkcombo.patch

openoffice.org-2.0.4.ooo69620.vcl.atkcombo.patch:
 unx/gtk/a11y/atktext.cxx     |    0 
 vcl/unx/gtk/a11y/atktext.cxx |   11 +++++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

--- NEW FILE openoffice.org-2.0.4.ooo69620.vcl.atkcombo.patch ---
Index: unx/gtk/a11y/atktext.cxx
===================================================================
RCS file: /cvs/gsl/vcl/unx/gtk/a11y/atktext.cxx,v
retrieving revision 1.3.30.2
diff -u -r1.3.30.2 atktext.cxx
--- openoffice.org.orig/vcl/unx/gtk/a11y/atktext.cxx	6 Oct 2006 09:22:37 -0000	1.3.30.2
+++ openoffice.org/vcl/unx/gtk/a11y/atktext.cxx	23 Oct 2006 12:50:52 -0000
@@ -184,8 +184,15 @@
         if( !pWrap->mpTextAttributes && pWrap->mpContext )
         {
             uno::Any any = pWrap->mpContext->queryInterface( accessibility::XAccessibleTextAttributes::static_type(NULL) );
-            pWrap->mpTextAttributes = reinterpret_cast< accessibility::XAccessibleTextAttributes * > (any.pReserved);
-            pWrap->mpTextAttributes->acquire();
+            /* Since this not a dedicated interface in Atk and thus has not
+             * been queried during wrapper initialization, we need to check
+             * the return value here.
+             */
+            if( any.hasValue() )
+            {
+                pWrap->mpTextAttributes = reinterpret_cast< accessibility::XAccessibleTextAttributes * > (any.pReserved);
+                pWrap->mpTextAttributes->acquire();
+            }
         }
 
         return pWrap->mpTextAttributes;


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-6/openoffice.org.spec,v
retrieving revision 1.892
retrieving revision 1.893
diff -u -r1.892 -r1.893
--- openoffice.org.spec	23 Oct 2006 09:32:35 -0000	1.892
+++ openoffice.org.spec	23 Oct 2006 13:12:52 -0000	1.893
@@ -134,6 +134,7 @@
 Patch66: workspace.calc39.patch
 Patch67: openoffice.org-2.0.4.ooo70361.vcl.atkfilechooser.patch
 Patch68: openoffice.org-2.0.4.ooo70601.sd.sal_uInt32_aslong.patch
+Patch69: openoffice.org-2.0.4.ooo69620.vcl.atkcombo.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -1002,6 +1003,7 @@
 %patch66 -p1 -b .workspace.calc39.patch
 %patch67 -p1 -b .ooo70361.vcl.atkfilechooser.patch
 %patch68 -p1 -b .ooo70601.sd.sal_uInt32_aslong.patch
+%patch69 -p1 -b .ooo69620.vcl.atkcombo.patch
 
 tar xzf %{SOURCE1}
 
@@ -2529,6 +2531,7 @@
 %changelog
 * Mon Oct 23 2006 Caolan McNamara <caolanm redhat com> - 1:2.0.4-5.5.1
 - add openoffice.org-2.0.4.ooo70601.sd.sal_uInt32_aslong.patch
+- Resolves: rhbz#210435 openoffice.org-2.0.4.ooo69620.vcl.atkcombo.patch
 
 * Thu Oct 12 2006 Caolan McNamara <caolanm redhat com> - 1:2.0.4-5.4
 - add openoffice.org-2.0.4.ooo70361.vcl.atkfilechooser.patch for rh#210440#


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]