@@ -4799,10 +4799,8 @@ func format(value, numFmt string, date1904 bool, cellType CellType, opts *Option
4799
4799
switch section .Type {
4800
4800
case nfp .TokenSectionPositive :
4801
4801
return nf .alignmentHandler (nf .positiveHandler ())
4802
- case nfp .TokenSectionNegative :
4803
- return nf .alignmentHandler (nf .negativeHandler ())
4804
4802
default :
4805
- return nf .alignmentHandler (nf .zeroHandler ())
4803
+ return nf .alignmentHandler (nf .negativeHandler ())
4806
4804
}
4807
4805
}
4808
4806
return nf .alignmentHandler (nf .textHandler ())
@@ -7108,11 +7106,6 @@ func (nf *numberFormat) negativeHandler() (result string) {
7108
7106
return nf .numberHandler ()
7109
7107
}
7110
7108
7111
- // zeroHandler will be handling zero selection for a number format expression.
7112
- func (nf * numberFormat ) zeroHandler () string {
7113
- return nf .value
7114
- }
7115
-
7116
7109
// textHandler will be handling text selection for a number format expression.
7117
7110
func (nf * numberFormat ) textHandler () (result string ) {
7118
7111
for _ , token := range nf .section [nf .sectionIdx ].Items {
@@ -7137,21 +7130,18 @@ func (nf *numberFormat) getValueSectionType(value string) (float64, string) {
7137
7130
return 0 , nfp .TokenSectionText
7138
7131
}
7139
7132
number , _ := strconv .ParseFloat (value , 64 )
7140
- if number > 0 {
7133
+ if number >= 0 {
7141
7134
return number , nfp .TokenSectionPositive
7142
7135
}
7143
- if number < 0 {
7144
- var hasNeg bool
7145
- for _ , sec := range nf .section {
7146
- if sec .Type == nfp .TokenSectionNegative {
7147
- hasNeg = true
7148
- }
7149
- }
7150
- if ! hasNeg {
7151
- nf .usePositive = true
7152
- return number , nfp .TokenSectionPositive
7136
+ var hasNeg bool
7137
+ for _ , sec := range nf .section {
7138
+ if sec .Type == nfp .TokenSectionNegative {
7139
+ hasNeg = true
7153
7140
}
7154
- return number , nfp .TokenSectionNegative
7155
7141
}
7156
- return number , nfp .TokenSectionZero
7142
+ if ! hasNeg {
7143
+ nf .usePositive = true
7144
+ return number , nfp .TokenSectionPositive
7145
+ }
7146
+ return number , nfp .TokenSectionNegative
7157
7147
}
0 commit comments