Documentation updated, Go 1.10+ required

This commit is contained in:
xuri 2019-08-11 00:36:14 +08:00
parent adc4aed472
commit 9c70d0ac86
No known key found for this signature in database
GPG Key ID: BA5E5BB1C948EDF7
43 changed files with 48 additions and 47 deletions

View File

@ -4,7 +4,6 @@ install:
- go get -d -t -v ./... && go build -v ./... - go get -d -t -v ./... && go build -v ./...
go: go:
- 1.9.x
- 1.10.x - 1.10.x
- 1.11.x - 1.11.x
- 1.12.x - 1.12.x

View File

@ -5,7 +5,7 @@
// Package excelize providing a set of functions that allow you to write to // Package excelize providing a set of functions that allow you to write to
// and read from XLSX files. Support reads and writes XLSX file generated by // and read from XLSX files. Support reads and writes XLSX file generated by
// Microsoft Excel™ 2007 and later. Support save file without losing original // Microsoft Excel™ 2007 and later. Support save file without losing original
// charts of XLSX. This library needs Go version 1.8 or later. // charts of XLSX. This library needs Go version 1.10 or later.
package excelize package excelize

View File

@ -5,7 +5,7 @@
// Package excelize providing a set of functions that allow you to write to // Package excelize providing a set of functions that allow you to write to
// and read from XLSX files. Support reads and writes XLSX file generated by // and read from XLSX files. Support reads and writes XLSX file generated by
// Microsoft Excel™ 2007 and later. Support save file without losing original // Microsoft Excel™ 2007 and later. Support save file without losing original
// charts of XLSX. This library needs Go version 1.8 or later. // charts of XLSX. This library needs Go version 1.10 or later.
package excelize package excelize

View File

@ -5,7 +5,7 @@
// Package excelize providing a set of functions that allow you to write to // Package excelize providing a set of functions that allow you to write to
// and read from XLSX files. Support reads and writes XLSX file generated by // and read from XLSX files. Support reads and writes XLSX file generated by
// Microsoft Excel™ 2007 and later. Support save file without losing original // Microsoft Excel™ 2007 and later. Support save file without losing original
// charts of XLSX. This library needs Go version 1.8 or later. // charts of XLSX. This library needs Go version 1.10 or later.
package excelize package excelize

View File

@ -5,7 +5,7 @@
// Package excelize providing a set of functions that allow you to write to // Package excelize providing a set of functions that allow you to write to
// and read from XLSX files. Support reads and writes XLSX file generated by // and read from XLSX files. Support reads and writes XLSX file generated by
// Microsoft Excel™ 2007 and later. Support save file without losing original // Microsoft Excel™ 2007 and later. Support save file without losing original
// charts of XLSX. This library needs Go version 1.8 or later. // charts of XLSX. This library needs Go version 1.10 or later.
package excelize package excelize

View File

@ -5,7 +5,7 @@
// Package excelize providing a set of functions that allow you to write to // Package excelize providing a set of functions that allow you to write to
// and read from XLSX files. Support reads and writes XLSX file generated by // and read from XLSX files. Support reads and writes XLSX file generated by
// Microsoft Excel™ 2007 and later. Support save file without losing original // Microsoft Excel™ 2007 and later. Support save file without losing original
// charts of XLSX. This library needs Go version 1.8 or later. // charts of XLSX. This library needs Go version 1.10 or later.
package excelize package excelize

2
col.go
View File

@ -5,7 +5,7 @@
// Package excelize providing a set of functions that allow you to write to // Package excelize providing a set of functions that allow you to write to
// and read from XLSX files. Support reads and writes XLSX file generated by // and read from XLSX files. Support reads and writes XLSX file generated by
// Microsoft Excel™ 2007 and later. Support save file without losing original // Microsoft Excel™ 2007 and later. Support save file without losing original
// charts of XLSX. This library needs Go version 1.8 or later. // charts of XLSX. This library needs Go version 1.10 or later.
package excelize package excelize

View File

@ -5,7 +5,7 @@
// Package excelize providing a set of functions that allow you to write to // Package excelize providing a set of functions that allow you to write to
// and read from XLSX files. Support reads and writes XLSX file generated by // and read from XLSX files. Support reads and writes XLSX file generated by
// Microsoft Excel™ 2007 and later. Support save file without losing original // Microsoft Excel™ 2007 and later. Support save file without losing original
// charts of XLSX. This library needs Go version 1.8 or later. // charts of XLSX. This library needs Go version 1.10 or later.
package excelize package excelize

