Skip to content

S
sdkjs
Commit 04bf1f3d authored by Sergey.Luzyanin's avatar Sergey.Luzyanin
Browse files
Options

Bug 31061 - Не отменяется перемещение изображения по Undo 

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@66643 954022d7-b5bf-4e40-9824-e11837661b57
parent 41523859
Show whitespace changes
Inline Side-by-side
Showing with 227 additions and 26 deletions
Common/Drawings/Format/ChartSpace.js
View file @ 04bf1f3d
...@@ -7637,6 +7637,25 @@ CChartSpace.prototype = ...@@ -7637,6 +7637,25 @@ CChartSpace.prototype =
{ {
switch (data.Type) switch (data.Type)
{ {
case historyitem_AutoShapes_SetDrawingBaseCoors:
{
if(this.drawingBase)
{
this.drawingBase.from.col = data.oldFromCol;
this.drawingBase.from.colOff = data.oldFromColOff;
this.drawingBase.from.row = data.oldFromRow;
this.drawingBase.from.rowOff = data.oldFromRowOff;
this.drawingBase.to.col = data.oldToCol;
this.drawingBase.to.colOff = data.oldToColOff;
this.drawingBase.to.row = data.oldToRow;
this.drawingBase.to.rowOff = data.oldToRowOff;
this.drawingBase.Pos.X = data.oldPosX;
this.drawingBase.Pos.Y = data.oldPosY;
this.drawingBase.ext.cx = data.oldCx;
this.drawingBase.ext.cy = data.oldCy;
}
break;
}
case historyitem_AutoShapes_RemoveFromDrawingObjects: case historyitem_AutoShapes_RemoveFromDrawingObjects:
{ {
addToDrawings(this.worksheet, this, data.Pos); addToDrawings(this.worksheet, this, data.Pos);
...@@ -7744,6 +7763,25 @@ CChartSpace.prototype = ...@@ -7744,6 +7763,25 @@ CChartSpace.prototype =
{ {
switch (data.Type) switch (data.Type)
{ {
case historyitem_AutoShapes_SetDrawingBaseCoors:
{
if(this.drawingBase)
{
this.drawingBase.from.col = data.fromCol;
this.drawingBase.from.colOff = data.fromColOff;
this.drawingBase.from.row = data.fromRow;
this.drawingBase.from.rowOff = data.fromRowOff;
this.drawingBase.to.col = data.toCol;
this.drawingBase.to.colOff = data.toColOff;
this.drawingBase.to.row = data.toRow;
this.drawingBase.to.rowOff = data.toRowOff;
this.drawingBase.Pos.X = data.posX;
this.drawingBase.Pos.Y = data.posY;
this.drawingBase.ext.cx = data.cx;
this.drawingBase.ext.cy = data.cy;
}
break;
}
case historyitem_AutoShapes_RemoveFromDrawingObjects: case historyitem_AutoShapes_RemoveFromDrawingObjects:
{ {
deleteDrawingBase(this.worksheet.Drawings, this.Get_Id()); deleteDrawingBase(this.worksheet.Drawings, this.Get_Id());
......
Common/Drawings/Format/GroupShape.js
View file @ 04bf1f3d
...@@ -1682,6 +1682,25 @@ CGroupShape.prototype = ...@@ -1682,6 +1682,25 @@ CGroupShape.prototype =
{ {
switch(data.Type) switch(data.Type)
{ {
case historyitem_AutoShapes_SetDrawingBaseCoors:
{
if(this.drawingBase)
{
this.drawingBase.from.col = data.oldFromCol;
this.drawingBase.from.colOff = data.oldFromColOff;
this.drawingBase.from.row = data.oldFromRow;
this.drawingBase.from.rowOff = data.oldFromRowOff;
this.drawingBase.to.col = data.oldToCol;
this.drawingBase.to.colOff = data.oldToColOff;
this.drawingBase.to.row = data.oldToRow;
this.drawingBase.to.rowOff = data.oldToRowOff;
this.drawingBase.Pos.X = data.oldPosX;
this.drawingBase.Pos.Y = data.oldPosY;
this.drawingBase.ext.cx = data.oldCx;
this.drawingBase.ext.cy = data.oldCy;
}
break;
}
case historyitem_AutoShapes_RemoveFromDrawingObjects: case historyitem_AutoShapes_RemoveFromDrawingObjects:
{ {
addToDrawings(this.worksheet, this, data.Pos); addToDrawings(this.worksheet, this, data.Pos);
...@@ -1750,6 +1769,25 @@ CGroupShape.prototype = ...@@ -1750,6 +1769,25 @@ CGroupShape.prototype =
{ {
switch(data.Type) switch(data.Type)
{ {
case historyitem_AutoShapes_SetDrawingBaseCoors:
{
if(this.drawingBase)
{
this.drawingBase.from.col = data.fromCol;
this.drawingBase.from.colOff = data.fromColOff;
this.drawingBase.from.row = data.fromRow;
this.drawingBase.from.rowOff = data.fromRowOff;
this.drawingBase.to.col = data.toCol;
this.drawingBase.to.colOff = data.toColOff;
this.drawingBase.to.row = data.toRow;
this.drawingBase.to.rowOff = data.toRowOff;
this.drawingBase.Pos.X = data.posX;
this.drawingBase.Pos.Y = data.posY;
this.drawingBase.ext.cx = data.cx;
this.drawingBase.ext.cy = data.cy;
}
break;
}
case historyitem_AutoShapes_RemoveFromDrawingObjects: case historyitem_AutoShapes_RemoveFromDrawingObjects:
{ {
deleteDrawingBase(this.worksheet.Drawings, this.Get_Id()); deleteDrawingBase(this.worksheet.Drawings, this.Get_Id());
......
Common/Drawings/Format/Image.js
View file @ 04bf1f3d
...@@ -668,6 +668,25 @@ CImageShape.prototype = ...@@ -668,6 +668,25 @@ CImageShape.prototype =
{ {
switch(data.Type) switch(data.Type)
{ {
case historyitem_AutoShapes_SetDrawingBaseCoors:
{
if(this.drawingBase)
{
this.drawingBase.from.col = data.oldFromCol;
this.drawingBase.from.colOff = data.oldFromColOff;
this.drawingBase.from.row = data.oldFromRow;
this.drawingBase.from.rowOff = data.oldFromRowOff;
this.drawingBase.to.col = data.oldToCol;
this.drawingBase.to.colOff = data.oldToColOff;
this.drawingBase.to.row = data.oldToRow;
this.drawingBase.to.rowOff = data.oldToRowOff;
this.drawingBase.Pos.X = data.oldPosX;
this.drawingBase.Pos.Y = data.oldPosY;
this.drawingBase.ext.cx = data.oldCx;
this.drawingBase.ext.cy = data.oldCy;
}
break;
}
case historyitem_AutoShapes_RemoveFromDrawingObjects: case historyitem_AutoShapes_RemoveFromDrawingObjects:
{ {
addToDrawings(this.worksheet, this, data.Pos); addToDrawings(this.worksheet, this, data.Pos);
...@@ -725,6 +744,25 @@ CImageShape.prototype = ...@@ -725,6 +744,25 @@ CImageShape.prototype =
{ {
switch(data.Type) switch(data.Type)
{ {
case historyitem_AutoShapes_SetDrawingBaseCoors:
{
if(this.drawingBase)
{
this.drawingBase.from.col = data.fromCol;
this.drawingBase.from.colOff = data.fromColOff;
this.drawingBase.from.row = data.fromRow;
this.drawingBase.from.rowOff = data.fromRowOff;
this.drawingBase.to.col = data.toCol;
this.drawingBase.to.colOff = data.toColOff;
this.drawingBase.to.row = data.toRow;
this.drawingBase.to.rowOff = data.toRowOff;
this.drawingBase.Pos.X = data.posX;
this.drawingBase.Pos.Y = data.posY;
this.drawingBase.ext.cx = data.cx;
this.drawingBase.ext.cy = data.cy;
}
break;
}
case historyitem_AutoShapes_RemoveFromDrawingObjects: case historyitem_AutoShapes_RemoveFromDrawingObjects:
{ {
deleteDrawingBase(this.worksheet.Drawings, this.Get_Id()); deleteDrawingBase(this.worksheet.Drawings, this.Get_Id());
......
Common/Drawings/Format/Shape.js
View file @ 04bf1f3d
...@@ -3047,6 +3047,23 @@ CShape.prototype = ...@@ -3047,6 +3047,23 @@ CShape.prototype =
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;
var oldFromCol = this.drawingBase.from.col,
oldFromColOff = this.drawingBase.from.colOff,
oldFromRow = this.drawingBase.from.row,
oldFromRowOff = this.drawingBase.from.rowOff,
oldToCol = this.drawingBase.to.col,
oldToColOff = this.drawingBase.to.colOff,
oldToRow = this.drawingBase.to.row,
oldToRowOff = this.drawingBase.to.rowOff,
oldPosX = this.drawingBase.Pos.X,
oldPosY = this.drawingBase.Pos.Y,
oldCx = this.drawingBase.ext.cx,
oldCy = this.drawingBase.ext.cy;
this.drawingBase.setGraphicObjectCoords(); this.drawingBase.setGraphicObjectCoords();
this.x = oldX; this.x = oldX;
this.y = oldY; this.y = oldY;
...@@ -3054,35 +3071,39 @@ CShape.prototype = ...@@ -3054,35 +3071,39 @@ CShape.prototype =
this.extY = oldExtY; this.extY = oldExtY;
var from = this.drawingBase.from, to = this.drawingBase.to; var from = this.drawingBase.from, to = this.drawingBase.to;
History.Add(this, {Type: historyitem_AutoShapes_SetDrawingBaseCoors, History.Add(this, {Type: historyitem_AutoShapes_SetDrawingBaseCoors,
fromCol: from.col, fromCol : from.col,
fromColOff: from.colOff, fromColOff : from.colOff,
fromRow : from.row, fromRow : from.row,
fromRowOff: from.rowOff, fromRowOff : from.rowOff,
toCol: to.col, toCol : to.col,
toColOff: to.colOff, toColOff : to.colOff,
toRow : to.row, toRow : to.row,
toRowOff: to.rowOff, toRowOff : to.rowOff,
posX : this.drawingBase.Pos.X, posX : this.drawingBase.Pos.X,
posY : this.drawingBase.Pos.Y, posY : this.drawingBase.Pos.Y,
cx : this.drawingBase.ext.cx, cx : this.drawingBase.ext.cx,
cy : this.drawingBase.ext.cy cy : this.drawingBase.ext.cy,
oldFromCol : oldFromCol,
oldFromColOff : oldFromColOff,
oldFromRow : oldFromRow,
oldFromRowOff : oldFromRowOff,
oldToCol : oldToCol,
oldToColOff : oldToColOff,
oldToRow : oldToRow,
oldToRowOff : oldToRowOff,
oldPosX : oldPosX,
oldPosY : oldPosY ,
oldCx : oldCx,
oldCy : oldCy
}); });
} }
}, },
setDrawingBaseCoords: function(fromCol, fromColOff, fromRow, fromRowOff, toCol, toColOff, toRow, toRowOff) setDrawingBaseCoords: function(fromCol, fromColOff, fromRow, fromRowOff, toCol, toColOff, toRow, toRowOff, posX, posY, extX, extY)
{ {
if(this.drawingBase) if(this.drawingBase)
{ {
this.drawingBase.from.col = fromCol;
this.drawingBase.from.colOff = fromColOff;
this.drawingBase.from.row = fromRow;
this.drawingBase.from.rowOff = fromRowOff;
this.drawingBase.to.col = toCol;
this.drawingBase.to.colOff = toColOff;
this.drawingBase.to.row = toRow;
this.drawingBase.to.rowOff = toRowOff;
History.Add(this, {Type: historyitem_AutoShapes_SetDrawingBaseCoors, History.Add(this, {Type: historyitem_AutoShapes_SetDrawingBaseCoors,
fromCol: fromCol, fromCol: fromCol,
fromColOff: fromColOff, fromColOff: fromColOff,
...@@ -3091,8 +3112,41 @@ CShape.prototype = ...@@ -3091,8 +3112,41 @@ CShape.prototype =
toCol: toCol, toCol: toCol,
toColOff: toColOff, toColOff: toColOff,
toRow : toRow, toRow : toRow,
toRowOff: toRowOff toRowOff: toRowOff,
posX : posX,
posY : posY,
cx : extX,
cy : extY,
oldFromCol : this.drawingBase.from.col,
oldFromColOff: this.drawingBase.from.colOff,
oldFromRow : this.drawingBase.from.row,
oldFromRowOff: this.drawingBase.from.rowOff,
oldToCol : this.drawingBase.to.col,
oldToColOff : this.drawingBase.to.colOff,
oldToRow : this.drawingBase.to.row,
oldToRowOff : this.drawingBase.to.rowOff,
oldPosX : this.drawingBase.Pos.X,
oldPosY : this.drawingBase.Pos.Y,
oldCx : this.drawingBase.ext.cx,
oldCy : this.drawingBase.ext.cy
}); });
this.drawingBase.from.col = fromCol;
this.drawingBase.from.colOff = fromColOff;
this.drawingBase.from.row = fromRow;
this.drawingBase.from.rowOff = fromRowOff;
this.drawingBase.to.col = toCol;
this.drawingBase.to.colOff = toColOff;
this.drawingBase.to.row = toRow;
this.drawingBase.to.rowOff = toRowOff;
this.drawingBase.Pos.X = posX;
this.drawingBase.Pos.Y = posY;
this.drawingBase.ext.cx = extX;
this.drawingBase.ext.cy = extY;
} }
}, },
...@@ -4627,7 +4681,21 @@ CShape.prototype = ...@@ -4627,7 +4681,21 @@ CShape.prototype =
{ {
case historyitem_AutoShapes_SetDrawingBaseCoors: case historyitem_AutoShapes_SetDrawingBaseCoors:
{ {
if(this.drawingBase)
{
this.drawingBase.from.col = data.oldFromCol;
this.drawingBase.from.colOff = data.oldFromColOff;
this.drawingBase.from.row = data.oldFromRow;
this.drawingBase.from.rowOff = data.oldFromRowOff;
this.drawingBase.to.col = data.oldToCol;
this.drawingBase.to.colOff = data.oldToColOff;
this.drawingBase.to.row = data.oldToRow;
this.drawingBase.to.rowOff = data.oldToRowOff;
this.drawingBase.Pos.X = data.oldPosX;
this.drawingBase.Pos.Y = data.oldPosY;
this.drawingBase.ext.cx = data.oldCx;
this.drawingBase.ext.cy = data.oldCy;
}
break; break;
} }
case historyitem_AutoShapes_RemoveFromDrawingObjects: case historyitem_AutoShapes_RemoveFromDrawingObjects:
...@@ -4713,6 +4781,25 @@ CShape.prototype = ...@@ -4713,6 +4781,25 @@ CShape.prototype =
{ {
switch (data.Type) switch (data.Type)
{ {
case historyitem_AutoShapes_SetDrawingBaseCoors:
{
if(this.drawingBase)
{
this.drawingBase.from.col = data.fromCol;
this.drawingBase.from.colOff = data.fromColOff;
this.drawingBase.from.row = data.fromRow;
this.drawingBase.from.rowOff = data.fromRowOff;
this.drawingBase.to.col = data.toCol;
this.drawingBase.to.colOff = data.toColOff;
this.drawingBase.to.row = data.toRow;
this.drawingBase.to.rowOff = data.toRowOff;
this.drawingBase.Pos.X = data.posX;
this.drawingBase.Pos.Y = data.posY;
this.drawingBase.ext.cx = data.cx;
this.drawingBase.ext.cy = data.cy;
}
break;
}
case historyitem_AutoShapes_RemoveFromDrawingObjects: case historyitem_AutoShapes_RemoveFromDrawingObjects:
{ {
deleteDrawingBase(this.worksheet.Drawings, this.Get_Id()); deleteDrawingBase(this.worksheet.Drawings, this.Get_Id());
......
Excel/model/Workbook.js
View file @ 04bf1f3d
...@@ -3178,7 +3178,7 @@ Woorksheet.prototype.copyDrawingObjects=function(oNewWs, wsFrom) ...@@ -3178,7 +3178,7 @@ Woorksheet.prototype.copyDrawingObjects=function(oNewWs, wsFrom)
drawingObject.graphicObject.setWorksheet(oNewWs); drawingObject.graphicObject.setWorksheet(oNewWs);
drawingObject.graphicObject.addToDrawingObjects(); drawingObject.graphicObject.addToDrawingObjects();
var drawingBase = this.Drawings[i]; var drawingBase = this.Drawings[i];
drawingObject.graphicObject.setDrawingBaseCoords(drawingBase.from.col, drawingBase.from.colOff, drawingBase.from.row, drawingBase.from.rowOff, drawingBase.to.col, drawingBase.to.colOff, drawingBase.to.row, drawingBase.to.rowOff); drawingObject.graphicObject.setDrawingBaseCoords(drawingBase.from.col, drawingBase.from.colOff, drawingBase.from.row, drawingBase.from.rowOff, drawingBase.to.col, drawingBase.to.colOff, drawingBase.to.row, drawingBase.to.rowOff, drawingBase.Pos.X, drawingBase.Pos.Y, drawingBase.ext.cx, drawingBase.ext.cy);
oNewWs.Drawings[oNewWs.Drawings.length - 1] = drawingObject; oNewWs.Drawings[oNewWs.Drawings.length - 1] = drawingObject;
} }
NEW_WORKSHEET_DRAWING_DOCUMENT = null; NEW_WORKSHEET_DRAWING_DOCUMENT = null;
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7