Merge branch release/v7.4.0 into master

Fix issue with minimization

api.js

@@ -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);
 		
@@ -513,10 +520,10 @@ window["AscOForm"] = window.AscOForm = AscOForm;
 		{
 			isClear = true;
 		}
-		else if (oForm.IsTextForm() || oForm.IsComboBox() || oForm.IsDatePicker())
+		else if (oForm.IsTextForm() || oForm.IsComboBox())
 		{
 			let sValue = AscBuilder.GetStringParameter(value, "");
-			if (!value)
+			if (!sValue)
 				isClear = true;
 			else
 				oForm.SetInnerText(sValue);
@@ -566,6 +573,19 @@ window["AscOForm"] = window.AscOForm = AscOForm;
 				isClear = true;
 			}
 		}
+		else if (oForm.IsDatePicker())
+		{
+			let sValue = AscBuilder.GetStringParameter(value, "");
+			if (!sValue)
+				isClear = true;
+			else
+				oForm.SetInnerText(sValue);
+			
+			// TODO: Надо FullDate попытаться выставить по заданному значение. Сейчас мы всегда сбрасываем на текущую дату
+			 let datePickerPr = oForm.GetDatePickerPr().Copy();
+			 datePickerPr.SetFullDate(null);
+			 oForm.SetDatePickerPr(datePickerPr);
+		}
 		
 		if (isClear)
 			oForm.ClearContentControlExt();
@@ -626,17 +646,34 @@ window["AscOForm"] = window.AscOForm = AscOForm;
 				form.private_FillPlaceholderContent();
 		}
 		
-		if (form.IsMainForm() && formPr.GetFixed())
+		let paragraph = form.GetParagraph();
+		if (form.IsMainForm() && formPr.GetFixed() && (!paragraph || !paragraph.GetParentShape()))
 		{
 			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);
-				drawing.Set_Props(drawingPr);
 				
-				form.MoveCursorToContentControl(false);
+				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();
 			}
 		}
 	}

apiBuilder.js

@@ -80,8 +80,8 @@
 	/**
 	 * Form insertion specific properties.
 	 * @typedef {Object} FormInsertPr
-	 * @property {boolean} [placeholderFromSelection=false] - Specifies if the currently selected text should be saved as placeholder for the inserted form.
-	 * @property {boolean} [keepSelectedTextInForm=true] - Specifies if the currently selected text should be saved as content for the inserted form.
+	 * @property {boolean} [placeholderFromSelection=false] - Specifies if the currently selected text should be saved as a placeholder of the inserted form.
+	 * @property {boolean} [keepSelectedTextInForm=true] - Specifies if the currently selected text should be saved as the content of the inserted form.
 	 */
 	
 	/**
@@ -340,9 +340,9 @@
 		return new AscBuilder.ApiPictureForm(oCC);
 	};
 	/**
-	 * Insert a text box with the specified text box properties over of the selected text.
+	 * Inserts a text box with the specified text box properties over the selected text.
 	 * @memberof ApiDocument
-	 * @param {TextFormPr} oFormPr - Text field properties.
+	 * @param {TextFormInsertPr} oFormPr - Properties for inserting a text field.
 	 * @returns {ApiTextForm}
 	 */
 	ApiDocument.prototype.InsertTextForm = function(oFormPr)