* fix small bug with sheet's markup for 2 reserved elements

* make sheetMode public as SheetMode
plandem · Nov 2, 2019 · 89ef343 · 89ef343
1 parent 4deee73
commit 89ef343
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git a/Makefile b/Makefile
@@ -22,7 +22,7 @@ docs-build: docs-vendor
 	yarn --cwd ./docs build
 
 docs-publish: docs-build
-	cd ./docs/src/.vuepress/dist; git init; git add -A; git commit -m 'deploy'; git push -f git@github.com:plandem/xlsx2go.git master:gh-pages;
+	cd ./docs/src/.vuepress/dist; git init; git add -A; git commit -m 'deploy'; git push -f git@github.com:plandem/xlsx.git master:gh-pages;
 
 docs-dev: docs-vendor
 	yarn --cwd ./docs dev

diff --git a/internal/ml/worksheet.go b/internal/ml/worksheet.go
@@ -139,8 +139,8 @@ type MergeCell struct {
 //SheetView is a direct mapping of XSD CT_SheetView
 type SheetView struct {
 	Pane                     *ml.Reserved       `xml:"pane,omitempty"`
-	Selection                *ml.Reserved       `xml:"selection,omitempty"`
-	PivotSelection           *ml.Reserved       `xml:"pivotSelection,omitempty"`
+	Selection                []*ml.Reserved     `xml:"selection,omitempty"`
+	PivotSelection           []*ml.Reserved     `xml:"pivotSelection,omitempty"`
 	ExtLst                   *ml.Reserved       `xml:"extLst,omitempty"`
 	WindowProtection         bool               `xml:"windowProtection,attr,omitempty"`
 	ShowFormulas             bool               `xml:"showFormulas,attr,omitempty"`

diff --git a/sheet.go b/sheet.go
@@ -14,12 +14,12 @@ const errorNotSupported = "not supported"
 const errorNotSupportedWrite = "not supported in read-only mode"
 const errorNotSupportedStream = "not supported in stream mode"
 
-type sheetMode byte
+type SheetMode byte
 
 //List of all possible open modes for Sheet. Mode applies only once, except SheetModeStream and few modes can be combined. E.g.: SheetModeStream, SheetModeMultiPhase
 const (
-	sheetModeUnknown sheetMode = 0
-	sheetModeRead    sheetMode = 1 << iota
+	sheetModeUnknown SheetMode = 0
+	sheetModeRead    SheetMode = 1 << iota
 	sheetModeWrite
 	SheetModeStream          //In stream mode only forward reading/writing is allowed
 	SheetModeMultiPhase      //Sheet will be iterated two times: first one to load meta information (e.g. merged cells) and another one for sheet data. Only for SheetModeStream mode.
@@ -86,6 +86,6 @@ type Sheet interface {
 	Close()
 
 	//private methods to use by internals only
-	mode() sheetMode
+	mode() SheetMode
 	info() *sheetInfo
 }
diff --git a/sheet_info.go b/sheet_info.go
@@ -33,7 +33,7 @@ type sheetInfo struct {
 	filters       *filters
 	relationships *ooxml.Relationships
 	sheet         Sheet
-	sheetMode     sheetMode
+	sheetMode     SheetMode
 	isInitialized bool
 	index         int
 }
@@ -125,7 +125,7 @@ func newSheetInfo(f interface{}, doc *Spreadsheet) *sheetInfo {
 }
 
 //some private methods used objects that use Sheet implementation and have no access to internal information
-func (s *sheetInfo) mode() sheetMode {
+func (s *sheetInfo) mode() SheetMode {
 	return s.sheetMode
 }
 

diff --git a/spreadsheet.go b/spreadsheet.go
@@ -54,7 +54,7 @@ func (xl *Spreadsheet) SheetNames() []string {
 }
 
 //SheetByName returns a sheet by name with required open mode options
-func (xl *Spreadsheet) SheetByName(name string, options ...sheetMode) Sheet {
+func (xl *Spreadsheet) SheetByName(name string, options ...SheetMode) Sheet {
 	for id := range xl.sheets {
 		if name == xl.workbook.ml.Sheets[id].Name {
 			return xl.Sheet(id, options...)
@@ -65,7 +65,7 @@ func (xl *Spreadsheet) SheetByName(name string, options ...sheetMode) Sheet {
 }
 
 //Sheet returns a sheet by 0-based index with required open mode options
-func (xl *Spreadsheet) Sheet(i int, options ...sheetMode) Sheet {
+func (xl *Spreadsheet) Sheet(i int, options ...SheetMode) Sheet {
 	if i >= len(xl.sheets) {
 		return nil
 	}
@@ -108,7 +108,7 @@ func (xl *Spreadsheet) Sheet(i int, options ...sheetMode) Sheet {
 }
 
 //AddSheet adds a new sheet with name to document
-func (xl *Spreadsheet) AddSheet(name string, options ...sheetMode) Sheet {
+func (xl *Spreadsheet) AddSheet(name string, options ...SheetMode) Sheet {
 	mode := sheetModeWrite
 	for _, m := range options {
 		mode |= m