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

Bug 25571 - Ошибка в консоли после отмены вставки текста в заголовок диаграммы...

Bug 25571 - Ошибка в консоли после отмены вставки текста в заголовок диаграммы на скопированном листе

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@57409 954022d7-b5bf-4e40-9824-e11837661b57
parent 0181404f
......@@ -326,11 +326,12 @@ CHistory.prototype =
}
CollaborativeEditing.Apply_LinkData();
var wsViews = Asc["editor"].wb.wsViews;
this.Get_RecalcData(Point);
for(var i = 0; i < wsViews.length; ++i)
{
if(wsViews[i])
{
wsViews[i].objectRender.controller.recalculate(undefined, Point);
wsViews[i].objectRender.controller.recalculate2(undefined);
}
}
......@@ -354,10 +355,11 @@ CHistory.prototype =
this._checkCurPoint();
Point = this.Points[this.Index];
CollaborativeEditing.Apply_LinkData();
this.Get_RecalcData(Point);
var wsViews = Asc["editor"].wb.wsViews;
for (var i = 0; i < wsViews.length; ++i) {
if (wsViews[i]) {
wsViews[i].objectRender.controller.recalculate(true, null);
wsViews[i].objectRender.controller.recalculate2(true);
}
}
var wsView = window["Asc"]["editor"].wb.getWorksheet();
......@@ -369,10 +371,11 @@ CHistory.prototype =
if (null != Point) {
if (bUndo) {
this.Get_RecalcData(Point);
var wsViews = Asc["editor"].wb.wsViews;
for (var i = 0; i < wsViews.length; ++i) {
if (wsViews[i]) {
wsViews[i].objectRender.controller.recalculate(undefined, Point);
wsViews[i].objectRender.controller.recalculate2(undefined);
}
}
......
......@@ -224,6 +224,31 @@ DrawingObjectsController.prototype.recalculate = function(bAll, Point)
this.objectsForRecalculate = {};
};
DrawingObjectsController.prototype.recalculate2 = function(bAll)
{
if(bAll)
{
var drawings = this.getDrawingObjects();
for(var i = 0; i < drawings.length; ++i)
{
if(drawings[i].recalcText)
{
drawings[i].recalcText();
}
drawings[i].recalculate();
}
}
else
{
for(var key in this.objectsForRecalculate)
{
this.objectsForRecalculate[key].recalculate();
}
}
this.objectsForRecalculate = {};
};
DrawingObjectsController.prototype.updateRecalcObjects = function()
{};
DrawingObjectsController.prototype. getTheme = function()
......
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