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:22:37 UTC

svn commit: r1379379 - /incubator/ooo/trunk/main/sw/source/filter/ww8/ww8graf2.cxx

Author: chengjh
Date: Fri Aug 31 09:22:37 2012
New Revision: 1379379

URL: http://svn.apache.org/viewvc?rev=1379379&view=rev
Log:
Fix issue i120716: The graphic's border size and spacing is not correct when open the .doc file

* source/filter/ww8/ww8graf2.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

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=1379379&r1=1379378&r2=1379379&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:22:37 2012
@@ -622,11 +622,14 @@ SwFrmFmt* SwWW8ImplReader::ImportGraf(Sd
 
                         aAttrSet.Put(aFlySet);
                     }
-
-                    Rectangle aInnerDist(   pRecord->nDxTextLeft,
+			//Modified for i120716,for graf importing from MS Word 2003 binary format, 
+			//there is no border distance.
+                    /*Rectangle aInnerDist(   pRecord->nDxTextLeft,
                         pRecord->nDyTextTop, pRecord->nDxTextRight,
-                        pRecord->nDyTextBottom  );
-
+                        pRecord->nDyTextBottom  );*/
+			
+			Rectangle aInnerDist(0,0,0,0); 
+			//End
                     MatchSdrItemsIntoFlySet( pObject, aAttrSet,
                         pRecord->eLineStyle, pRecord->eShapeType,
                         aInnerDist );