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

падение при копировании через ctrl

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@58247 954022d7-b5bf-4e40-9824-e11837661b57
parent 27cf5a59
...@@ -230,7 +230,7 @@ NullState.prototype = ...@@ -230,7 +230,7 @@ NullState.prototype =
{ {
this.drawingObjects.drawingObjects.showDrawingObjects(true); this.drawingObjects.drawingObjects.showDrawingObjects(true);
} }
if(this.drawingObjects.drawingObjects.cSld) if(this.drawingObjects.drawingObjects && this.drawingObjects.drawingObjects.cSld)
{ {
this.drawingObjects.stX = x; this.drawingObjects.stX = x;
this.drawingObjects.stY = y; this.drawingObjects.stY = y;
...@@ -463,7 +463,7 @@ RotateState.prototype = ...@@ -463,7 +463,7 @@ RotateState.prototype =
{ {
copy = tracks[i].originalObject.copy(); copy = tracks[i].originalObject.copy();
this.drawingObjects.drawingObjects.getWorksheetModel && copy.setWorksheet(this.drawingObjects.drawingObjects.getWorksheetModel()); this.drawingObjects.drawingObjects.getWorksheetModel && copy.setWorksheet(this.drawingObjects.drawingObjects.getWorksheetModel());
if(this.drawingObjects.drawingObjects.cSld) if(this.drawingObjects.drawingObjects && this.drawingObjects.drawingObjects.cSld)
{ {
copy.setParent(this.drawingObjects.drawingObjects); copy.setParent(this.drawingObjects.drawingObjects);
if(!copy.spPr || !copy.spPr.xfrm if(!copy.spPr || !copy.spPr.xfrm
...@@ -516,7 +516,7 @@ RotateState.prototype = ...@@ -516,7 +516,7 @@ RotateState.prototype =
group.updateCoordinatesAfterInternalResize(); group.updateCoordinatesAfterInternalResize();
} }
//drawingObjects.recalculate(); //drawingObjects.recalculate();
if(!oThis.drawingObjects.drawingObjects.cSld) if(!oThis.drawingObjects.drawingObjects || !oThis.drawingObjects.drawingObjects.cSld)
{ {
var arr_x = [], arr_y = [], transform, min_x, min_y, drawing, arr_x2 = [], arr_y2 = [], min_x2, min_y2; var arr_x = [], arr_y = [], transform, min_x, min_y, drawing, arr_x2 = [], arr_y2 = [], min_x2, min_y2;
for(i = 0; i < oThis.drawingObjects.selectedObjects.length; ++i) for(i = 0; i < oThis.drawingObjects.selectedObjects.length; ++i)
......
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