Commit d27f76d1 authored by Sergey Luzyanin's avatar Sergey Luzyanin

fix Bug 32415

parent 6b474826
...@@ -363,10 +363,15 @@ CImageShape.prototype.recalculateBrush = CShape.prototype.recalculateBrush; ...@@ -363,10 +363,15 @@ CImageShape.prototype.recalculateBrush = CShape.prototype.recalculateBrush;
CImageShape.prototype.recalculatePen = function() CImageShape.prototype.recalculatePen = function()
{ {
CShape.prototype.recalculatePen.call(this); CShape.prototype.recalculatePen.call(this);
if(this.pen && AscFormat.isRealNumber(this.pen.w)) if(this.pen)
{ {
if(AscFormat.isRealNumber(this.pen.w)){
this.pen.w *= 2; this.pen.w *= 2;
} }
// if(!this.pen.Fill){
// this.pen = null;
// }
}
}; };
CImageShape.prototype.getCompiledLine = CShape.prototype.getCompiledLine; CImageShape.prototype.getCompiledLine = CShape.prototype.getCompiledLine;
......
...@@ -865,7 +865,7 @@ ParaDrawing.prototype.CheckWH = function() ...@@ -865,7 +865,7 @@ ParaDrawing.prototype.CheckWH = function()
var yc = this.GraphicObj.localTransform.TransformPointY(this.GraphicObj.extX / 2, this.GraphicObj.extY / 2); var yc = this.GraphicObj.localTransform.TransformPointY(this.GraphicObj.extX / 2, this.GraphicObj.extY / 2);
var oBounds = this.GraphicObj.bounds; var oBounds = this.GraphicObj.bounds;
var LineCorrect = 0; 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 = (this.GraphicObj.pen.w == null) ? 12700 : parseInt(this.GraphicObj.pen.w);
LineCorrect /= 72000.0; LineCorrect /= 72000.0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment