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

Bug 25071 - [CoEdit] Различные имена листов при одновременном добавлении листов и вводе данных

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@57035 954022d7-b5bf-4e40-9824-e11837661b57
parent 43451de5
...@@ -2305,41 +2305,36 @@ Woorksheet.prototype.renameWsToCollaborate=function(name){ ...@@ -2305,41 +2305,36 @@ Woorksheet.prototype.renameWsToCollaborate=function(name){
//переименование для отправки изменений //переименование для отправки изменений
for(var i = 0, length = this.workbook.aCollaborativeActions.length; i < length; ++i) for(var i = 0, length = this.workbook.aCollaborativeActions.length; i < length; ++i)
{ {
var action = this.workbook.aCollaborativeActions[i]; var aPointActions = this.workbook.aCollaborativeActions[i];
if(g_oUndoRedoWorkbook == action.oClass) for (var j = 0, length2 = aPointActions.length; j < length2; ++j) {
{ var action = aPointActions[j];
if(historyitem_Workbook_SheetAdd == action.nActionType) if (g_oUndoRedoWorkbook == action.oClass) {
{ if (historyitem_Workbook_SheetAdd == action.nActionType) {
if(lastname == action.oData.name) if (lastname == action.oData.name)
action.oData.name = name; action.oData.name = name;
} }
} }
else if(g_oUndoRedoWorksheet == action.oClass) else if (g_oUndoRedoWorksheet == action.oClass) {
{ if (historyitem_Worksheet_Rename == action.nActionType) {
if(historyitem_Worksheet_Rename == action.nActionType) if (lastname == action.oData.to)
{
if(lastname == action.oData.to)
action.oData.to = name; action.oData.to = name;
} }
} }
else if(g_oUndoRedoCell == action.oClass) else if (g_oUndoRedoCell == action.oClass) {
{ if (action.oData instanceof UndoRedoData_CellSimpleData) {
if(action.oData instanceof UndoRedoData_CellSimpleData) if (action.oData.oNewVal instanceof UndoRedoData_CellValueData) {
{
if(action.oData.oNewVal instanceof UndoRedoData_CellValueData)
{
var oNewVal = action.oData.oNewVal; var oNewVal = action.oData.oNewVal;
if(null != oNewVal.formula && -1 != oNewVal.formula.indexOf(lastname)) if (null != oNewVal.formula && -1 != oNewVal.formula.indexOf(lastname)) {
{ var oParser = new parserFormula(oNewVal.formula, "A1", this);
var oParser = new parserFormula(oNewVal.formula,"A1",this);
oParser.parse(); oParser.parse();
aFormulas.push({formula: oParser, value: oNewVal}); aFormulas.push({ formula: oParser, value: oNewVal });
} }
} }
} }
} }
} }
}
//переименование для локальной версии //переименование для локальной версии
this.setName(name); this.setName(name);
for(var i = 0, length = aFormulas.length; i < length; ++i) for(var i = 0, length = aFormulas.length; i < length; ++i)
......
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