rpms/openoffice.org/devel openoffice.org-3.0.0.ooo88033.svx.a11ycrash.patch, NONE, 1.1 openoffice.org.spec, 1.1468, 1.1469

[Caolan McNamara (caolanm)]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17436

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.0.0.ooo88033.svx.a11ycrash.patch 
Log Message:
Resolves: rhbz#441128 openoffice.org-3.0.0.ooo88033.svx.a11ycrash.patch

openoffice.org-3.0.0.ooo88033.svx.a11ycrash.patch:

--- NEW FILE openoffice.org-3.0.0.ooo88033.svx.a11ycrash.patch ---
Index: source/editeng/editeng.cxx
===================================================================
RCS file: /cvs/graphics/svx/source/editeng/editeng.cxx,v
retrieving revision 1.110
diff -u -r1.110 editeng.cxx
--- openoffice.org.orig/svx/source/editeng/editeng.cxx	12 Mar 2008 09:42:13 -0000	1.110
+++ openoffice.org/svx/source/editeng/editeng.cxx	8 Apr 2008 08:02:08 -0000
@@ -2357,7 +2357,8 @@
 	if ( pImpEditEngine->IsFormatted() )
 	{
 		ParaPortion* pParaPortion = pImpEditEngine->GetParaPortions()[nPara];
-		EditLine* pLine = pParaPortion ? pParaPortion->GetLines().GetObject( 0 ) : NULL;
+		EditLine* pLine = (pParaPortion && pParaPortion->GetLines().Count()) ? 
+			pParaPortion->GetLines().GetObject( 0 ) : NULL;
 		DBG_ASSERT( pParaPortion && pLine, "GetParagraphInfos - Paragraph out of range" );
 		if ( pParaPortion && pLine )
 		{


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1468
retrieving revision 1.1469
diff -u -r1.1468 -r1.1469
--- openoffice.org.spec	7 Apr 2008 09:04:36 -0000	1.1468
+++ openoffice.org.spec	8 Apr 2008 08:13:20 -0000	1.1469
@@ -1,6 +1,6 @@
 %define oootag DEV300
 %define ooomilestone 5
-%define rh_rpm_release 3
+%define rh_rpm_release 4
 
 # undef to get english only and no-langpacks for a faster smoketest build
 %define langpacks 1
@@ -140,6 +140,7 @@
 Patch67: openoffice.org-3.0.0.ooo87604.fixupsystemhunspell.patch
 Patch68: openoffice.org-3.0.0.ooo85691.vcl.tooltipcolor.patch
 Patch69: openoffice.org-3.0.0.ooo87991.fpickersafe.patch
+Patch70: openoffice.org-3.0.0.ooo88033.svx.a11ycrash.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/openoffice.org
@@ -1124,6 +1125,7 @@
 %patch67 -p1 -b .ooo87604.fixupsystemhunspell.patch
 %patch68 -p1 -b .ooo85691.vcl.tooltipcolor.patch
 %patch69 -p1 -b .ooo87991.fpickersafe.patch
+%patch70 -p1 -b .ooo88033.svx.a11ycrash.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -2872,6 +2874,9 @@
 %{python_py_sitearch}/unohelper.py*
 
 %changelog
+* Tue Apr 08 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.5.4
+- Resolves: rhbz#441128 openoffice.org-3.0.0.ooo88033.svx.a11ycrash.patch
+
 * Mon Apr 07 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.5.3
 - Resolves: rhbz#441112 openoffice.org-3.0.0.ooo85691.vcl.tooltipcolor.patch
 - Resolves: rhbz#441108 openoffice.org-3.0.0.ooo87991.fpickersafe.patch