rpms/openoffice.org/F-10 openoffice.org-3.0.1.ooo98885.sw.safeindex.patch, NONE, 1.1 openoffice.org.spec, 1.1714, 1.1715

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22981/F-10

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.0.1.ooo98885.sw.safeindex.patch 
Log Message:
Resolves: rhbz#483931 openoffice.org-3.0.1.ooo98885.sw.safeindex.patch

openoffice.org-3.0.1.ooo98885.sw.safeindex.patch:

--- NEW FILE openoffice.org-3.0.1.ooo98885.sw.safeindex.patch ---
Index: source/core/bastyp/index.cxx
===================================================================
RCS file: /cvs/sw/sw/source/core/bastyp/index.cxx,v
retrieving revision 1.11
diff -u -r1.11 index.cxx
--- openoffice.org.orig/sw/source/core/bastyp/index.cxx	10 Apr 2008 12:51:37 -0000	1.11
+++ openoffice.org/sw/source/core/bastyp/index.cxx	4 Feb 2009 14:59:32 -0000
@@ -302,7 +302,7 @@
 			pArr->pFirst = pArr->pLast = this;
 			nIndex = nIdx;
 		}
-        else if( nIdx > ((pArr->pLast->nIndex - pArr->pFirst->nIndex) / 2) )
+        else if( pArr->pLast && (nIdx > ((pArr->pLast->nIndex - pArr->pFirst->nIndex) / 2)) )
 			ChgValue( *pArr->pLast, nIdx );
 		else
 			ChgValue( *pArr->pFirst, nIdx );


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-10/openoffice.org.spec,v
retrieving revision 1.1714
retrieving revision 1.1715
diff -u -r1.1714 -r1.1715
--- openoffice.org.spec	30 Jan 2009 12:48:10 -0000	1.1714
+++ openoffice.org.spec	4 Feb 2009 15:09:21 -0000	1.1715
@@ -137,6 +137,7 @@
 Patch64: openoffice.org-3.0.1.ooo98240.sc.basicworkaround.patch
 Patch65: openoffice.org-3.0.1.ooo98288.ucb.neonchange.patch
 Patch66: openoffice.org-3.0.1.ooo98649.svtools.missingUI.patch
+Patch67: openoffice.org-3.0.1.ooo98885.sw.safeindex.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/openoffice.org
@@ -1398,6 +1399,7 @@
 %patch64 -p1 -b .ooo98240.sc.basicworkaround.patch
 %patch65 -p1 -b .ooo98288.ucb.neonchange.patch
 %patch66 -p1 -b .ooo98649.svtools.missingUI.patch
+%patch67 -p1 -b .ooo98885.sw.safeindex.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -3764,8 +3766,9 @@
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Fri Jan 30 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.0.1-15.3
+* Wed Feb 30 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.0.1-15.3
 - Resolves: rhbz#483223 openoffice.org-3.0.1.ooo98649.svtools.missingUI.patch
+- Resolves: rhbz#483931 openoffice.org-3.0.1.ooo98885.sw.safeindex.patch
 
 * Tue Jan 20 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.0.1-15.2
 - Resolves: rhbz#479624 add