Skip to content

Commit 16306a8

Browse files
Define default worksheet and theme XML path as constants (qax-os#2246)
1 parent 265e50a commit 16306a8

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

file.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ func NewFile(opts ...Options) *File {
3434
f.Pkg.Store(defaultXMLPathDocPropsApp, []byte(xml.Header+templateDocpropsApp))
3535
f.Pkg.Store(defaultXMLPathDocPropsCore, []byte(xml.Header+templateDocpropsCore))
3636
f.Pkg.Store(defaultXMLPathWorkbookRels, []byte(xml.Header+templateWorkbookRels))
37-
f.Pkg.Store("xl/theme/theme1.xml", []byte(xml.Header+templateTheme))
38-
f.Pkg.Store("xl/worksheets/sheet1.xml", []byte(xml.Header+templateSheet))
37+
f.Pkg.Store(defaultXMLPathTheme, []byte(xml.Header+templateTheme))
38+
f.Pkg.Store(defaultXMLPathSheet, []byte(xml.Header+templateSheet))
3939
f.Pkg.Store(defaultXMLPathStyles, []byte(xml.Header+templateStyles))
4040
f.Pkg.Store(defaultXMLPathWorkbook, []byte(xml.Header+templateWorkbook))
4141
f.Pkg.Store(defaultXMLPathContentTypes, []byte(xml.Header+templateContentTypes))
@@ -47,9 +47,9 @@ func NewFile(opts ...Options) *File {
4747
f.Relationships = sync.Map{}
4848
rels, _ := f.relsReader(defaultXMLPathWorkbookRels)
4949
f.Relationships.Store(defaultXMLPathWorkbookRels, rels)
50-
f.sheetMap["Sheet1"] = "xl/worksheets/sheet1.xml"
50+
f.sheetMap["Sheet1"] = defaultXMLPathSheet
5151
ws, _ := f.workSheetReader("Sheet1")
52-
f.Sheet.Store("xl/worksheets/sheet1.xml", ws)
52+
f.Sheet.Store(defaultXMLPathSheet, ws)
5353
f.Theme, _ = f.themeReader()
5454
f.options = f.getOptions(opts...)
5555
return f

templates.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -299,6 +299,7 @@ const (
299299
defaultXMLPathDocPropsCustom = "docProps/custom.xml"
300300
defaultXMLPathRels = "_rels/.rels"
301301
defaultXMLPathSharedStrings = "xl/sharedStrings.xml"
302+
defaultXMLPathSheet = "xl/worksheets/sheet1.xml"
302303
defaultXMLPathStyles = "xl/styles.xml"
303304
defaultXMLPathTheme = "xl/theme/theme1.xml"
304305
defaultXMLPathVolatileDeps = "xl/volatileDependencies.xml"

0 commit comments

Comments
 (0)