rpms/openoffice.org/devel openoffice.org-2.1.0.ooo61812.svx.a11ycrash.patch, NONE, 1.1 openoffice.org.spec, 1.926, 1.927

[fedora-cvs-commits at redhat.com]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.1.0.ooo61812.svx.a11ycrash.patch 
Log Message:
rhbz#214773 crash on joining editengine paragraphs under a11y

openoffice.org-2.1.0.ooo61812.svx.a11ycrash.patch:
 source/outliner/outliner.cxx     |    0 
 svx/source/outliner/outliner.cxx |    7 +++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

--- NEW FILE openoffice.org-2.1.0.ooo61812.svx.a11ycrash.patch ---
Index: source/outliner/outliner.cxx
===================================================================
RCS file: /cvs/graphics/svx/source/outliner/outliner.cxx,v
retrieving revision 1.69
diff -u -r1.69 outliner.cxx
--- openoffice.org.orig/svx/source/outliner/outliner.cxx	12 Oct 2006 13:02:06 -0000	1.69
+++ openoffice.org/svx/source/outliner/outliner.cxx	9 Nov 2006 15:01:03 -0000
@@ -1964,9 +1964,12 @@
     EBulletInfo aInfo;
 
     aInfo.nParagraph = nPara;
-    aInfo.bVisible = ImplHasBullet( nPara );
 
-    const SvxNumberFormat* pFmt = ImplGetBullet( nPara );
+    DBG_ASSERT(pParaList && pParaList->GetParagraphCount() > nPara, "Paragraph out of range\n");
+
+    aInfo.bVisible = (pParaList && pParaList->GetParagraphCount() > nPara) ? ImplHasBullet( nPara ) : false;
+
+    const SvxNumberFormat* pFmt = (pParaList && pParaList->GetParagraphCount() > nPara) ? ImplGetBullet( nPara ) : 0;
     aInfo.nType = pFmt ? pFmt->GetNumberingType() : 0;
 
     if( pFmt )


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.926
retrieving revision 1.927
diff -u -r1.926 -r1.927
--- openoffice.org.spec	9 Nov 2006 14:15:46 -0000	1.926
+++ openoffice.org.spec	9 Nov 2006 15:05:20 -0000	1.927
@@ -126,6 +126,7 @@
 Patch60: openoffice.org-2.0.4.ooo71285.tools.ulongmax.patch
 Patch61: openoffice.org-2.1.0.ooo65491.psprint.enablenups.patch
 Patch62: openoffice.org-2.1.0.ooo71379.psprint.endfeatureonnewline.patch
+Patch63: openoffice.org-2.1.0.ooo61812.svx.a11ycrash.patch
 
 %define instdir %{_libdir}/openoffice.org2.1
 
@@ -988,6 +989,7 @@
 %patch60 -p1 -b .ooo71285.tools.ulongmax.patch
 %patch61 -p1 -b .ooo65491.psprint.enablenups.patch
 %patch62 -p1 -b .ooo71379.psprint.endfeatureonnewline.patch
+%patch63 -p1 -b .ooo61812.svx.a11ycrash.patch
 
 tar xzf %{SOURCE1}
 
@@ -2515,6 +2517,7 @@
 - Resolves: rhbz#213996 openoffice.org-2.1.0.ooo65491.psprint.enablenups.patch
 - Resolves: rhbz#213996 distinguish properly between ppd and cups option
 - Resolves: rhbz#213996 openoffice.org-2.1.0.ooo71379.psprint.endfeatureonnewline.patch
+- Resolves: rhbz#214773 openoffice.org-2.1.0.ooo61812.svx.a11ycrash.patch
 
 * Tue Nov 07 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.1.0-2.1
 - next upstream