Поправил вставку комментариев при copy-past

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

Excel/model/CellComment.js

@@ -1452,7 +1452,7 @@ CCellCommentator.prototype = {
 		return null;
 	},
 
-	asc_addComment: function(comment) {
+	asc_addComment: function(comment, bIsNotUpdate) {
 
 		var _this = this;
 		var oComment = comment;
@@ -1461,8 +1461,10 @@ CCellCommentator.prototype = {
 		oComment.setId();
 
 		if (!oComment.bDocument) {
-			oComment.asc_putCol(_this.worksheet.getSelectedColumnIndex());
-			oComment.asc_putRow(_this.worksheet.getSelectedRowIndex());
+			if (!bIsNotUpdate) {
+				oComment.asc_putCol(_this.worksheet.getSelectedColumnIndex());
+				oComment.asc_putRow(_this.worksheet.getSelectedRowIndex());
+			}
 
 			var existComments = _this.asc_getComments(oComment.nCol, oComment.nRow);
 			if ( existComments.length ) {
@@ -1490,13 +1492,18 @@ CCellCommentator.prototype = {
 					History.Add(g_oUndoRedoComment, historyitem_Comment_Add, _this.worksheet.model.getId(), null, new asc_CCommentData(oComment));
 
 					_this.aComments.push(oComment);
-					_this.drawCommentCells();
+
+					if (!bIsNotUpdate)
+						_this.drawCommentCells();
 				}
 				_this.worksheet.model.workbook.handlers.trigger("asc_onAddComment", oComment.asc_getId(), oComment);
 			}
 		}
-		
-		_this.isLockedComment(oComment, true, callbackFunc);
+
+		if (bIsNotUpdate)
+			callbackFunc(true);
+		else
+			_this.isLockedComment(oComment, true, callbackFunc);
 	},
 
 	asc_changeComment: function(id, oComment, bChangeCoords, bNoEvent) {
@@ -1567,7 +1574,7 @@ CCellCommentator.prototype = {
 		
 		function callbackFunc(result) {
 			if ( !result ) {
-				_this.worksheet.model.workbook.handlers.trigger("asc_onLockComment", comment.asc_getId(), oComment.asc_getUserId());
+				_this.worksheet.model.workbook.handlers.trigger("asc_onLockComment", comment.asc_getId(), comment.asc_getUserId());
 			} else {
 				_this.worksheet.model.workbook.handlers.trigger("asc_onUnLockComment", comment.asc_getId());
 				

Excel/view/WorksheetView.js

@@ -8882,15 +8882,9 @@
 										if (comment.nCol == pasteCol && comment.nRow == pasteRow) {
 											var commentData = new asc_CCommentData(comment);
 											//change nRow, nCol
-											commentData.nCol = c + autoC*plCol;
-											commentData.nRow = r + autoR*plRow;
-											commentData.setId();
-											t.cellCommentator.addCommentSerialize(commentData);
-											
-											History.Create_NewPoint();
-											History.Add(g_oUndoRedoComment, historyitem_Comment_Add, t.model.getId(), null, commentData);
-											
-											t.cellCommentator.worksheet.model.workbook.handlers.trigger("asc_onAddComment", commentData.asc_getId(), commentData);
+											commentData.asc_putCol(c + autoC*plCol);
+											commentData.asc_putRow(r + autoR*plRow);
+											t.cellCommentator.asc_addComment(commentData, true);
 										}
 									}
 								}