Commit ecf363b9 authored by Sergey Luzyanin's avatar Sergey Luzyanin Committed by Alexander.Trofimov

поправил Measure ParaDrawing

parent 65caa0fd
...@@ -4641,8 +4641,20 @@ ParaDrawing.prototype = ...@@ -4641,8 +4641,20 @@ ParaDrawing.prototype =
if(AscFormat.isRealNumber(this.Extent.W) && AscFormat.isRealNumber(this.Extent.H) && (!this.GraphicObj.checkAutofit || !this.GraphicObj.checkAutofit()) && !this.SizeRelH && !this.SizeRelV) if(AscFormat.isRealNumber(this.Extent.W) && AscFormat.isRealNumber(this.Extent.H) && (!this.GraphicObj.checkAutofit || !this.GraphicObj.checkAutofit()) && !this.SizeRelH && !this.SizeRelV)
{ {
var oEffectExtent = this.EffectExtent; var oEffectExtent = this.EffectExtent;
this.Width = this.Extent.W + AscFormat.getValOrDefault(oEffectExtent.L, 0) + AscFormat.getValOrDefault(oEffectExtent.R, 0); var dW, dH;
this.Height = this.Extent.H + AscFormat.getValOrDefault(oEffectExtent.T, 0) + AscFormat.getValOrDefault(oEffectExtent.B, 0); if(AscFormat.checkNormalRotate(AscFormat.isRealNumber(this.GraphicObj.rot) ? this.GraphicObj.rot : 0))
{
dW = this.Extent.W;
dH = this.Extent.H;
}
else
{
dH = this.Extent.W;
dW = this.Extent.H;
}
this.Width = dW + AscFormat.getValOrDefault(oEffectExtent.L, 0) + AscFormat.getValOrDefault(oEffectExtent.R, 0);
this.Height = dH + AscFormat.getValOrDefault(oEffectExtent.T, 0) + AscFormat.getValOrDefault(oEffectExtent.B, 0);
this.WidthVisible = this.Width; this.WidthVisible = this.Width;
} }
else else
......
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