wangxin/loongoffice
1
0
Fork 0
forked from amazingfate/loongoffice
Code Pull Requests Activity

CWS-TOOLING: integrate CWS dba31b

Browse Source
This commit is contained in:
Vladimir Glazounov
2008-10-01 12:28:29 +00:00
parent c8ebff286b
commit d2b287cdd4
107 changed files with 1611 additions and 2044 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
reportdesign/java/com/sun/star/report/SDBCReportData.java
View File

@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: SDBCReportData.java,v $
* $Revision: 1.6 $
* $Revision: 1.6.32.1 $
*
* This file is part of OpenOffice.org.
*
@ -85,11 +85,9 @@ public class SDBCReportData implements DataSource
final XResultSetMetaData resultSetMetaData = sup.getMetaData();
columnCount = resultSetMetaData.getColumnCount();
firstParameterIndex = columnCount + 1;
if (parameters != null)
{
firstParameterIndex = columnCount + 1;
columnCount += parameters.getCount();
}
columnTypes = new int[columnCount];
columnNames = new String[columnCount];

39
reportdesign/java/com/sun/star/report/SDBCReportDataFactory.java
View File

@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: SDBCReportDataFactory.java,v $
* $Revision: 1.9 $
* $Revision: 1.9.18.1 $
*
* This file is part of OpenOffice.org.
*
@ -72,15 +72,14 @@ public class SDBCReportDataFactory implements DataSourceFactory
{
public static final String COMMAND_TYPE = "command-type";
public static final String ESCAPE_PROCESSING = "escape-processing";
public static final String GROUP_EXPRESSIONS = "group-expressions";
public static final String MASTER_VALUES = "master-values";
public static final String DETAIL_COLUMNS = "detail-columns";
public static final String UNO_FILTER = "Filter";
private static final String APPLY_FILTER = "ApplyFilter";
private static final String UNO_COMMAND = "Command";
private static final String UNO_ORDER = "Order";
private static final String UNO_APPLY_FILTER = "ApplyFilter";
private static final String UNO_COMMAND_TYPE = "CommandType";
private final XConnection connection;
@ -435,22 +434,26 @@ public class SDBCReportDataFactory implements DataSourceFactory
if (queries.hasByName(command))
{
final XPropertySet prop = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, queries.getByName(command));
final Boolean escape = (Boolean)prop.getPropertyValue("EscapeProcessing");
if ( escape.booleanValue() )
final Boolean escape = (Boolean) prop.getPropertyValue("EscapeProcessing");
if (escape.booleanValue())
{
statement = (String) prop.getPropertyValue(UNO_COMMAND);
final XSingleSelectQueryComposer composer = getComposer(tools,statement,CommandType.COMMAND);
if ( composer != null )
final XSingleSelectQueryComposer composer = getComposer(tools, statement, CommandType.COMMAND);
if (composer != null)
{
final String order = (String) prop.getPropertyValue(UNO_ORDER);
if ( order != null && order.length() != 0 )
composer.setOrder(order);
final Boolean applyFilter = (Boolean)prop.getPropertyValue(UNO_APPLY_FILTER);
if ( applyFilter.booleanValue() )
final String order = (String) prop.getPropertyValue(UNO_ORDER);
if (order != null && order.length() != 0)
{
final String filter = (String) prop.getPropertyValue(UNO_FILTER);
if ( filter != null && filter.length() != 0 )
composer.setOrder(order);
}
final Boolean applyFilter = (Boolean) prop.getPropertyValue(UNO_APPLY_FILTER);
if (applyFilter.booleanValue())
{
final String filter = (String) prop.getPropertyValue(UNO_FILTER);
if (filter != null && filter.length() != 0)
{
composer.setFilter(filter);
}
}
statement = composer.getQuery();
}
@ -561,10 +564,10 @@ public class SDBCReportDataFactory implements DataSourceFactory
final XRowSet rowSet = (XRowSet) UnoRuntime.queryInterface(XRowSet.class, m_cmpCtx.getServiceManager().createInstanceWithContext("com.sun.star.sdb.RowSet", m_cmpCtx));
final XPropertySet rowSetProp = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, rowSet);
rowSetProp.setPropertyValue(
"ActiveConnection", connection);
rowSetProp.setPropertyValue(UNO_COMMAND_TYPE,
new Integer(commandType));
rowSetProp.setPropertyValue("ActiveConnection", connection);
final Boolean escapeProcessing = (Boolean)parameters.get(ESCAPE_PROCESSING);
rowSetProp.setPropertyValue("EscapeProcessing", escapeProcessing);
rowSetProp.setPropertyValue(UNO_COMMAND_TYPE, new Integer(commandType));
rowSetProp.setPropertyValue(UNO_COMMAND, command);
final String filter = (String) parameters.get(UNO_FILTER);

4
reportdesign/java/com/sun/star/report/pentaho/PentahoReportJob.java
View File

@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: PentahoReportJob.java,v $
* $Revision: 1.9 $
* $Revision: 1.8.16.4 $
*
* This file is part of OpenOffice.org.
*
@ -338,8 +338,10 @@ public class PentahoReportJob implements ReportJob
parameters.put(SDBCReportDataFactory.GROUP_EXPRESSIONS, expressions);
final String command = (String) officeReport.getAttribute(OfficeNamespaces.OOREPORT_NS, "command");
final String commandType = (String) officeReport.getAttribute(OfficeNamespaces.OOREPORT_NS, SDBCReportDataFactory.COMMAND_TYPE);
final String escapeProcessing = (String) officeReport.getAttribute(OfficeNamespaces.OOREPORT_NS, SDBCReportDataFactory.ESCAPE_PROCESSING);
report.setQuery(command);
parameters.put(SDBCReportDataFactory.COMMAND_TYPE, commandType);
parameters.put(SDBCReportDataFactory.ESCAPE_PROCESSING,new Boolean(!("false".equals(escapeProcessing))));
final String filter = (String) officeReport.getAttribute(OfficeNamespaces.OOREPORT_NS, "filter");
parameters.put(SDBCReportDataFactory.UNO_FILTER, filter);