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

Bug 20701 - Ошибка в консоли при передаче 2-ому пользователю перенесенное значение ячейки

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@50165 954022d7-b5bf-4e40-9824-e11837661b57
parent 0780b8b2
...@@ -3155,8 +3155,9 @@ UndoRedoWoorksheet.prototype = { ...@@ -3155,8 +3155,9 @@ UndoRedoWoorksheet.prototype = {
else if(historyitem_Worksheet_MoveRange == Type) else if(historyitem_Worksheet_MoveRange == Type)
{ {
//todo worksheetView.autoFilters._moveAutoFilters(worksheetView ,null, null, g_oUndoRedoAutoFiltersMoveData); //todo worksheetView.autoFilters._moveAutoFilters(worksheetView ,null, null, g_oUndoRedoAutoFiltersMoveData);
var from = Data.from; var from = Asc.Range(Data.from.c1, Data.from.r1, Data.from.c2, Data.from.r2);
var to = Data.to; var to = Asc.Range(Data.to.c1, Data.to.r1, Data.to.c2, Data.to.r2);
if(bUndo) if(bUndo)
{ {
var temp = from; var temp = from;
...@@ -3167,8 +3168,8 @@ UndoRedoWoorksheet.prototype = { ...@@ -3167,8 +3168,8 @@ UndoRedoWoorksheet.prototype = {
{ {
var collaborativeEditing = this.wb.oApi.collaborativeEditing, var collaborativeEditing = this.wb.oApi.collaborativeEditing,
nSheetId = ws.getId(), nSheetId = ws.getId(),
coBBoxTo = {r1:0,c1:0,r2:0,c2:0 }, coBBoxTo = Asc.Range(0, 0, 0, 0),
coBBoxFrom = {r1:0,c1:0,r2:0,c2:0 }; coBBoxFrom = Asc.Range(0, 0, 0, 0);
coBBoxTo.r1 = collaborativeEditing.getLockOtherRow2( nSheetId, to.r1); coBBoxTo.r1 = collaborativeEditing.getLockOtherRow2( nSheetId, to.r1);
coBBoxTo.c1 = collaborativeEditing.getLockOtherColumn2( nSheetId, to.c1); coBBoxTo.c1 = collaborativeEditing.getLockOtherColumn2( nSheetId, to.c1);
......
...@@ -3636,7 +3636,7 @@ Woorksheet.prototype._moveRange=function(oBBoxFrom, oBBoxTo){ ...@@ -3636,7 +3636,7 @@ Woorksheet.prototype._moveRange=function(oBBoxFrom, oBBoxTo){
History.Add(g_oUndoRedoWorksheet, historyitem_Worksheet_MoveRange, History.Add(g_oUndoRedoWorksheet, historyitem_Worksheet_MoveRange,
this.getId(), new Asc.Range(0, 0, gc_nMaxCol0, gc_nMaxRow0), this.getId(), new Asc.Range(0, 0, gc_nMaxCol0, gc_nMaxRow0),
new UndoRedoData_FromTo(oBBoxFrom, oBBoxTo)); new UndoRedoData_FromTo(new UndoRedoData_BBox(oBBoxFrom), new UndoRedoData_BBox(oBBoxTo)));
History.EndTransaction(); History.EndTransaction();
return true; return 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