diff options
| author | David Ostrovsky <david@ostrovsky.org> | 2013-03-06 01:10:53 +0100 |
|---|---|---|
| committer | David Ostrovsky <david@ostrovsky.org> | 2013-03-06 01:16:11 +0100 |
| commit | cde76a32058aef5cd19b17f01aebb6715f97ec6b (patch) | |
| tree | 558295e962a1060cb33cae12c7ba69380b53e64a | |
| parent | acc4ed5c4b116fe6b5104833341cc044f77e0374 (diff) | |
fdo#61726 java class collision with new idl
Change-Id: I90ea912fd0cc54068843d21cb2585e78e70a3d71
| -rw-r--r-- | reportbuilder/Jar_reportbuilder.mk | 2 | ||||
| -rw-r--r-- | reportbuilder/java/com/sun/star/report/ReportEngine2.java (renamed from reportbuilder/java/com/sun/star/report/ReportEngine.java) | 2 | ||||
| -rw-r--r-- | reportbuilder/java/com/sun/star/report/pentaho/PentahoReportEngine.java | 5 |
3 files changed, 4 insertions, 5 deletions
diff --git a/reportbuilder/Jar_reportbuilder.mk b/reportbuilder/Jar_reportbuilder.mk index 54e55e626c5b..d99c127820dc 100644 --- a/reportbuilder/Jar_reportbuilder.mk +++ b/reportbuilder/Jar_reportbuilder.mk @@ -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/ParameterMap \ 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/ReportEngineParameterNames \ reportbuilder/java/com/sun/star/report/ReportExecutionException \ diff --git a/reportbuilder/java/com/sun/star/report/ReportEngine.java b/reportbuilder/java/com/sun/star/report/ReportEngine2.java index dd88f6a30d86..07a2fa09c1fe 100644 --- a/reportbuilder/java/com/sun/star/report/ReportEngine.java +++ b/reportbuilder/java/com/sun/star/report/ReportEngine2.java @@ -27,7 +27,7 @@ package com.sun.star.report; * vs. local jobs etc). * */ -public interface ReportEngine +public interface ReportEngine2 { public ReportJobDefinition createJobDefinition(); diff --git a/reportbuilder/java/com/sun/star/report/pentaho/PentahoReportEngine.java b/reportbuilder/java/com/sun/star/report/pentaho/PentahoReportEngine.java index 2b8d451938a2..01f5480714d4 100644 --- a/reportbuilder/java/com/sun/star/report/pentaho/PentahoReportEngine.java +++ b/reportbuilder/java/com/sun/star/report/pentaho/PentahoReportEngine.java @@ -18,15 +18,14 @@ package com.sun.star.report.pentaho; 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.ReportJob; import com.sun.star.report.ReportJobDefinition; import com.sun.star.report.util.DefaultReportJobDefinition; - import org.jfree.report.JFreeReportBoot; -public class PentahoReportEngine implements ReportEngine +public class PentahoReportEngine implements ReportEngine2 { private final ReportEngineMetaData metaData; |