pengjunjie/sdkjs
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/sdkjs.git synced 2026-04-07 14:09:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

[ve] Don't remove \r\n in the end of original Shapes' Text tag

Browse Source
This commit is contained in:
Fedor Kobyakov
2025-08-25 11:48:27 +03:00
parent b39c487887
commit f578c68243
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
visio/model/ooxmlApi/convertFunctions.js
View File

@ -1952,19 +1952,6 @@
// UPD: now with binary file read \r\n in original is replaced with \n! Focus is made for binary \n
// visio set extra \r\n at the end of each text element (text tag): see fix below.
// UPD: fix below works for both binary read with \n and xml with \r\n
let lastTextEl = textElement.elements[textElement.elements.length - 1];
if (typeof lastTextEl === "string") {
if (lastTextEl.endsWith("\r\n")) {
lastTextEl = lastTextEl.slice(0, lastTextEl.length - 2);
textElement.elements[textElement.elements.length - 1] = lastTextEl;
} else if (lastTextEl.endsWith("\n")) {
lastTextEl = lastTextEl.slice(0, lastTextEl.length - 1);
textElement.elements[textElement.elements.length - 1] = lastTextEl;
}
}
// read text:
// consider CRLF (\r\n) (UPD: \n for binary read) as new paragraph start.
// Right after CRLF visio searches for pp
@ -1987,6 +1974,19 @@
currentParagraph = oContent.Content.slice(-1)[0]; // last paragraph
}
// visio set extra \r\n at the end of each Text tag: see fix below.
// UPD: fix below works for both binary read with \n and xml with \r\n
if (i === textElement.elements.length - 1) {
if (typeof textElementPart === "string") {
if (textElementPart.endsWith("\r\n")) {
textElementPart = textElementPart.slice(0, textElementPart.length - 2);
} else if (textElementPart.endsWith("\n")) {
textElementPart = textElementPart.slice(0, textElementPart.length - 1);
}
}
}
if (typeof textElementPart === "string" || textElementPart.kind === AscVisio.c_oVsdxTextKind.FLD) {
if (typeof textElementPart === "string") {
// Split on CRLF, or LF