summaryrefslogtreecommitdiff
path: root/reportbuilder
diff options
context:
space:
mode:
authorLionel Elie Mamane <lionel@mamane.lu>2013-04-10 18:03:58 +0200
committerLionel Elie Mamane <lionel@mamane.lu>2013-04-10 18:16:00 +0200
commiteb39389da846a5d31acbfeab029ca0dacbc5f02c (patch)
tree70dc2f7215ec97048b9da9ddc62c0d102f24fb43 /reportbuilder
parent60e9d2dd5c0e1c085de7354b1ca5cd1cb8b0d082 (diff)
reportbuilder: do not use empty tablename
Change-Id: I03ed5e810468ee206820a250c740b80c0ceda432
Diffstat (limited to 'reportbuilder')
-rw-r--r--reportbuilder/java/org/libreoffice/report/SDBCReportDataFactory.java10
1 files changed, 9 insertions, 1 deletions
diff --git a/reportbuilder/java/org/libreoffice/report/SDBCReportDataFactory.java b/reportbuilder/java/org/libreoffice/report/SDBCReportDataFactory.java
index 24e1fe10ba52..4d0a797bf739 100644
--- a/reportbuilder/java/org/libreoffice/report/SDBCReportDataFactory.java
+++ b/reportbuilder/java/org/libreoffice/report/SDBCReportDataFactory.java
@@ -254,7 +254,15 @@ public class SDBCReportDataFactory implements DataSourceFactory
try
{
column = UnoRuntime.queryInterface(XPropertySet.class, columns.getByName(expression));
- expression = quote + column.getPropertyValue("TableName") + quote + "." + quote + expression + quote;
+ String prefix;
+ prefix = (String)column.getPropertyValue("TableName");
+ if (prefix == null)
+ prefix = "";
+ if (!prefix.isEmpty())
+ {
+ prefix = quote + prefix + quote + ".";
+ }
+ expression = prefix + quote + expression + quote;
}
catch (Exception ex)
{