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

git-svn-id:...

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@51375 954022d7-b5bf-4e40-9824-e11837661b57
parent 07b5c4d8
...@@ -413,6 +413,15 @@ CImageShape.prototype = ...@@ -413,6 +413,15 @@ CImageShape.prototype =
}, },
setGroup: function(group)
{
var oldId = isRealObject(this.group) ? this.group.Get_Id() : null;
var newId = isRealObject(group) ? group.Get_Id() : null;
History.Add(g_oUndoRedoGraphicObjects, historyitem_AutoShapes_SetGroup, null, null,
new UndoRedoDataGraphicObjects(this.Get_Id(), new UndoRedoDataGOSingleProp(oldId, newId)));
this.group = group;
},
recalculateTransform: function() recalculateTransform: function()
{ {
var xfrm = this.spPr.xfrm; var xfrm = this.spPr.xfrm;
...@@ -714,10 +723,6 @@ CImageShape.prototype = ...@@ -714,10 +723,6 @@ CImageShape.prototype =
return num === 0 || num === 4 ? _tmp_x/_tmp_y : _tmp_y/_tmp_x; return num === 0 || num === 4 ? _tmp_x/_tmp_y : _tmp_y/_tmp_x;
}, },
setGroup: function(group)
{
this.group = group;
},
getFullOffset: function() getFullOffset: function()
{ {
...@@ -1115,6 +1120,11 @@ CImageShape.prototype = ...@@ -1115,6 +1120,11 @@ CImageShape.prototype =
{ {
switch (type) switch (type)
{ {
case historyitem_AutoShapes_SetGroup:
{
this.group = g_oTableId.Get_ById(data.oldValue);
break;
}
case historyitem_AutoShapes_SetPresetGeometry: case historyitem_AutoShapes_SetPresetGeometry:
{ {
this.spPr.geometry = g_oTableId.Get_ById(data.oldValue); this.spPr.geometry = g_oTableId.Get_ById(data.oldValue);
...@@ -1171,6 +1181,11 @@ CImageShape.prototype = ...@@ -1171,6 +1181,11 @@ CImageShape.prototype =
{ {
switch (type) switch (type)
{ {
case historyitem_AutoShapes_SetGroup:
{
this.group = g_oTableId.Get_ById(data.newValue);
break;
}
case historyitem_AutoShapes_SetPresetGeometry: case historyitem_AutoShapes_SetPresetGeometry:
{ {
this.spPr.geometry = g_oTableId.Get_ById(data.newValue); this.spPr.geometry = g_oTableId.Get_ById(data.newValue);
......
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