Tag: cws_dev300_rptchart02 User: oj Date: 2008-06-09 10:52:13+0000 Modified: dba/reportdesign/java/com/sun/star/report/SDBCReportData.java dba/reportdesign/java/com/sun/star/report/SDBCReportDataFactory.java dba/reportdesign/java/com/sun/star/report/pentaho/SOReportJobFactory.java dba/reportdesign/java/com/sun/star/report/pentaho/output/chart/ChartRawReportTarget.java
Log: #i89437# check if command is not null 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.3.4.2&r2=1.3.4.3 Delta lines: +57 -41 --------------------- --- SDBCReportData.java 2008-04-16 06:20:45+0000 1.3.4.2 +++ SDBCReportData.java 2008-06-09 10:52:10+0000 1.3.4.3 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: SDBCReportData.java,v $ - * $Revision: 1.3.4.2 $ + * $Revision: 1.3.4.3 $ * * This file is part of OpenOffice.org. * @@ -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) File [changed]: SDBCReportDataFactory.java Url: http://dba.openoffice.org/source/browse/dba/reportdesign/java/com/sun/star/report/SDBCReportDataFactory.java?r1=1.3.4.8&r2=1.3.4.9 Delta lines: +5 -1 ------------------- --- SDBCReportDataFactory.java 2008-05-27 08:06:15+0000 1.3.4.8 +++ SDBCReportDataFactory.java 2008-06-09 10:52:10+0000 1.3.4.9 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: SDBCReportDataFactory.java,v $ - * $Revision: 1.3.4.8 $ + * $Revision: 1.3.4.9 $ * * This file is part of OpenOffice.org. * @@ -98,6 +98,10 @@ { try { + if (command == null) + { + return new SDBCReportData(null); + } int commandType = CommandType.COMMAND; final String commandTypeValue = (String) parameters.get(COMMAND_TYPE); if (commandTypeValue != null) Directory: /dba/reportdesign/java/com/sun/star/report/pentaho/ ============================================================== File [changed]: SOReportJobFactory.java Url: http://dba.openoffice.org/source/browse/dba/reportdesign/java/com/sun/star/report/pentaho/SOReportJobFactory.java?r1=1.3.4.4&r2=1.3.4.5 Delta lines: +2 -5 ------------------- --- SOReportJobFactory.java 2008-05-22 08:04:53+0000 1.3.4.4 +++ SOReportJobFactory.java 2008-06-09 10:52:10+0000 1.3.4.5 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: SOReportJobFactory.java,v $ - * $Revision: 1.3.4.4 $ + * $Revision: 1.3.4.5 $ * * This file is part of OpenOffice.org. * @@ -176,8 +176,7 @@ catch (java.lang.IncompatibleClassChangeError e2) { Log.error("Detected an IncompatibleClassChangeError"); - e2.printStackTrace(System.err); - System.err.println(e2); + throw new com.sun.star.lang.WrappedTargetException("caught a " + e2.getClass().getName(), this, new com.sun.star.uno.Exception(e2.getLocalizedMessage())); } Thread.currentThread().setContextClassLoader(cl); @@ -348,8 +347,6 @@ } catch (java.lang.IncompatibleClassChangeError e2) { - e2.printStackTrace(System.err); - System.err.println(e2); } return xFactory; Directory: /dba/reportdesign/java/com/sun/star/report/pentaho/output/chart/ =========================================================================== File [changed]: ChartRawReportTarget.java Url: http://dba.openoffice.org/source/browse/dba/reportdesign/java/com/sun/star/report/pentaho/output/chart/ChartRawReportTarget.java?r1=1.2.4.2&r2=1.2.4.3 Delta lines: +2 -3 ------------------- --- ChartRawReportTarget.java 2008-04-16 06:23:44+0000 1.2.4.2 +++ ChartRawReportTarget.java 2008-06-09 10:52:10+0000 1.2.4.3 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: ChartRawReportTarget.java,v $ - * $Revision: 1.2.4.2 $ + * $Revision: 1.2.4.3 $ * * This file is part of OpenOffice.org. * @@ -75,7 +75,6 @@ throws ReportProcessingException { super(reportJob, resourceManager, baseResource, inputRepository, outputRepository, target, imageService, dataSourceFactory); - Log.getInstance().addTarget(new PrintStreamLogTarget()); } protected String getTargetMimeType() --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
