From f7a4345511343ee8f5cdb959e2e633f07d8b5abf Mon Sep 17 00:00:00 2001 From: GoshaZotov Date: Mon, 12 Feb 2024 15:06:29 +0300 Subject: [PATCH] [se] Fix --- cell/model/Serialize.js | 14 +++++++++++++- cell/model/protectRange.js | 16 ++++++++-------- 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/cell/model/Serialize.js b/cell/model/Serialize.js index 4f8eb82b9b..1f25708f10 100644 --- a/cell/model/Serialize.js +++ b/cell/model/Serialize.js @@ -6085,6 +6085,11 @@ this.memory.WriteByte(c_oSerPropLenType.Variable); this.memory.WriteString2(desc.name); } + if (desc.type) { + this.memory.WriteByte(c_oSerUserProtectedRangeDesc.Type); + this.memory.WriteByte(c_oSerPropLenType.Byte); + this.memory.WriteByte(desc.type); + } }; this.WriteUserProtectedRange = function (oUserProtectedRange) { @@ -6124,6 +6129,11 @@ }); } } + if (oUserProtectedRange.type) { + this.bs.WriteItem(c_oSerUserProtectedRange.Type, function () { + oThis.memory.WriteByte(oUserProtectedRange.type); + }); + } }; this.WriteTimelines = function (aTimelines) { @@ -9220,7 +9230,9 @@ oUser.name = this.stream.GetString2LE(length); } else if (c_oSerUserProtectedRangeDesc.Id === type) { oUser.id = this.stream.GetString2LE(length); - } else { + } else if (c_oSerUserProtectedRangeDesc.Type === type) { + oUser.type = this.stream.GetByte(); + } else { res = c_oSerConstants.ReadUnknown; } diff --git a/cell/model/protectRange.js b/cell/model/protectRange.js index 0a721d4f4a..3c5ae45f36 100644 --- a/cell/model/protectRange.js +++ b/cell/model/protectRange.js @@ -44,7 +44,8 @@ //for warning this.warningText = null; - this.type = null;//c_oSerUserProtectedRangeType -> notView/view/edit + //everyone edit/view type + this.type = null;//c_oSerUserProtectedRangeType -> notView/view/edit, //default -> AscCommonExcel.c_oSerUserProtectedRangeType.view this.Id = AscCommon.g_oIdCounter.Get_NewId(); this._ws = ws; @@ -370,7 +371,7 @@ CUserProtectedRangeUserInfo.prototype.asc_getName = function () { return this.name; }; - CUserProtectedRangeUserInfo.prototype.asc_getUserProtectedType = function () { + CUserProtectedRangeUserInfo.prototype.asc_getType = function () { return this.type; }; @@ -380,7 +381,7 @@ CUserProtectedRangeUserInfo.prototype.asc_setName = function (val) { this.name = val; }; - CUserProtectedRangeUserInfo.prototype.asc_setUserProtectedType = function (val) { + CUserProtectedRangeUserInfo.prototype.asc_setType = function (val) { this.type = val; }; @@ -396,17 +397,16 @@ prot["asc_getName"] = prot.asc_getName; prot["asc_getUsers"] = prot.asc_getUsers; prot["asc_getUserGroups"] = prot.asc_getUserGroups; - prot["asc_getUserProtectedType"] = prot.asc_getUserProtectedType; - prot["asc_getHideContent"] = prot.asc_getHideContent; + prot["asc_getType"] = prot.asc_getType; prot["asc_setRef"] = prot.asc_setRef; prot["asc_setName"] = prot.asc_setName; prot["asc_setUsers"] = prot.asc_setUsers; - prot["asc_setHideContent"] = prot.asc_setHideContent; prot["asc_getId"] = prot.asc_getId; prot["asc_getIsLock"] = prot.asc_getIsLock; + prot["asc_setType"] = prot.asc_setType; @@ -414,9 +414,9 @@ prot = CUserProtectedRangeUserInfo.prototype; prot["asc_getId"] = prot.asc_getId; prot["asc_getName"] = prot.asc_getName; - prot["asc_getUserProtectedType"] = prot.asc_getUserProtectedType; + prot["asc_getType"] = prot.asc_getType; prot["asc_setId"] = prot.asc_setId; prot["asc_setName"] = prot.asc_setName; - prot["asc_setUserProtectedType"] = prot.asc_setUserProtectedType; + prot["asc_setType"] = prot.asc_setType; })(window);