diff --git a/designer/src/com/fr/design/actions/file/export/AbstractExcelExportAction.java b/designer/src/com/fr/design/actions/file/export/AbstractExcelExportAction.java index 63aaf064c..ae1a08ce2 100644 --- a/designer/src/com/fr/design/actions/file/export/AbstractExcelExportAction.java +++ b/designer/src/com/fr/design/actions/file/export/AbstractExcelExportAction.java @@ -36,7 +36,7 @@ public abstract class AbstractExcelExportAction extends AbstractExportAction { if (hasLayerReport(tpl)) { return "zip"; } else { - return ExcelUtils.checkPOIJarExist() ? "xlsx" : "xls"; + return ExcelUtils.checkThirdJarSupportPOI() ? "xlsx" : "xls"; } } } \ No newline at end of file diff --git a/designer_chart/src/com/fr/design/mainframe/actions/ExcelExportAction4Chart.java b/designer_chart/src/com/fr/design/mainframe/actions/ExcelExportAction4Chart.java index aa703f311..e1e64395a 100644 --- a/designer_chart/src/com/fr/design/mainframe/actions/ExcelExportAction4Chart.java +++ b/designer_chart/src/com/fr/design/mainframe/actions/ExcelExportAction4Chart.java @@ -58,7 +58,7 @@ public class ExcelExportAction4Chart extends AbstractExportAction4JChart { @Override protected String getDefaultExtension() { - return ExcelUtils.checkPOIJarExist() ? "xlsx" : "xls"; + return ExcelUtils.checkThirdJarSupportPOI() ? "xlsx" : "xls"; } @Override diff --git a/designer_chart/src/com/fr/design/mainframe/exporter/ExcelExporter4Chart.java b/designer_chart/src/com/fr/design/mainframe/exporter/ExcelExporter4Chart.java index 425f5d2ea..71e02d173 100644 --- a/designer_chart/src/com/fr/design/mainframe/exporter/ExcelExporter4Chart.java +++ b/designer_chart/src/com/fr/design/mainframe/exporter/ExcelExporter4Chart.java @@ -6,14 +6,14 @@ import com.fr.design.mainframe.JChart; import com.fr.general.FRLogger; import com.fr.general.IOUtils; import com.fr.stable.CoreGraphHelper; -import org.apache.poi.hssf.usermodel.HSSFClientAnchor; -import org.apache.poi.hssf.usermodel.HSSFWorkbook; -import org.apache.poi.ss.usermodel.ClientAnchor; -import org.apache.poi.ss.usermodel.Drawing; -import org.apache.poi.ss.usermodel.Sheet; -import org.apache.poi.ss.usermodel.Workbook; -import org.apache.poi.xssf.usermodel.XSSFClientAnchor; -import org.apache.poi.xssf.usermodel.XSSFWorkbook; +import com.fr.third.v2.org.apache.poi.hssf.usermodel.HSSFClientAnchor; +import com.fr.third.v2.org.apache.poi.hssf.usermodel.HSSFWorkbook; +import com.fr.third.v2.org.apache.poi.ss.usermodel.ClientAnchor; +import com.fr.third.v2.org.apache.poi.ss.usermodel.Drawing; +import com.fr.third.v2.org.apache.poi.ss.usermodel.Sheet; +import com.fr.third.v2.org.apache.poi.ss.usermodel.Workbook; +import com.fr.third.v2.org.apache.poi.xssf.usermodel.XSSFClientAnchor; +import com.fr.third.v2.org.apache.poi.xssf.usermodel.XSSFWorkbook; import java.awt.*; import java.awt.image.BufferedImage; import java.io.ByteArrayOutputStream; @@ -73,7 +73,7 @@ public class ExcelExporter4Chart extends ImageExporter4Chart { } private boolean checkExcelExportVersion() { - return ExcelUtils.checkPOIJarExist(); + return ExcelUtils.checkThirdJarSupportPOI(); } // 加载图片. private int loadPicture(BufferedImage bufferedImage)throws IOException {