rpms/openoffice.org/F-12 openoffice.org-3.2.0.ooo107151.sc.pop-empty-cell.patch, NONE, 1.1 openoffice.org.spec, 1.2036, 1.2037

[David Tardon]

Author: dtardon

Update of /cvs/extras/rpms/openoffice.org/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31632

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.2.0.ooo107151.sc.pop-empty-cell.patch 
Log Message:
add openoffice.org-3.2.0.ooo107151.sc.pop-empty-cell.patch

openoffice.org-3.2.0.ooo107151.sc.pop-empty-cell.patch:
 interpr1.cxx |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE openoffice.org-3.2.0.ooo107151.sc.pop-empty-cell.patch ---
diff -r f7fde8505c28 sc/source/core/tool/interpr1.cxx
--- a/sc/source/core/tool/interpr1.cxx	Tue Nov 17 13:55:31 2009 +0100
+++ b/sc/source/core/tool/interpr1.cxx	Tue Nov 24 15:15:17 2009 +0100
@@ -780,6 +780,7 @@
         switch ( GetRawStackType() )
         {
             case svEmptyCell:
+                Pop();
                 aComp.bEmpty[ i ] = TRUE;
                 break;
             case svMissing:
@@ -836,6 +837,7 @@
         switch (GetRawStackType())
         {
             case svEmptyCell:
+                Pop();
                 aComp.bEmpty[ i ] = TRUE;
                 break;
             case svMissing:


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/extras/rpms/openoffice.org/F-12/openoffice.org.spec,v
retrieving revision 1.2036
retrieving revision 1.2037
diff -u -p -r1.2036 -r1.2037
--- openoffice.org.spec	23 Nov 2009 10:49:37 -0000	1.2036
+++ openoffice.org.spec	24 Nov 2009 14:28:27 -0000	1.2037
@@ -173,6 +173,7 @@ Patch96: workspace.impress183.patch
 Patch97: openoffice.org-3.2.0.ooo59648.sw.scaling.patch
 Patch98: openoffice.org-3.1.1.ooo107131.impress.tabledrag.crash
 Patch99: openoffice.org-3.2.0.oooXXXXX.canvas.fixcolorspace.patch
+Patch100: openoffice.org-3.2.0.ooo107151.sc.pop-empty-cell.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1732,6 +1733,7 @@ cat %{PATCH11} >> svtools/source/dialogs
 %patch97 -p0 -b .ooo59648.sw.scaling.patch
 %patch98 -p0 -b .ooo107131.impress.tabledrag.crash
 %patch99 -p0 -b .oooXXXXX.canvas.fixcolorspace.patch
+%patch100 -p1 -b .ooo107151.sc.pop-empty-cell.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4268,6 +4270,7 @@ fi
 * Mon Nov 23 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.1-19.19
 - Resolves: rhbz#540379/ooo#107131 impress tabledrag crash
 - Resolves: rhbz#540231 add openoffice.org-3.2.0.oooXXXXX.canvas.fixcolorspace.patch
+- add openoffice.org-4.2.0.ooo107151.sc.pop-empty-cell.patch (dtardon)
 
 * Thu Nov 17 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.1-19.18
 - Resolves: ooo#59648 sw .doc export scaling (caolanm)