diff options
| author | xuri <xuri.me@gmail.com> | 2019-12-15 10:09:34 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-15 10:09:34 +0800 |
| commit | 3763228ea7c37e18633ada493a63a6a8722e508c (patch) | |
| tree | 1eed502278311de497be3654bbe234c3d7fc37b2 /xmlWorksheet.go | |
| parent | 4c433c57e65734094f959d25b50f138a6ca88020 (diff) | |
| parent | da0d2ffbb6ebdfb7b1e5cf501a1986421311017b (diff) | |
Fix #533 Merge pull request #536 from match-meng/mergecell
Fix #533, add support overlapped mergecells
Diffstat (limited to 'xmlWorksheet.go')
| -rw-r--r-- | xmlWorksheet.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xmlWorksheet.go b/xmlWorksheet.go index a071e4d..9a478e1 100644 --- a/xmlWorksheet.go +++ b/xmlWorksheet.go @@ -109,7 +109,7 @@ type xlsxPageSetUp struct { FirstPageNumber int `xml:"firstPageNumber,attr,omitempty"` FitToHeight int `xml:"fitToHeight,attr,omitempty"` FitToWidth int `xml:"fitToWidth,attr,omitempty"` - HorizontalDPI float32 `xml:"horizontalDpi,attr,omitempty"` + HorizontalDPI int `xml:"horizontalDpi,attr,omitempty"` RID string `xml:"http://schemas.openxmlformats.org/officeDocument/2006/relationships id,attr,omitempty"` Orientation string `xml:"orientation,attr,omitempty"` PageOrder string `xml:"pageOrder,attr,omitempty"` @@ -119,7 +119,7 @@ type xlsxPageSetUp struct { Scale int `xml:"scale,attr,omitempty"` UseFirstPageNumber bool `xml:"useFirstPageNumber,attr,omitempty"` UsePrinterDefaults bool `xml:"usePrinterDefaults,attr,omitempty"` - VerticalDPI float32 `xml:"verticalDpi,attr,omitempty"` + VerticalDPI int `xml:"verticalDpi,attr,omitempty"` } // xlsxPrintOptions directly maps the printOptions element in the namespace |