View File

@ -5,7 +5,7 @@
// Package excelize providing a set of functions that allow you to write to // Package excelize providing a set of functions that allow you to write to
// and read from XLSX files. Support reads and writes XLSX file generated by // and read from XLSX files. Support reads and writes XLSX file generated by
// Microsoft Excel™ 2007 and later. Support save file without losing original // Microsoft Excel™ 2007 and later. Support save file without losing original
// charts of XLSX. This library needs Go version 1.8 or later. // charts of XLSX. This library needs Go version 1.10 or later.
package excelize package excelize

View File

@ -5,7 +5,7 @@
// Package excelize providing a set of functions that allow you to write to // Package excelize providing a set of functions that allow you to write to
// and read from XLSX files. Support reads and writes XLSX file generated by // and read from XLSX files. Support reads and writes XLSX file generated by
// Microsoft Excel™ 2007 and later. Support save file without losing original // Microsoft Excel™ 2007 and later. Support save file without losing original
// charts of XLSX. This library needs Go version 1.8 or later. // charts of XLSX. This library needs Go version 1.10 or later.
package excelize package excelize

View File

@ -5,7 +5,7 @@
// Package excelize providing a set of functions that allow you to write to // Package excelize providing a set of functions that allow you to write to
// and read from XLSX files. Support reads and writes XLSX file generated by // and read from XLSX files. Support reads and writes XLSX file generated by
// Microsoft Excel™ 2007 and later. Support save file without losing original // Microsoft Excel™ 2007 and later. Support save file without losing original
// charts of XLSX. This library needs Go version 1.8 or later. // charts of XLSX. This library needs Go version 1.10 or later.
package excelize package excelize

View File

@ -5,7 +5,7 @@
// Package excelize providing a set of functions that allow you to write to // Package excelize providing a set of functions that allow you to write to
// and read from XLSX files. Support reads and writes XLSX file generated by // and read from XLSX files. Support reads and writes XLSX file generated by
// Microsoft Excel™ 2007 and later. Support save file without losing original // Microsoft Excel™ 2007 and later. Support save file without losing original
// charts of XLSX. This library needs Go version 1.8 or later. // charts of XLSX. This library needs Go version 1.10 or later.
package excelize package excelize

View File

@ -5,7 +5,7 @@
// Package excelize providing a set of functions that allow you to write to // Package excelize providing a set of functions that allow you to write to
// and read from XLSX files. Support reads and writes XLSX file generated by // and read from XLSX files. Support reads and writes XLSX file generated by
// Microsoft Excel™ 2007 and later. Support save file without losing original // Microsoft Excel™ 2007 and later. Support save file without losing original
// charts of XLSX. This library needs Go version 1.8 or later. // charts of XLSX. This library needs Go version 1.10 or later.
package excelize package excelize

View File

@ -5,7 +5,7 @@
// Package excelize providing a set of functions that allow you to write to // Package excelize providing a set of functions that allow you to write to
// and read from XLSX files. Support reads and writes XLSX file generated by // and read from XLSX files. Support reads and writes XLSX file generated by
// Microsoft Excel™ 2007 and later. Support save file without losing original // Microsoft Excel™ 2007 and later. Support save file without losing original
// charts of XLSX. This library needs Go version 1.8 or later. // charts of XLSX. This library needs Go version 1.10 or later.
package excelize package excelize

View File

@ -5,7 +5,7 @@
// Package excelize providing a set of functions that allow you to write to // Package excelize providing a set of functions that allow you to write to
// and read from XLSX files. Support reads and writes XLSX file generated by // and read from XLSX files. Support reads and writes XLSX file generated by
// Microsoft Excel™ 2007 and later. Support save file without losing original // Microsoft Excel™ 2007 and later. Support save file without losing original
// charts of XLSX. This library needs Go version 1.8 or later. // charts of XLSX. This library needs Go version 1.10 or later.
// //
// See https://xuri.me/excelize for more information about this package. // See https://xuri.me/excelize for more information about this package.
package excelize package excelize

View File

