Баг с подсказками гиперссылок на слайдах отличных от первого и Bug 29087 -...

Баг с подсказками гиперссылок на слайдах отличных от первого и Bug 29087 - [CoEdit] Множественные ошибки в консоли при применении undo после вставки автофигуры

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

Common/Drawings/CommonController.js

@@ -589,9 +589,14 @@ DrawingObjectsController.prototype =
             {
                 tx = invert_transform_text.TransformPointX(x, y);
                 ty = invert_transform_text.TransformPointY(x, y);
-                if(this.document || (this.drawingObjects.cSld && !(this.noNeedUpdateCursorType === true)))
+                if( this.document || (this.drawingObjects.cSld && !(this.noNeedUpdateCursorType === true)) )
                 {
-                    content.Update_CursorType(tx, ty, pageIndex);
+                    var nPageIndex = pageIndex;
+                    if(this.drawingObjects.cSld && !( this.noNeedUpdateCursorType === true ) && isRealNumber(this.drawingObjects.num))
+                    {
+                        nPageIndex = this.drawingObjects.num;
+                    }
+                    content.Update_CursorType(tx, ty, nPageIndex);
                     ret.updated = true;
                 }
                 else if(this.drawingObjects)

Excel/model/History.js

@@ -271,11 +271,12 @@ CHistory.prototype.RedoExecute = function(Point, oRedoObjectParam)
 	}
 };
 CHistory.prototype.UndoRedoEnd = function (Point, oRedoObjectParam, bUndo) {
-	var wsViews, i, oState;
+	var wsViews, i, oState = null, bCoaut = false;
 	if (!bUndo && null == Point) {
 		this._checkCurPoint();
 		Point = this.Points[this.Index];
 		CollaborativeEditing.Apply_LinkData();
+		bCoaut = true;
         if(!window["NATIVE_EDITOR_ENJINE"]) {
             this.Get_RecalcData(Point);
             wsViews = Asc["editor"].wb.wsViews;
@@ -295,8 +296,11 @@ CHistory.prototype.UndoRedoEnd = function (Point, oRedoObjectParam, bUndo) {
 		if (oRedoObjectParam.bUpdateWorksheetByModel)
 			this.workbook.handlers.trigger("updateWorksheetByModel");
 
-		oState = bUndo ? Point.SelectionState : ((this.Index === this.Points.length - 1) ?
-			this.LastState : this.Points[this.Index + 1].SelectionState);
+		if(!bCoaut)
+		{
+			oState = bUndo ? Point.SelectionState : ((this.Index === this.Points.length - 1) ?
+				this.LastState : this.Points[this.Index + 1].SelectionState);
+		}
 
 		if (this.workbook.bCollaborativeChanges) {
 		    //active может поменяться только при remove, hide листов