[se] Move common functions

cell/fromToJSON.js

@@ -181,9 +181,9 @@
 
 			allowBlank:       oDataValidation.allowBlank,
 			error:            oDataValidation.error,
-			errorStyle:       ToXML_ST_DataValidationErrorStyle(oDataValidation.errorStyle),
+			errorStyle:       AscCommonExcel.ToXml_ST_DataValidationErrorStyle(oDataValidation.errorStyle),
 			errorTitle:       oDataValidation.errorTitle,
-			imeMode:          ToXML_ST_DataValidationImeMode(oDataValidation.imeMode),
+			imeMode:          AscCommonExcel.ToXml_ST_DataValidationImeMode(oDataValidation.imeMode),
 			operator:         AscCommonExcel.ToXml_ST_DataValidationOperator(oDataValidation.operator),
 			prompt:           oDataValidation.prompt,
 			promptTitle:      oDataValidation.promptTitle,
@@ -191,7 +191,7 @@
 			showErrorMessage: oDataValidation.showErrorMessage,
 			showInputMessage: oDataValidation.showInputMessage,
 			sqref:            getSqRefString(oDataValidation.ranges),
-			type:             ToXML_ST_DataValidationType(oDataValidation.type)
+			type:             AscCommonExcel.ToXml_ST_DataValidationType(oDataValidation.type)
 		}
 	};
 	WriterToJSON.prototype.SerFormula = function(oFormula)
@@ -233,7 +233,7 @@
 			stopIfTrue:   oCondRule.stopIfTrue,
 			text:         oCondRule.text,
 			timePeriod:   AscCommonExcel.ToXml_ST_TimePeriod(oCondRule.timePeriod),
-			type:         ToXML_CfRuleType(oCondRule.type),
+			type:         AscCommonExcel.ToXml_ST_CfType(oCondRule.type),
 		}
 	};
 	WriterToJSON.prototype.SerRuleElement = function(oRule)
@@ -267,7 +267,7 @@
 		return {
 			cfvo:      aCFVO,
 			cfIcon:    aCFIS,
-			iconSet:   AscCommonExcel.ToXml_IconSetType(oIconSet.IconSet),
+			iconSet:   AscCommonExcel.ToXml_ST_IconSetType(oIconSet.IconSet),
 			percent:   oIconSet.Percent,
 			reverse:   oIconSet.Reverse,
 			showValue: oIconSet.ShowValue,
@@ -277,7 +277,7 @@
 	WriterToJSON.prototype.SerCondFmtIconSet = function(oCFIS)
 	{
 		return {
-			iconSet: AscCommonExcel.ToXml_IconSetType(oCFIS.IconSet),
+			iconSet: AscCommonExcel.ToXml_ST_IconSetType(oCFIS.IconSet),
 			iconId:  oCFIS.IconId
 		}
 	};
@@ -615,462 +615,6 @@
 		return refs.join(' ');
 	}
 
