Commit 84ba368b authored by Dmitry.Vikulov's avatar Dmitry.Vikulov Committed by Alexander.Trofimov

Исправлено падение при редактировании ячейки

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@48576 954022d7-b5bf-4e40-9824-e11837661b57
parent 5742f73e
......@@ -865,8 +865,6 @@ DrawingObjectsController.prototype =
}
shape_props.ShapeProperties.fill = CreateAscFillEx(c_obj.getFill());
shape_props.ShapeProperties.stroke = CreateAscStrokeEx(c_obj.getStroke());
//shape_props.ShapeProperties = CreateAscShapePropFromProp(shape_props.ShapeProperties); // уже не надо, т.к. это asc_класс
}
ret.push(shape_props);
......@@ -874,9 +872,6 @@ DrawingObjectsController.prototype =
if (isRealObject(image_props))
{
//if (image_props.ShapeProperties)
// image_props.ShapeProperties = CreateAscShapePropFromProp(image_props.ShapeProperties); // уже не надо, т.к. это asc_класс
ret.push(image_props);
}
......
......@@ -1070,7 +1070,7 @@
t.handlers.trigger("changeSelection", /*isStartPoint*/true, coord.x, coord.y, /*isCoord*/true, /*isSelectMode*/true);
return;
}
else if ( t.targetInfo.target != "moveResizeRange" )
else if ( t.targetInfo && t.targetInfo.target != "moveResizeRange" )
t.handlers.trigger("resetSelectedGraphicObjects");
if (event.originalEvent && 2 === event.originalEvent.detail) {
......
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