Przeglądaj źródła

Merge branch 'fix/xlsx-multiple-spans' of https://github.com/minimum2scp/xlsx into minimum2scp-fix/xlsx-multiple-spans

Geoffrey J. Teale 11 lat temu
rodzic
commit
e4e890e676
1 zmienionych plików z 2 dodań i 2 usunięć
  1. 2 2
      lib.go

+ 2 - 2
lib.go

@@ -532,8 +532,8 @@ func readRowsFromSheet(Worksheet *xlsxWorksheet, file *File) ([]*Row, int, int)
 			rows[insertRowIndex-minRow] = new(Row)
 			rows[insertRowIndex-minRow] = new(Row)
 			insertRowIndex++
 			insertRowIndex++
 		}
 		}
-		// range is not empty
-		if len(rawrow.Spans) != 0 {
+		// range is not empty and only one range exist
+		if len(rawrow.Spans) != 0 && strings.Count(rawrow.Spans, ":") == 1 {
 			row = makeRowFromSpan(rawrow.Spans)
 			row = makeRowFromSpan(rawrow.Spans)
 		} else {
 		} else {
 			row = makeRowFromRaw(rawrow)
 			row = makeRowFromRaw(rawrow)