-	function ToXML_IconSetType(nType)
-	{
-		var sType = undefined;
-		switch (nType)
-		{
-			case Asc.EIconSetType.Arrows3:
-				sType = "3Arrows";
-				break;
-			case Asc.EIconSetType.Arrows3Gray:
-				sType = "3ArrowsGray";
-				break;
-			case Asc.EIconSetType.Flags3:
-				sType = "3Flags";
-				break;
-			case Asc.EIconSetType.Signs3:
-				sType = "3Signs";
-				break;
-			case Asc.EIconSetType.Symbols3:
-				sType = "3Symbols";
-				break;
-			case Asc.EIconSetType.Symbols3_2:
-				sType = "3Symbols2";
-				break;
-			case Asc.EIconSetType.Traffic3Lights1:
-				sType = "3TrafficLights1";
-				break;
-			case Asc.EIconSetType.Traffic3Lights2:
-				sType = "3TrafficLights2";
-				break;
-			case Asc.EIconSetType.Arrows4:
-				sType = "4Arrows";
-				break;
-			case Asc.EIconSetType.Arrows4Gray:
-				sType = "4ArrowsGray";
-				break;
-			case Asc.EIconSetType.Rating4:
-				sType = "4Rating";
-				break;
-			case Asc.EIconSetType.RedToBlack4:
-				sType = "4RedToBlack";
-				break;
-			case Asc.EIconSetType.Traffic4Lights:
-				sType = "4TrafficLights";
-				break;
-			case Asc.EIconSetType.Arrows5:
-				sType = "5Arrows";
-				break;
-			case Asc.EIconSetType.Arrows5Gray:
-				sType = "5ArrowsGray";
-				break;
-			case Asc.EIconSetType.Quarters5:
-				sType = "5Quarters";
-				break;
-			case Asc.EIconSetType.Rating5: 
-				sType = "5Rating";
-				break;
-			case Asc.EIconSetType.Triangles3:
-				sType = "3Triangles";
-				break;
-			case Asc.EIconSetType.Stars3:
-				sType = "3Stars";
-				break;
-			case Asc.EIconSetType.Boxes5:
-				sType = "5Boxes";
-				break;
-			case Asc.EIconSetType.NoIcons:
-				sType = "NoIcons";
-				break;
-		}
-
-		return sType;
-	}
-	function FromXML_IconSetType(sType)
-	{
-		var nType = undefined;
-		switch (sType)
-		{
-			case "3Arrows":
-				nType = Asc.EIconSetType.Arrows3;
-				break;
-			case "3ArrowsGray":
-				nType = Asc.EIconSetType.Arrows3Gray;
-				break;
-			case "3Flags":
-				nType = Asc.EIconSetType.Flags3;
-				break;
-			case "3Signs":
-				nType = Asc.EIconSetType.Signs3;
-				break;
-			case "3Symbols":
-				nType = Asc.EIconSetType.Symbols3;
-				break;
-			case "3Symbols2":
-				nType = Asc.EIconSetType.Symbols3_2;
-				break;
-			case "3TrafficLights1":
-				nType = Asc.EIconSetType.Traffic3Lights1;
-				break;
-			case "3TrafficLights2":
-				nType = Asc.EIconSetType.Traffic3Lights2;
-				break;
-			case "4Arrows":
-				nType = Asc.EIconSetType.Arrows4;
-				break;
-			case "4ArrowsGray":
-				nType = Asc.EIconSetType.Arrows4Gray;
-				break;
-			case "4Rating":
-				nType = Asc.EIconSetType.Rating4;
-				break;
-			case "4RedToBlack":
-				nType = Asc.EIconSetType.RedToBlack4;
-				break;
-			case "4TrafficLights":
-				nType = Asc.EIconSetType.Traffic4Lights;
-				break;
-			case "5Arrows":
-				nType = Asc.EIconSetType.Arrows5;
-				break;
-			case "5ArrowsGray":
-				nType = Asc.EIconSetType.Arrows5Gray;
-				break;
-			case "5Quarters":
-				nType = Asc.EIconSetType.Quarters5;
-				break;
-			case "5Rating": 
-				nType = Asc.EIconSetType.Rating5;
-				break;
-			case "3Triangles":
-				nType = Asc.EIconSetType.Triangles3;
-				break;
-			case "3Stars":
-				nType = Asc.EIconSetType.Stars3;
-				break;
-			case "5Boxes":
-				nType = Asc.EIconSetType.Boxes5;
-				break;
-			case "NoIcons":
-				nType = Asc.EIconSetType.NoIcons;
-				break;
-		}
-
-		return nType;
-	}
-	function ToXML_CfRuleType(nType)
-	{
-		var sType = undefined;
-		switch (nType)
-		{
-			case Asc.ECfType.aboveAverage:
-				sType = "aboveAverage";
-				break;
-			case Asc.ECfType.beginsWith:
-				sType = "beginsWith";
-				break;
-			case Asc.ECfType.cellIs:
-				sType = "cellIs";
-				break;
-			case Asc.ECfType.colorScale:
-				sType = "colorScale";
-				break;
-			case Asc.ECfType.containsBlanks:
-				sType = "containsBlanks";
-				break;
-			case Asc.ECfType.containsErrors:
-				sType = "containsErrors";
-				break;
-			case Asc.ECfType.containsText:
-				sType = "containsText";
-				break;
-			case Asc.ECfType.dataBar:
-				sType = "dataBar";
-				break;
-			case Asc.ECfType.duplicateValues:
-				sType = "duplicateValues";
-				break;
-			case Asc.ECfType.expression:
-				sType = "expression";
-				break;
-			case Asc.ECfType.iconSet:
-				sType = "iconSet";
-				break;
-			case Asc.ECfType.notContainsBlanks:
-				sType = "notContainsBlanks";
-				break;
-			case Asc.ECfType.notContainsErrors:
-				sType = "notContainsErrors";
-				break;
-			case Asc.ECfType.notContainsText:
-				sType = "notContainsText";
-				break;
-			case Asc.ECfType.timePeriod:
-				sType = "timePeriod";
-				break;
-			case Asc.ECfType.top10:
-				sType = "top10";
-				break;
-			case Asc.ECfType.uniqueValues:
-				sType = "uniqueValues";
-				break;
-			case Asc.ECfType.endsWith:
-				sType = "endsWith";
-				break;
-		}
-
-		return sType;
-	}
-	function FromXML_CfRuleType(sType)
-	{
-		var nType = undefined;
-		switch (sType)
-		{
-			case "aboveAverage":
-				nType = Asc.ECfType.aboveAverage;
-				break;
-			case "beginsWith":
-				nType = Asc.ECfType.beginsWith;
-				break;
-			case "cellIs":
-				nType = Asc.ECfType.cellIs;
-				break;
-			case "colorScale":
-				nType = Asc.ECfType.colorScale;
-				break;
-			case "containsBlanks":
-				nType = Asc.ECfType.containsBlanks;
-				break;
-			case "containsErrors":
-				nType = Asc.ECfType.containsErrors;
-				break;
-			case "containsText":
-				nType = Asc.ECfType.containsText;
-				break;
-			case "dataBar":
-				nType = Asc.ECfType.dataBar;
-				break;
-			case "duplicateValues":
-				nType = Asc.ECfType.duplicateValues;
-				break;
-			case "expression":
-				nType = Asc.ECfType.expression;
-				break;
-			case "iconSet":
-				nType = Asc.ECfType.iconSet;
-				break;
-			case "notContainsBlanks":
-				nType = Asc.ECfType.notContainsBlanks;
-				break;
-			case "notContainsErrors":
-				nType = Asc.ECfType.notContainsErrors;
-				break;
-			case "notContainsText":
-				nType = Asc.ECfType.notContainsText;
-				break;
-			case "timePeriod":
-				nType = Asc.ECfType.timePeriod;
-				break;
-			case "top10":
-				nType = Asc.ECfType.top10;
-				break;
-			case "uniqueValues":
-				nType = Asc.ECfType.uniqueValues;
-				break;
-			case "endsWith":
-				nType = Asc.ECfType.endsWith;
-				break;
-		}
-
-		return nType;
-	}
-	function ToXML_ST_DataValidationErrorStyle(nType)
-	{
-		var sType = undefined;
-		switch (nType)
-		{
-			case Asc.EDataValidationErrorStyle.Stop:
-				sType = "stop";
-				break;
-			case Asc.EDataValidationErrorStyle.Warning:
-				sType = "warning";
-				break;
-			case Asc.EDataValidationErrorStyle.Information:
-				sType = "information";
-				break;
-		}
-
-		return sType;
-	}
-	function FromXML_ST_DataValidationErrorStyle(sType)
-	{
-		var nType = undefined;
-		switch (sType)
-		{
-			case "stop":
-				nType = Asc.EDataValidationErrorStyle.Stop;
-				break;
-			case "warning":
-				nType = Asc.EDataValidationErrorStyle.Warning;
-				break;
-			case "information":
-				nType = Asc.EDataValidationErrorStyle.Information;
-				break;
-		}
-
-		return nType;
-	}
-	function ToXML_ST_DataValidationImeMode(nType)
-	{
-		var sType = undefined;
-		switch (nType)
-		{
-			case Asc.EDataValidationImeMode.NoControl:
-				sType = "noControl";
-				break;
-			case Asc.EDataValidationImeMode.Off:
-				sType = "off";
-				break;
-			case Asc.EDataValidationImeMode.On:
-				sType = "on";
-				break;
-			case Asc.EDataValidationImeMode.Disabled:
-				sType = "disabled";
-				break;
-			case Asc.EDataValidationImeMode.Hiragana:
-				sType = "hiragana";
-				break;
-			case Asc.EDataValidationImeMode.FullKatakana:
-				sType = "fullKatakana";
-				break;
-			case Asc.EDataValidationImeMode.HalfKatakana:
-				sType = "halfKatakana";
-				break;
-			case Asc.EDataValidationImeMode.FullAlpha:
-				sType = "fullAlpha";
-				break;
-			case Asc.EDataValidationImeMode.HalfAlpha:
-				sType = "halfAlpha";
-				break;
-			case Asc.EDataValidationImeMode.FullHangul:
-				sType = "fullHangul";
-				break;
-			case Asc.EDataValidationImeMode.HalfHangul:
-				sType = "halfHangul";
-				break;
-		}
-
-		return sType;
-	}
-	function FromXML_ST_DataValidationImeMode(sType)
-	{
-		var nType = undefined;
-		switch (sType)
-		{
-			case "noControl":
-				nType = Asc.EDataValidationImeMode.NoControl;
-				break;
-			case "off":
-				nType = Asc.EDataValidationImeMode.Off;
-				break;
-			case "on":
-				nType = Asc.EDataValidationImeMode.On;
-				break;
-			case "disabled":
-				nType = Asc.EDataValidationImeMode.Disabled;
-				break;
-			case "hiragana":
-				nType = Asc.EDataValidationImeMode.Hiragana;
-				break;
-			case "fullKatakana":
-				nType = Asc.EDataValidationImeMode.FullKatakana;
-				break;
-			case "halfKatakana":
-				nType = Asc.EDataValidationImeMode.HalfKatakana;
-				break;
-			case "fullAlpha":
-				nType = Asc.EDataValidationImeMode.FullAlpha;
-				break;
-			case "halfAlpha":
-				nType = Asc.EDataValidationImeMode.HalfAlpha;
-				break;
-			case "fullHangul":
-				nType = Asc.EDataValidationImeMode.FullHangul;
-				break;
-			case "halfHangul":
-				nType = Asc.EDataValidationImeMode.HalfHangul;
-				break;
-		}
-
-		return nType;
-	}
-	function ToXML_ST_DataValidationType(nType)
-	{
-		var sType = undefined;
-		switch (nType)
-		{
-			case Asc.EDataValidationType.None:
-				sType = "none";
-				break;
-			case Asc.EDataValidationType.Custom:
-				sType = "custom";
-				break;
-			case Asc.EDataValidationType.Date:
-				sType = "date";
-				break;
-			case Asc.EDataValidationType.Decimal:
-				sType = "decimal";
-				break;
-			case Asc.EDataValidationType.List:
-				sType = "list";
-				break;
-			case Asc.EDataValidationType.TextLength:
-				sType = "textLength";
-				break;
-			case Asc.EDataValidationType.Time:
-				sType = "time";
-				break;
-			case Asc.EDataValidationType.Whole:
-				sType = "whole";
-				break;
-		}
-
-		return sType;
-	}
-	function FromXML_ST_DataValidationType(sType)
-	{
-		var nType = undefined;
-		switch (sType)
-		{
-			case "none":
-				nType = Asc.EDataValidationType.None;
-				break;
-			case "custom":
-				nType = Asc.EDataValidationType.Custom;
-				break;
-			case "date":
-				nType = Asc.EDataValidationType.Date;
-				break;
-			case "decimal":
-				nType = Asc.EDataValidationType.Decimal;
-				break;
-			case "list":
-				nType = Asc.EDataValidationType.List;
-				break;
-			case "textLength":
-				nType = Asc.EDataValidationType.TextLength;
-				break;
-			case "time":
-				nType = Asc.EDataValidationType.Time;
-				break;
-			case "whole":
-				nType = Asc.EDataValidationType.Whole;
-				break;
-		}
-
-		return nType;
-	}
 	function ToXML_ST_EditAs(nType)
 	{
 		var sType = undefined;

cell/model/SerializeXml.js

@@ -158,7 +158,7 @@
 
 	function FromXml_ST_IconSetType(val) {
 		//в пивотах есть функция FromXml_ST_IconSetType, но там корвенртирцем в другие константы. пока оставляю так, нужно сделать общие
-		var res = null;
+		var res = undefined;
 		switch (val) {
 			case "3Arrows":
 				res = Asc.EIconSetType.Arrows3;
@@ -229,7 +229,7 @@
 
 	function ToXml_ST_IconSetType(val) {
 		//в пивотах есть функция ToXml_ST_IconSetType, но там корвенртирцем в другие константы. пока оставляю так, нужно сделать общие
-		var res = null;
+		var res = undefined;
 		switch (val) {
 			case Asc.EIconSetType.Arrows3:
 				res = "3Arrows";
@@ -488,7 +488,7 @@
 		return res;
 	}
 
-	function FromXML_ST_CfType(val) {
+	function FromXml_ST_CfType(val) {
 		var res = null;
 		switch (val) {
 			case "aboveAverage":
@@ -549,7 +549,7 @@
 		return res;
 	}
 
-	function ToXML_ST_CfType(val) {
+	function ToXml_ST_CfType(val) {
 		var res = null;
 		switch (val) {
 			case Asc.ECfType.aboveAverage:
@@ -611,7 +611,7 @@
 	}
 
 	function FromXml_ST_DataValidationType(val) {
-		var res = null;
+		var res = undefined;
 		switch (val) {
 			case "none":
 				res = Asc.EDataValidationType.None;
@@ -642,7 +642,7 @@
 	}
 
 	function ToXml_ST_DataValidationType(val) {
-		var res = null;
+		var res = undefined;
 		switch (val) {
 			case Asc.EDataValidationType.None:
 				res = "none";
@@ -673,7 +673,7 @@
 	}
 
 	function FromXml_ST_DataValidationImeMode(val) {
-		var res = null;
+		var res = undefined;
 		switch (val) {
 			case "noControl":
 				res = Asc.EDataValidationImeMode.NoControl;
@@ -713,7 +713,7 @@
 	}
 
 	function ToXml_ST_DataValidationImeMode(val) {
-		var res = null;
+		var res = undefined;
 		switch (val) {
 			case Asc.EDataValidationImeMode.NoControl:
 				res = "noControl";
@@ -1795,6 +1795,43 @@
 		return nType;
 	}
 
+	function ToXml_ST_DataValidationErrorStyle(nType)
+	{
+		var sType = undefined;
+		switch (nType)
+		{
+			case Asc.EDataValidationErrorStyle.Stop:
+				sType = "stop";
+				break;
+			case Asc.EDataValidationErrorStyle.Warning:
+				sType = "warning";
+				break;
+			case Asc.EDataValidationErrorStyle.Information:
+				sType = "information";
+				break;
+		}
+
+		return sType;
+	}
+	function FromXml_ST_DataValidationErrorStyle(sType)
+	{
+		var nType = undefined;
+		switch (sType)
+		{
+			case "stop":
+				nType = Asc.EDataValidationErrorStyle.Stop;
+				break;
+			case "warning":
+				nType = Asc.EDataValidationErrorStyle.Warning;
+				break;
+			case "information":
+				nType = Asc.EDataValidationErrorStyle.Information;
+				break;
+		}
+
+		return nType;
+	}
+
 	function boolToNumber(val) {
 		return val ? 1 : 0;
 	}
@@ -6844,7 +6881,7 @@ xmlns:xr16=\"http://schemas.microsoft.com/office/spreadsheetml/2017/revision16\"
 				this.error = val;
 			} else if ("errorStyle" === reader.GetName()) {
 				val = reader.GetValue();
-				this.errorStyle = val;
+				this.errorStyle = FromXml_ST_DataValidationErrorStyle(val);
 			} else if ("errorTitle" === reader.GetName()) {
 				val = reader.GetValue();
 				this.errorTitle = val;
@@ -7012,7 +7049,7 @@ xmlns:xr16=\"http://schemas.microsoft.com/office/spreadsheetml/2017/revision16\"
 		//WritingStringNullableAttrEncodeXmlStringHHHH
 		writer.WriteXmlNullableAttributeStringEncode("error", this.error);
 
-		writer.WriteXmlNullableAttributeString("errorStyle", this.errorStyle);
+		writer.WriteXmlNullableAttributeString("errorStyle", ToXml_ST_DataValidationErrorStyle(this.errorStyle));
 
 		//WritingStringNullableAttrEncodeXmlStringHHHH
 		writer.WriteXmlNullableAttributeStringEncode("errorTitle", this.errorTitle);
@@ -10092,7 +10129,7 @@ xmlns:xr16=\"http://schemas.microsoft.com/office/spreadsheetml/2017/revision16\"
 				this.timePeriod = FromXml_ST_TimePeriod(val);
 			} else if ("type" === reader.GetName()) {
 				val = reader.GetValue();
-				this.type = FromXML_ST_CfType(val);
+				this.type = FromXml_ST_CfType(val);
 			} else if ("id" === reader.GetName()) {
 				val = reader.GetValue();
 				this._openId = val;
@@ -10184,7 +10221,7 @@ xmlns:xr16=\"http://schemas.microsoft.com/office/spreadsheetml/2017/revision16\"
 			2692 </xsd:restriction>*/
 
 
-		writer.WriteXmlAttributeString("type", ToXML_ST_CfType(this.type));
+		writer.WriteXmlAttributeString("type", ToXml_ST_CfType(this.type));
 		writer.WriteXmlAttributeNumber("priority", this.priority);
 
 		if (false === this.aboveAverage) {
@@ -16485,6 +16522,16 @@ xmlns:xr16=\"http://schemas.microsoft.com/office/spreadsheetml/2017/revision16\"
 	window["AscCommonExcel"].FromXml_ST_VerticalAlignment = FromXml_ST_VerticalAlignment;
 	window["AscCommonExcel"].ToXml_ST_CfvoType = ToXml_ST_CfvoType;
 	window["AscCommonExcel"].FromXml_ST_CfvoType = FromXml_ST_CfvoType;
+	window["AscCommonExcel"].ToXml_ST_IconSetType = ToXml_ST_IconSetType;
+	window["AscCommonExcel"].FromXml_ST_IconSetType = FromXml_ST_IconSetType;
+	window["AscCommonExcel"].ToXml_ST_CfType = ToXml_ST_CfType;
+	window["AscCommonExcel"].FromXml_ST_CfType = FromXml_ST_CfType;
+	window["AscCommonExcel"].ToXml_ST_DataValidationErrorStyle = ToXml_ST_DataValidationErrorStyle;
+	window["AscCommonExcel"].FromXml_ST_DataValidationErrorStyle = FromXml_ST_DataValidationErrorStyle;
+	window["AscCommonExcel"].ToXml_ST_DataValidationType = ToXml_ST_DataValidationType;
+	window["AscCommonExcel"].FromXml_ST_DataValidationType = FromXml_ST_DataValidationType;
+	window["AscCommonExcel"].ToXml_ST_DataValidationImeMode = ToXml_ST_DataValidationImeMode;
+	window["AscCommonExcel"].FromXml_ST_DataValidationImeMode = FromXml_ST_DataValidationImeMode;