rpms/openoffice.org/F-8 workspace.sw8u10bf02.patch, NONE, 1.1 openoffice.org.spec, 1.1330, 1.1331

[Caolan McNamara (caolanm)]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28514

Modified Files:
	openoffice.org.spec 
Added Files:
	workspace.sw8u10bf02.patch 
Log Message:
Resolves: rhbz#386371 add workspace.sw8u10bf02.patch

workspace.sw8u10bf02.patch:

--- NEW FILE workspace.sw8u10bf02.patch ---
Index: sw/sw/source/filter/html/htmltab.cxx
diff -u sw/sw/source/filter/html/htmltab.cxx:1.23 sw/sw/source/filter/html/htmltab.cxx:1.23.96.1
--- sw/sw/source/filter/html/htmltab.cxx:1.23	Thu Sep 27 02:50:05 2007
+++ sw/sw/source/filter/html/htmltab.cxx	Thu Nov 22 03:41:27 2007
@@ -2996,6 +2996,15 @@
 	else
 	{
 		SwTableNode *pTblNd = pNd->FindTableNode();
+        if( pTblNd->GetTable().GetHTMLTableLayout() )
+        { // if there is already a HTMTableLayout, this table is already finished
+          // and we have to look for the right table in the environment
+            SwTableNode *pOutTbl = pTblNd;
+            do {
+                pTblNd = pOutTbl;
+                pOutTbl = pOutTbl->StartOfSectionNode()->FindTableNode();
+            } while( pOutTbl && pTblNd->GetTable().GetHTMLTableLayout() );
+        }
 		SwNodeIndex aIdx( *pTblNd->EndOfSectionNode() );
 		pStNd = pDoc->GetNodes().MakeTextSection( aIdx, SwTableBoxStartNode,
 												  pColl );


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-8/openoffice.org.spec,v
retrieving revision 1.1330
retrieving revision 1.1331
diff -u -r1.1330 -r1.1331
--- openoffice.org.spec	31 Oct 2007 16:27:01 -0000	1.1330
+++ openoffice.org.spec	22 Nov 2007 13:50:55 -0000	1.1331
@@ -151,6 +151,7 @@
 Patch69: openoffice.org.ooo82608.vcl.gtkbadfree.patch
 Patch70: openoffice.org-2.3.0.ooo82966.svx.missing3d.patch
 Patch71: openoffice.org-2.3.0.ooo83169.colordialog.crash.patch
+Patch72: workspace.sw8u10bf02.patch
 
 %define instdir %{_libdir}/openoffice.org
 
@@ -1097,6 +1098,7 @@
 %patch69 -p1 -b .ooo82608.vcl.gtkbadfree.patch
 %patch70 -p1 -b .ooo82966.svx.missing3d.patch
 %patch71 -p1 -b .ooo83169.colordialog.crash.patch
+%patch72 -p1 -b .workspace.sw8u10bf02.patch
 
 %if %{linkopt}
 chmod a+x solenv/bin/mklinkscript.pl
@@ -2800,6 +2802,7 @@
 * Thu Oct 25 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-6.7.unreleased
 - add openoffice.org-2.3.0.ooo82966.svx.missing3d.patch
 - add openoffice.org-2.3.0.ooo83169.colordialog.crash.patch
+- Resolves: rhbz#386371 add workspace.sw8u10bf02.patch
 
 * Wed Oct 24 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-6.6
 - Resolves: rhbz#338701 fix openoffice.org.ooo82608.vcl.gtkbadfree.patch