diff options
Diffstat (limited to 'styles.go')
| -rw-r--r-- | styles.go | 16 |
1 files changed, 8 insertions, 8 deletions
@@ -1957,13 +1957,13 @@ func (f *File) NewConditionalStyle(style string) (int, error) { // Documents generated by excelize start with Calibri. func (f *File) GetDefaultFont() string { font := f.readDefaultFont() - return font.Name.Val + return *font.Name.Val } // SetDefaultFont changes the default font in the workbook. func (f *File) SetDefaultFont(fontName string) { font := f.readDefaultFont() - font.Name.Val = fontName + font.Name.Val = stringPtr(fontName) s := f.stylesReader() s.Fonts.Font[0] = font custom := true @@ -1987,10 +1987,10 @@ func (f *File) setFont(formatStyle *formatStyle) *xlsxFont { formatStyle.Font.Color = "#000000" } fnt := xlsxFont{ - Sz: &attrValFloat{Val: formatStyle.Font.Size}, + Sz: &attrValFloat{Val: float64Ptr(formatStyle.Font.Size)}, Color: &xlsxColor{RGB: getPaletteColor(formatStyle.Font.Color)}, - Name: &attrValString{Val: formatStyle.Font.Family}, - Family: &attrValInt{Val: 2}, + Name: &attrValString{Val: stringPtr(formatStyle.Font.Family)}, + Family: &attrValInt{Val: intPtr(2)}, } if formatStyle.Font.Bold { fnt.B = &formatStyle.Font.Bold @@ -1998,8 +1998,8 @@ func (f *File) setFont(formatStyle *formatStyle) *xlsxFont { if formatStyle.Font.Italic { fnt.I = &formatStyle.Font.Italic } - if fnt.Name.Val == "" { - fnt.Name.Val = f.GetDefaultFont() + if *fnt.Name.Val == "" { + *fnt.Name.Val = f.GetDefaultFont() } if formatStyle.Font.Strike { strike := true @@ -2007,7 +2007,7 @@ func (f *File) setFont(formatStyle *formatStyle) *xlsxFont { } val, ok := fontUnderlineType[formatStyle.Font.Underline] if ok { - fnt.U = &attrValString{Val: val} + fnt.U = &attrValString{Val: stringPtr(val)} } return &fnt } |