From 2f693566b23e24933492574aea5be2be1fd6706c Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Wed, 20 Mar 2024 19:05:26 +0000 Subject: Prefer numbering properties to numbering from paragraph style --- lib/docx/body-reader.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'lib') diff --git a/lib/docx/body-reader.js b/lib/docx/body-reader.js index b9bdb57..7a00164 100644 --- a/lib/docx/body-reader.js +++ b/lib/docx/body-reader.js @@ -553,6 +553,12 @@ function BodyReader(options) { function readNumberingProperties(styleId, element, numbering) { + var level = element.firstOrEmpty("w:ilvl").attributes["w:val"]; + var numId = element.firstOrEmpty("w:numId").attributes["w:val"]; + if (level !== undefined && numId !== undefined) { + return numbering.findLevel(numId, level); + } + if (styleId != null) { var levelByStyleId = numbering.findLevelByParagraphStyleId(styleId); if (levelByStyleId != null) { @@ -560,13 +566,7 @@ function readNumberingProperties(styleId, element, numbering) { } } - var level = element.firstOrEmpty("w:ilvl").attributes["w:val"]; - var numId = element.firstOrEmpty("w:numId").attributes["w:val"]; - if (level === undefined || numId === undefined) { - return null; - } else { - return numbering.findLevel(numId, level); - } + return null; } var supportedImageTypes = { -- cgit v1.2.3