From 0d57cd758e98f54529d50447112ddae0835f0394 Mon Sep 17 00:00:00 2001 From: "Ocke.Janssen" Date: Thu, 4 Nov 2010 12:25:08 +0100 Subject: dba34b: #i115145# catch numberformatexception when creating bigdecimal --- reportbuilder/java/com/sun/star/report/SDBCReportData.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'reportbuilder/java/com/sun/star/report') diff --git a/reportbuilder/java/com/sun/star/report/SDBCReportData.java b/reportbuilder/java/com/sun/star/report/SDBCReportData.java index 769657aa6bf5..a759b1712fe9 100644 --- a/reportbuilder/java/com/sun/star/report/SDBCReportData.java +++ b/reportbuilder/java/com/sun/star/report/SDBCReportData.java @@ -47,7 +47,6 @@ import com.sun.star.util.Time; import java.sql.Timestamp; - public class SDBCReportData implements DataSource { @@ -349,7 +348,7 @@ public class SDBCReportData implements DataSource private Object convertObject(final int type, final Object obj) { - final Object ret; + Object ret; switch (type) { case DataType.DATE: @@ -365,7 +364,14 @@ public class SDBCReportData implements DataSource case DataType.NUMERIC: if (!(obj instanceof Any)) { - ret = new java.math.BigDecimal((String) obj); + try + { + ret = new java.math.BigDecimal(String.valueOf(obj)); + } + catch (NumberFormatException ex) + { + ret = obj; + } } else { -- cgit