From a2dd6e5df43af14c4a53afcbb5f3f35bea2ca0bc Mon Sep 17 00:00:00 2001 From: bokuweb Date: Sun, 25 Jul 2021 08:51:28 +0900 Subject: [PATCH] Fix duplicated extended (#317) * fix: duplicated comments extended * 0.0.206 --- docx-core/src/reader/comments_extended.rs | 11 ++++++++++- docx-wasm/package.json | 2 +- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/docx-core/src/reader/comments_extended.rs b/docx-core/src/reader/comments_extended.rs index 620466f..b28f1d3 100644 --- a/docx-core/src/reader/comments_extended.rs +++ b/docx-core/src/reader/comments_extended.rs @@ -18,7 +18,16 @@ impl FromXML for CommentsExtended { let e = XMLElement::from_str(&name.local_name) .expect("should convert to XMLElement"); if let XMLElement::CommentExtended = e { - comments_extended.push(CommentExtended::read(&mut r, &attributes)?); + if let Ok(ex) = CommentExtended::read(&mut r, &attributes) { + if let Some(pos) = comments_extended + .iter() + .position(|e| e.paragraph_id == ex.paragraph_id) + { + comments_extended[pos] = ex; + } else { + comments_extended.push(ex); + } + } } } Ok(XmlEvent::EndElement { name, .. }) => { diff --git a/docx-wasm/package.json b/docx-wasm/package.json index c7db665..b0b98b1 100644 --- a/docx-wasm/package.json +++ b/docx-wasm/package.json @@ -1,6 +1,6 @@ { "name": "docx-wasm", - "version": "0.0.205", + "version": "0.0.206", "main": "dist/node/index.js", "browser": "dist/web/index.js", "author": "bokuweb ",