Browse Source

Merge pull request #352 in BA/design from ~DANIEL/finereport_design:master to master

* commit 'eda9287a911587fd74e5614771094a47d61ee2fa':
  poi
master
superman 8 years ago
parent
commit
52041f263b
  1. 2
      designer/src/com/fr/design/actions/file/export/AbstractExcelExportAction.java
  2. 2
      designer_chart/src/com/fr/design/mainframe/actions/ExcelExportAction4Chart.java
  3. 18
      designer_chart/src/com/fr/design/mainframe/exporter/ExcelExporter4Chart.java

2
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";
}
}
}

2
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

18
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 {

Loading…
Cancel
Save