summaryrefslogtreecommitdiff
path: root/reportbuilder/java/com/sun/star/report/SDBCReportData.java
diff options
context:
space:
mode:
Diffstat (limited to 'reportbuilder/java/com/sun/star/report/SDBCReportData.java')
-rw-r--r--reportbuilder/java/com/sun/star/report/SDBCReportData.java12
1 files changed, 9 insertions, 3 deletions
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
{