rpms/openoffice.org/devel workspace.sw33bf06.patch, NONE, 1.1 openoffice.org.spec, 1.2264, 1.2265 openoffice.org-3.3.0.ooo112516.sw.avoid.divbyzero.patch, 1.1, NONE openoffice.org-3.3.0.ooo112657.sw.rtf.dont-crash-on-merged-cells-without-clmgf.patch, 1.1, NONE

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv17969

Modified Files:
	openoffice.org.spec 
Added Files:
	workspace.sw33bf06.patch 
Removed Files:
	openoffice.org-3.3.0.ooo112516.sw.avoid.divbyzero.patch 
	openoffice.org-3.3.0.ooo112657.sw.rtf.dont-crash-on-merged-cells-without-clmgf.patch 
Log Message:
merge patches into accepted workspaces

workspace.sw33bf06.patch:
 core/text/txttab.cxx  |    4 ++++
 filter/rtf/rtftbl.cxx |    6 +++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

--- NEW FILE workspace.sw33bf06.patch ---
diff -ru sw.orig/source/core/text/txttab.cxx sw/source/core/text/txttab.cxx
--- sw.orig/source/core/text/txttab.cxx	2010-06-18 15:03:06.000000000 +0100
+++ sw/source/core/text/txttab.cxx	2010-06-18 15:30:19.000000000 +0100
@@ -194,6 +194,10 @@
             if ( nCount < 0 )
                 nCount = 0;
 
+			//Minimum tab stop width is 1
+			if (nDefTabDist <= 0)
+			    nDefTabDist = 1;
+
 			nCount /= nDefTabDist;
             nNextPos = ( nCount + 1 ) * nDefTabDist ;
             // --> FME 2004-09-21 #117919 Minimum tab stop width is 1 or 51 twips:
# HG changeset patch
# Parent 23574dd1e2de7a4ebb1348b00ae43e1761af672d
#i112657# do not crash when there are merged cells not started by \clmgf at the beginning of a row

diff -r 23574dd1e2de sw/source/filter/rtf/rtftbl.cxx
--- sw/source/filter/rtf/rtftbl.cxx	Thu Jun 24 09:29:05 2010 +0200
+++ sw/source/filter/rtf/rtftbl.cxx	Thu Jun 24 14:35:01 2010 +0200
@@ -288,7 +288,11 @@
 			break;
 
 		case RTF_CLMRG:
-			aMergeBoxes[ nBoxCnt ] = TRUE;
+            // would crash later on reading \cellx (#i112657#)
+            if (nBoxCnt != 0)
+            {
+                aMergeBoxes[ nBoxCnt ] = TRUE;
+            }
 			break;
 
 		case RTF_CELLX:


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2264
retrieving revision 1.2265
diff -u -p -r1.2264 -r1.2265
--- openoffice.org.spec	1 Jul 2010 15:08:42 -0000	1.2264
+++ openoffice.org.spec	1 Jul 2010 16:58:02 -0000	1.2265
@@ -152,8 +152,7 @@ Patch81: workspace.tl81.patch
 Patch82: openoffice.org-3.3.0.ooo112384.sw.export.doc.styledoesntexist.patch
 Patch83: workspace.gtkfpicker9.patch
 Patch84: workspace.gtk3.patch
-Patch85: openoffice.org-3.3.0.ooo112516.sw.avoid.divbyzero.patch
-Patch86: openoffice.org-3.3.0.ooo112657.sw.rtf.dont-crash-on-merged-cells-without-clmgf.patch
+Patch85: workspace.sw33bf06.patch
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %define instdir %{_libdir}
@@ -1719,8 +1718,7 @@ cp -p %{SOURCE5} external/unowinreg/unow
 %patch82 -p0 -b .ooo112384.sw.export.doc.styledoesntexist.patch
 %patch83 -p0 -b .workspace.gtkfpicker9.patch
 %patch84 -p0 -b .workspace.gtk3.patch
-%patch85 -p0 -b .ooo112516.sw.avoid.divbyzero.patch
-%patch86 -p1 -b .ooo112657.sw.rtf.dont-crash-on-merged-cells-without-clmgf.patch
+%patch85 -p0 -b .workspace.sw33bf06.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`


--- openoffice.org-3.3.0.ooo112516.sw.avoid.divbyzero.patch DELETED ---


--- openoffice.org-3.3.0.ooo112657.sw.rtf.dont-crash-on-merged-cells-without-clmgf.patch DELETED ---