Merge branch hotfix/v7.2.1 into master

Fix the problem with creating ComboBox form using the Builder

.gitignore

@@ -0,0 +1 @@
+.idea/

api.js

@@ -34,7 +34,6 @@
 (function(window, document) {
     window['Asc']['Addons'] = window['Asc']['Addons'] || {};
 	window['Asc']['Addons']['forms'] = true; // register addon
-	
 	window['Asc']['asc_docs_api'].prototype['asc_AddContentControlCheckBox'] = window['Asc']['asc_docs_api'].prototype.asc_AddContentControlCheckBox = function(oPr, oFormPr, oCommonPr)
 	{
 		var oLogicDocument = this.private_GetLogicDocument();
@@ -85,6 +84,7 @@
 			{
 				oCC.SetFormPr(oFormPr);
 				oCC.UpdatePlaceHolderTextPrForForm();
+				private_CheckFormKey(oCC, oLogicDocument);
 			}
 
 			if (oCommonPr)
@@ -175,32 +175,34 @@
 			oLogicDocument.StartAction(AscDFH.historydescription_Document_AddContentControlPicture);
 
 			var oCC = oLogicDocument.AddContentControlPicture();
+			let oFormParaDrawing = null;
 			if (oCC && oFormPr)
 			{
 				oCC.SetFormPr(oFormPr);
 				oCC.UpdatePlaceHolderTextPrForForm();
-				oCC.ConvertFormToFixed();
+				private_CheckFormKey(oCC, oLogicDocument);
+
+				oFormParaDrawing = oCC.ConvertFormToFixed();
 				oCC.SetPictureFormPr(new AscCommon.CSdtPictureFormPr());
-				oCC.SelectContentControl();
 				var aDrawings = oCC.GetAllDrawingObjects();
-				for(var nDrawing = 0; nDrawing < aDrawings.length; ++nDrawing) 
+				for(var nDrawing = 0; nDrawing < aDrawings.length; ++nDrawing)
 				{
 					var oDrawing = aDrawings[nDrawing];
 					var oGraphic = oDrawing.GraphicObj;
-					if(oGraphic && oGraphic.getObjectType() === AscDFH.historyitem_type_ImageShape) 
+					if(oGraphic && oGraphic.getObjectType() === AscDFH.historyitem_type_ImageShape)
 					{
 						var oSpPr = oGraphic.spPr;
-						if(oSpPr) 
+						if(oSpPr)
 						{
-							if(oSpPr.Fill) 
+							if(oSpPr.Fill)
 							{
 								oSpPr.setFill(null);
 							}
-							if(oSpPr.ln) 
+							if(oSpPr.ln)
 							{
 								oSpPr.setLn(null);
 							}
-							if(oSpPr.geometry) 
+							if(oSpPr.geometry)
 							{
 								oSpPr.setGeometry(null);
 							}
@@ -240,7 +242,15 @@
 
 			oLogicDocument.UpdateInterface();
 			oLogicDocument.Recalculate();
-			oLogicDocument.FinalizeAction();
+			if(oFormParaDrawing)
+			{
+				let oFormShape = oFormParaDrawing.GraphicObj;
+				if(oFormShape)
+				{
+					oFormShape.Set_CurrentElement(true, null, true);
+				}
+			}
+ 			oLogicDocument.FinalizeAction();
 		}
 	};
 	window['Asc']['asc_docs_api'].prototype['asc_AddContentControlList'] = window['Asc']['asc_docs_api'].prototype.asc_AddContentControlList = function(isComboBox, oPr, oFormPr, oCommonPr)
@@ -264,6 +274,7 @@
 			{
 				oCC.SetFormPr(oFormPr);
 				oCC.UpdatePlaceHolderTextPrForForm();
+				private_CheckFormKey(oCC, oLogicDocument);
 			}
 
 			if (oCC && oCommonPr)
@@ -296,21 +307,32 @@
 			oLogicDocument.FinalizeAction();
 		}
 	};
-	window['Asc']['asc_docs_api'].prototype['asc_AddContentControlTextForm'] = window['Asc']['asc_docs_api'].prototype.asc_AddContentControlTextForm = function(oPr, oFormPr)
+	window['Asc']['asc_docs_api'].prototype['asc_AddContentControlTextForm'] = window['Asc']['asc_docs_api'].prototype.asc_AddContentControlTextForm = function(contentControlPr)
 	{
 		var oLogicDocument = this.private_GetLogicDocument();
 		if (!oLogicDocument)
 			return;
 
+		let textFormPr      = contentControlPr ? contentControlPr.TextFormPr : null;
+		let formPr          = contentControlPr ? contentControlPr.FormPr : null;
+		let placeholderText = contentControlPr ? contentControlPr.PlaceholderText : "";
+
 		if (!oLogicDocument.IsSelectionLocked(AscCommon.changestype_Paragraph_Content))
 		{
 			oLogicDocument.StartAction(AscDFH.historydescription_Document_AddContentControlTextForm);
 
-			var oCC = oLogicDocument.AddContentControlTextForm(oPr);
-			if (oCC && oFormPr)
+			var oCC = oLogicDocument.AddContentControlTextForm(textFormPr);
+			if (oCC)
 			{
-				oCC.SetFormPr(oFormPr);
-				oCC.UpdatePlaceHolderTextPrForForm();
+				if (placeholderText)
+					oCC.SetPlaceholderText(placeholderText);
+
+				if (formPr)
+				{
+					oCC.SetFormPr(formPr);
+					oCC.UpdatePlaceHolderTextPrForForm();
+					private_CheckFormKey(oCC, oLogicDocument);
+				}
 			}
 
 			oLogicDocument.UpdateInterface();
@@ -318,5 +340,89 @@
 			oLogicDocument.FinalizeAction();
 		}
 	};
+	window['Asc']['asc_docs_api'].prototype['asc_AddComplexForm'] = window['Asc']['asc_docs_api'].prototype.asc_AddComplexForm = function(json, formPr)
+	{
+		let logicDocument = this.private_GetLogicDocument();
+		if (!logicDocument)
+			return;
+
+		function AddComplexForm()
+		{
+			if (!logicDocument.IsSelectionLocked(AscCommon.changestype_Paragraph_Content))
+			{
+				logicDocument.StartAction(AscDFH.historydescription_Document_AddComplexForm);
+
+				let complexForm = logicDocument.AddComplexForm(new AscWord.CSdtComplexFormPr(), formPr);
+				private_CheckFormKey(complexForm, logicDocument);
+
+				if (json)
+					AscWord.JsonToForm(json, complexForm);
+
+				logicDocument.UpdateInterface();
+				logicDocument.Recalculate();
+				logicDocument.FinalizeAction();
+			}
+		}
+
+		if (json)
+		{
+			AscFonts.FontPickerByCharacter.checkText(AscWord.GetUnicodesFromJsonToForm(), this, function() {
+				AddComplexForm();
+			}, true);
+		}
+		else
+		{
+			AddComplexForm();
+		}
+	};
+	window['Asc']['asc_docs_api'].prototype['asc_GetCurrentComplexForm'] = window['Asc']['asc_docs_api'].prototype.asc_GetCurrentComplexForm = function()
+	{
+		let logicDocument = this.private_GetLogicDocument();
+		if (!logicDocument)
+			return null;
+
+		let form = logicDocument.GetContentControl();
+		if (!form || !form.IsForm())
+			return null;
+
+		let mainForm = form.GetMainForm();
+
+		return (mainForm.IsComplexForm() ? mainForm : null);
+	};
+	window['Asc']['asc_docs_api'].prototype['asc_ConvertFormToJson'] = window['Asc']['asc_docs_api'].prototype.asc_ConvertFormToJson = function(form)
+	{
+		let logicDocument = this.private_GetLogicDocument();
+		if (!logicDocument)
+			return null;
+
+		if (typeof (form) === "string")
+			form = AscCommon.g_oTableId.Get_ById(form);
+
+		if (!form || !(form instanceof AscWord.CInlineLevelSdt) || !form.IsForm())
+			return null;
+
+		return AscWord.FormToJson(form);
+	};
+
+	function private_CheckFormKey(form, logicDocument)
+	{
+		if (!form || !form.IsForm() || !logicDocument)
+			return;
+
+		let key = form.GetFormKey();
+		if (key && "" !== key.trim())
+			return;
+
+		let formManager  = logicDocument.GetFormsManager();
+		let keyGenerator = formManager.GetKeyGenerator();
+
+		let formPr = form.GetFormPr().Copy();
+		if (!formPr)
+			return;
+
+		key = keyGenerator.GetNewKey(form);
+		formPr.SetKey(key);
+		form.SetFormPr(formPr);
+	}
 
 })(window, window.document);

apiBuilder.js

@@ -156,7 +156,7 @@
 		oPr.SetWidth((GetNumberParameter(oFormPr["cellWidth"], 0) * 72 * 20 / 25.4) | 0);
 
 		oCC.ApplyTextFormPr(oPr);
-
+		CheckFormKey(oCC);
 		return new AscBuilder.ApiTextForm(oCC);
 	};
 	/**
@@ -226,6 +226,7 @@
 			private_PerformAddCheckBox();
 		}
 
+		CheckFormKey(oCC);
 		return new AscBuilder.ApiCheckBoxForm(oCC);
 	};
 	/**
@@ -239,7 +240,7 @@
 		if (!oFormPr)
 			oFormPr = {};
 
-		var oPr = new CSdtComboBoxPr();
+		var oPr = new AscCommon.CSdtComboBoxPr();
 		oPr.AddItem(AscCommon.translateManager.getValue("Choose an item"), "");
 
 		var oCC = CreateCommonForm(oFormPr);
@@ -290,6 +291,7 @@
 			}
 		}
 
+		CheckFormKey(oCC);
 		return new AscBuilder.ApiComboBoxForm(oCC);
 	};
 	/**
@@ -328,6 +330,7 @@
 
 		oCC.SetPictureFormPr(oPr);
 
+		CheckFormKey(oCC);
 		return new AscBuilder.ApiPictureForm(oCC);
 	};
 	////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -357,6 +360,27 @@
 
 		return oCC;
 	}
+	function CheckFormKey(form)
+	{
+		let logicDocument = editor && editor.WordControl && editor.WordControl.m_oLogicDocument;
+		if (!form || !form.IsForm() || !logicDocument)
+			return;
+
+		let key = form.GetFormKey();
+		if (key && "" !== key.trim())
+			return;
+
+		let formManager  = logicDocument.GetFormsManager();
+		let keyGenerator = formManager.GetKeyGenerator();
+
+		let formPr = form.GetFormPr().Copy();
+		if (!formPr)
+			return;
+
+		key = keyGenerator.GetNewKey(form);
+		formPr.SetKey(key);
+		form.SetFormPr(formPr);
+	}
 	////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 	// Export
 	////////////////////////////////////////////////////////////////////////////////////////////////////////////////////