@ -5,7 +5,7 @@
// Package excelize providing a set of functions that allow you to write to // Package excelize providing a set of functions that allow you to write to
// and read from XLSX files. Support reads and writes XLSX file generated by // and read from XLSX files. Support reads and writes XLSX file generated by
// Microsoft Excel™ 2007 and later. Support save file without losing original // Microsoft Excel™ 2007 and later. Support save file without losing original
// charts of XLSX. This library needs Go version 1.8 or later. // charts of XLSX. This library needs Go version 1.10 or later.
package excelize package excelize

2
lib.go
View File

@ -5,7 +5,7 @@
// Package excelize providing a set of functions that allow you to write to // Package excelize providing a set of functions that allow you to write to
// and read from XLSX files. Support reads and writes XLSX file generated by // and read from XLSX files. Support reads and writes XLSX file generated by
// Microsoft Excel™ 2007 and later. Support save file without losing original // Microsoft Excel™ 2007 and later. Support save file without losing original
// charts of XLSX. This library needs Go version 1.8 or later. // charts of XLSX. This library needs Go version 1.10 or later.
package excelize package excelize

View File

@ -5,7 +5,7 @@
// Package excelize providing a set of functions that allow you to write to // Package excelize providing a set of functions that allow you to write to
// and read from XLSX files. Support reads and writes XLSX file generated by // and read from XLSX files. Support reads and writes XLSX file generated by
// Microsoft Excel™ 2007 and later. Support save file without losing original // Microsoft Excel™ 2007 and later. Support save file without losing original
// charts of XLSX. This library needs Go version 1.8 or later. // charts of XLSX. This library needs Go version 1.10 or later.
package excelize package excelize

View File

@ -5,7 +5,7 @@
// Package excelize providing a set of functions that allow you to write to // Package excelize providing a set of functions that allow you to write to
// and read from XLSX files. Support reads and writes XLSX file generated by // and read from XLSX files. Support reads and writes XLSX file generated by
// Microsoft Excel™ 2007 and later. Support save file without losing original // Microsoft Excel™ 2007 and later. Support save file without losing original
// charts of XLSX. This library needs Go version 1.8 or later. // charts of XLSX. This library needs Go version 1.10 or later.
package excelize package excelize

View File

@ -5,7 +5,7 @@
// Package excelize providing a set of functions that allow you to write to // Package excelize providing a set of functions that allow you to write to
// and read from XLSX files. Support reads and writes XLSX file generated by // and read from XLSX files. Support reads and writes XLSX file generated by
// Microsoft Excel™ 2007 and later. Support save file without losing original // Microsoft Excel™ 2007 and later. Support save file without losing original
// charts of XLSX. This library needs Go version 1.8 or later. // charts of XLSX. This library needs Go version 1.10 or later.
package excelize package excelize

View File

