docxmlater 8.7.1 → 9.0.0

package/dist/core/DocumentParser.d.ts

@@ -39,6 +39,7 @@ export declare class DocumentParser {
     private extractBookmarkEndsFromContent;
     private findNextTag;
     private findNextTopLevelTag;
+    private countUnclosedTags;
     private isPositionInsideTable;
     private isPositionInsideDel;
     private findDelEndPosition;

package/dist/core/DocumentParser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DocumentParser.d.ts","sourceRoot":"","sources":["../../src/core/DocumentParser.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"DocumentParser.d.ts","sourceRoot":"","sources":["../../src/core/DocumentParser.ts"],"names":[],"mappings":"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"}

package/dist/core/DocumentParser.js

@@ -265,36 +265,18 @@ class DocumentParser {
         return bodyElements;
     }
     extractBodyLevelBookmarkEnds(content, startPos, endPos) {
-        const bookmarks = [];
         const searchContent = endPos === -1
             ? content.slice(startPos)
             : content.slice(startPos, endPos);
-        const bookmarkEndRegex = /<w:bookmarkEnd[^>]*w:id="(\d+)"[^>]*\/?>/g;
-        let match;
-        while ((match = bookmarkEndRegex.exec(searchContent)) !== null) {
-            const idStr = match[1];
-            if (idStr) {
-                const id = parseInt(idStr, 10);
-                if (!isNaN(id)) {
-                    const bookmark = new Bookmark_1.Bookmark({
-                        name: `_end_${id}`,
-                        id: id,
-                        skipNormalization: true,
-                    });
-                    bookmarks.push(bookmark);
-                }
-            }
-        }
-        return bookmarks;
+        return this.extractBookmarkEndsFromContent(searchContent);
     }
     extractBookmarkEndsFromContent(content) {
         const bookmarks = [];
-        const bookmarkEndRegex = /<w:bookmarkEnd[^>]*w:id="(\d+)"[^>]*\/?>/g;
-        let match;
-        while ((match = bookmarkEndRegex.exec(content)) !== null) {
-            const idStr = match[1];
-            if (idStr) {
-                const id = parseInt(idStr, 10);
+        const bookmarkEndXmls = XMLParser_1.XMLParser.extractElements(content, "w:bookmarkEnd");
+        for (const bookmarkEndXml of bookmarkEndXmls) {
+            const idAttr = XMLParser_1.XMLParser.extractAttribute(bookmarkEndXml, "w:id");
+            if (idAttr) {
+                const id = parseInt(idAttr, 10);
                 if (!isNaN(id)) {
                     const bookmark = new Bookmark_1.Bookmark({
                         name: `_end_${id}`,
@@ -341,11 +323,44 @@ class DocumentParser {
         }
         return -1;
     }
+    countUnclosedTags(content, tagName) {
+        let opens = 0;
+        let closes = 0;
+        let pos = 0;
+        while (pos < content.length) {
+            const openPos = content.indexOf(`<${tagName}`, pos);
+            if (openPos === -1)
+                break;
+            const afterTagName = openPos + tagName.length + 1;
+            if (afterTagName < content.length) {
+                const charAfter = content.charAt(afterTagName);
+                if (charAfter === ' ' || charAfter === '>' || charAfter === '/' ||
+                    charAfter === '\t' || charAfter === '\n' || charAfter === '\r') {
+                    const tagEnd = content.indexOf('>', openPos);
+                    if (tagEnd !== -1) {
+                        const isSelfClosing = content.charAt(tagEnd - 1) === '/';
+                        if (!isSelfClosing) {
+                            opens++;
+                        }
+                    }
+                }
+            }
+            pos = openPos + 1;
+        }
+        pos = 0;
+        const closeTag = `</${tagName}>`;
+        while (pos < content.length) {
+            const closePos = content.indexOf(closeTag, pos);
+            if (closePos === -1)
+                break;
+            closes++;
+            pos = closePos + closeTag.length;
+        }
+        return opens - closes;
+    }
     isPositionInsideTable(content, position) {
         const beforeContent = content.substring(0, position);
-        const openTableTags = (beforeContent.match(/<w:tbl[\s>]/g) || []).length;
-        const closeTableTags = (beforeContent.match(/<\/w:tbl>/g) || []).length;
-        return openTableTags > closeTableTags;
+        return this.countUnclosedTags(beforeContent, "w:tbl") > 0;
     }
     isPositionInsideDel(content, position) {
         const beforeContent = content.substring(0, position);
@@ -359,20 +374,11 @@ class DocumentParser {
         if (tagEnd !== -1 && content.charAt(tagEnd - 1) === "/")
             return false;
         const contentBeforeDel = content.substring(0, lastDelOpen);
-        const pOpens = (contentBeforeDel.match(/<w:p[\s>]/g) || []).length;
-        const pCloses = (contentBeforeDel.match(/<\/w:p>/g) || []).length;
-        const insideParagraph = pOpens > pCloses;
-        if (insideParagraph)
+        if (this.countUnclosedTags(contentBeforeDel, "w:p") > 0)
             return false;
-        const tblOpens = (contentBeforeDel.match(/<w:tbl[\s>]/g) || []).length;
-        const tblCloses = (contentBeforeDel.match(/<\/w:tbl>/g) || []).length;
-        const insideTable = tblOpens > tblCloses;
-        if (insideTable)
+        if (this.countUnclosedTags(contentBeforeDel, "w:tbl") > 0)
             return false;
-        const sdtOpens = (contentBeforeDel.match(/<w:sdt[\s>]/g) || []).length;
-        const sdtCloses = (contentBeforeDel.match(/<\/w:sdt>/g) || []).length;
-        const insideSdt = sdtOpens > sdtCloses;
-        if (insideSdt)
+        if (this.countUnclosedTags(contentBeforeDel, "w:sdt") > 0)
             return false;
         return true;
     }
@@ -704,9 +710,15 @@ class DocumentParser {
                 if (child.index < insXmls.length) {
                     const revisionXml = insXmls[child.index];
                     if (revisionXml) {
-                        const revision = await this.parseRevisionFromXml(revisionXml, "w:ins", relationshipManager, zipHandler, imageManager);
-                        if (revision) {
-                            paragraph.addRevision(revision);
+                        const revResult = await this.parseRevisionFromXml(revisionXml, "w:ins", relationshipManager, zipHandler, imageManager);
+                        if (revResult.revision) {
+                            paragraph.addRevision(revResult.revision);
+                        }
+                        for (const bookmark of revResult.bookmarkStarts) {
+                            paragraph.addBookmarkStart(bookmark);
+                        }
+                        for (const bookmark of revResult.bookmarkEnds) {
+                            paragraph.addBookmarkEnd(bookmark);
                         }
                     }
                 }
@@ -715,9 +727,15 @@ class DocumentParser {
                 if (child.index < delXmls.length) {
                     const revisionXml = delXmls[child.index];
                     if (revisionXml) {
-                        const revision = await this.parseRevisionFromXml(revisionXml, "w:del", relationshipManager, zipHandler, imageManager);
-                        if (revision) {
-                            paragraph.addRevision(revision);
+                        const revResult = await this.parseRevisionFromXml(revisionXml, "w:del", relationshipManager, zipHandler, imageManager);
+                        if (revResult.revision) {
+                            paragraph.addRevision(revResult.revision);
+                        }
+                        for (const bookmark of revResult.bookmarkStarts) {
+                            paragraph.addBookmarkStart(bookmark);
+                        }
+                        for (const bookmark of revResult.bookmarkEnds) {
+                            paragraph.addBookmarkEnd(bookmark);
                         }
                     }
                 }
@@ -726,9 +744,15 @@ class DocumentParser {
                 if (child.index < moveFromXmls.length) {
                     const revisionXml = moveFromXmls[child.index];
                     if (revisionXml) {
-                        const revision = await this.parseRevisionFromXml(revisionXml, "w:moveFrom", relationshipManager, zipHandler, imageManager);
-                        if (revision) {
-                            paragraph.addRevision(revision);
+                        const revResult = await this.parseRevisionFromXml(revisionXml, "w:moveFrom", relationshipManager, zipHandler, imageManager);
+                        if (revResult.revision) {
+                            paragraph.addRevision(revResult.revision);
+                        }
+                        for (const bookmark of revResult.bookmarkStarts) {
+                            paragraph.addBookmarkStart(bookmark);
+                        }
+                        for (const bookmark of revResult.bookmarkEnds) {
+                            paragraph.addBookmarkEnd(bookmark);
                         }
                     }
                 }
@@ -737,9 +761,15 @@ class DocumentParser {
                 if (child.index < moveToXmls.length) {
                     const revisionXml = moveToXmls[child.index];
                     if (revisionXml) {
-                        const revision = await this.parseRevisionFromXml(revisionXml, "w:moveTo", relationshipManager, zipHandler, imageManager);
-                        if (revision) {
-                            paragraph.addRevision(revision);
+                        const revResult = await this.parseRevisionFromXml(revisionXml, "w:moveTo", relationshipManager, zipHandler, imageManager);
+                        if (revResult.revision) {
+                            paragraph.addRevision(revResult.revision);
+                        }
+                        for (const bookmark of revResult.bookmarkStarts) {
+                            paragraph.addBookmarkStart(bookmark);
+                        }
+                        for (const bookmark of revResult.bookmarkEnds) {
+                            paragraph.addBookmarkEnd(bookmark);
                         }
                     }
                 }
@@ -769,6 +799,7 @@ class DocumentParser {
         }
     }
     async parseRevisionFromXml(revisionXml, tagName, relationshipManager, zipHandler, imageManager) {
+        const result = { revision: null, bookmarkStarts: [], bookmarkEnds: [] };
         try {
             let revisionType;
             switch (tagName) {
@@ -785,21 +816,21 @@ class DocumentParser {
                     revisionType = "moveTo";
                     break;
                 default:
-                    return null;
+                    return result;
             }
             const idAttr = XMLParser_1.XMLParser.extractAttribute(revisionXml, "w:id");
             const author = XMLParser_1.XMLParser.extractAttribute(revisionXml, "w:author");
             const dateAttr = XMLParser_1.XMLParser.extractAttribute(revisionXml, "w:date");
             const moveId = XMLParser_1.XMLParser.extractAttribute(revisionXml, "w:moveId");
             if (!idAttr || !author) {
-                return null;
+                return result;
             }
             const id = parseInt(idAttr, 10);
             const date = dateAttr ? new Date(dateAttr) : new Date();
             const hyperlinkXmls = XMLParser_1.XMLParser.extractElements(revisionXml, "w:hyperlink");
             let xmlWithoutHyperlinks = revisionXml;
             for (const hyperlinkXml of hyperlinkXmls) {
-                xmlWithoutHyperlinks = xmlWithoutHyperlinks.replace(hyperlinkXml, '');
+                xmlWithoutHyperlinks = xmlWithoutHyperlinks.split(hyperlinkXml).join('');
             }
             const runXmls = XMLParser_1.XMLParser.extractElements(xmlWithoutHyperlinks, "w:r");
             const content = [];
@@ -823,14 +854,30 @@ class DocumentParser {
             }
             for (const hyperlinkXml of hyperlinkXmls) {
                 const hyperlinkObj = XMLParser_1.XMLParser.parseToObject(hyperlinkXml, { trimValues: false });
-                const result = this.parseHyperlinkFromObject(hyperlinkObj["w:hyperlink"], relationshipManager);
-                if (result.hyperlink) {
-                    content.push(result.hyperlink);
+                const hyperlinkResult = this.parseHyperlinkFromObject(hyperlinkObj["w:hyperlink"], relationshipManager);
+                if (hyperlinkResult.hyperlink) {
+                    content.push(hyperlinkResult.hyperlink);
+                }
+                result.bookmarkStarts.push(...hyperlinkResult.bookmarkStarts);
+                result.bookmarkEnds.push(...hyperlinkResult.bookmarkEnds);
+            }
+            const bookmarkStartXmls = XMLParser_1.XMLParser.extractElements(xmlWithoutHyperlinks, "w:bookmarkStart");
+            const bookmarkEndXmls = XMLParser_1.XMLParser.extractElements(xmlWithoutHyperlinks, "w:bookmarkEnd");
+            for (const bookmarkXml of bookmarkStartXmls) {
+                const bookmark = this.parseBookmarkStart(bookmarkXml);
+                if (bookmark) {
+                    result.bookmarkStarts.push(bookmark);
+                }
+            }
+            for (const bookmarkXml of bookmarkEndXmls) {
+                const bookmark = this.parseBookmarkEnd(bookmarkXml);
+                if (bookmark) {
+                    result.bookmarkEnds.push(bookmark);
                 }
             }
             if (content.length === 0) {
                 logger_1.defaultLogger.debug("[DocumentParser] Empty revision content skipped", { tagName, id: idAttr, author });
-                return null;
+                return result;
             }
             const revision = new Revision_1.Revision({
                 id,
@@ -840,13 +887,14 @@ class DocumentParser {
                 content,
                 moveId,
             });
-            return revision;
+            result.revision = revision;
+            return result;
         }
         catch (error) {
             logger_1.defaultLogger.warn("[DocumentParser] Failed to parse revision:", error instanceof Error
                 ? { message: error.message, stack: error.stack }
                 : { error: String(error) });
-            return null;
+            return result;
         }
     }
     parseCommentsXml(commentsXml) {
@@ -1107,6 +1155,8 @@ class DocumentParser {
                 paragraph.setRightIndent((0, parsingHelpers_1.safeParseInt)(ind["@_w:right"]));
             if ((0, parsingHelpers_1.isExplicitlySet)(ind["@_w:firstLine"]))
                 paragraph.setFirstLineIndent((0, parsingHelpers_1.safeParseInt)(ind["@_w:firstLine"]));
+            if ((0, parsingHelpers_1.isExplicitlySet)(ind["@_w:hanging"]))
+                paragraph.setHangingIndent((0, parsingHelpers_1.safeParseInt)(ind["@_w:hanging"]));
         }
         if (pPrObj["w:spacing"]) {
             const spacing = pPrObj["w:spacing"];
@@ -1598,6 +1648,13 @@ class DocumentParser {
                                                 const complexField = this.createComplexFieldFromRuns(fieldRuns);
                                                 if (complexField) {
                                                     if (fieldRevisions.length > 0) {
+                                                        for (const rev of fieldRevisions) {
+                                                            rev.setFieldContext({
+                                                                field: complexField,
+                                                                instruction: complexField.getInstruction(),
+                                                                position: 'result',
+                                                            });
+                                                        }
                                                         complexField.setResultRevisions(fieldRevisions);
                                                     }
                                                     groupedContent.push(complexField);
@@ -1632,6 +1689,13 @@ class DocumentParser {
                                     const complexField = this.createComplexFieldFromRuns(fieldRuns);
                                     if (complexField) {
                                         if (fieldRevisions.length > 0) {
+                                            for (const rev of fieldRevisions) {
+                                                rev.setFieldContext({
+                                                    field: complexField,
+                                                    instruction: complexField.getInstruction(),
+                                                    position: 'result',
+                                                });
+                                            }
                                             complexField.setResultRevisions(fieldRevisions);
                                         }
                                         groupedContent.push(complexField);
@@ -1685,11 +1749,13 @@ class DocumentParser {
             }
             else if (item instanceof Revision_1.Revision) {
                 if (fieldState === "separate" || fieldState === "result") {
+                    item.setFieldContext({ position: 'result' });
                     fieldRevisions.push(item);
                     fieldState = "result";
                     logger_1.defaultLogger.debug(`Found revision inside complex field result: type=${item.getType()}, id=${item.getId()}`);
                 }
                 else if (fieldState === "begin" || fieldState === "instruction") {
+                    item.setFieldContext({ position: 'instruction' });
                     instructionRevisions.push(item);
                     fieldState = "instruction";
                     logger_1.defaultLogger.debug(`Found revision inside complex field instruction: type=${item.getType()}, id=${item.getId()}`);
@@ -2078,6 +2144,7 @@ class DocumentParser {
             instructionFormatting,
             resultFormatting,
             multiParagraph: false,
+            hasResult: hasSeparate,
         };
         return new Field_1.ComplexField(properties);
     }
@@ -2211,7 +2278,7 @@ class DocumentParser {
                 }
             }
             else {
-                console.warn('[DocumentParser] _orderedChildren missing - using fallback element ordering which may affect tab/break positions');
+                logger_1.defaultLogger.warn('[DocumentParser] _orderedChildren missing - using fallback element ordering which may affect tab/break positions');
                 const textElement = runObj["w:t"];
                 if (textElement !== undefined && textElement !== null) {
                     const textElements = toArray(textElement);
@@ -2420,6 +2487,31 @@ class DocumentParser {
         const content = paragraph.getContent();
         if (!content || content.length < 2)
             return;
+        const trackingEnabled = paragraph.trackingContext?.isEnabled();
+        if (trackingEnabled) {
+            const hasFieldContent = content.some((item) => {
+                if (item instanceof Run_1.Run) {
+                    const runContent = item.getContent();
+                    return runContent.some((c) => c.type === "fieldChar" || c.type === "instructionText");
+                }
+                if (item instanceof Revision_1.Revision) {
+                    const revContent = item.getContent();
+                    for (const inner of revContent) {
+                        if (inner instanceof Run_1.Run) {
+                            const innerRunContent = inner.getContent();
+                            if (innerRunContent.some((c) => c.type === "fieldChar" || c.type === "instructionText")) {
+                                return true;
+                            }
+                        }
+                    }
+                }
+                return false;
+            });
+            if (hasFieldContent) {
+                logger_1.defaultLogger.debug("Skipping hyperlink merge: tracking enabled with field content present");
+                return;
+            }
+        }
         const mergedContent = [];
         let i = 0;
         let contentChanged = false;
@@ -2676,11 +2768,28 @@ class DocumentParser {
         if (rPrObj["w:sz"]) {
             run.setSize(parseInt(rPrObj["w:sz"]["@_w:val"], 10) / 2);
         }
+        if (rPrObj["w:szCs"]) {
+            const szCsVal = parseInt(rPrObj["w:szCs"]["@_w:val"], 10) / 2;
+            const sizeVal = rPrObj["w:sz"] ? parseInt(rPrObj["w:sz"]["@_w:val"], 10) / 2 : undefined;
+            if (sizeVal === undefined || szCsVal !== sizeVal) {
+                run.setSizeCs(szCsVal);
+            }
+        }
         if (rPrObj["w:color"]) {
-            const colorVal = rPrObj["w:color"]["@_w:val"];
+            const colorObj = rPrObj["w:color"];
+            const colorVal = colorObj["@_w:val"];
             if (colorVal && colorVal !== "auto") {
                 run.setColor(colorVal);
             }
+            if (colorObj["@_w:themeColor"]) {
+                run.setThemeColor(colorObj["@_w:themeColor"]);
+            }
+            if (colorObj["@_w:themeTint"]) {
+                run.setThemeTint(parseInt(colorObj["@_w:themeTint"], 16));
+            }
+            if (colorObj["@_w:themeShade"]) {
+                run.setThemeShade(parseInt(colorObj["@_w:themeShade"], 16));
+            }
         }
         if (rPrObj["w:highlight"]) {
             run.setHighlight(rPrObj["w:highlight"]["@_w:val"]);
@@ -2715,11 +2824,27 @@ class DocumentParser {
                 if (prevRPr["w:sz"]) {
                     prevProps.size = (0, parsingHelpers_1.safeParseInt)(prevRPr["w:sz"]["@_w:val"]) / 2;
                 }
+                if (prevRPr["w:szCs"]) {
+                    const szCsVal = (0, parsingHelpers_1.safeParseInt)(prevRPr["w:szCs"]["@_w:val"]) / 2;
+                    if (!prevRPr["w:sz"] || szCsVal !== prevProps.size) {
+                        prevProps.sizeCs = szCsVal;
+                    }
+                }
                 if (prevRPr["w:color"]) {
-                    const colorVal = prevRPr["w:color"]["@_w:val"];
+                    const colorObj = prevRPr["w:color"];
+                    const colorVal = colorObj["@_w:val"];
                     if (colorVal && colorVal !== "auto") {
                         prevProps.color = colorVal;
                     }
+                    if (colorObj["@_w:themeColor"]) {
+                        prevProps.themeColor = colorObj["@_w:themeColor"];
+                    }
+                    if (colorObj["@_w:themeTint"]) {
+                        prevProps.themeTint = parseInt(colorObj["@_w:themeTint"], 16);
+                    }
+                    if (colorObj["@_w:themeShade"]) {
+                        prevProps.themeShade = parseInt(colorObj["@_w:themeShade"], 16);
+                    }
                 }
                 if (prevRPr["w:highlight"]) {
                     prevProps.highlight = prevRPr["w:highlight"]["@_w:val"];
@@ -2940,6 +3065,7 @@ class DocumentParser {
             const effects = this.parseImageEffects(blipObj);
             const spPrObj = picPicObj["pic:spPr"];
             let border = undefined;
+            let rotation = 0;
             if (spPrObj) {
                 const lnObj = spPrObj["a:ln"];
                 if (lnObj) {
@@ -2948,6 +3074,10 @@ class DocumentParser {
                         border = { width: widthEmu / 12700 };
                     }
                 }
+                const xfrmObj = spPrObj["a:xfrm"];
+                if (xfrmObj?.["@_rot"]) {
+                    rotation = parseInt(xfrmObj["@_rot"], 10) / 60000;
+                }
             }
             const relationshipId = blipObj["@_r:embed"];
             if (!relationshipId) {
@@ -2985,6 +3115,7 @@ class DocumentParser {
                 crop,
                 effects,
                 border,
+                rotation,
             });
             imageManager.registerImage(image, relationshipId, originalFilename);
             image.setRelationshipId(relationshipId);
@@ -3280,6 +3411,19 @@ class DocumentParser {
                 table.setAlignment(alignment);
             }
         }
+        if (tblPrObj["w:shd"]) {
+            const shd = tblPrObj["w:shd"];
+            const shading = {};
+            if (shd["@_w:val"])
+                shading.pattern = shd["@_w:val"];
+            if (shd["@_w:fill"])
+                shading.fill = shd["@_w:fill"];
+            if (shd["@_w:color"])
+                shading.color = shd["@_w:color"];
+            if (Object.keys(shading).length > 0) {
+                table.setShading(shading);
+            }
+        }
     }
     async parseTableRowFromObject(rowObj, relationshipManager, zipHandler, imageManager, rawRowXml) {
         try {
@@ -3541,6 +3685,57 @@ class DocumentParser {
                         cell.setVerticalMerge("continue");
                     }
                 }
+                if (tcPr["w:cellIns"]) {
+                    const cellIns = tcPr["w:cellIns"];
+                    const id = parseInt(cellIns["@_w:id"] || "0", 10);
+                    const author = cellIns["@_w:author"] || "Unknown";
+                    const dateAttr = cellIns["@_w:date"];
+                    const date = dateAttr ? new Date(dateAttr) : new Date();
+                    const revision = new Revision_1.Revision({
+                        id,
+                        author,
+                        date,
+                        type: "tableCellInsert",
+                        content: [],
+                    });
+                    cell.setCellRevision(revision);
+                }
+                if (tcPr["w:cellDel"]) {
+                    const cellDel = tcPr["w:cellDel"];
+                    const id = parseInt(cellDel["@_w:id"] || "0", 10);
+                    const author = cellDel["@_w:author"] || "Unknown";
+                    const dateAttr = cellDel["@_w:date"];
+                    const date = dateAttr ? new Date(dateAttr) : new Date();
+                    const revision = new Revision_1.Revision({
+                        id,
+                        author,
+                        date,
+                        type: "tableCellDelete",
+                        content: [],
+                    });
+                    cell.setCellRevision(revision);
+                }
+                if (tcPr["w:cellMerge"]) {
+                    const cellMerge = tcPr["w:cellMerge"];
+                    const id = parseInt(cellMerge["@_w:id"] || "0", 10);
+                    const author = cellMerge["@_w:author"] || "Unknown";
+                    const dateAttr = cellMerge["@_w:date"];
+                    const date = dateAttr ? new Date(dateAttr) : new Date();
+                    const vMergeAttr = cellMerge["@_w:vMerge"];
+                    const vMergeOrigAttr = cellMerge["@_w:vMergeOrig"];
+                    const revision = new Revision_1.Revision({
+                        id,
+                        author,
+                        date,
+                        type: "tableCellMerge",
+                        content: [],
+                        previousProperties: {
+                            vMerge: vMergeAttr,
+                            vMergeOrig: vMergeOrigAttr,
+                        },
+                    });
+                    cell.setCellRevision(revision);
+                }
             }
             if (rawCellXml) {
                 const cellContent = this.extractCellContentInOrder(rawCellXml);