Merge branch 'master' into fix/cell_lock

1 files changed, 17 insertions, 13 deletions

diff --git a/shape.go b/shape.go
index c90963c..0455b22 100644
--- a/shape.go
+++ b/shape.go
@@ -1,11 +1,11 @@
-// Copyright 2016 - 2019 The excelize Authors. All rights reserved. Use of
+// Copyright 2016 - 2020 The excelize Authors. All rights reserved. Use of
 // this source code is governed by a BSD-style license that can be found in
 // the LICENSE file.
 //
 // 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
 // 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
 
@@ -40,7 +40,7 @@ func parseFormatShapeSet(formatSet string) (*formatShape, error) {
 // print settings) and properties set. For example, add text box (rect shape)
 // in Sheet1:
 //
-//    err := f.AddShape("Sheet1", "G6", `{"type":"rect","color":{"line":"#4286F4","fill":"#8eb9ff"},"paragraph":[{"text":"Rectangle Shape","font":{"bold":true,"italic":true,"family":"Berlin Sans FB Demi","size":36,"color":"#777777","underline":"sng"}}],"width":180,"height": 90}`)
+//    err := f.AddShape("Sheet1", "G6", `{"type":"rect","color":{"line":"#4286F4","fill":"#8eb9ff"},"paragraph":[{"text":"Rectangle Shape","font":{"bold":true,"italic":true,"family":"Times New Roman","size":36,"color":"#777777","underline":"sng"}}],"width":180,"height": 90}`)
 //
 // The following shows the type of shape supported by excelize:
 //
@@ -275,7 +275,8 @@ func (f *File) AddShape(sheet, cell, format string) error {
 		drawingXML = strings.Replace(sheetRelationshipsDrawingXML, "..", "xl", -1)
 	} else {
 		// Add first shape for given sheet.
-		rID := f.addSheetRelationships(sheet, SourceRelationshipDrawingML, sheetRelationshipsDrawingXML, "")
+		sheetRels := "xl/worksheets/_rels/" + strings.TrimPrefix(f.sheetMap[trimSheetName(sheet)], "xl/worksheets/") + ".rels"
+		rID := f.addRels(sheetRels, SourceRelationshipDrawingML, sheetRelationshipsDrawingXML, "")
 		f.addSheetDrawing(sheet, rID)
 	}
 	err = f.addDrawingShape(sheet, drawingXML, cell, formatSet)
@@ -360,7 +361,7 @@ func (f *File) addDrawingShape(sheet, drawingXML, cell string, formatSet *format
 			FontRef: &aFontRef{
 				Idx: "minor",
 				SchemeClr: &attrValString{
-					Val: "tx1",
+					Val: stringPtr("tx1"),
 				},
 			},
 		},
@@ -377,11 +378,11 @@ func (f *File) addDrawingShape(sheet, drawingXML, cell string, formatSet *format
 	if len(formatSet.Paragraph) < 1 {
 		formatSet.Paragraph = []formatShapeParagraph{
 			{
-				Font: formatFont{
+				Font: Font{
 					Bold:      false,
 					Italic:    false,
 					Underline: "none",
-					Family:    "Calibri",
+					Family:    f.GetDefaultFont(),
 					Size:      11,
 					Color:     "#000000",
 				},
@@ -409,11 +410,6 @@ func (f *File) addDrawingShape(sheet, drawingXML, cell string, formatSet *format
 					U:       u,
 					Sz:      p.Font.Size * 100,
 					Latin:   &aLatin{Typeface: p.Font.Family},
-					SolidFill: &aSolidFill{
-						SrgbClr: &attrValString{
-							Val: strings.Replace(strings.ToUpper(p.Font.Color), "#", "", -1),
-						},
-					},
 				},
 				T: text,
 			},
@@ -421,6 +417,14 @@ func (f *File) addDrawingShape(sheet, drawingXML, cell string, formatSet *format
 				Lang: "en-US",
 			},
 		}
+		srgbClr := strings.Replace(strings.ToUpper(p.Font.Color), "#", "", -1)
+		if len(srgbClr) == 6 {
+			paragraph.R.RPr.SolidFill = &aSolidFill{
+				SrgbClr: &attrValString{
+					Val: stringPtr(srgbClr),
+				},
+			}
+		}
 		shape.TxBody.P = append(shape.TxBody.P, paragraph)
 	}
 	twoCellAnchor.Sp = &shape
@@ -449,7 +453,7 @@ func setShapeRef(color string, i int) *aRef {
 	return &aRef{
 		Idx: i,
 		SrgbClr: &attrValString{
-			Val: strings.Replace(strings.ToUpper(color), "#", "", -1),
+			Val: stringPtr(strings.Replace(strings.ToUpper(color), "#", "", -1)),
 		},
 	}
 }