strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Automated merge with http://hg.services.openoffice.org/cws/dba33e

Browse source
This commit is contained in:
Ocke Janssen [oj] 2010-01-07 09:18:48 +01:00
commit 63ccb14ff9
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
reportbuilder/java/com/sun/star/report/SDBCReportDataFactory.java
View file

@ -210,7 +210,7 @@ public class SDBCReportDataFactory implements DataSourceFactory
final Boolean escapeProcessing = (Boolean) parameters.get(ESCAPE_PROCESSING);
final String filter = (String) parameters.get(UNO_FILTER);
final Integer maxRows = (Integer) parameters.get("MaxRows");
RowSetProperties rowSetProps = new RowSetProperties(escapeProcessing, commandType, command, filter, maxRows);
final RowSetProperties rowSetProps = new RowSetProperties(escapeProcessing, commandType, command, filter, maxRows);
final Object[] p = createRowSet(rowSetProps, parameters);
final XRowSet rowSet = (XRowSet) p[0];
@ -260,7 +260,7 @@ public class SDBCReportDataFactory implements DataSourceFactory
final Object[] pair = (Object[]) groupExpressions.get(i);
String expression = (String) pair[0];
if (columns.hasByName(expression))
if (!expression.startsWith(quote) && columns.hasByName(expression))
{
expression = quote + expression + quote;
}

5
reportbuilder/java/com/sun/star/report/pentaho/PentahoReportJob.java
View file

@ -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)