diff options
-rw-r--r-- | sc/source/filter/oox/condformatbuffer.cxx | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/sc/source/filter/oox/condformatbuffer.cxx b/sc/source/filter/oox/condformatbuffer.cxx index 60e3e7c41b70..754c36c2bc7a 100644 --- a/sc/source/filter/oox/condformatbuffer.cxx +++ b/sc/source/filter/oox/condformatbuffer.cxx @@ -121,8 +121,16 @@ void SetCfvoData( ColorScaleRuleModelEntry* pEntry, const AttributeList& rAttrib { OUString aType = rAttribs.getString( XML_type, OUString() ); - double nVal = rAttribs.getDouble( XML_val, 0.0 ); - pEntry->mnVal = nVal; + if( aType == "formula" ) + { + OUString aFormula = rAttribs.getString( XML_val, OUString() ); + pEntry->maFormula = aFormula; + } + else + { + double nVal = rAttribs.getDouble( XML_val, 0.0 ); + pEntry->mnVal = nVal; + } if (aType == "num") { // nothing to do @@ -143,12 +151,6 @@ void SetCfvoData( ColorScaleRuleModelEntry* pEntry, const AttributeList& rAttrib { pEntry->mbPercentile = true; } - else if( aType == "formula" ) - { - OUString aFormula = rAttribs.getString( XML_val, OUString() ); - pEntry->maFormula = aFormula; - } - } } |