sc/source/filter/oox/condformatbuffer.cxx | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
New commits:
commit 2987635da7c46874c3d1b7979b70dec0de4b69b1
Author: Julien Nabet <serval2...@yahoo.fr>
Date: Sun Nov 23 00:51:10 2014 +0100
make sure to check for formula first, fdo#80301
Cherry-picked from 37ac70c117a7b8b9ac66b583a793096c3ad87a11
Change-Id: Ie822d1a154b7b25437ce7e5d09eb399460823acf
Reviewed-on: https://gerrit.libreoffice.org/13081
Reviewed-by: Markus Mohrhard <markus.mohrh...@googlemail.com>
Tested-by: Markus Mohrhard <markus.mohrh...@googlemail.com>
diff --git a/sc/source/filter/oox/condformatbuffer.cxx
b/sc/source/filter/oox/condformatbuffer.cxx
index 60e3e7c..754c36c 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;
- }
-
}
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