@ -5,7 +5,7 @@
// Package excelize providing a set of functions that allow you to write to // Package excelize providing a set of functions that allow you to write to
// and read from XLSX files. Support reads and writes XLSX file generated by // and read from XLSX files. Support reads and writes XLSX file generated by
// Microsoft Excel™ 2007 and later. Support save file without losing original // Microsoft Excel™ 2007 and later. Support save file without losing original
// charts of XLSX. This library needs Go version 1.8 or later. // charts of XLSX. This library needs Go version 1.10 or later.
package excelize package excelize
@ -740,9 +740,7 @@ func (f *File) searchSheet(name, value string, regSearch bool) ([]string, error)
result []string result []string
r xlsxRow r xlsxRow
) )
xml.NewDecoder(bytes.NewReader(f.readXML(name)))
d := f.sharedStringsReader() d := f.sharedStringsReader()
decoder := xml.NewDecoder(bytes.NewReader(f.readXML(name))) decoder := xml.NewDecoder(bytes.NewReader(f.readXML(name)))
for { for {
token, _ := decoder.Token() token, _ := decoder.Token()

View File

@ -5,7 +5,7 @@
// Package excelize providing a set of functions that allow you to write to // Package excelize providing a set of functions that allow you to write to
// and read from XLSX files. Support reads and writes XLSX file generated by // and read from XLSX files. Support reads and writes XLSX file generated by
// Microsoft Excel™ 2007 and later. Support save file without losing original // Microsoft Excel™ 2007 and later. Support save file without losing original
// charts of XLSX. This library needs Go version 1.8 or later. // charts of XLSX. This library needs Go version 1.10 or later.
package excelize package excelize

View File

@ -5,7 +5,7 @@
// Package excelize providing a set of functions that allow you to write to // Package excelize providing a set of functions that allow you to write to
// and read from XLSX files. Support reads and writes XLSX file generated by // and read from XLSX files. Support reads and writes XLSX file generated by
// Microsoft Excel™ 2007 and later. Support save file without losing original // Microsoft Excel™ 2007 and later. Support save file without losing original
// charts of XLSX. This library needs Go version 1.8 or later. // charts of XLSX. This library needs Go version 1.10 or later.
package excelize package excelize

View File

@ -5,7 +5,7 @@
// Package excelize providing a set of functions that allow you to write to // Package excelize providing a set of functions that allow you to write to
// and read from XLSX files. Support reads and writes XLSX file generated by // and read from XLSX files. Support reads and writes XLSX file generated by
// Microsoft Excel™ 2007 and later. Support save file without losing original // Microsoft Excel™ 2007 and later. Support save file without losing original
// charts of XLSX. This library needs Go version 1.8 or later. // charts of XLSX. This library needs Go version 1.10 or later.
package excelize package excelize

View File

@ -5,7 +5,7 @@
// Package excelize providing a set of functions that allow you to write to // Package excelize providing a set of functions that allow you to write to
// and read from XLSX files. Support reads and writes XLSX file generated by // and read from XLSX files. Support reads and writes XLSX file generated by
// Microsoft Excel™ 2007 and later. Support save file without losing original // Microsoft Excel™ 2007 and later. Support save file without losing original
// charts of XLSX. This library needs Go version 1.8 or later. // charts of XLSX. This library needs Go version 1.10 or later.
package excelize package excelize

View File

@ -5,7 +5,7 @@
// Package excelize providing a set of functions that allow you to write to // Package excelize providing a set of functions that allow you to write to
// and read from XLSX files. Support reads and writes XLSX file generated by // and read from XLSX files. Support reads and writes XLSX file generated by
// Microsoft Excel™ 2007 and later. Support save file without losing original // Microsoft Excel™ 2007 and later. Support save file without losing original
// charts of XLSX. This library needs Go version 1.8 or later. // charts of XLSX. This library needs Go version 1.10 or later.
package excelize package excelize

View File

@ -5,7 +5,7 @@
// Package excelize providing a set of functions that allow you to write to // Package excelize providing a set of functions that allow you to write to
// and read from XLSX files. Support reads and writes XLSX file generated by // and read from XLSX files. Support reads and writes XLSX file generated by
// Microsoft Excel™ 2007 and later. Support save file without losing original // Microsoft Excel™ 2007 and later. Support save file without losing original
// charts of XLSX. This library needs Go version 1.8 or later. // charts of XLSX. This library needs Go version 1.10 or later.
// //
// This file contains default templates for XML files we don't yet populated // This file contains default templates for XML files we don't yet populated
// based on content. // based on content.

Binary file not shown.

View File

@ -5,7 +5,7 @@
// Package excelize providing a set of functions that allow you to write to // Package excelize providing a set of functions that allow you to write to
// and read from XLSX files. Support reads and writes XLSX file generated by // and read from XLSX files. Support reads and writes XLSX file generated by
// Microsoft Excel™ 2007 and later. Support save file without losing original // Microsoft Excel™ 2007 and later. Support save file without losing original
// charts of XLSX. This library needs Go version 1.8 or later. // charts of XLSX. This library needs Go version 1.10 or later.
package excelize package excelize

View File

@ -5,12 +5,15 @@
// Package excelize providing a set of functions that allow you to write to // Package excelize providing a set of functions that allow you to write to
// and read from XLSX files. Support reads and writes XLSX file generated by // and read from XLSX files. Support reads and writes XLSX file generated by
// Microsoft Excel™ 2007 and later. Support save file without losing original // Microsoft Excel™ 2007 and later. Support save file without losing original
// charts of XLSX. This library needs Go version 1.8 or later. // charts of XLSX. This library needs Go version 1.10 or later.
package excelize package excelize
import "encoding/xml" import "encoding/xml"
// xlsxProperties specifies to an OOXML document properties such as the
// template used, the number of pages and words, and the application name and
// version.
type xlsxProperties struct { type xlsxProperties struct {
XMLName xml.Name `xml:"http://schemas.openxmlformats.org/officeDocument/2006/extended-properties Properties"` XMLName xml.Name `xml:"http://schemas.openxmlformats.org/officeDocument/2006/extended-properties Properties"`
Template string Template string
@ -42,6 +45,8 @@ type xlsxProperties struct {
DocSecurity int DocSecurity int
} }
// xlsxVectorVariant specifies the set of hyperlinks that were in this
// document when last saved.
type xlsxVectorVariant struct { type xlsxVectorVariant struct {
Content string `xml:",innerxml"` Content string `xml:",innerxml"`
} }
@ -50,6 +55,7 @@ type xlsxVectorLpstr struct {
Content string `xml:",innerxml"` Content string `xml:",innerxml"`
} }
// xlsxDigSig contains the signature of a digitally signed document.
type xlsxDigSig struct { type xlsxDigSig struct {
Content string `xml:",innerxml"` Content string `xml:",innerxml"`
} }

View File

@ -5,7 +5,7 @@
// Package excelize providing a set of functions that allow you to write to // Package excelize providing a set of functions that allow you to write to
// and read from XLSX files. Support reads and writes XLSX file generated by // and read from XLSX files. Support reads and writes XLSX file generated by
// Microsoft Excel™ 2007 and later. Support save file without losing original // Microsoft Excel™ 2007 and later. Support save file without losing original
// charts of XLSX. This library needs Go version 1.8 or later. // charts of XLSX. This library needs Go version 1.10 or later.
package excelize package excelize

View File

@ -5,7 +5,7 @@
// Package excelize providing a set of functions that allow you to write to // Package excelize providing a set of functions that allow you to write to
// and read from XLSX files. Support reads and writes XLSX file generated by // and read from XLSX files. Support reads and writes XLSX file generated by
// Microsoft Excel™ 2007 and later. Support save file without losing original // Microsoft Excel™ 2007 and later. Support save file without losing original
// charts of XLSX. This library needs Go version 1.8 or later. // charts of XLSX. This library needs Go version 1.10 or later.
package excelize package excelize

View File

@ -5,7 +5,7 @@
// Package excelize providing a set of functions that allow you to write to // Package excelize providing a set of functions that allow you to write to
// and read from XLSX files. Support reads and writes XLSX file generated by // and read from XLSX files. Support reads and writes XLSX file generated by
// Microsoft Excel™ 2007 and later. Support save file without losing original // Microsoft Excel™ 2007 and later. Support save file without losing original
// charts of XLSX. This library needs Go version 1.8 or later. // charts of XLSX. This library needs Go version 1.10 or later.
package excelize package excelize

View File

@ -5,7 +5,7 @@
// Package excelize providing a set of functions that allow you to write to // Package excelize providing a set of functions that allow you to write to
// and read from XLSX files. Support reads and writes XLSX file generated by // and read from XLSX files. Support reads and writes XLSX file generated by
// Microsoft Excel™ 2007 and later. Support save file without losing original // Microsoft Excel™ 2007 and later. Support save file without losing original
// charts of XLSX. This library needs Go version 1.8 or later. // charts of XLSX. This library needs Go version 1.10 or later.
package excelize package excelize

View File

@ -5,7 +5,7 @@
// Package excelize providing a set of functions that allow you to write to // Package excelize providing a set of functions that allow you to write to
// and read from XLSX files. Support reads and writes XLSX file generated by // and read from XLSX files. Support reads and writes XLSX file generated by
// Microsoft Excel™ 2007 and later. Support save file without losing original // Microsoft Excel™ 2007 and later. Support save file without losing original
// charts of XLSX. This library needs Go version 1.8 or later. // charts of XLSX. This library needs Go version 1.10 or later.
package excelize package excelize

View File

@ -5,7 +5,7 @@
// Package excelize providing a set of functions that allow you to write to // Package excelize providing a set of functions that allow you to write to
// and read from XLSX files. Support reads and writes XLSX file generated by // and read from XLSX files. Support reads and writes XLSX file generated by
// Microsoft Excel™ 2007 and later. Support save file without losing original // Microsoft Excel™ 2007 and later. Support save file without losing original
// charts of XLSX. This library needs Go version 1.8 or later. // charts of XLSX. This library needs Go version 1.10 or later.
package excelize package excelize

View File

@ -5,7 +5,7 @@
// Package excelize providing a set of functions that allow you to write to // Package excelize providing a set of functions that allow you to write to
// and read from XLSX files. Support reads and writes XLSX file generated by // and read from XLSX files. Support reads and writes XLSX file generated by
// Microsoft Excel™ 2007 and later. Support save file without losing original // Microsoft Excel™ 2007 and later. Support save file without losing original
// charts of XLSX. This library needs Go version 1.8 or later. // charts of XLSX. This library needs Go version 1.10 or later.
package excelize package excelize

View File

@ -5,7 +5,7 @@
// Package excelize providing a set of functions that allow you to write to // Package excelize providing a set of functions that allow you to write to
// and read from XLSX files. Support reads and writes XLSX file generated by // and read from XLSX files. Support reads and writes XLSX file generated by
// Microsoft Excel™ 2007 and later. Support save file without losing original // Microsoft Excel™ 2007 and later. Support save file without losing original
// charts of XLSX. This library needs Go version 1.8 or later. // charts of XLSX. This library needs Go version 1.10 or later.
package excelize package excelize

View File

@ -5,7 +5,7 @@
// Package excelize providing a set of functions that allow you to write to // Package excelize providing a set of functions that allow you to write to
// and read from XLSX files. Support reads and writes XLSX file generated by // and read from XLSX files. Support reads and writes XLSX file generated by
// Microsoft Excel™ 2007 and later. Support save file without losing original // Microsoft Excel™ 2007 and later. Support save file without losing original
// charts of XLSX. This library needs Go version 1.8 or later. // charts of XLSX. This library needs Go version 1.10 or later.
package excelize package excelize

View File

@ -5,7 +5,7 @@
// Package excelize providing a set of functions that allow you to write to // Package excelize providing a set of functions that allow you to write to
// and read from XLSX files. Support reads and writes XLSX file generated by // and read from XLSX files. Support reads and writes XLSX file generated by
// Microsoft Excel™ 2007 and later. Support save file without losing original // Microsoft Excel™ 2007 and later. Support save file without losing original
// charts of XLSX. This library needs Go version 1.8 or later. // charts of XLSX. This library needs Go version 1.10 or later.
package excelize package excelize

View File

@ -5,7 +5,7 @@
// Package excelize providing a set of functions that allow you to write to // Package excelize providing a set of functions that allow you to write to
// and read from XLSX files. Support reads and writes XLSX file generated by // and read from XLSX files. Support reads and writes XLSX file generated by
// Microsoft Excel™ 2007 and later. Support save file without losing original // Microsoft Excel™ 2007 and later. Support save file without losing original
// charts of XLSX. This library needs Go version 1.8 or later. // charts of XLSX. This library needs Go version 1.10 or later.
package excelize package excelize

View File

@ -5,7 +5,7 @@
// Package excelize providing a set of functions that allow you to write to // Package excelize providing a set of functions that allow you to write to
// and read from XLSX files. Support reads and writes XLSX file generated by // and read from XLSX files. Support reads and writes XLSX file generated by
// Microsoft Excel™ 2007 and later. Support save file without losing original // Microsoft Excel™ 2007 and later. Support save file without losing original
// charts of XLSX. This library needs Go version 1.8 or later. // charts of XLSX. This library needs Go version 1.10 or later.
package excelize package excelize

View File

@ -5,13 +5,11 @@
// Package excelize providing a set of functions that allow you to write to // Package excelize providing a set of functions that allow you to write to
// and read from XLSX files. Support reads and writes XLSX file generated by // and read from XLSX files. Support reads and writes XLSX file generated by
// Microsoft Excel™ 2007 and later. Support save file without losing original // Microsoft Excel™ 2007 and later. Support save file without losing original
// charts of XLSX. This library needs Go version 1.8 or later. // charts of XLSX. This library needs Go version 1.10 or later.
package excelize package excelize
import ( import "encoding/xml"
"encoding/xml"
)
// xlsxWorksheet directly maps the worksheet element in the namespace // xlsxWorksheet directly maps the worksheet element in the namespace
// http://schemas.openxmlformats.org/spreadsheetml/2006/main - currently I have // http://schemas.openxmlformats.org/spreadsheetml/2006/main - currently I have