rpms/openoffice.org/devel openoffice.org-3.0.1.ooo98885.sw.safeindex.patch, NONE, 1.1 openoffice.org.spec, 1.1780, 1.1781

[Caolan McNamara]

Author: caolanm

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

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/devel/openoffice.org.spec,v
retrieving revision 1.1780
retrieving revision 1.1781
diff -u -r1.1780 -r1.1781
--- openoffice.org.spec	3 Feb 2009 23:15:57 -0000	1.1780
+++ openoffice.org.spec	4 Feb 2009 15:09:22 -0000	1.1781
@@ -1,6 +1,6 @@
 %define oootag OOO300
 %define ooomilestone 15
-%define rh_rpm_release 6
+%define rh_rpm_release 7
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -137,6 +137,7 @@
 Patch66: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
 Patch67: openoffice.org-3.0.1.ooo98649.svtools.missingUI.patch
 Patch68: workspace.gcc44.patch
+Patch69: openoffice.org-3.0.1.ooo98885.sw.safeindex.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1426,6 +1427,7 @@
 %patch66 -p1 -b .gccXXXXX.solenv.javaregistration.patch
 %patch67 -p1 -b .ooo98649.svtools.missingUI.patch
 %patch68 -p1 -b .workspace.gcc44.patch
+%patch69 -p1 -b .ooo98885.sw.safeindex.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -3837,6 +3839,9 @@
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
+* Wed Feb 04 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.0.1-15.7
+- Resolves: rhbz#483931 openoffice.org-3.0.1.ooo98885.sw.safeindex.patch
+
 * Tue Feb 03 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.0.1-15.6
 - Resolves: rhbz#483223 openoffice.org-3.0.1.ooo98649.svtools.missingUI.patch
 - add mythes-pt depend to pt langpack