Commit 356cbc4a authored by SergeyLuzyanin's avatar SergeyLuzyanin

fix Bug 35228

parent 1ab4241b
...@@ -669,11 +669,12 @@ ...@@ -669,11 +669,12 @@
{ {
if(this.drawingBase && this.spPr && this.spPr.xfrm && !this.group) { if(this.drawingBase && this.spPr && this.spPr.xfrm && !this.group) {
var oldX = this.x, oldY = this.y, oldExtX = this.extX, oldExtY = this.extY; var oldX = this.x, oldY = this.y, oldExtX = this.extX, oldExtY = this.extY;
var oldRot = this.rot;
this.x = this.spPr.xfrm.offX; this.x = this.spPr.xfrm.offX;
this.y = this.spPr.xfrm.offY; this.y = this.spPr.xfrm.offY;
this.extX = this.spPr.xfrm.extX; this.extX = this.spPr.xfrm.extX;
this.extY = this.spPr.xfrm.extY; this.extY = this.spPr.xfrm.extY;
this.rot = AscFormat.isRealNumber(this.spPr.xfrm.rot) ? AscFormat.normalizeRotate(this.spPr.xfrm.rot) : 0;
var oldFromCol = this.drawingBase.from.col, var oldFromCol = this.drawingBase.from.col,
oldFromColOff = this.drawingBase.from.colOff, oldFromColOff = this.drawingBase.from.colOff,
...@@ -694,6 +695,7 @@ ...@@ -694,6 +695,7 @@
this.y = oldY; this.y = oldY;
this.extX = oldExtX; this.extX = oldExtX;
this.extY = oldExtY; this.extY = oldExtY;
this.rot = oldRot;
var from = this.drawingBase.from, to = this.drawingBase.to; var from = this.drawingBase.from, to = this.drawingBase.to;
History.Add(new AscDFH.CChangesDrawingsObjectNoId(this, AscDFH.historyitem_AutoShapes_SetDrawingBaseCoors, History.Add(new AscDFH.CChangesDrawingsObjectNoId(this, AscDFH.historyitem_AutoShapes_SetDrawingBaseCoors,
new CDrawingBasePosWritable({ new CDrawingBasePosWritable({
......
...@@ -176,7 +176,7 @@ StartAddNewShape.prototype = ...@@ -176,7 +176,7 @@ StartAddNewShape.prototype =
shape.setParent(oThis.drawingObjects.drawingObjects); shape.setParent(oThis.drawingObjects.drawingObjects);
shape.setRecalculateInfo(); shape.setRecalculateInfo();
} }
shape.addToDrawingObjects(undefined, AscCommon.c_oAscCellAnchorType.cellanchorAbsolute); shape.addToDrawingObjects(undefined, AscCommon.c_oAscCellAnchorType.cellanchorTwoCell);
shape.checkDrawingBaseCoords(); shape.checkDrawingBaseCoords();
oThis.drawingObjects.checkChartTextSelection(); oThis.drawingObjects.checkChartTextSelection();
oThis.drawingObjects.resetSelection(); oThis.drawingObjects.resetSelection();
......
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