fix Bug 32415

common/Drawings/Format/Image.js

@@ -87,7 +87,7 @@ function CImageShape()
     AscCommon.g_oTableId.Add( this, this.Id );
 }
 
-	CImageShape.prototype = Object.create(AscFormat.CGraphicObjectBase.prototype);
+	CImageShape.prototype = Object.create(AscFormat.CGraphicObjectBase.prototype);
 	CImageShape.prototype.constructor = CImageShape;
 
 CImageShape.prototype.getObjectType = function()
@@ -363,9 +363,14 @@ CImageShape.prototype.recalculateBrush = CShape.prototype.recalculateBrush;
 CImageShape.prototype.recalculatePen = function()
 {
     CShape.prototype.recalculatePen.call(this);
-    if(this.pen && AscFormat.isRealNumber(this.pen.w))
+    if(this.pen)
     {
-        this.pen.w *= 2;
+        if(AscFormat.isRealNumber(this.pen.w)){
+            this.pen.w *= 2;
+        }
+       // if(!this.pen.Fill){
+       //     this.pen = null;
+       // }
     }
 };
 

word/Editor/Paragraph/ParaDrawing.js

@@ -865,7 +865,7 @@ ParaDrawing.prototype.CheckWH = function()
 	var yc          = this.GraphicObj.localTransform.TransformPointY(this.GraphicObj.extX / 2, this.GraphicObj.extY / 2);
 	var oBounds     = this.GraphicObj.bounds;
 	var LineCorrect = 0;
-	if (this.GraphicObj.pen)
+	if (this.GraphicObj.pen && this.GraphicObj.pen.Fill && this.GraphicObj.pen.Fill.fill)
 	{
 		LineCorrect = (this.GraphicObj.pen.w == null) ? 12700 : parseInt(this.GraphicObj.pen.w);
 		LineCorrect /= 72000.0;