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

Fix the position of the inserted image form

api.js

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2019
+ * (c) Copyright Ascensio System SIA 2010-2023
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -12,7 +12,7 @@
  * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
  * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
  *
- * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * You can contact Ascensio System SIA at 20A-6 Ernesta Birznieka-Upish
  * street, Riga, Latvia, EU, LV-1050.
  *
  * The  interactive user interfaces in modified source and object code versions
@@ -42,6 +42,8 @@ window["AscOForm"] = window.AscOForm = AscOForm;
 		if (!oLogicDocument)
 			return;
 		
+		CheckCurrentSelection(oLogicDocument);
+		
 		if (oPr && oFormPr)
 		{
 			if (oPr.GroupKey)
@@ -85,7 +87,6 @@ window["AscOForm"] = window.AscOForm = AscOForm;
 			if (oFormPr)
 			{
 				private_ApplyFormPr(oCC, oFormPr, oLogicDocument);
-				oCC.UpdatePlaceHolderTextPrForForm();
 				private_CheckFormKey(oCC, oLogicDocument);
 			}
 
@@ -170,6 +171,8 @@ window["AscOForm"] = window.AscOForm = AscOForm;
 		var oLogicDocument = this.private_GetLogicDocument();
 		if (!oLogicDocument)
 			return;
+		
+		CheckCurrentSelection(oLogicDocument);
 
 		oLogicDocument.RemoveTextSelection();
 		if (!oLogicDocument.IsSelectionLocked(AscCommon.changestype_Paragraph_Content))
@@ -183,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();
@@ -260,6 +263,8 @@ window["AscOForm"] = window.AscOForm = AscOForm;
 		var oLogicDocument = this.private_GetLogicDocument();
 		if (!oLogicDocument)
 			return;
+		
+		CheckCurrentSelection(oLogicDocument);
 
 		oLogicDocument.RemoveTextSelection();
 		if (!oLogicDocument.IsSelectionLocked(AscCommon.changestype_Paragraph_Content))
@@ -293,6 +298,8 @@ window["AscOForm"] = window.AscOForm = AscOForm;
 		var oLogicDocument = this.private_GetLogicDocument();
 		if (!oLogicDocument)
 			return;
+		
+		CheckCurrentSelection(oLogicDocument);
 
 		oLogicDocument.RemoveTextSelection();
 		if (!oLogicDocument.IsSelectionLocked(AscCommon.changestype_Paragraph_Content))
@@ -339,6 +346,8 @@ window["AscOForm"] = window.AscOForm = AscOForm;
 		var oLogicDocument = this.private_GetLogicDocument();
 		if (!oLogicDocument)
 			return;
+		
+		CheckCurrentSelection(oLogicDocument);
 
 		let textFormPr      = contentControlPr ? contentControlPr.TextFormPr : null;
 		let formPr          = contentControlPr ? contentControlPr.FormPr : null;
@@ -372,6 +381,8 @@ window["AscOForm"] = window.AscOForm = AscOForm;
 		let logicDocument = this.private_GetLogicDocument();
 		if (!logicDocument)
 			return;
+		
+		CheckCurrentSelection(logicDocument, true);
 
 		function AddComplexForm()
 		{
@@ -430,6 +441,161 @@ window["AscOForm"] = window.AscOForm = AscOForm;
 
 		return AscWord.FormToJson(form);
 	};
+	window['Asc']['asc_docs_api'].prototype['asc_SetFormValue'] = window['Asc']['asc_docs_api'].prototype.asc_SetFormValue = function(value, formId)
+	{
+		let logicDocument = this.private_GetLogicDocument();
+		if (!logicDocument)
+			return;
+		
+		let form = logicDocument.GetContentControl(formId);
+		if (!form || !form.IsForm())
+			return;
+		
+		return this.private_SetFormValue(form.GetId(), value);
+	};
+	window['Asc']['asc_docs_api'].prototype['asc_GetFormValue'] = window['Asc']['asc_docs_api'].prototype.asc_GetFormValue = function(formId)
+	{
+		let logicDocument = this.private_GetLogicDocument();
+		if (!logicDocument)
+			return "";
+		
+		let form = logicDocument.GetContentControl(formId);
+		if (!form || !form.IsForm())
+			return "";
+		
+		if (form.IsPictureForm())
+			return "";
+		else if (form.IsCheckBox())
+			return form.IsCheckBoxChecked();
+		else if (form.IsPlaceHolder())
+			return "";
+		
+		return form.GetInnerText();
+	};
+	window['Asc']['asc_docs_api'].prototype.private_SetFormValue = function(internalId, value)
+	{
+		let oLogicDocument = this.private_GetLogicDocument();
+		
+		if (!AscCommon.g_oTableId
+			|| !oLogicDocument
+			|| !oLogicDocument.IsDocumentEditor())
+			return;
+		
+		let oForm = AscCommon.g_oTableId.GetClass(internalId);
+		
+		if (!oForm
+			|| !(oForm instanceof AscWord.CInlineLevelSdt)
+			|| !oForm.IsForm())
+			return;
+		
+		// При проверке лока внутри параграфа мы ориентируемся на выделение внутри этого параграфа
+		// поэтому нужно выделить форму
+		let state = oLogicDocument.SaveDocumentState();
+		oForm.SelectContentControl();
+		
+		let oParagraph = oForm.GetParagraph();
+		
+		oForm.SkipFillingFormModeCheck(true);
+		oForm.SkipSpecialContentControlLock(true);
+		if (!oParagraph
+			|| oLogicDocument.IsSelectionLocked(AscCommon.changestype_None, {
+				Type      : AscCommon.changestype_2_ElementsArray_and_Type,
+				Elements  : [oParagraph],
+				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);
+		
+		oLogicDocument.StartAction(AscDFH.historydescription_Document_FillFormInPlugin);
+		
+		let isClear = false;
+		if (null === value)
+		{
+			isClear = true;
+		}
+		else if (oForm.IsTextForm() || oForm.IsComboBox())
+		{
+			let sValue = AscBuilder.GetStringParameter(value, "");
+			if (!sValue)
+				isClear = true;
+			else
+				oForm.SetInnerText(sValue);
+		}
+		else if (oForm.IsDropDownList())
+		{
+			let sValue = AscBuilder.GetStringParameter(value, "");
+			let oPr    = oForm.GetDropDownListPr();
+			let nIndex = oPr.FindByText(sValue);
+			if (-1 !== nIndex)
+				oForm.SelectListItem(oPr.GetItemValue(nIndex));
+			else
+				isClear = true;
+		}
+		else if (oForm.IsCheckBox())
+		{
+			let isChecked = value === "true" ? true : value === "false" ? false : AscBuilder.GetBoolParameter(value, null);
+			if (null !== isChecked)
+				oForm.SetCheckBoxChecked(isChecked);
+			else
+				isClear = true;
+		}
+		else if (oForm.IsPictureForm())
+		{
+			let sValue = AscBuilder.GetStringParameter(value, "");
+			if (!sValue)
+				return;
+			
+			let oImg;
+			let allDrawings = oForm.GetAllDrawingObjects();
+			for (let nDrawing = 0; nDrawing < allDrawings.length; ++nDrawing)
+			{
+				if (allDrawings[nDrawing].IsPicture())
+				{
+					oImg = allDrawings[nDrawing].GraphicObj;
+					break;
+				}
+			}
+			
+			if (oImg)
+			{
+				oForm.SetShowingPlcHdr(false);
+				oImg.setBlipFill(AscFormat.CreateBlipFillRasterImageId(sValue));
+			}
+			else
+			{
+				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();
+		
+		oLogicDocument.OnChangeForm(oForm);
+		oLogicDocument.Recalculate();
+		oLogicDocument.UpdateTracks();
+		oLogicDocument.UpdateInterface();
+		oLogicDocument.FinalizeAction();
+	};
 
 	function private_CheckFormKey(form, logicDocument)
 	{
@@ -458,19 +624,49 @@ window["AscOForm"] = window.AscOForm = AscOForm;
 		
 		form.SetFormPr(formPr.Copy());
 		
-		if (formPr.GetFixed())
+		let docPartId = form.GetPlaceholder();
+		let glossary  = logicDocument.GetGlossaryDocument();
+		if ((form.IsTextForm()
+				|| form.IsDropDownList()
+				|| form.IsComboBox()
+				|| form.IsDatePicker())
+			&&
+			(docPartId === glossary.GetDefaultPlaceholderTextDocPartId()
+				|| docPartId === glossary.GetDefaultPlaceholderListDocPartId()
+				|| docPartId === glossary.GetDefaultPlaceholderDateTimeDocPartId()))
+		{
+			if (docPartId === glossary.GetDefaultPlaceholderTextDocPartId())
+				form.SetPlaceholder(glossary.GetDefaultPlaceholderTextOformDocPartId());
+			else if (docPartId === glossary.GetDefaultPlaceholderListDocPartId())
+				form.SetPlaceholder(glossary.GetDefaultPlaceholderListOformDocPartId());
+			else if (docPartId === glossary.GetDefaultPlaceholderDateTimeDocPartId())
+				form.SetPlaceholder(glossary.GetDefaultPlaceholderDateTimeOformDocPartId());
+
+			if (form.IsPlaceHolder())
+				form.private_FillPlaceholderContent();
+		}
+		
+		let paragraph = form.GetParagraph();
+		if (form.IsMainForm() && formPr.GetFixed() && (!paragraph || !paragraph.GetParentShape()))
 		{
 			logicDocument.Recalculate(true);
 			let drawing = form.ConvertFormToFixed();
 			if (drawing)
-			{
-				let drawingPr = new Asc.asc_CImgProperty();
-				drawingPr.asc_putWrappingStyle(Asc.c_oAscWrapStyle2.Square);
-				drawing.Set_Props(drawingPr);
-				
-				form.MoveCursorToContentControl(false);
-			}
+				drawing.SelectAsDrawing();
 		}
 	}
+	
+	function CheckCurrentSelection(logicDocument, isComplex)
+	{
+		let form = logicDocument.GetContentControl();
+		
+		if (!form || !form.IsForm() || (form.IsComplexForm() && !isComplex))
+			return;
+		
+		if (isComplex)
+			form = form.GetMainForm();
+		
+		form.MoveCursorOutsideForm(false);
+	}
 
 })(window, window.document);

apiBuilder.js

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2019
+ * (c) Copyright Ascensio System SIA 2010-2023
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -12,7 +12,7 @@
  * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
  * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
  *
- * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * You can contact Ascensio System SIA at 20A-6 Ernesta Birznieka-Upish
  * street, Riga, Latvia, EU, LV-1050.
  *
  * The  interactive user interfaces in modified source and object code versions
@@ -38,6 +38,7 @@
 	// Import
 	////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 	const AscBuilder         = window["AscBuilder"];
+	const ApiDocument        = AscBuilder.ApiDocument;
 	const GetStringParameter = AscBuilder.GetStringParameter;
 	const GetBoolParameter   = AscBuilder.GetBoolParameter;
 	const GetNumberParameter = AscBuilder.GetNumberParameter;
@@ -62,33 +63,46 @@
 	 */
 
 	/**
-	 * Specific text form properties.
+	 * Specific text field properties.
 	 * @typedef {Object} TextFormPrBase
-	 * @property {boolean} comb - Specifies if the text form should be a comb of characters with the same cell width. The maximum number of characters must be set to a positive value.
-	 * @property {number} maxCharacters - The maximum number of characters in the text form.
+	 * @property {boolean} comb - Specifies if the text field should be a comb of characters with the same cell width. The maximum number of characters must be set to a positive value.
+	 * @property {number} maxCharacters - The maximum number of characters in the text field.
 	 * @property {number} cellWidth - The cell width for each character measured in millimeters. If this parameter is not specified or equal to 0 or less, then the width will be set automatically.
-	 * @property {boolean} multiLine - Specifies if the current fixed size text form is multiline or not.
-	 * @property {boolean} autoFit - Specifies if the text form content should be autofit, i.e. whether the font size adjusts to the size of the fixed size form.
+	 * @property {boolean} multiLine - Specifies if the current fixed size text field is multiline or not.
+	 * @property {boolean} autoFit - Specifies if the text field content should be autofit, i.e. whether the font size adjusts to the size of the fixed size form.
 	 */
 
 	/**
-	 * Text form properties.
+	 * Text field properties.
 	 * @typedef {FormPrBase | TextFormPrBase} TextFormPr
 	 */
+	
+	/**
+	 * Form insertion specific properties.
+	 * @typedef {Object} FormInsertPr
+	 * @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.
+	 */
+	
+	/**
+	 * Properties for inserting a text field.
+	 * @typedef {FormPrBase | TextFormPrBase | FormInsertPr} TextFormInsertPr
+	 */
+	
 	 
 	/**
-	 * Specific checkbox properties.
+	 * Specific checkbox / radio button properties.
 	 * @typedef {Object} CheckBoxFormPrBase
 	 * @property {boolean} radio - Specifies if the current checkbox is a radio button. In this case, the key parameter is considered as an identifier for the group of radio buttons.
 	 */
 
 	/**
-	 * Checkbox form properties.
+	 * Checkbox / radio button properties.
 	 * @typedef {FormPrBase | CheckBoxFormPrBase} CheckBoxFormPr
 	 */
 
 	/**
-	 * Specific combo box properties.
+	 * Specific combo box / dropdown list properties.
 	 * @typedef {Object} ComboBoxFormPrBase
 	 * @property {boolean} editable - Specifies if the combo box text can be edited.
 	 * @property {boolean} autoFit - Specifies if the combo box form content should be autofit, i.e. whether the font size adjusts to the size of the fixed size form.
@@ -100,7 +114,7 @@
 	 */
 
 	/**
-	 * Combo box form properties.
+	 * Combo box / dropdown list properties.
 	 * @typedef {FormPrBase | ComboBoxFormPrBase} ComboBoxFormPr
 	 */
 
@@ -136,9 +150,9 @@
 	 */
 
 	/**
-	 * Creates a text form with the specified text form properties.
+	 * Creates a text field with the specified text field properties.
 	 * @memberof Api
-	 * @param {TextFormPr} oFormPr - Text form properties.
+	 * @param {TextFormPr} oFormPr - Text field properties.
 	 * @returns {ApiTextForm}
 	 */
 	Api.prototype.CreateTextForm = function(oFormPr)
@@ -146,23 +160,15 @@
 		if (!oFormPr)
 			oFormPr = {};
 
-		let oCC = CreateCommonForm(oFormPr);
-
-		let oPr = new AscCommon.CSdtTextFormPr();
-		oPr.SetComb(GetBoolParameter(oFormPr["comb"], false));
-		oPr.SetMaxCharacters(GetNumberParameter(oFormPr["maxCharacters"], -1));
-		oPr.SetMultiLine(GetBoolParameter(oFormPr["multiLine"], false));
-		oPr.SetAutoFit(GetBoolParameter(oFormPr["autoFit"], false));
-		oPr.SetWidth((GetNumberParameter(oFormPr["cellWidth"], 0) * 72 * 20 / 25.4) | 0);
-
-		oCC.ApplyTextFormPr(oPr);
-		CheckFormKey(oCC);
-		return new AscBuilder.ApiTextForm(oCC);
+		let form = CreateCommonForm(oFormPr);
+		ApplyTextFormPr(form, oFormPr);
+		CheckFormKey(form);
+		return new AscBuilder.ApiTextForm(form);
 	};
 	/**
-	 * Creates a checkbox/radio button form with the specified checkbox/radio button form properties.
+	 * Creates a checkbox / radio button with the specified checkbox / radio button properties.
 	 * @memberof Api
-	 * @param {CheckBoxFormPr} oFormPr - Checkbox/radio button form properties.
+	 * @param {CheckBoxFormPr} oFormPr - Checkbox / radio button properties.
 	 * @returns {ApiCheckBoxForm}
 	 */
 	Api.prototype.CreateCheckBoxForm = function(oFormPr)
@@ -230,9 +236,9 @@
 		return new AscBuilder.ApiCheckBoxForm(oCC);
 	};
 	/**
-	 * Creates a combo box/dropdown form with the specified combo box/dropdown form properties.
+	 * Creates a combo box / dropdown list with the specified combo box / dropdown list properties.
 	 * @memberof Api
-	 * @param {ComboBoxFormPr} oFormPr - Combo box/dropdown form properties.
+	 * @param {ComboBoxFormPr} oFormPr - Combo box / dropdown list properties.
 	 * @returns {ApiComboBoxForm}
 	 */
 	Api.prototype.CreateComboBoxForm = function(oFormPr)
@@ -333,32 +339,78 @@
 		CheckFormKey(oCC);
 		return new AscBuilder.ApiPictureForm(oCC);
 	};
