Commit 1999f63c authored by Sergey.Konovalov's avatar Sergey.Konovalov Committed by Alexander.Trofimov

Bug 22065 - Результат вычисления формулы не отображается у второго пользователя если изменить шрифт

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@51628 954022d7-b5bf-4e40-9824-e11837661b57
parent 44432165
...@@ -2069,9 +2069,6 @@ Workbook.prototype.DeserializeHistory = function(aChanges, fCallback){ ...@@ -2069,9 +2069,6 @@ Workbook.prototype.DeserializeHistory = function(aChanges, fCallback){
if(aChanges.length > 0) if(aChanges.length > 0)
{ {
this.bCollaborativeChanges = true; this.bCollaborativeChanges = true;
History.Clear();
History.Create_NewPoint();
History.SetSelection(null, true);
//собираем общую длину //собираем общую длину
var dstLen = 0; var dstLen = 0;
var aIndexes = new Array(); var aIndexes = new Array();
...@@ -2109,6 +2106,9 @@ Workbook.prototype.DeserializeHistory = function(aChanges, fCallback){ ...@@ -2109,6 +2106,9 @@ Workbook.prototype.DeserializeHistory = function(aChanges, fCallback){
aFontMap.push(i); aFontMap.push(i);
window["Asc"]["editor"]._loadFonts(aFontMap, function(){ window["Asc"]["editor"]._loadFonts(aFontMap, function(){
History.Clear();
History.Create_NewPoint();
History.SetSelection(null, true);
var oHistoryPositions = null;//нужен самый последний historyitem_Workbook_SheetPositions var oHistoryPositions = null;//нужен самый последний historyitem_Workbook_SheetPositions
var oRedoObjectParam = new Asc.RedoObjectParam(); var oRedoObjectParam = new Asc.RedoObjectParam();
History.RedoPrepare(oRedoObjectParam); History.RedoPrepare(oRedoObjectParam);
......
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