ooo-build r11888 - in trunk: . patches/src680

[strba svn gnome org]

Author: strba
Date: Thu Mar 13 10:31:37 2008
New Revision: 11888
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11888&view=rev

Log:
2008-03-13  Fridrich Strba  <fridrich strba bluewin ch>
	* patches/src680/sw-nested-positionned-tables-ww8-import-fix.diff,
	patches/src680/apply: fix a part of problem with nested tables.


Added:
   trunk/patches/src680/sw-nested-positionned-tables-ww8-import-fix.diff
Modified:
   trunk/ChangeLog
   trunk/patches/src680/apply

Modified: trunk/patches/src680/apply
==============================================================================
--- trunk/patches/src680/apply	(original)
+++ trunk/patches/src680/apply	Thu Mar 13 10:31:37 2008
@@ -502,6 +502,9 @@
 # enable build debug=t in sw module on x86_64
 sw-debug-build.diff, fridrich
 
+# convert kind of correctly nested positioned tables
+sw-nested-positionned-tables-ww8-import-fix.diff, i#86988, fridrich
+
 [ Fixes < ooh680-m7 ]
 # fix a regression created by my header/footer patch
 sw-my-mess.diff, fridrich

Added: trunk/patches/src680/sw-nested-positionned-tables-ww8-import-fix.diff
==============================================================================
--- (empty file)
+++ trunk/patches/src680/sw-nested-positionned-tables-ww8-import-fix.diff	Thu Mar 13 10:31:37 2008
@@ -0,0 +1,16 @@
+--- sw/source/filter/ww8/ww8par2.cxx	2 Jan 2008 14:42:31 -0000	1.134.66.1
++++ sw/source/filter/ww8/ww8par2.cxx	13 Mar 2008 10:05:43 -0000
+@@ -722,7 +722,12 @@
+     //unit no matter what else happens. So if we are not in a table at
+     //all, or if we are in the first cell then test that the last frame
+     //data is the same as the current one
+-    if (bNowApo && InEqualApo(nCellLevel))
++	
++// -->>>>> fridrich_strba -- 2008-03-12 -- i#86988 -- fire this one
++// -->>>>> only when we are in the outermost table (nCellLevel <= 1)
++    if (bNowApo && InEqualApo(nCellLevel) && /* nCellLevel is smaller or equal to one */ nCellLevel <= 1)
++// <<<<<-- end of a great fix
++// <<<<<-- fridrich_strba -- 2008-03-12 -- i#86988
+     {
+         // two bordering eachother
+         if (!TestSameApo(aRet, pTabPos))