Commit 1ee7bbf0 authored by Oleg.Korshul's avatar Oleg.Korshul

баг с падением в колонтитуле.

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@61420 954022d7-b5bf-4e40-9824-e11837661b57
parent 541046b6
...@@ -1780,6 +1780,8 @@ CDrawingDocument.prototype = ...@@ -1780,6 +1780,8 @@ CDrawingDocument.prototype =
_ret.push(this.TextMatrix.tx); _ret.push(this.TextMatrix.tx);
_ret.push(this.TextMatrix.ty); _ret.push(this.TextMatrix.ty);
} }
return _ret;
} }
var _select = this.LogicDocument.Get_SelectionBounds(); var _select = this.LogicDocument.Get_SelectionBounds();
...@@ -1792,6 +1794,22 @@ CDrawingDocument.prototype = ...@@ -1792,6 +1794,22 @@ CDrawingDocument.prototype =
this.SelectRect1 = _rect1; this.SelectRect1 = _rect1;
this.SelectRect2 = _rect2; this.SelectRect2 = _rect2;
var _x1 = _rect1.X;
var _y1 = _rect1.Y;
var _y11 = _rect1.Y + _rect.H;
var _x2 = _rect2.X + _rect2.W;
var _y2 = _rect2.Y;
var _y22 = _rect2.Y + _rect2.Y;
var _eps = 0.0001;
if (Math.abs(_x1 - _x2) < _eps &&
Math.abs(_y1 - _y2) < _eps &&
Math.abs(_y11 - _y22) < _eps)
{
_ret[0] = 0;
}
else
{
_ret.push(_select.Start.X); _ret.push(_select.Start.X);
_ret.push(_select.Start.Y); _ret.push(_select.Start.Y);
_ret.push(_select.Start.Page); _ret.push(_select.Start.Page);
...@@ -1808,6 +1826,9 @@ CDrawingDocument.prototype = ...@@ -1808,6 +1826,9 @@ CDrawingDocument.prototype =
_ret.push(this.TextMatrix.tx); _ret.push(this.TextMatrix.tx);
_ret.push(this.TextMatrix.ty); _ret.push(this.TextMatrix.ty);
} }
return _ret;
}
} }
var _object_bounds = this.LogicDocument.DrawingObjects.getSelectedObjectsBounds(); var _object_bounds = this.LogicDocument.DrawingObjects.getSelectedObjectsBounds();
...@@ -1819,6 +1840,8 @@ CDrawingDocument.prototype = ...@@ -1819,6 +1840,8 @@ CDrawingDocument.prototype =
_ret.push(_object_bounds.maxX); _ret.push(_object_bounds.maxX);
_ret.push(_object_bounds.maxY); _ret.push(_object_bounds.maxY);
_ret.push(_object_bounds.pageIndex); _ret.push(_object_bounds.pageIndex);
return _ret;
} }
return _ret; return _ret;
......
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