rpms/openoffice.org/devel workspace.sw8u10bf02.patch, NONE, 1.1 openoffice.org.spec, 1.1342, 1.1343

[Caolan McNamara (caolanm)]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28599

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/devel/openoffice.org.spec,v
retrieving revision 1.1342
retrieving revision 1.1343
diff -u -r1.1342 -r1.1343
--- openoffice.org.spec	21 Nov 2007 14:44:11 -0000	1.1342
+++ openoffice.org.spec	22 Nov 2007 13:51:45 -0000	1.1343
@@ -151,6 +151,7 @@
 Patch69: openoffice.org-2.3.1.ooo81307.sw.word2.patch
 Patch70: openoffice.org-2.3.0.ooo83591.vcl.checkboxes.patch
 Patch71: openoffice.org-2.3.1.ooo82911.sd.insertbackground.patch
+Patch72: workspace.sw8u10bf02.patch
 
 %define instdir %{_libdir}/openoffice.org
 
@@ -1101,6 +1102,7 @@
 %patch69 -p1 -b .ooo81307.sw.word2.patch
 %patch70 -p1 -b .ooo83591.vcl.checkboxes.patch
 %patch71 -p1 -b .ooo82911.sd.insertbackground.patch
+%patch72 -p1 -b .workspace.sw8u10bf02.patch
 
 %if %{linkopt}
 chmod a+x solenv/bin/mklinkscript.pl
@@ -2799,6 +2801,7 @@
 %changelog
 * Wed Nov 21 2007 Jan Navratil <jnavrati at redhat.com> - 1:2.3.1-9.3
 - Resolves: rhbz#247634 fix openoffice.org-2.3.1.ooo82911.sd.insertbackground.patch
+- Resolves: rhbz#386371 add workspace.sw8u10bf02.patch
 
 * Thu Nov 15 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.1-9.2
 - move from firefox to xulrunner