Merge branch 'master' into master

col.go

@@ -8,7 +8,7 @@ import (
 
 	"time"
 
-	"github.com/extrame/goyymmdd"
+	yymmdd "github.com/extrame/goyymmdd"
 )
 
 //content type
@@ -72,7 +72,6 @@ func (xf *XfRk) String(wb *WorkBook) string {
 						f = float64(i)
 					}
 					t := timeFromExcelTime(f, wb.dateMode == 1)
-
 					return yymmdd.Format(t, formatter.str)
 				}
 			}
@@ -169,9 +168,25 @@ type NumberCol struct {
 }
 
 func (c *NumberCol) String(wb *WorkBook) []string {
+	if fNo := wb.Xfs[c.Index].formatNo(); fNo != 0 {
+		t := timeFromExcelTime(c.Float, wb.dateMode == 1)
+		return []string{yymmdd.Format(t, wb.Formats[fNo].str)}
+	}
 	return []string{strconv.FormatFloat(c.Float, 'f', -1, 64)}
 }
 
+type FormulaStringCol struct {
+	Col
+	RenderedValue string
+}
+
+func (c *FormulaStringCol) String(wb *WorkBook) []string {
+	return []string{c.RenderedValue}
+}
+
+//str, err = wb.get_string(buf_item, size)
+//wb.sst[offset_pre] = wb.sst[offset_pre] + str
+
 type FormulaCol struct {
 	Header struct {
 		Col

row.go

@@ -35,6 +35,17 @@ func (r *Row) Col(i int) string {
 	return ""
 }
 
+//ColExact Get the Nth Col from the Row, if has not, return nil.
+//For merged cells value is returned for first cell only
+func (r *Row) ColExact(i int) string {
+	serial := uint16(i)
+	if ch, ok := r.cols[serial]; ok {
+		strs := ch.String(r.wb)
+		return strs[0]
+	}
+	return ""
+}
+
 //LastCol Get the number of Last Col of the Row.
 func (r *Row) LastCol() int {
 	return int(r.info.Lcell)

workbook.go

@@ -255,7 +255,7 @@ func (w *WorkBook) get_string(buf io.ReadSeeker, size uint16) (res string, err e
 
 func (w *WorkBook) addSheet(sheet *boundsheet, buf io.ReadSeeker) {
 	name, _ := w.get_string(buf, uint16(sheet.Name))
-	w.sheets = append(w.sheets, &WorkSheet{bs: sheet, Name: name, wb: w})
+	w.sheets = append(w.sheets, &WorkSheet{bs: sheet, Name: name, wb: w, Visibility: TWorkSheetVisibility(sheet.Visible)})
 }
 
 //reading a sheet from the compress file to memory, you should call this before you try to get anything from sheet

worksheet.go

@@ -1,28 +1,40 @@
 package xls
 
 import (
+	"bytes"
 	"encoding/binary"
 	"fmt"
 	"io"
 	"unicode/utf16"
 )
 
+type TWorkSheetVisibility byte
+
+const (
+	WorkSheetVisible    TWorkSheetVisibility = 0
+	WorkSheetHidden     TWorkSheetVisibility = 1
+	WorkSheetVeryHidden TWorkSheetVisibility = 2
+)
+
 type boundsheet struct {
 	Filepos uint32
-	Type    byte
 	Visible byte
+	Type    byte
 	Name    byte
 }
 
 //WorkSheet in one WorkBook
 type WorkSheet struct {
-	bs   *boundsheet
+	bs         *boundsheet
-	wb   *WorkBook
+	wb         *WorkBook
-	Name string
+	Name       string
-	rows map[uint16]*Row
+	Selected   bool
+	Visibility TWorkSheetVisibility
+	rows       map[uint16]*Row
 	//NOTICE: this is the max row number of the sheet, so it should be count -1
-	MaxRow uint16
+	MaxRow      uint16
-	parsed bool
+	parsed      bool
+	rightToLeft bool
 }
 
 func (w *WorkSheet) Row(i int) *Row {
@@ -37,9 +49,10 @@ func (w *WorkSheet) parse(buf io.ReadSeeker) {
 	w.rows = make(map[uint16]*Row)
 	b := new(bof)
 	var bof_pre *bof
+	var col_pre interface{}
 	for {
 		if err := binary.Read(buf, binary.LittleEndian, b); err == nil {
-			bof_pre = w.parseBof(buf, b, bof_pre)
+			bof_pre, col_pre = w.parseBof(buf, b, bof_pre, col_pre)
 			if b.Id == 0xa {
 				break
 			}
@@ -51,11 +64,22 @@ func (w *WorkSheet) parse(buf io.ReadSeeker) {
 	w.parsed = true
 }
 
-func (w *WorkSheet) parseBof(buf io.ReadSeeker, b *bof, pre *bof) *bof {
+func (w *WorkSheet) parseBof(buf io.ReadSeeker, b *bof, pre *bof, col_pre interface{}) (*bof, interface{}) {
 	var col interface{}
+	var bts = make([]byte, b.Size)
+	binary.Read(buf, binary.LittleEndian, bts)
+	buf = bytes.NewReader(bts)
 	switch b.Id {
 	// case 0x0E5: //MERGEDCELLS
 	// ws.mergedCells(buf)
+	case 0x23E: // WINDOW2
+		var sheetOptions, firstVisibleRow, firstVisibleColumn uint16
+		binary.Read(buf, binary.LittleEndian, &sheetOptions)
+		binary.Read(buf, binary.LittleEndian, &firstVisibleRow)    // not valuable
+		binary.Read(buf, binary.LittleEndian, &firstVisibleColumn) // not valuable
+		//buf.Seek(int64(b.Size)-2*3, 1)
+		w.rightToLeft = (sheetOptions & 0x40) != 0
+		w.Selected = (sheetOptions & 0x400) != 0
 	case 0x208: //ROW
 		r := new(rowInfo)
 		binary.Read(buf, binary.LittleEndian, r)
@@ -89,6 +113,18 @@ func (w *WorkSheet) parseBof(buf io.ReadSeeker, b *bof, pre *bof) *bof {
 		c.Bts = make([]byte, b.Size-20)
 		binary.Read(buf, binary.LittleEndian, &c.Bts)
 		col = c
+	case 0x207: //STRING = FORMULA-VALUE is expected right after FORMULA
+		if ch, ok := col_pre.(*FormulaCol); ok {
+			c := new(FormulaStringCol)
+			c.Col = ch.Header.Col
+			var cStringLen uint16
+			binary.Read(buf, binary.LittleEndian, &cStringLen)
+			str, err := w.wb.get_string(buf, cStringLen)
+			if nil == err {
+				c.RenderedValue = str
+			}
+			col = c
+		}
 	case 0x27e: //RK
 		col = new(RkCol)
 		binary.Read(buf, binary.LittleEndian, col)
@@ -163,7 +199,7 @@ func (w *WorkSheet) parseBof(buf io.ReadSeeker, b *bof, pre *bof) *bof {
 	if col != nil {
 		w.add(col)
 	}
-	return b
+	return b, col
 }
 
 func (w *WorkSheet) add(content interface{}) {
@@ -194,6 +230,9 @@ func (w *WorkSheet) addContent(row_num uint16, ch contentHandler) {
 		info.Index = row_num
 		row = w.addRow(info)
 	}
+	if row.info.Lcell < ch.LastCol() {
+		row.info.Lcell = ch.LastCol()
+	}
 	row.cols[ch.FirstCol()] = ch
 }