merge the formfield patch from ooo-build
[ooovba.git] / jfreereport / patches / libformula.patch
blob07968b44867557106774025de196df5ece5058f2
1 --- misc/libformula/source/org/pentaho/reporting/libraries/formula/function/datetime/DateDifFunction.java 2008-12-12 13:04:46.000000000 +0100
2 +++ misc/build/libformula/source/org/pentaho/reporting/libraries/formula/function/datetime/DateDifFunction.java 2008-12-15 08:15:18.293125000 +0100
3 @@ -198,12 +198,6 @@
4 LibFormulaErrorValue.ERROR_INVALID_ARGUMENT_VALUE);
7 - if (res < 0)
8 - {
9 - throw new EvaluationException(
10 - LibFormulaErrorValue.ERROR_INVALID_ARGUMENT_VALUE);
11 - }
13 //noinspection UnpredictableBigDecimalConstructorCall
14 return new TypeValuePair(NumberType.GENERIC_NUMBER, new BigDecimal((double) res));
16 --- misc/libformula/source/org/pentaho/reporting/libraries/formula/lvalues/FormulaFunction.java 2008-12-12 13:04:46.000000000 +0100
17 +++ misc/build/libformula/source/org/pentaho/reporting/libraries/formula/lvalues/FormulaFunction.java 2008-12-15 08:13:14.308750000 +0100
18 @@ -161,7 +161,8 @@
20 for (int i = 0; i < parameters.length; i++)
22 - parameters[i].initialize(context);
23 + if ( parameters[i] != null )
24 + parameters[i].initialize(context);