You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ch...@apache.org on 2012/08/31 11:48:56 UTC
svn commit: r1379387 - in /incubator/ooo/trunk/main/sw/source/filter/ww8:
ww8graf2.cxx ww8par6.cxx
Author: chengjh
Date: Fri Aug 31 09:48:55 2012
New Revision: 1379387
URL: http://svn.apache.org/viewvc?rev=1379387&view=rev
Log:
Fix issue i120717: The graphic's spacing is not correct when open the .doc file
* source/filter/ww8/ww8graf2.cxx
* source/filter/ww8/ww8par6.cxx
MS Word Binary compatibility
Patch by: Fan Zheng,<zh...@gmail.com>
Found by: dongjun zong,<zo...@gmail.com>
Review by: Jian Hong Cheng,<ch...@apache.org>
Modified:
incubator/ooo/trunk/main/sw/source/filter/ww8/ww8graf2.cxx
incubator/ooo/trunk/main/sw/source/filter/ww8/ww8par6.cxx
Modified: incubator/ooo/trunk/main/sw/source/filter/ww8/ww8graf2.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sw/source/filter/ww8/ww8graf2.cxx?rev=1379387&r1=1379386&r2=1379387&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sw/source/filter/ww8/ww8graf2.cxx (original)
+++ incubator/ooo/trunk/main/sw/source/filter/ww8/ww8graf2.cxx Fri Aug 31 09:48:55 2012
@@ -622,7 +622,7 @@ SwFrmFmt* SwWW8ImplReader::ImportGraf(Sd
aAttrSet.Put(aFlySet);
}
- //Modified for i120716,for graf importing from MS Word 2003 binary format,
+ //Modified for i120717,for graf importing from MS Word 2003 binary format,
//there is no border distance.
/*Rectangle aInnerDist( pRecord->nDxTextLeft,
pRecord->nDyTextTop, pRecord->nDxTextRight,
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=1379387&r1=1379386&r2=1379387&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sw/source/filter/ww8/ww8par6.cxx (original)
+++ incubator/ooo/trunk/main/sw/source/filter/ww8/ww8par6.cxx Fri Aug 31 09:48:55 2012
@@ -1338,7 +1338,7 @@ void GetLineIndex(SvxBoxItem &rBox, shor
eCodeIdx = WW8_BordersSO::single0;// 1 Twip for us
else if( nLineThickness < 20)
eCodeIdx = WW8_BordersSO::single5;// 10 Twips for us
- else if (nLineThickness < 50)
+ else if (nLineThickness < 45) //Modified for i120716
eCodeIdx = WW8_BordersSO::single1;// 20 Twips
else if (nLineThickness < 80)
eCodeIdx = WW8_BordersSO::single2;// 50