diff --git a/docx-core/src/documents/elements/page_margin.rs b/docx-core/src/documents/elements/page_margin.rs index 7a076d8..0f76f2f 100644 --- a/docx-core/src/documents/elements/page_margin.rs +++ b/docx-core/src/documents/elements/page_margin.rs @@ -23,31 +23,31 @@ impl PageMargin { Default::default() } - pub fn top(self, v: u32) -> PageMargin { + pub fn top(self, v: i32) -> PageMargin { PageMargin { top: v, ..self } } - pub fn left(self, v: u32) -> PageMargin { + pub fn left(self, v: i32) -> PageMargin { PageMargin { left: v, ..self } } - pub fn bottom(self, v: u32) -> PageMargin { + pub fn bottom(self, v: i32) -> PageMargin { PageMargin { bottom: v, ..self } } - pub fn right(self, v: u32) -> PageMargin { + pub fn right(self, v: i32) -> PageMargin { PageMargin { right: v, ..self } } - pub fn header(self, v: u32) -> PageMargin { + pub fn header(self, v: i32) -> PageMargin { PageMargin { header: v, ..self } } - pub fn footer(self, v: u32) -> PageMargin { + pub fn footer(self, v: i32) -> PageMargin { PageMargin { footer: v, ..self } } - pub fn gutter(self, v: u32) -> PageMargin { + pub fn gutter(self, v: i32) -> PageMargin { PageMargin { gutter: v, ..self } } } diff --git a/docx-core/src/reader/section_property.rs b/docx-core/src/reader/section_property.rs index d910e13..058afd1 100644 --- a/docx-core/src/reader/section_property.rs +++ b/docx-core/src/reader/section_property.rs @@ -31,25 +31,25 @@ fn read_page_margin( let local_name = &a.name.local_name; match local_name.as_str() { "top" => { - margin = margin.top(value_to_dax(&a.value)? as u32); + margin = margin.top(value_to_dax(&a.value)? as i32); } "right" => { - margin = margin.right(value_to_dax(&a.value)? as u32); + margin = margin.right(value_to_dax(&a.value)? as i32); } "bottom" => { - margin = margin.bottom(value_to_dax(&a.value)? as u32); + margin = margin.bottom(value_to_dax(&a.value)? as i32); } "left" => { - margin = margin.left(value_to_dax(&a.value)? as u32); + margin = margin.left(value_to_dax(&a.value)? as i32); } "header" => { - margin = margin.header(value_to_dax(&a.value)? as u32); + margin = margin.header(value_to_dax(&a.value)? as i32); } "footer" => { - margin = margin.footer(value_to_dax(&a.value)? as u32); + margin = margin.footer(value_to_dax(&a.value)? as i32); } "gutter" => { - margin = margin.gutter(value_to_dax(&a.value)? as u32); + margin = margin.gutter(value_to_dax(&a.value)? as i32); } _ => {} } diff --git a/docx-core/src/types/page_margin.rs b/docx-core/src/types/page_margin.rs index 6b6c9a4..46d8587 100644 --- a/docx-core/src/types/page_margin.rs +++ b/docx-core/src/types/page_margin.rs @@ -3,11 +3,11 @@ use serde::Serialize; #[derive(Debug, Clone, PartialEq, Serialize)] #[serde(rename_all = "camelCase")] pub struct PageMargin { - pub top: u32, - pub left: u32, - pub bottom: u32, - pub right: u32, - pub header: u32, - pub footer: u32, - pub gutter: u32, + pub top: i32, + pub left: i32, + pub bottom: i32, + pub right: i32, + pub header: i32, + pub footer: i32, + pub gutter: i32, } diff --git a/docx-wasm/package.json b/docx-wasm/package.json index c36940b..3fe2d1c 100644 --- a/docx-wasm/package.json +++ b/docx-wasm/package.json @@ -1,6 +1,6 @@ { "name": "docx-wasm", - "version": "0.0.254", + "version": "0.0.255", "main": "dist/node/index.js", "browser": "dist/web/index.js", "author": "bokuweb ", diff --git a/docx-wasm/src/page_margin.rs b/docx-wasm/src/page_margin.rs index 509ba77..8d469ff 100644 --- a/docx-wasm/src/page_margin.rs +++ b/docx-wasm/src/page_margin.rs @@ -17,40 +17,40 @@ impl PageMargin { #[wasm_bindgen] impl PageMargin { - pub fn top(self, v: u32) -> PageMargin { + pub fn top(self, v: i32) -> PageMargin { PageMargin(docx_rs::PageMargin { top: v, ..self.0 }) } - pub fn left(self, v: u32) -> PageMargin { + pub fn left(self, v: i32) -> PageMargin { PageMargin(docx_rs::PageMargin { left: v, ..self.0 }) } - pub fn bottom(self, v: u32) -> PageMargin { + pub fn bottom(self, v: i32) -> PageMargin { PageMargin(docx_rs::PageMargin { bottom: v, ..self.0 }) } - pub fn right(self, v: u32) -> PageMargin { + pub fn right(self, v: i32) -> PageMargin { PageMargin(docx_rs::PageMargin { right: v, ..self.0 }) } - pub fn header(self, v: u32) -> PageMargin { + pub fn header(self, v: i32) -> PageMargin { PageMargin(docx_rs::PageMargin { header: v, ..self.0 }) } - pub fn footer(self, v: u32) -> PageMargin { + pub fn footer(self, v: i32) -> PageMargin { PageMargin(docx_rs::PageMargin { footer: v, ..self.0 }) } - pub fn gutter(self, v: u32) -> PageMargin { + pub fn gutter(self, v: i32) -> PageMargin { PageMargin(docx_rs::PageMargin { gutter: v, ..self.0