ooo-build r12707 - in trunk: . patches/dev300

[freuter svn gnome org]

Author: freuter
Date: Thu May 29 15:28:45 2008
New Revision: 12707
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12707&view=rev

Log:
some progress on n#367341

Added:
   trunk/patches/dev300/sw_layout_in_table_cell_fix.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Thu May 29 15:28:45 2008
@@ -2426,3 +2426,6 @@
 libwpg-testing.diff
 libwps-testing.diff
 writerperfect-testing.diff
+
+[ WWInProgress ]
+sw_layout_in_table_cell_fix.diff, n#367341, flr
\ No newline at end of file

Added: trunk/patches/dev300/sw_layout_in_table_cell_fix.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/sw_layout_in_table_cell_fix.diff	Thu May 29 15:28:45 2008
@@ -0,0 +1,32 @@
+Index: sw/source/filter/ww8/ww8graf.cxx
+===================================================================
+RCS file: /cvs/sw/sw/source/filter/ww8/ww8graf.cxx,v
+retrieving revision 1.150
+diff -u -r1.150 ww8graf.cxx
+--- sw/source/filter/ww8/ww8graf.cxx	13 Nov 2007 15:29:52 -0000	1.150
++++ sw/source/filter/ww8/ww8graf.cxx	29 May 2008 15:01:28 -0000
+@@ -2789,7 +2789,7 @@
+     // Switch on 'follow text flow',
+     // if object is laid out inside table cell and
+     // its wrapping isn't 'SURROUND_THROUGH'
+-    if (bLayoutInTableCell && eSurround != SURROUND_THROUGHT)
++    if (bLayoutInTableCell /*&& eSurround != SURROUND_THROUGHT*/)
+     {
+         SwFmtFollowTextFlow aFollowTextFlow( TRUE );
+         aFlySet.Put( aFollowTextFlow );
+Index: svx/source/msfilter/msdffimp.cxx
+===================================================================
+RCS file: /cvs/graphics/svx/source/msfilter/msdffimp.cxx,v
+retrieving revision 1.152.182.1
+diff -u -r1.152.182.1 msdffimp.cxx
+--- svx/source/msfilter/msdffimp.cxx	18 Jan 2008 12:11:23 -0000	1.152.182.1
++++ svx/source/msfilter/msdffimp.cxx	29 May 2008 15:01:31 -0000
+@@ -7971,7 +7971,7 @@
+       nXRelTo( 2 ), //   relative to column
+       nYAlign( 0 ), // position n cm below
+       nYRelTo( 2 ), //   relative to paragraph
+-      nLayoutInTableCell( 0 ), // element is laid out in table cell
++      nLayoutInTableCell( 0x00008000 ), // element is laid out in table cell
+       nTextRotationAngle( 0 ),
+       nDxTextLeft( 144 ),
+       nDyTextTop( 72 ),