ooo-build r11889 - trunk/patches/src680

[strba svn gnome org]

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

Log:
make the patch a bit less OD-like

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

Modified: trunk/patches/src680/sw-nested-positionned-tables-ww8-import-fix.diff
==============================================================================
--- trunk/patches/src680/sw-nested-positionned-tables-ww8-import-fix.diff	(original)
+++ trunk/patches/src680/sw-nested-positionned-tables-ww8-import-fix.diff	Thu Mar 13 10:36:10 2008
@@ -1,16 +1,11 @@
 --- 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 @@
+@@ -722,7 +722,7 @@
      //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
++    if (bNowApo && InEqualApo(nCellLevel) && nCellLevel <= 1)
      {
          // two bordering eachother
          if (!TestSameApo(aRet, pTabPos))