Bug 24537 - Ошибка в консоли при Undo/Redo применения Merge & Center после Select All

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@56462 954022d7-b5bf-4e40-9824-e11837661b57

Excel/model/UndoRedo.js

@@ -2964,11 +2964,18 @@ UndoRedoWoorksheet.prototype = {
 			index = Data.index;
 			if(false != this.wb.bCollaborativeChanges)
 			{
+			    var range;
+			    if (g_nAllColIndex == index) {
+			        range = new Asc.Range(0, 0, gc_nMaxCol0, gc_nMaxRow0);
+			    }
+			    else {
 			        index = collaborativeEditing.getLockOtherColumn2(nSheetId, index);
+			        range = new Asc.Range(index, 0, index, gc_nMaxRow0);
+			    }
 			    oLockInfo = new Asc.asc_CLockInfo();
 			    oLockInfo["sheetId"] = nSheetId;
 			    oLockInfo["type"] = c_oAscLockTypeElem.Range;
-				oLockInfo["rangeOrObjectId"] = new Asc.Range(index, 0, index, gc_nMaxRow0);
+			    oLockInfo["rangeOrObjectId"] = range;
 			    this.wb.aCollaborativeChangeElements.push(oLockInfo);
 			}
 			var col = ws._getCol(index);
@@ -3388,9 +3395,14 @@ UndoRedoRowCol.prototype = {
 			}
 			else
 			{
+			    if (g_nAllColIndex == nIndex) {
+			        oLockInfo["rangeOrObjectId"] = new Asc.Range(0, 0, gc_nMaxCol0, gc_nMaxRow0);
+			    }
+			    else{
 			        nIndex = collaborativeEditing.getLockOtherColumn2(nSheetId, nIndex);
 			        oLockInfo["rangeOrObjectId"] = new Asc.Range(nIndex, 0, nIndex, gc_nMaxRow0);
 			    }
+			}
 			this.wb.aCollaborativeChangeElements.push(oLockInfo);
 		}
 		var Val;

Excel/model/Workbook.js

@@ -2528,7 +2528,7 @@ Woorksheet.prototype.setColWidth=function(width, start, stop){
 			var oNewProps = col.getWidthProp();
 			if(false == oOldProps.isEqual(oNewProps))
 				History.Add(g_oUndoRedoWorksheet, historyitem_Worksheet_ColProp, oThis.getId(),
-					new Asc.Range(col.index, 0, col.index, gc_nMaxRow0),
+					col._getUpdateRange(),
 					new UndoRedoData_IndexSimpleProp(col.index, false, oOldProps, oNewProps));
 		}
 	};
@@ -2578,7 +2578,7 @@ Woorksheet.prototype.setColHidden=function(bHidden, start, stop){
 			var oNewProps = col.getWidthProp();
 			if(false == oOldProps.isEqual(oNewProps))
 				History.Add(g_oUndoRedoWorksheet, historyitem_Worksheet_ColProp, oThis.getId(),
-					new Asc.Range(col.index, 0, col.index, gc_nMaxRow0),
+					col._getUpdateRange(),
 					new UndoRedoData_IndexSimpleProp(col.index, false, oOldProps, oNewProps));
 		}
 	};
@@ -2630,7 +2630,7 @@ Woorksheet.prototype.setColBestFit=function(bBestFit, width, start, stop){
 		var oNewProps = col.getWidthProp();
 		if(false == oOldProps.isEqual(oNewProps))
 			History.Add(g_oUndoRedoWorksheet, historyitem_Worksheet_ColProp, oThis.getId(),
-				new Asc.Range(col.index, 0, col.index, gc_nMaxRow0),
+				col._getUpdateRange(),
 				new UndoRedoData_IndexSimpleProp(col.index, false, oOldProps, oNewProps));
 	};
 	if(0 != start && gc_nMaxCol0 == stop)
@@ -2979,7 +2979,7 @@ Woorksheet.prototype._removeRow=function(index){
 Woorksheet.prototype._getCol=function(index){
 	//0-based
 	var oCurCol;
-	if(-1 == index)
+	if (g_nAllColIndex == index)
 		oCurCol = this.getAllCol();
 	else
 	{