+	/**
+	 * Inserts a text box with the specified text box properties over the selected text.
+	 * @memberof ApiDocument
+	 * @param {TextFormInsertPr} oFormPr - Properties for inserting a text field.
+	 * @returns {ApiTextForm}
+	 */
+	ApiDocument.prototype.InsertTextForm = function(oFormPr)
+	{
+		if (!oFormPr)
+			oFormPr = {};
+		
+		let logicDocument = this.Document;
+		let placeholder = GetStringParameter(oFormPr["placeholder"], undefined);
+		if (GetBoolParameter(oFormPr["placeholderFromSelection"], false))
+			placeholder = logicDocument.GetSelectedText();
+		
+		if (!GetBoolParameter(oFormPr["keepSelectedTextInForm"], true))
+			logicDocument.RemoveBeforePaste();
+		
+		let contentControl = logicDocument.AddContentControl(c_oAscSdtLevelType.Inline);
+		if (!contentControl)
+			return null;
+		
+		ApplyCommonFormPr(contentControl, oFormPr);
+		SetFormPlaceholder(contentControl, placeholder);
+		ApplyTextFormPr(contentControl, oFormPr, true);
+		CheckFormKey(contentControl);
+		return new AscBuilder.ApiTextForm(contentControl);
+	};
 	////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 	// Private area
 	////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 	function CreateCommonForm(oFormPr)
 	{
-		if (!oFormPr)
-			oFormPr = {};
+		let contentControl = new AscCommonWord.CInlineLevelSdt();
 		
-		var oTempFormPr = new AscCommon.CSdtFormPr();
-		oTempFormPr.SetHelpText(GetStringParameter(oFormPr["tip"], undefined));
-		oTempFormPr.SetRequired(GetBoolParameter(oFormPr["required"], false));
-		oTempFormPr.SetKey(GetStringParameter(oFormPr["key"], undefined));
-
-		var oCC = new AscCommonWord.CInlineLevelSdt();
-
-		let sPlaceHolder = GetStringParameter(oFormPr["placeholder"], undefined);
-		if (sPlaceHolder)
-			oCC.SetPlaceholderText(sPlaceHolder);
+		ApplyCommonFormPr(contentControl, oFormPr);
+		
+		let placeholder = oFormPr ? GetStringParameter(oFormPr["placeholder"], undefined) : undefined;
+		SetFormPlaceholder(contentControl, placeholder);
+		
+		contentControl.ReplaceContentWithPlaceHolder(false);
+		contentControl.UpdatePlaceHolderTextPrForForm();
+		return contentControl;
+	}
+	function SetFormPlaceholder(form, text)
+	{
+		if (text)
+			form.SetPlaceholderText(text);
 		else
-			oCC.SetPlaceholder(c_oAscDefaultPlaceholderName.Text);
-
-		oCC.ReplaceContentWithPlaceHolder(false);
-		oCC.SetFormPr(oTempFormPr);
-		oCC.UpdatePlaceHolderTextPrForForm();
-
-		return oCC;
+			form.SetPlaceholder(c_oAscDefaultPlaceholderName.Text);
+	}
+	function ApplyCommonFormPr(form, formPr)
+	{
+		if (!formPr)
+			formPr = {};
+		
+		let sdtFormPr = new AscCommon.CSdtFormPr();
+		sdtFormPr.SetHelpText(GetStringParameter(formPr["tip"], undefined));
+		sdtFormPr.SetRequired(GetBoolParameter(formPr["required"], false));
+		sdtFormPr.SetKey(GetStringParameter(formPr["key"], undefined));
+		form.SetFormPr(sdtFormPr);
+	}
+	function ApplyTextFormPr(form, formPr, keepContent)
+	{
+		let textFormPr = new AscCommon.CSdtTextFormPr();
+		textFormPr.SetComb(GetBoolParameter(formPr["comb"], false));
+		textFormPr.SetMaxCharacters(GetNumberParameter(formPr["maxCharacters"], -1));
+		textFormPr.SetMultiLine(GetBoolParameter(formPr["multiLine"], false));
+		textFormPr.SetAutoFit(GetBoolParameter(formPr["autoFit"], false));
+		textFormPr.SetWidth((GetNumberParameter(formPr["cellWidth"], 0) * 72 * 20 / 25.4) | 0);
+		form.ApplyTextFormPr(textFormPr, keepContent);
 	}
 	function CheckFormKey(form)
 	{
@@ -387,6 +439,8 @@
 	Api.prototype["CreateTextForm"]     = Api.prototype.CreateTextForm;
 	Api.prototype["CreatePictureForm"]  = Api.prototype.CreatePictureForm;
 	Api.prototype["CreateCheckBoxForm"] = Api.prototype.CreateCheckBoxForm;	
-	Api.prototype["CreateComboBoxForm"] = Api.prototype.CreateComboBoxForm;	
+	Api.prototype["CreateComboBoxForm"] = Api.prototype.CreateComboBoxForm;
+	
+	ApiDocument.prototype["InsertTextForm"] = ApiDocument.prototype.InsertTextForm;
 
 }(window, null));

