User: kz Date: 2008-05-05 13:40:47+0000 Modified: dba/reportdesign/java/com/sun/star/report/pentaho/SOReportJobFactory.java
Log: INTEGRATION: CWS dba30beta (1.4.6); FILE MERGED 2008/04/22 10:30:25 oj 1.4.6.1: #i88503# merge changes from rptchart02 File Changes: 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.4&r2=1.5 Delta lines: +12 -3 -------------------- --- SOReportJobFactory.java 2008-04-10 17:20:02+0000 1.4 +++ SOReportJobFactory.java 2008-05-05 13:40:41+0000 1.5 @@ -86,12 +86,12 @@ */ private static final String __serviceName = "com.sun.star.report.pentaho.SOReportJobFactory"; - private PropertySetMixin m_prophlp; + private final PropertySetMixin m_prophlp; /** * The initial component contextr, that gives access to the service manager, supported singletons, ... It's * often later used */ - private XComponentContext m_cmpCtx; + private final XComponentContext m_cmpCtx; private XConnection activeConnection; private XReportDefinition report; @@ -233,9 +233,18 @@ } mimetype = report.getMimeType(); } + else + { + XPropertySet set = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, rowSet); + if ( set == null ) + { + throw new com.sun.star.lang.IllegalArgumentException(); + } + activeConnection = (XConnection) UnoRuntime.queryInterface(XConnection.class,set.getPropertyValue("ActiveConnection")); + } if (mimetype == null) { - mimetype = "application/vnd.oasis.opendocument.text"; + mimetype = PentahoReportEngineMetaData.OPENDOCUMENT_TEXT; } final DataSourceFactory dataFactory = new SDBCReportDataFactory(m_cmpCtx, activeConnection); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
