Merge branch hotfix/v7.5.1 into release/v7.6.0

Fix the position of the inserted image form

api.js

@@ -186,7 +186,7 @@ window["AscOForm"] = window.AscOForm = AscOForm;
 				oCC.SetFormPr(oFormPr);
 				oCC.UpdatePlaceHolderTextPrForForm();
 				private_CheckFormKey(oCC, oLogicDocument);
-
+				oLogicDocument.Recalculate(true);
 				oFormParaDrawing = oCC.ConvertFormToFixed();
 				oCC.SetPictureFormPr(new AscCommon.CSdtPictureFormPr());
 				var aDrawings = oCC.GetAllDrawingObjects();
@@ -488,6 +488,11 @@ window["AscOForm"] = window.AscOForm = AscOForm;
 			|| !oForm.IsForm())
 			return;
 		
+		// При проверке лока внутри параграфа мы ориентируемся на выделение внутри этого параграфа
+		// поэтому нужно выделить форму
+		let state = oLogicDocument.SaveDocumentState();
+		oForm.SelectContentControl();
+		
 		let oParagraph = oForm.GetParagraph();
 		
 		oForm.SkipFillingFormModeCheck(true);
@@ -499,10 +504,12 @@ window["AscOForm"] = window.AscOForm = AscOForm;
 				CheckType : AscCommon.changestype_Paragraph_Content
 			}, true, oLogicDocument.IsFillingFormMode()))
 		{
+			oLogicDocument.LoadDocumentState(state);
 			oForm.SkipFillingFormModeCheck(false);
 			oForm.SkipSpecialContentControlLock(false);
 			return;
 		}
+		oLogicDocument.LoadDocumentState(state);
 		oForm.SkipFillingFormModeCheck(false);
 		oForm.SkipSpecialContentControlLock(false);
 		
@@ -645,29 +652,7 @@ window["AscOForm"] = window.AscOForm = AscOForm;
 			logicDocument.Recalculate(true);
 			let drawing = form.ConvertFormToFixed();
 			if (drawing)
-			{
-				logicDocument.Recalculate(true);
-				let x = drawing.Internal_Position.Calculate_X_Value(Asc.c_oAscRelativeFromH.Page);
-				let y = drawing.Internal_Position.Calculate_Y_Value(Asc.c_oAscRelativeFromV.Page);
-
-				let drawingPr = new Asc.asc_CImgProperty();
-				drawingPr.asc_putWrappingStyle(Asc.c_oAscWrapStyle2.Square);
-				
-				let positionH = new Asc.CImagePositionH();
-				drawingPr.asc_putPositionH(positionH);
-				positionH.put_UseAlign(false);
-				positionH.put_RelativeFrom(Asc.c_oAscRelativeFromH.Page);
-				positionH.put_Value(x);
-				
-				let positionV = new Asc.CImagePositionV();
-				drawingPr.asc_putPositionV(positionV);
-				positionV.put_UseAlign(false);
-				positionV.put_RelativeFrom(Asc.c_oAscRelativeFromV.Page);
-				positionV.put_Value(y);
-				
-				drawing.Set_Props(drawingPr);
 				drawing.SelectAsDrawing();
-			}
 		}
 	}