User: rt Date: 2008-06-16 13:02:00+0000 Modified: dba/reportdesign/java/com/sun/star/report/SDBCReportData.java
Log: INTEGRATION: CWS rptchart02 (1.3.4); FILE MERGED 2008/06/09 10:52:10 oj 1.3.4.3: #i89437# check if command is not null 2008/04/16 06:20:45 oj 1.3.4.2: RESYNC: (1.3-1.4); FILE MERGED 2008/03/12 09:42:43 oj 1.3.4.1: impl chart handling and some code refactoring File Changes: Directory: /dba/reportdesign/java/com/sun/star/report/ ====================================================== File [changed]: SDBCReportData.java Url: http://dba.openoffice.org/source/browse/dba/reportdesign/java/com/sun/star/report/SDBCReportData.java?r1=1.5&r2=1.6 Delta lines: +55 -39 --------------------- --- SDBCReportData.java 2008-05-05 13:32:07+0000 1.5 +++ SDBCReportData.java 2008-06-16 13:01:57+0000 1.6 @@ -65,6 +65,15 @@ row = (XRow) UnoRuntime.queryInterface(XRow.class, rowSet); this.rowSet = rowSet; + if (rowSet == null) + { + rowCount = 0; + columnCount = 0; + columnTypes = new int[1]; + columnNames = new String[1]; + } + else + { final XParametersSupplier xSuppParams = (XParametersSupplier) UnoRuntime.queryInterface( XParametersSupplier.class, rowSet); if (xSuppParams != null) @@ -119,6 +128,7 @@ rowCount = 0; } } + } public int getColumnCount() throws DataSourceException { @@ -137,6 +147,8 @@ public boolean absolute(final int row) throws DataSourceException { + if (rowSet == null) + return false; try { if (row == 0) @@ -154,6 +166,8 @@ public boolean next() throws DataSourceException { + if (rowSet == null) + return false; try { return rowSet.next(); @@ -276,6 +290,8 @@ public Object getObject(final int column) throws DataSourceException { + if (rowSet == null) + return null; try { final boolean isParameterValue = (parameters != null) && (column >= firstParameterIndex); @@ -322,7 +338,7 @@ } } - Object convertObject(final int type, final Object obj) + private Object convertObject(final int type, final Object obj) { final Object ret; switch (type) --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
