You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by zj...@apache.org on 2012/10/08 15:21:52 UTC
svn commit: r1395547 -
/incubator/ooo/trunk/main/sw/source/filter/ww8/ww8par6.cxx
Author: zjchen
Date: Mon Oct 8 13:21:52 2012
New Revision: 1395547
URL: http://svn.apache.org/viewvc?rev=1395547&view=rev
Log:
#i119466# Doc file loaded by AOO, table with incorrect text wrapping property.
Reported by: louqle
Patch by: Chen Zuo Jun
Review by: Lei De Bin
Modified:
incubator/ooo/trunk/main/sw/source/filter/ww8/ww8par6.cxx
Modified: incubator/ooo/trunk/main/sw/source/filter/ww8/ww8par6.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sw/source/filter/ww8/ww8par6.cxx?rev=1395547&r1=1395546&r2=1395547&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sw/source/filter/ww8/ww8par6.cxx (original)
+++ incubator/ooo/trunk/main/sw/source/filter/ww8/ww8par6.cxx Mon Oct 8 13:21:52 2012
@@ -1926,6 +1926,10 @@ WW8SwFlyPara::WW8SwFlyPara( SwPaM& rPaM,
nNewNettoWidth = MINFLY; // Minimum
eSurround = ( rWW.nSp37 > 1 ) ? SURROUND_IDEAL : SURROUND_NONE;
+ //#i119466 mapping "Around" wrap setting to "Parallel" for table
+ const bool bIsTable = rIo.pPlcxMan->HasParaSprm(0x2416);
+ if ( bIsTable && rWW.nSp37 == 2 )
+ eSurround = SURROUND_PARALLEL;
/*
#95905#, #83307# seems to have gone away now, so reenable parallel