Kaydet (Commit) 37ac70c1 authored tarafından Julien Nabet's avatar Julien Nabet Kaydeden (comit) Markus Mohrhard

make sure to check for formula first, fdo#80301

Change-Id: Ie822d1a154b7b25437ce7e5d09eb399460823acf
üst 84a6d8ee
......@@ -121,8 +121,16 @@ void SetCfvoData( ColorScaleRuleModelEntry* pEntry, const AttributeList& rAttrib
{
OUString aType = rAttribs.getString( XML_type, OUString() );
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;
}
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment