[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sc/source

[Julien Nabet]

 sc/source/filter/oox/condformatbuffer.cxx |   18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

New commits:
commit 008c0fe0f9b489a10ecc81e0205f2ac9e25b60ff
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Sun Nov 23 00:51:10 2014 +0100

    make sure to check for formula first, fdo#80301
    
    Change-Id: Ie822d1a154b7b25437ce7e5d09eb399460823acf
    Reviewed-on: https://gerrit.libreoffice.org/13082
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    Tested-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/sc/source/filter/oox/condformatbuffer.cxx b/sc/source/filter/oox/condformatbuffer.cxx
index ca87185..46a2a94 100644
--- a/sc/source/filter/oox/condformatbuffer.cxx
+++ b/sc/source/filter/oox/condformatbuffer.cxx
@@ -129,8 +129,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
@@ -151,12 +159,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;
-    }
-
 }
 
 }