wynd
/
docx-rs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: page margein type (#472) 

* fix: page margein type

* fix
main
bokuweb 2022-05-16 18:56:03 +09:00 committed by GitHub
parent 66a5e7c71a
commit edfd4bb9c4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
docx-core/src/documents/elements/page_margin.rs
View File

@ -23,31 +23,31 @@ impl PageMargin {
Default::default() Default::default()
} }
pub fn top(self, v: u32) -> PageMargin { pub fn top(self, v: i32) -> PageMargin {
PageMargin { top: v, ..self } PageMargin { top: v, ..self }
} }
pub fn left(self, v: u32) -> PageMargin { pub fn left(self, v: i32) -> PageMargin {
PageMargin { left: v, ..self } PageMargin { left: v, ..self }
} }
pub fn bottom(self, v: u32) -> PageMargin { pub fn bottom(self, v: i32) -> PageMargin {
PageMargin { bottom: v, ..self } PageMargin { bottom: v, ..self }
} }
pub fn right(self, v: u32) -> PageMargin { pub fn right(self, v: i32) -> PageMargin {
PageMargin { right: v, ..self } PageMargin { right: v, ..self }
} }
pub fn header(self, v: u32) -> PageMargin { pub fn header(self, v: i32) -> PageMargin {
PageMargin { header: v, ..self } PageMargin { header: v, ..self }
} }
pub fn footer(self, v: u32) -> PageMargin { pub fn footer(self, v: i32) -> PageMargin {
PageMargin { footer: v, ..self } PageMargin { footer: v, ..self }
} }
pub fn gutter(self, v: u32) -> PageMargin { pub fn gutter(self, v: i32) -> PageMargin {
PageMargin { gutter: v, ..self } PageMargin { gutter: v, ..self }
} }
} }

14
docx-core/src/reader/section_property.rs
View File

@ -31,25 +31,25 @@ fn read_page_margin(
let local_name = &a.name.local_name; let local_name = &a.name.local_name;
match local_name.as_str() { match local_name.as_str() {
"top" => { "top" => {
margin = margin.top(value_to_dax(&a.value)? as u32); margin = margin.top(value_to_dax(&a.value)? as i32);
} }
"right" => { "right" => {
margin = margin.right(value_to_dax(&a.value)? as u32); margin = margin.right(value_to_dax(&a.value)? as i32);
} }
"bottom" => { "bottom" => {
margin = margin.bottom(value_to_dax(&a.value)? as u32); margin = margin.bottom(value_to_dax(&a.value)? as i32);
} }
"left" => { "left" => {
margin = margin.left(value_to_dax(&a.value)? as u32); margin = margin.left(value_to_dax(&a.value)? as i32);
} }
"header" => { "header" => {
margin = margin.header(value_to_dax(&a.value)? as u32); margin = margin.header(value_to_dax(&a.value)? as i32);
} }
"footer" => { "footer" => {
margin = margin.footer(value_to_dax(&a.value)? as u32); margin = margin.footer(value_to_dax(&a.value)? as i32);
} }
"gutter" => { "gutter" => {
margin = margin.gutter(value_to_dax(&a.value)? as u32); margin = margin.gutter(value_to_dax(&a.value)? as i32);
} }
_ => {} _ => {}
} }

14
docx-core/src/types/page_margin.rs
View File

@ -3,11 +3,11 @@ use serde::Serialize;
#[derive(Debug, Clone, PartialEq, Serialize)] #[derive(Debug, Clone, PartialEq, Serialize)]
#[serde(rename_all = "camelCase")] #[serde(rename_all = "camelCase")]
pub struct PageMargin { pub struct PageMargin {
pub top: u32, pub top: i32,
pub left: u32, pub left: i32,
pub bottom: u32, pub bottom: i32,
pub right: u32, pub right: i32,
pub header: u32, pub header: i32,
pub footer: u32, pub footer: i32,
pub gutter: u32, pub gutter: i32,
} }

2
docx-wasm/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "docx-wasm", "name": "docx-wasm",
"version": "0.0.254", "version": "0.0.255",
"main": "dist/node/index.js", "main": "dist/node/index.js",
"browser": "dist/web/index.js", "browser": "dist/web/index.js",
"author": "bokuweb <bokuweb12@gmail.com>", "author": "bokuweb <bokuweb12@gmail.com>",

14
docx-wasm/src/page_margin.rs
View File

@ -17,40 +17,40 @@ impl PageMargin {
#[wasm_bindgen] #[wasm_bindgen]
impl PageMargin { impl PageMargin {
pub fn top(self, v: u32) -> PageMargin { pub fn top(self, v: i32) -> PageMargin {
PageMargin(docx_rs::PageMargin { top: v, ..self.0 }) 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 }) 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 { PageMargin(docx_rs::PageMargin {
bottom: v, bottom: v,
..self.0 ..self.0
}) })
} }
pub fn right(self, v: u32) -> PageMargin { pub fn right(self, v: i32) -> PageMargin {
PageMargin(docx_rs::PageMargin { right: v, ..self.0 }) 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 { PageMargin(docx_rs::PageMargin {
header: v, header: v,
..self.0 ..self.0
}) })
} }
pub fn footer(self, v: u32) -> PageMargin { pub fn footer(self, v: i32) -> PageMargin {
PageMargin(docx_rs::PageMargin { PageMargin(docx_rs::PageMargin {
footer: v, footer: v,
..self.0 ..self.0
}) })
} }
pub fn gutter(self, v: u32) -> PageMargin { pub fn gutter(self, v: i32) -> PageMargin {
PageMargin(docx_rs::PageMargin { PageMargin(docx_rs::PageMargin {
gutter: v, gutter: v,
..self.0 ..self.0