apiPlugins.js

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2022
+ * (c) Copyright Ascensio System SIA 2010-2023
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -12,7 +12,7 @@
  * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
  * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
  *
- * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * You can contact Ascensio System SIA at 20A-6 Ernesta Birznieka-Upish
  * street, Riga, Latvia, EU, LV-1050.
  *
  * The  interactive user interfaces in modified source and object code versions
@@ -114,110 +114,7 @@
 	 */
 	window["asc_docs_api"].prototype["pluginMethod_SetFormValue"] = function(internalId, value)
 	{
-		let oLogicDocument = this.private_GetLogicDocument();
-
-		if (!AscCommon.g_oTableId
-			|| !oLogicDocument
-			|| !oLogicDocument.IsDocumentEditor())
-			return;
-
-		let oForm = AscCommon.g_oTableId.GetClass(internalId);
-
-		if (!oForm
-			|| !(oForm instanceof AscWord.CInlineLevelSdt)
-			|| !oForm.IsForm())
-			return;
-
-		// При проверке лока внутри параграфа мы ориентируемся на выделение внутри этого параграфа
-		// поэтому нужно выделить форму
-		let state = oLogicDocument.SaveDocumentState();
-		oForm.SelectContentControl();
-		
-		let oParagraph = oForm.GetParagraph();
-		
-		oForm.SkipSpecialContentControlLock(true);
-		if (!oParagraph
-			|| oLogicDocument.IsSelectionLocked(AscCommon.changestype_None, {
-				Type      : AscCommon.changestype_2_ElementsArray_and_Type,
-				Elements  : [oParagraph],
-				CheckType : AscCommon.changestype_Paragraph_Content
-			}, true, oLogicDocument.IsFillingFormMode()))
-		{
-			oLogicDocument.LoadDocumentState(state);
-			oForm.SkipSpecialContentControlLock(false);
-			return;
-		}
-		oLogicDocument.LoadDocumentState(state);
-		oForm.SkipSpecialContentControlLock(false);
-
-		oLogicDocument.StartAction(AscDFH.historydescription_Document_FillFormInPlugin);
-
-		let isClear = false;
-		if (null === value)
-		{
-			isClear = true;
-		}
-		else if (oForm.IsTextForm() || oForm.IsComboBox())
-		{
-			let sValue = AscBuilder.GetStringParameter(value, "");
-			if (!value)
-				isClear = true;
-			else
-				oForm.SetInnerText(sValue);
-		}
-		else if (oForm.IsDropDownList())
-		{
-			let sValue = AscBuilder.GetStringParameter(value, "");
-			let oPr    = oForm.GetDropDownListPr();
-			let nIndex = oPr.FindByText(sValue);
-			if (-1 !== nIndex)
-				oForm.SelectListItem(oPr.GetItemValue(nIndex));
-			else
-				isClear = true;
-		}
-		else if (oForm.IsCheckBox())
-		{
-			let isChecked = value === "true" ? true : value === "false" ? false : AscBuilder.GetBoolParameter(value, null);
-			if (null !== isChecked)
-				oForm.SetCheckBoxChecked(isChecked);
-			else
-				isClear = true;
-		}
-		else if (oForm.IsPictureForm())
-		{
-			let sValue = AscBuilder.GetStringParameter(value, "");
-			if (!sValue)
-				return;
-
-			let oImg;
-			let allDrawings = oForm.GetAllDrawingObjects();
-			for (let nDrawing = 0; nDrawing < allDrawings.length; ++nDrawing)
-			{
-				if (allDrawings[nDrawing].IsPicture())
-				{
-					oImg = allDrawings[nDrawing].GraphicObj;
-					break;
-				}
-			}
-
-			if (oImg)
-			{
-				oForm.SetShowingPlcHdr(false);
-				oImg.setBlipFill(AscFormat.CreateBlipFillRasterImageId(sValue));
-			}
-			else
-			{
-				isClear = true;
-			}
-		}
-
-		if (isClear)
-			oForm.ClearContentControlExt();
-
-		oLogicDocument.OnChangeForm(oForm);
-		oLogicDocument.Recalculate();
-		oLogicDocument.UpdateTracks();
-		oLogicDocument.FinalizeAction();
+		this.private_SetFormValue(internalId, value);
 	};
 	/**
 	 * Returns a value of the specified form.

oform/OForm.js

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2019
+ * (c) Copyright Ascensio System SIA 2010-2023
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -12,7 +12,7 @@
  * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
  * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
  *
- * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * You can contact Ascensio System SIA at 20A-6 Ernesta Birznieka-Upish
  * street, Riga, Latvia, EU, LV-1050.
  *
  * The  interactive user interfaces in modified source and object code versions

oform/Role.js

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2019
+ * (c) Copyright Ascensio System SIA 2010-2023
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -12,7 +12,7 @@
  * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
  * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
  *
- * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * You can contact Ascensio System SIA at 20A-6 Ernesta Birznieka-Upish
  * street, Riga, Latvia, EU, LV-1050.
  *
  * The  interactive user interfaces in modified source and object code versions

oform/format/BaseFormatObject.js

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2019
+ * (c) Copyright Ascensio System SIA 2010-2023
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -12,7 +12,7 @@
  * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
  * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
  *
- * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * You can contact Ascensio System SIA at 20A-6 Ernesta Birznieka-Upish
  * street, Riga, Latvia, EU, LV-1050.
  *
  * The  interactive user interfaces in modified source and object code versions

oform/format/Document.js

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2019
+ * (c) Copyright Ascensio System SIA 2010-2023
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -12,7 +12,7 @@
  * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
  * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
  *
- * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * You can contact Ascensio System SIA at 20A-6 Ernesta Birznieka-Upish
  * street, Riga, Latvia, EU, LV-1050.
  *
  * The  interactive user interfaces in modified source and object code versions

oform/format/FieldGroup.js

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2019
+ * (c) Copyright Ascensio System SIA 2010-2023
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -12,7 +12,7 @@
  * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
  * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
  *
- * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * You can contact Ascensio System SIA at 20A-6 Ernesta Birznieka-Upish
  * street, Riga, Latvia, EU, LV-1050.
  *
  * The  interactive user interfaces in modified source and object code versions

oform/format/FieldMaster.js

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2019
+ * (c) Copyright Ascensio System SIA 2010-2023
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -12,7 +12,7 @@
  * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
  * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
  *
- * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * You can contact Ascensio System SIA at 20A-6 Ernesta Birznieka-Upish
  * street, Riga, Latvia, EU, LV-1050.
  *
  * The  interactive user interfaces in modified source and object code versions

oform/format/User.js

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2019
+ * (c) Copyright Ascensio System SIA 2010-2023
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -12,7 +12,7 @@
  * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
  * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
  *
- * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * You can contact Ascensio System SIA at 20A-6 Ernesta Birznieka-Upish
  * street, Riga, Latvia, EU, LV-1050.
  *
  * The  interactive user interfaces in modified source and object code versions

oform/format/UserMaster.js

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2019
+ * (c) Copyright Ascensio System SIA 2010-2023
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -12,7 +12,7 @@
  * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
  * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
  *
- * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * You can contact Ascensio System SIA at 20A-6 Ernesta Birznieka-Upish
  * street, Riga, Latvia, EU, LV-1050.
  *
  * The  interactive user interfaces in modified source and object code versions

oform/format/changes/DictionaryBase.js

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2019
+ * (c) Copyright Ascensio System SIA 2010-2023
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -12,7 +12,7 @@
  * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
  * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
  *
- * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * You can contact Ascensio System SIA at 20A-6 Ernesta Birznieka-Upish
  * street, Riga, Latvia, EU, LV-1050.
  *
  * The  interactive user interfaces in modified source and object code versions

oform/format/changes/DocumentChanges.js

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2019
+ * (c) Copyright Ascensio System SIA 2010-2023
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -12,7 +12,7 @@
  * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
  * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
  *
- * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * You can contact Ascensio System SIA at 20A-6 Ernesta Birznieka-Upish
  * street, Riga, Latvia, EU, LV-1050.
  *
  * The  interactive user interfaces in modified source and object code versions

oform/format/changes/FieldGroupChanges.js

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2019
+ * (c) Copyright Ascensio System SIA 2010-2023
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -12,7 +12,7 @@
  * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
  * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
  *
- * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * You can contact Ascensio System SIA at 20A-6 Ernesta Birznieka-Upish
  * street, Riga, Latvia, EU, LV-1050.
  *
  * The  interactive user interfaces in modified source and object code versions

oform/format/changes/FieldMasterChanges.js

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2019
+ * (c) Copyright Ascensio System SIA 2010-2023
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -12,7 +12,7 @@
  * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
  * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
  *
- * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * You can contact Ascensio System SIA at 20A-6 Ernesta Birznieka-Upish
  * street, Riga, Latvia, EU, LV-1050.
  *
  * The  interactive user interfaces in modified source and object code versions

oform/format/changes/UserChanges.js

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2019
+ * (c) Copyright Ascensio System SIA 2010-2023
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -12,7 +12,7 @@
  * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
  * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
  *
- * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * You can contact Ascensio System SIA at 20A-6 Ernesta Birznieka-Upish
  * street, Riga, Latvia, EU, LV-1050.
  *
  * The  interactive user interfaces in modified source and object code versions

oform/format/changes/UserMasterChanges.js

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2019
+ * (c) Copyright Ascensio System SIA 2010-2023
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -12,7 +12,7 @@
  * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
  * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
  *
- * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * You can contact Ascensio System SIA at 20A-6 Ernesta Birznieka-Upish
  * street, Riga, Latvia, EU, LV-1050.
  *
  * The  interactive user interfaces in modified source and object code versions

oform/xml/XmlContext.js

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2019
+ * (c) Copyright Ascensio System SIA 2010-2023
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -12,7 +12,7 @@
  * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
  * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
  *
- * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * You can contact Ascensio System SIA at 20A-6 Ernesta Birznieka-Upish
  * street, Riga, Latvia, EU, LV-1050.
  *
  * The  interactive user interfaces in modified source and object code versions

oform/xml/XmlPackage.js

@@ -1,5 +1,5 @@
 /*
- * (c) Copyright Ascensio System SIA 2010-2019
+ * (c) Copyright Ascensio System SIA 2010-2023
  *
  * This program is a free software product. You can redistribute it and/or
  * modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -12,7 +12,7 @@
  * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
  * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
  *
- * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * You can contact Ascensio System SIA at 20A-6 Ernesta Birznieka-Upish
  * street, Riga, Latvia, EU, LV-1050.
  *
  * The  interactive user interfaces in modified source and object code versions