fix Bug 35018

common/Drawings/CommonController.js

@@ -8191,24 +8191,17 @@ DrawingObjectsController.prototype =
         }
     },
 
-    checkSelectedObjectsAndCallback: function(callback, args, bNoSendProps, nHistoryPointType, bCheckConnectors)
+    checkSelectedObjectsAndCallback: function(callback, args, bNoSendProps, nHistoryPointType, aAdditionalObjects)
     {
         var selection_state = this.getSelectionState();
         this.drawingObjects.objectLocker.reset();
-        var oMapId = {};
         for(var i = 0; i < this.selectedObjects.length; ++i)
         {
             this.drawingObjects.objectLocker.addObjectId(this.selectedObjects[i].Get_Id());
-            oMapId[this.selectedObjects[i].Get_Id()] = true;
         }
-        if(bCheckConnectors){
-            var _aDrawings = this.selection.groupSelection ? this.selection.groupSelection.selectedObjects : this.selectedObjects;
-            var _aConnectors = [];
-            this.getAllConnectorsByDrawings(_aDrawings, _aConnectors, undefined, true);
-            for(var i = 0; i < _aConnectors.length; ++i){
-                if(!oMapId[_aConnectors[i].Get_Id()]){
-                    this.drawingObjects.objectLocker.addObjectId(_aConnectors[i].Get_Id());
-                }
+        if(aAdditionalObjects){
+            for(var i = 0; i < aAdditionalObjects.length; ++i){
+                this.drawingObjects.objectLocker.addObjectId(aAdditionalObjects[i].Get_Id());
             }
         }
         var _this = this;

common/Drawings/TrackObjects/ResizeTracks.js

@@ -310,7 +310,7 @@ function ResizeTrackShapeImage(originalObject, cardDirection, drawingsController
         this.resizedRot = originalObject.rot;
 
         this.transform = originalObject.transform.CreateDublicate();
-        this.geometry = (function(){ return originalObject.getGeom();})();
+        this.geometry = AscFormat.ExecuteNoHistory(function(){ return originalObject.getGeom().createDuplicate();}, this, []);
 
         if(!originalObject.isChart())
         {

common/Private/Locks.js

@@ -750,7 +750,7 @@ if(typeof CComments !== "undefined")
 
 if(typeof CPresentation !== "undefined")
 {
-    CPresentation.prototype.Document_Is_SelectionLocked =  function(CheckType, AdditionalData, isIgnoreCanEditFlag)
+    CPresentation.prototype.Document_Is_SelectionLocked =  function(CheckType, AdditionalData, isIgnoreCanEditFlag, aAdditionaObjects)
     {
         if (!this.CanEdit() && true !== isIgnoreCanEditFlag)
             return true;
@@ -796,6 +796,19 @@ if(typeof CPresentation !== "undefined")
                 };
                 selected_objects[i].Lock.Check(check_obj);
             }
+            if(Array.isArray(aAdditionaObjects)){
+                for(var i = 0; i < aAdditionaObjects.length; ++i)
+                {
+                    var check_obj =
+                        {
+                            "type": c_oAscLockTypeElemPresentation.Object,
+                            "slideId": slide_id,
+                            "objId": aAdditionaObjects[i].Get_Id(),
+                            "guid": aAdditionaObjects[i].Get_Id()
+                        };
+                    aAdditionaObjects[i].Lock.Check(check_obj);
+                }
+            }
         }
 
         if(CheckType === AscCommon.changestype_AddShape || CheckType === AscCommon.changestype_AddComment)

slide/Editor/DrawingObjectsController.js

@@ -115,7 +115,7 @@ DrawingObjectsController.prototype.handleOleObjectDoubleClick = function(drawing
     oPresentation.OnMouseUp(e, x, y, pageIndex);
 };
 
-DrawingObjectsController.prototype.checkSelectedObjectsAndCallback = function(callback, args, bNoSendProps, nHistoryPointType)
+DrawingObjectsController.prototype.checkSelectedObjectsAndCallback = function(callback, args, bNoSendProps, nHistoryPointType, aAdditionaObjects)
 {
     var check_type = AscCommon.changestype_Drawing_Props, comment;
     if(this.drawingObjects.slideComments)
@@ -127,7 +127,7 @@ DrawingObjectsController.prototype.checkSelectedObjectsAndCallback = function(ca
             comment = comment.Get_Id();
         }
     }
-    if(editor.WordControl.m_oLogicDocument.Document_Is_SelectionLocked(check_type, comment) === false)
+    if(editor.WordControl.m_oLogicDocument.Document_Is_SelectionLocked(check_type, comment, undefined, aAdditionaObjects) === false)
     {
         var nPointType = AscFormat.isRealNumber(nHistoryPointType) ? nHistoryPointType : AscDFH.historydescription_CommonControllerCheckSelected;
         History.Create_NewPoint(nPointType);