Переглянути джерело

Bugfix: corrupted xlsx after write operation, relate issue #152.

Signed-off-by: Ri Xu <xuri.me@gmail.com>
Ri Xu 8 роки тому
батько
коміт
96b3e1ea74
2 змінених файлів з 2 додано та 2 видалено
  1. 1 1
      excelize.go
  2. 1 1
      xmlWorksheet.go

+ 1 - 1
excelize.go

@@ -135,7 +135,7 @@ func checkSheet(xlsx *xlsxWorksheet) {
 // Office Excel 2007.
 func replaceWorkSheetsRelationshipsNameSpace(workbookMarshal string) string {
 	oldXmlns := `<worksheet xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main">`
-	newXmlns := `<worksheet xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:mx="http://schemas.microsoft.com/office/mac/excel/2008/main" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mv="urn:schemas-microsoft-com:mac:vml" xmlns:x14="http://schemas.microsoft.com/office/spreadsheetml/2009/9/main" xmlns:x14ac="http://schemas.microsoft.com/office/spreadsheetml/2009/9/ac" xmlns:xm="http://schemas.microsoft.com/office/excel/2006/main">`
+	newXmlns := `<worksheet xr:uid="{00000000-0001-0000-0000-000000000000}" xmlns:xr3="http://schemas.microsoft.com/office/spreadsheetml/2016/revision3" xmlns:xr2="http://schemas.microsoft.com/office/spreadsheetml/2015/revision2" xmlns:xr="http://schemas.microsoft.com/office/spreadsheetml/2014/revision" xmlns:x14="http://schemas.microsoft.com/office/spreadsheetml/2009/9/main" xmlns:x14ac="http://schemas.microsoft.com/office/spreadsheetml/2009/9/ac" mc:Ignorable="x14ac xr xr2 xr3" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mx="http://schemas.microsoft.com/office/mac/excel/2008/main" xmlns:mv="urn:schemas-microsoft-com:mac:vml" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main">`
 	workbookMarshal = strings.Replace(workbookMarshal, oldXmlns, newXmlns, -1)
 	return workbookMarshal
 }

+ 1 - 1
xmlWorksheet.go

@@ -357,7 +357,7 @@ type xlsxSheetProtection struct {
 // properties specify how to display that phonetic run.
 type xlsxPhoneticPr struct {
 	Alignment string `xml:"alignment,attr,omitempty"`
-	FontID    int    `xml:"fontId,attr,omitempty"`
+	FontID    *int   `xml:"fontId,attr"`
 	Type      string `xml:"type,attr,omitempty"`
 }