Tag: mws_ooo300 User: obo Date: 2008-11-17 15:11:09+0000 Modified: dba/reportbuilder/java/com/sun/star/report/SDBCReportData.java
Log: INTEGRATION: CWS dba301a (1.1.1.1.6); FILE MERGED 2008/09/11 08:45:08 oj 1.1.1.1.6.1: #i93735# use column names from rowset getColumns File Changes: Directory: /dba/reportbuilder/java/com/sun/star/report/ ======================================================= File [changed]: SDBCReportData.java Url: http://dba.openoffice.org/source/browse/dba/reportbuilder/java/com/sun/star/report/SDBCReportData.java?r1=1.1.1.1&r2=1.1.1.1.2.1 Delta lines: +9 -6 ------------------- --- SDBCReportData.java 2008-08-12 14:14:10+0000 1.1.1.1 +++ SDBCReportData.java 2008-11-17 15:11:07+0000 1.1.1.1.2.1 @@ -32,6 +32,7 @@ import com.sun.star.beans.UnknownPropertyException; import com.sun.star.beans.XPropertySet; import com.sun.star.container.XIndexAccess; +import com.sun.star.container.XNameAccess; import com.sun.star.lang.IndexOutOfBoundsException; import com.sun.star.lang.WrappedTargetException; import com.sun.star.sdb.XParametersSupplier; @@ -43,6 +44,7 @@ import com.sun.star.sdbc.XResultSetMetaDataSupplier; import com.sun.star.sdbc.XRow; import com.sun.star.sdbc.XRowSet; +import com.sun.star.sdbcx.XColumnsSupplier; import com.sun.star.uno.Any; import com.sun.star.uno.UnoRuntime; import com.sun.star.util.DateTime; @@ -81,15 +83,16 @@ parameters = xSuppParams.getParameters(); } + final XColumnsSupplier columnsSup = (XColumnsSupplier)UnoRuntime.queryInterface(XColumnsSupplier.class, rowSet); + final XNameAccess columns = columnsSup.getColumns(); + final String[] columnNamesList = columns.getElementNames(); final XResultSetMetaDataSupplier sup = (XResultSetMetaDataSupplier) UnoRuntime.queryInterface(XResultSetMetaDataSupplier.class, rowSet); final XResultSetMetaData resultSetMetaData = sup.getMetaData(); columnCount = resultSetMetaData.getColumnCount(); - if (parameters != null) - { firstParameterIndex = columnCount + 1; + if (parameters != null) columnCount += parameters.getCount(); - } columnTypes = new int[columnCount]; columnNames = new String[columnCount]; @@ -98,7 +101,7 @@ { if (i < firstParameterIndex) { - columnNames[i - 1] = resultSetMetaData.getColumnName(i); + columnNames[i - 1] = columnNamesList[i - 1];// resultSetMetaData.getColumnName(i); columnTypes[i - 1] = resultSetMetaData.getColumnType(i); } else --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
