rpms/openoffice.org/F-9 openoffice.org-3.0.0.ooo95533.sw.safertableexport.patch, NONE, 1.1 openoffice.org.spec, 1.1508, 1.1509

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22717

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.0.0.ooo95533.sw.safertableexport.patch 
Log Message:
Resolves: rhbz#468336 openoffice.org-3.0.0.ooo95533.sw.safertableexport.patch

openoffice.org-3.0.0.ooo95533.sw.safertableexport.patch:

--- NEW FILE openoffice.org-3.0.0.ooo95533.sw.safertableexport.patch ---
Index: source/filter/ww8/wrtw8nds.cxx
===================================================================
RCS file: /cvs/sw/sw/source/filter/ww8/wrtw8nds.cxx,v
retrieving revision 1.109
diff -u -r1.109 wrtw8nds.cxx
--- openoffice.org.orig/sw/source/filter/ww8/wrtw8nds.cxx	8 Jul 2008 08:29:15 -0000	1.109
+++ openoffice.org/sw/source/filter/ww8/wrtw8nds.cxx	28 Oct 2008 09:47:19 -0000
@@ -2239,6 +2239,12 @@
         {
             ASSERT( nColCnt < rCols.Count(), "Leaving table" );
 
+            if (nColCnt >= rCols.Count())
+            {
+                //Doomage, row wider than table
+                break;
+            }
+
             SwWriteTableCell* pCell = rCells[nBox];
             const bool bProcessCoveredCell = bNewTableModel && 0 == pCell->GetRowSpan();
 


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-9/openoffice.org.spec,v
retrieving revision 1.1508
retrieving revision 1.1509
diff -u -r1.1508 -r1.1509
--- openoffice.org.spec	7 Oct 2008 08:24:00 -0000	1.1508
+++ openoffice.org.spec	28 Oct 2008 10:02:01 -0000	1.1509
@@ -171,6 +171,7 @@
 Patch96: openoffice.org-2.4.0.ooo93119.shell.echos.patch
 Patch97: openoffice.org-2.4.1.ooo92217.sal.alloc.patch
 Patch98: openoffice.org-2.4.1.ooo81576.vcl.fixscale.patch
+Patch99: openoffice.org-3.0.0.ooo95533.sw.safertableexport.patch
 
 %define instdir %{_libdir}/openoffice.org
 
@@ -1156,6 +1157,7 @@
 %patch96 -p1 -b .ooo93119.shell.echos.patch
 %patch97 -p1 -b .ooo92217.sal.alloc.patch
 %patch98 -p1 -b .ooo81576.vcl.fixscale.patch
+%patch99 -p1 -b .ooo95533.sw.safertableexport.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -2951,9 +2953,10 @@
 
 
 %changelog
-* Tue Oct 07 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.1-17.7
+* Tue Oct 28 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.1-17.7
 - Resolves: ooo#94495 Toggle weblayout/normal layout and notes
 - Resolves: rhbz#465792 openoffice.org-2.4.1.ooo81576.vcl.fixscale.patch
+- Resolves: rhbz#468336 openoffice.org-3.0.0.ooo95533.sw.safertableexport.patch
 
 * Tue Aug 26 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.1-17.6
 - Resolves: CVE-2008-3282 numeric truncation error in OOo memory allocator