rpms/openoffice.org/devel openoffice.org-3.1.0.ooo99526.sw.mailmergeup.outofrange.patch, NONE, 1.1 openoffice.org.spec, 1.1820, 1.1821

[Caolan McNamara]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.1.0.ooo99526.sw.mailmergeup.outofrange.patch 
Log Message:
Resolves: rhbz#486807 add openoffice.org-3.1.0.ooo99526.sw.mailmergeup.outofrange.patch

openoffice.org-3.1.0.ooo99526.sw.mailmergeup.outofrange.patch:

--- NEW FILE openoffice.org-3.1.0.ooo99526.sw.mailmergeup.outofrange.patch ---
Index: source/ui/dbui/mmlayoutpage.cxx
===================================================================
RCS file: /cvs/sw/sw/source/ui/dbui/mmlayoutpage.cxx,v
retrieving revision 1.21
diff -u -r1.21 mmlayoutpage.cxx
--- sw.orig/source/ui/dbui/mmlayoutpage.cxx	6 May 2008 12:55:06 -0000	1.21
+++ sw/source/ui/dbui/mmlayoutpage.cxx	23 Feb 2009 11:51:34 -0000
@@ -804,7 +804,8 @@
 {
     bool bDown = pButton == &m_aDownPB;
     BOOL bMoved = m_pExampleWrtShell->MoveParagraph( bDown ? 1 : -1 );
-    m_pWizard->GetConfigItem().MoveGreeting(bDown ? 1 : -1 );
+    if (bMoved || bDown)
+        m_pWizard->GetConfigItem().MoveGreeting(bDown ? 1 : -1 );
     if(!bMoved && bDown)
     {
         //insert a new paragraph before the greeting line
Index: source/core/doc/docnum.cxx
===================================================================
RCS file: /cvs/sw/sw/source/core/doc/docnum.cxx,v
retrieving revision 1.77.22.1
diff -u -r1.77.22.1 docnum.cxx
--- sw.orig/source/core/doc/docnum.cxx	14 Aug 2008 19:44:28 -0000	1.77.22.1
+++ sw/source/core/doc/docnum.cxx	23 Feb 2009 11:51:26 -0000
@@ -2073,6 +2073,10 @@
 	}
 	else
 	{
+        //Impossible to move to negative index
+        if (Abs(nOffset) > nStIdx)
+            return FALSE;
+
 		nInEndIdx = nStIdx - 1;
 		nStIdx += nOffset;
 	}


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1820
retrieving revision 1.1821
diff -u -r1.1820 -r1.1821
--- openoffice.org.spec	20 Feb 2009 14:50:23 -0000	1.1820
+++ openoffice.org.spec	23 Feb 2009 12:28:30 -0000	1.1821
@@ -1,6 +1,6 @@
 %define oootag OOO310
 %define ooomilestone 2
-%define rh_rpm_release 1
+%define rh_rpm_release 2
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -125,6 +125,7 @@
 Patch52: workspace.xmergeclean.patch
 Patch53: openoffice.org-3.1.0.ooo99407.filter-detectsmalldevicefilters.patch
 Patch54: openoffice.org-3.1.0.ooo99427.sd.ensure-icons-state.patch
+Patch55: openoffice.org-3.1.0.ooo99526.sw.mailmergeup.outofrange.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1584,6 +1585,7 @@
 %patch52 -p0 -b .workspace.xmergeclean.patch
 %patch53 -p0 -b .ooo99407.filter-detectsmalldevicefilters.patch
 %patch54 -p0 -b .ooo99427.sd.ensure-icons-state.patch
+%patch55 -p0 -b .ooo99526.sw.mailmergeup.outofrange.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4094,6 +4096,9 @@
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
+* Mon Feb 23 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.0-2.2
+- Resolves: rhbz#486807 add openoffice.org-3.1.0.ooo99526.sw.mailmergeup.outofrange.patch
+
 * Fri Feb 20 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.0-2.1
 - next milestone
 - drop integrated workspace.mba31issues01.patch