Commit ef452988 authored by Sergey.Luzyanin's avatar Sergey.Luzyanin

Поправил падение при сборке изменений

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@59108 954022d7-b5bf-4e40-9824-e11837661b57
parent 3317530a
...@@ -263,29 +263,34 @@ CHistory.prototype.UndoRedoEnd = function (Point, oRedoObjectParam, bUndo) { ...@@ -263,29 +263,34 @@ CHistory.prototype.UndoRedoEnd = function (Point, oRedoObjectParam, bUndo) {
this._checkCurPoint(); this._checkCurPoint();
Point = this.Points[this.Index]; Point = this.Points[this.Index];
CollaborativeEditing.Apply_LinkData(); CollaborativeEditing.Apply_LinkData();
this.Get_RecalcData(Point); if(!window["NATIVE_EDITOR_ENJINE"]) {
wsViews = Asc["editor"].wb.wsViews; this.Get_RecalcData(Point);
for (i = 0; i < wsViews.length; ++i) { wsViews = Asc["editor"].wb.wsViews;
if (wsViews[i]) { for (i = 0; i < wsViews.length; ++i) {
wsViews[i].objectRender.controller.recalculate2(true); if (wsViews[i]) {
} wsViews[i].objectRender.controller.recalculate2(true);
} }
//var wsView = window["Asc"]["editor"].wb.getWorksheet(); }
//if(wsView && wsView.objectRender && wsView.objectRender.controller) //var wsView = window["Asc"]["editor"].wb.getWorksheet();
//{ //if(wsView && wsView.objectRender && wsView.objectRender.controller)
// wsView.objectRender.controller.updateOverlay(); //{
//} // wsView.objectRender.controller.updateOverlay();
//}
}
} }
if (null != Point) { if (null != Point) {
if (bUndo) { if (bUndo) {
this.Get_RecalcData(Point);
wsViews = Asc["editor"].wb.wsViews; if(!window["NATIVE_EDITOR_ENJINE"]) {
for (i = 0; i < wsViews.length; ++i) { this.Get_RecalcData(Point);
if (wsViews[i]) { wsViews = Asc["editor"].wb.wsViews;
wsViews[i].objectRender.controller.recalculate2(undefined); for (i = 0; i < wsViews.length; ++i) {
} if (wsViews[i]) {
} wsViews[i].objectRender.controller.recalculate2(undefined);
}
}
}
gUndoInsDelCellsFlag = true; gUndoInsDelCellsFlag = true;
} }
......
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