diff options
Diffstat (limited to 'reportbuilder')
| -rw-r--r-- | reportbuilder/java/org/libreoffice/report/SDBCReportDataFactory.java | 10 |
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) { |