Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix/client open bugs #2951

Merged
merged 4 commits into from
Aug 26, 2022
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 20 additions & 19 deletions cell/model/SerializeXml.js
Original file line number Diff line number Diff line change
Expand Up @@ -4841,7 +4841,7 @@ xmlns:x=\"urn:schemas-microsoft-com:office:excel\">");

CT_Value.prototype.fromXml = function (reader) {
this.readAttr(reader);
this.val = reader.GetText();
this.val = reader.GetTextDecodeXml();
};
CT_Value.prototype.readAttributes = function (attr, uq) {
if (attr()) {
Expand Down Expand Up @@ -6232,10 +6232,11 @@ xmlns:xr16=\"http://schemas.microsoft.com/office/spreadsheetml/2017/revision16\"
while (reader.ReadNextSiblingNode(depth)) {
var name = reader.GetNameNoNS();
if ("formula1" === name) {
val = new Asc.CDataFormula(reader.GetText());
val = new Asc.CDataFormula(prepareTextFromXml(reader.GetTextDecodeXml()));

this.formula1 = val;
} else if ("formula2" === name) {
val = new Asc.CDataFormula(reader.GetText());
val = new Asc.CDataFormula(prepareTextFromXml(reader.GetTextDecodeXml()));
this.formula2 = val;
} else if ("sqref" === name) {
this.setSqRef(reader.GetText());
Expand Down Expand Up @@ -6267,7 +6268,7 @@ xmlns:xr16=\"http://schemas.microsoft.com/office/spreadsheetml/2017/revision16\"
m_oFormula1->m_sText = convert.convert(oReader.GetText3());*/

//TODO r1c1? не могу найти в каком виде она должна быть здесь записана
val = new Asc.CDataFormula(reader.GetText());
val = new Asc.CDataFormula(prepareTextFromXml(reader.GetTextDecodeXml()));
this.formula1 = val;
}
}
Expand Down Expand Up @@ -7070,7 +7071,7 @@ xmlns:xr16=\"http://schemas.microsoft.com/office/spreadsheetml/2017/revision16\"
if (!this.securityDescriptors) {
this.securityDescriptors = [];
}
this.securityDescriptors.push(reader.GetText());
this.securityDescriptors.push(prepareTextFromXml(reader.GetTextDecodeXml()));
}
}
};
Expand Down Expand Up @@ -7150,32 +7151,32 @@ xmlns:xr16=\"http://schemas.microsoft.com/office/spreadsheetml/2017/revision16\"
while (reader.ReadNextSiblingNode(depth)) {
var name = reader.GetNameNoNS();
if ("evenFooter" === name) {
val = reader.GetText();
val = prepareTextFromXml(reader.GetTextDecodeXml());
if (val) {
this.setEvenFooter(val);
}
} else if ("evenHeader" === name) {
val = reader.GetText();
val = prepareTextFromXml(reader.GetTextDecodeXml());
if (val) {
this.setEvenHeader(val);
}
} else if ("firstFooter" === name) {
val = reader.GetText();
val = prepareTextFromXml(reader.GetTextDecodeXml());
if (val) {
this.setFirstFooter(val);
}
} else if ("firstHeader" === name) {
val = reader.GetText();
val = prepareTextFromXml(reader.GetTextDecodeXml());
if (val) {
this.setFirstHeader(val);
}
} else if ("oddFooter" === name) {
val = reader.GetText();
val = prepareTextFromXml(reader.GetTextDecodeXml());
if (val) {
this.setOddFooter(val);
}
} else if ("oddHeader" === name) {
val = reader.GetText();
val = prepareTextFromXml(reader.GetTextDecodeXml());
if (val) {
this.setOddHeader(val);
}
Expand Down Expand Up @@ -7378,7 +7379,7 @@ xmlns:xr16=\"http://schemas.microsoft.com/office/spreadsheetml/2017/revision16\"
this.colorLow = AscCommon.getColorFromXml2(reader);
} else if ("f" === name) {
//TODO текст, возможно нужно использовать prepareTextToXml
this.f = reader.GetText();
this.f = prepareTextFromXml(reader.GetTextDecodeXml());
} else if ("sparklines" === name) {
var depth2 = reader.GetDepth();
while (reader.ReadNextSiblingNode(depth2)) {
Expand Down Expand Up @@ -7550,7 +7551,7 @@ xmlns:xr16=\"http://schemas.microsoft.com/office/spreadsheetml/2017/revision16\"
var name = reader.GetNameNoNS();

if ("f" === name) {
this.setF(reader.GetText());
this.setF(prepareTextFromXml(reader.GetTextDecodeXml()));
} else if ("sqref" === name) {
this.setSqRef(reader.GetText());
}
Expand Down Expand Up @@ -7788,7 +7789,7 @@ xmlns:xr16=\"http://schemas.microsoft.com/office/spreadsheetml/2017/revision16\"
} else if ("slicerCacheHideItemsWithNoData" === name) {

} else if ("id" === name) {
val = reader.GetText();
val = prepareTextFromXml(reader.GetTextDecodeXml());
this.ids.push(val);
} else if ("presenceInfo" === name) {

Expand Down Expand Up @@ -8167,7 +8168,7 @@ xmlns:xr16=\"http://schemas.microsoft.com/office/spreadsheetml/2017/revision16\"
this.aRuleElements.push(val);
} else if ("formula" === name || "f" === name) {
val = new AscCommonExcel.CFormulaCF()
val.Text = reader.GetText();
val.Text = prepareTextFromXml(reader.GetTextDecodeXml());
this.aRuleElements.push(val);
} else if ("iconSet" === name) {
val = new AscCommonExcel.CIconSet();
Expand Down Expand Up @@ -8391,7 +8392,7 @@ xmlns:xr16=\"http://schemas.microsoft.com/office/spreadsheetml/2017/revision16\"
var name = reader.GetNameNoNS();
if ("formula" === name || "f" === name) {
//TODO prepareTextToXml?
this.Val = reader.GetText();
this.Val = prepareTextFromXml(reader.GetTextDecodeXml());
}
}
};
Expand Down Expand Up @@ -10830,7 +10831,7 @@ xmlns:xr16=\"http://schemas.microsoft.com/office/spreadsheetml/2017/revision16\"
var val;
while (reader.ReadNextSiblingNode(depth)) {
if ("v" === reader.GetName()) {
val = reader.GetText();
val = prepareTextFromXml(reader.GetTextDecodeXml());
this.val.CellValue = val;
}
}
Expand Down Expand Up @@ -12274,7 +12275,7 @@ xmlns:xr16=\"http://schemas.microsoft.com/office/spreadsheetml/2017/revision16\"
var name = reader.GetNameNoNS();

if ("author" === name) {
this.arr.push(reader.GetText());
this.arr.push(prepareTextFromXml(reader.GetTextDecodeXml()));
}
}
};
Expand Down Expand Up @@ -12611,7 +12612,7 @@ xmlns:xr16=\"http://schemas.microsoft.com/office/spreadsheetml/2017/revision16\"
var name = reader.GetNameNoNS();

if ("text" === name) {
this.text = reader.GetText();
this.text = prepareTextFromXml(reader.GetTextDecodeXml());
} else if ("mentions" === name) {
//m_oMentions = oReader;
reader.readXmlArray("mention", function () {
Expand Down