Automated merge with file:///net/so-cwsserv01/export/cws/dba33d/DEV300/ooo

reportbuilder/java/com/sun/star/report/pentaho/PentahoReportJob.java

@@ -257,6 +257,11 @@ public class PentahoReportJob implements ReportJob
                     if (parameters.length > 0)
                     {
                         String name = parameters[0].toString();
+                        if (parameters[0] instanceof ContextLookup)
+                        {
+                            final ContextLookup context = (ContextLookup) parameters[0];
+                            name = context.getName();
+                        }
                         for (int j = 0; j < reportFunctions.length; j++)
                         {
                             if (reportFunctions[j] instanceof FormulaExpression)
@@ -370,7 +375,7 @@ public class PentahoReportJob implements ReportJob
         catch (final Exception e)
         {
             String message = e.getMessage();
-            if (message.length() == 0)
+            if (message == null || message.length() == 0)
             {
                 message = "Failed to process the report";
             }

reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FormatValueUtility.java

@@ -57,7 +57,7 @@ public class FormatValueUtility
     private static final String BOOLEAN_VALUE = "boolean-value";
     private static final String STRING_VALUE = "string-value";
     public static final String VALUE_TYPE = "value-type";
-    private static final String VALUE = "value";
+    public static final String VALUE = "value";
     private static SimpleDateFormat dateFormat;
     private static SimpleDateFormat timeFormat;
 

reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/TableCellLayoutController.java

@@ -80,6 +80,10 @@ public class TableCellLayoutController extends SectionLayoutController
             {
                 FormatValueUtility.applyValueForCell(value.getValue(), attributeMap, valueType);
             }
+            else if ( "float".equals(valueType))
+            {
+                attributeMap.setAttribute(OfficeNamespaces.OFFICE_NS, FormatValueUtility.VALUE, "1.#NAN");
+            }
         }
         catch (Exception e)
         {