mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fdo#61726 java class collision with new idl

Browse Source 
Change-Id: I90ea912fd0cc54068843d21cb2585e78e70a3d71
This commit is contained in:
David Ostrovsky 2013-03-06 01:10:53 +01:00
parent acc4ed5c4b
commit cde76a3205
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
reportbuilder/Jar_reportbuilder.mk
View File

@ -68,7 +68,7 @@ $(eval $(call gb_Jar_add_sourcefiles,sun-report-builder,\
reportbuilder/java/com/sun/star/report/OutputRepository \ reportbuilder/java/com/sun/star/report/OutputRepository \
reportbuilder/java/com/sun/star/report/ParameterMap \ reportbuilder/java/com/sun/star/report/ParameterMap \
reportbuilder/java/com/sun/star/report/ReportAddIn \ reportbuilder/java/com/sun/star/report/ReportAddIn \
reportbuilder/java/com/sun/star/report/ReportEngine \ reportbuilder/java/com/sun/star/report/ReportEngine2 \
reportbuilder/java/com/sun/star/report/ReportEngineMetaData \ reportbuilder/java/com/sun/star/report/ReportEngineMetaData \
reportbuilder/java/com/sun/star/report/ReportEngineParameterNames \ reportbuilder/java/com/sun/star/report/ReportEngineParameterNames \
reportbuilder/java/com/sun/star/report/ReportExecutionException \ reportbuilder/java/com/sun/star/report/ReportExecutionException \

2
reportbuilder/java/com/sun/star/report/ReportEngine.java → reportbuilder/java/com/sun/star/report/ReportEngine2.java
View File

@ -27,7 +27,7 @@ package com.sun.star.report;
* vs. local jobs etc). * vs. local jobs etc).
* *
*/ */
public interface ReportEngine public interface ReportEngine2
{ {
public ReportJobDefinition createJobDefinition(); public ReportJobDefinition createJobDefinition();

5
reportbuilder/java/com/sun/star/report/pentaho/PentahoReportEngine.java
View File

@ -18,15 +18,14 @@
package com.sun.star.report.pentaho; package com.sun.star.report.pentaho;
import com.sun.star.report.JobDefinitionException; import com.sun.star.report.JobDefinitionException;
import com.sun.star.report.ReportEngine; import com.sun.star.report.ReportEngine2;
import com.sun.star.report.ReportEngineMetaData; import com.sun.star.report.ReportEngineMetaData;
import com.sun.star.report.ReportJob; import com.sun.star.report.ReportJob;
import com.sun.star.report.ReportJobDefinition; import com.sun.star.report.ReportJobDefinition;
import com.sun.star.report.util.DefaultReportJobDefinition; import com.sun.star.report.util.DefaultReportJobDefinition;
import org.jfree.report.JFreeReportBoot; import org.jfree.report.JFreeReportBoot;
public class PentahoReportEngine implements ReportEngine public class PentahoReportEngine implements ReportEngine2
{ {
private final ReportEngineMetaData metaData; private final ReportEngineMetaData metaData;