rpms/openoffice.org/devel openoffice.org-3.1.1.ooo104484.sc.wrong.cast.patch, NONE, 1.1 openoffice.org.spec, 1.1998, 1.1999

[Caolan McNamara]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.1.1.ooo104484.sc.wrong.cast.patch 
Log Message:
Resolves: ooo#104484 openoffice.org-3.1.1.ooo104484.sc.wrong.cast.patch

openoffice.org-3.1.1.ooo104484.sc.wrong.cast.patch:
 chart2uno.cxx |   14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

--- NEW FILE openoffice.org-3.1.1.ooo104484.sc.wrong.cast.patch ---
Index: source/ui/unoobj/chart2uno.cxx
===================================================================
--- sc.orig/source/ui/unoobj/chart2uno.cxx	(revision 275719)
+++ sc/source/ui/unoobj/chart2uno.cxx	(working copy)
@@ -500,6 +500,10 @@
         ScRefTokenHelper::getDoubleRefDataFromToken(aData, *itr);
         SCCOLROW n1 = aData.Ref1.nCol;
         SCCOLROW n2 = aData.Ref2.nCol;
+        if (n1 > SCCOL_MAX)
+            n1 = SCCOL_MAX;
+        if (n2 > SCCOL_MAX)
+            n2 = SCCOL_MAX;
         SCCOLROW nTmp = n2 - n1 + 1;
         if (n1 < mnStartCol)
             mnStartCol = static_cast<SCCOL>(n1);
@@ -510,14 +514,18 @@
 
         n1 = aData.Ref1.nRow;
         n2 = aData.Ref2.nRow;
+        if (n1 > SCROW_MAX)
+            n1 = SCROW_MAX;
+        if (n2 > SCROW_MAX)
+            n2 = SCROW_MAX;
         nTmp = n2 - n1 + 1;
 
         if (n1 < mnStartRow)
-            mnStartRow = static_cast<SCCOL>(n1);
+            mnStartRow = static_cast<SCROW>(n1);
         if (n2 > nEndRow)
-            nEndRow = static_cast<SCCOL>(n2);
+            nEndRow = static_cast<SCROW>(n2);
         if (nTmp > nMaxRows)
-            nMaxRows = static_cast<SCCOL>(nTmp);
+            nMaxRows = static_cast<SCROW>(nTmp);
     }
 
     // total column size ?


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1998
retrieving revision 1.1999
diff -u -p -r1.1998 -r1.1999
--- openoffice.org.spec	2 Sep 2009 13:45:43 -0000	1.1998
+++ openoffice.org.spec	3 Sep 2009 13:04:03 -0000	1.1999
@@ -1,6 +1,6 @@
 %define oootag OOO310
 %define ooomilestone 19
-%define rh_rpm_release 5
+%define rh_rpm_release 6
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -158,6 +158,7 @@ Patch80: openoffice.org-3.1.1.ooo104329.
 Patch81: workspace.os131.patch
 Patch82: workspace.vcl102.patch
 Patch83: openoffice.org-3.1.1.ooo104157.svx.crashonencryptparse.patch
+Patch84: openoffice.org-3.1.1.ooo104484.sc.wrong.cast.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1701,6 +1702,7 @@ cat %{PATCH11} >> svtools/source/dialogs
 %patch81 -p0 -b .workspace.os131.patch
 %patch82 -p0 -b .workspace.vcl102.patch
 %patch83 -p0 -b .ooo104157.svx.crashonencryptparse.patch
+%patch84 -p0 -b .ooo104484.sc.wrong.cast.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4210,6 +4212,9 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
+* Thu Sep 03 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.1-19.6
+- Resolves: ooo#104484 openoffice.org-3.1.1.ooo104484.sc.wrong.cast.patch
+
 * Wed Sep 02 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.1-19.5
 - Resolves: rhbz#520772 copy/paste cockup