rpms/openoffice.org/devel workspace.dr69.patch, NONE, 1.1 openoffice.org.spec, 1.2000, 1.2001 openoffice.org-3.1.1.ooo104484.sc.wrong.cast.patch, 1.1, NONE

[Caolan McNamara]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	workspace.dr69.patch 
Removed Files:
	openoffice.org-3.1.1.ooo104484.sc.wrong.cast.patch 
Log Message:
build

workspace.dr69.patch:
 chart2uno.cxx |   14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

--- NEW FILE workspace.dr69.patch ---
Index: sc/source/ui/unoobj/chart2uno.cxx
===================================================================
--- sc/source/ui/unoobj/chart2uno.cxx	(.../tags/DEV300_m54)	(revision 275870)
+++ sc/source/ui/unoobj/chart2uno.cxx	(.../cws/dr69)	(revision 275870)
@@ -500,6 +500,10 @@
         ScRefTokenHelper::getDoubleRefDataFromToken(aData, *itr);
         SCCOLROW n1 = aData.Ref1.nCol;
         SCCOLROW n2 = aData.Ref2.nCol;
+        if (n1 > MAXCOL)
+            n1 = MAXCOL;
+        if (n2 > MAXCOL)
+            n2 = MAXCOL;
         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 > MAXROW)
+            n1 = MAXROW;
+        if (n2 > MAXROW)
+            n2 = MAXROW;
         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.2000
retrieving revision 1.2001
diff -u -p -r1.2000 -r1.2001
--- openoffice.org.spec	7 Sep 2009 12:09:32 -0000	1.2000
+++ openoffice.org.spec	8 Sep 2009 11:51:04 -0000	1.2001
@@ -158,7 +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
+Patch84: workspace.dr69.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1702,7 +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
+%patch84 -p0 -b .workspace.dr69.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4212,8 +4212,8 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Mon Sep 07 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.1-19.6-UNBUILT
-- Resolves: ooo#104484 openoffice.org-3.1.1.ooo104484.sc.wrong.cast.patch
+* Tue Sep 08 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.1-19.6
+- Resolves: ooo#104484 workspace.dr69.patch
 - Resolves: rhbz#521460 - wrong page size for A3/A5
 
 * Wed Sep 02 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.1-19.5


--- openoffice.org-3.1.1.ooo104484.sc.wrong.cast.patch DELETED ---