Commit cc0d753a authored by Sergey Luzyanin's avatar Sergey Luzyanin

fix Bug 32446 - [Copy&Paste] JS ошибка после вставки slide title из CPE

parent 4143104a
...@@ -4574,17 +4574,28 @@ ParaDrawing.prototype = ...@@ -4574,17 +4574,28 @@ ParaDrawing.prototype =
return; return;
var dW, dH, bInline = this.Is_Inline(); var dW, dH, bInline = this.Is_Inline();
this.GraphicObj.recalculate(); this.GraphicObj.recalculate();
this.setExtent(this.GraphicObj.spPr.xfrm.extX, this.GraphicObj.spPr.xfrm.extY); var extX, extY;
if(this.GraphicObj.spPr.xfrm && AscFormat.isRealNumber(this.GraphicObj.spPr.xfrm.extX) && AscFormat.isRealNumber(this.GraphicObj.spPr.xfrm.extY))
{
extX = this.GraphicObj.spPr.xfrm.extX;
extY = this.GraphicObj.spPr.xfrm.extY;
}
else
{
extX = 5;
extY = 5;
}
if(AscFormat.checkNormalRotate(AscFormat.isRealNumber(this.GraphicObj.rot) ? this.GraphicObj.rot : 0)) if(AscFormat.checkNormalRotate(AscFormat.isRealNumber(this.GraphicObj.rot) ? this.GraphicObj.rot : 0))
{ {
dW = this.GraphicObj.spPr.xfrm.extX; dW = extX;
dH = this.GraphicObj.spPr.xfrm.extY; dH = extY;
} }
else else
{ {
dH = this.GraphicObj.spPr.xfrm.extX; dH = extX;
dW = this.GraphicObj.spPr.xfrm.extY; dW = extY;
} }
this.setExtent(extX, extY);
var xc = this.GraphicObj.localTransform.TransformPointX(this.GraphicObj.extX/2, this.GraphicObj.extY/2); var xc = this.GraphicObj.localTransform.TransformPointX(this.GraphicObj.extX/2, this.GraphicObj.extY/2);
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;
......
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