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

Bug 27436 - JS Error при копировании Chart или Image с Tight-Thought Wrapping

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@59509 954022d7-b5bf-4e40-9824-e11837661b57
parent 2b6006d4
......@@ -4027,8 +4027,9 @@ function DrawingObjects() {
_this.updateSizeDrawingObjects = function(target) {
ExecuteNoHistory(function(){
// ExecuteNoHistory(function(){
if(History.TurnOffHistory > 0)
return;
var i, bNeedRecalc = false, drawingObject, coords, cellTo;
if(target.target === c_oTargetType.RowResize)
{
......@@ -4098,7 +4099,7 @@ function DrawingObjects() {
_this.controller.recalculate2();
_this.showDrawingObjects(true);
}
}, _this, []);
// }, _this, []);
};
_this.checkCursorDrawingObject = function(x, y) {
......
......@@ -1057,6 +1057,7 @@ CGraphicObjects.prototype =
selectedObjects[i].recalculate();
drawing = new ParaDrawing(0, 0, selectedObjects[i].copy(), this.document.DrawingDocument, this.document, null);
drawing.Set_DrawingType(selectedObjects[i].parent.DrawingType);
drawing.GraphicObj.setParent(drawing);
drawing.Update_Size(selectedObjects[i].bounds.w, selectedObjects[i].bounds.h);
if(selectedObjects[i].parent.DrawingType === drawing_Anchor)
{
......
......@@ -113,6 +113,10 @@ CWrapPolygon.prototype =
var cur_max_x;
var cur_min_x;
var point_count = this.calculatedPoints.length;
if(point_count === 0)
{
return {max: null, min: null};
}
for(var point_index = 1; point_index < point_count; ++point_index)
{
var point0 = this.calculatedPoints[point_index-1];
......
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