diff --git a/cool-jconon-backend/src/main/java/it/cnr/si/cool/jconon/service/PrintService.java b/cool-jconon-backend/src/main/java/it/cnr/si/cool/jconon/service/PrintService.java index 563e93c277..afc9f2ad11 100644 --- a/cool-jconon-backend/src/main/java/it/cnr/si/cool/jconon/service/PrintService.java +++ b/cool-jconon-backend/src/main/java/it/cnr/si/cool/jconon/service/PrintService.java @@ -2582,7 +2582,7 @@ private List> createHeadApplicationAll(Session session, Fo } private HSSFSheet createSheet(HSSFWorkbook wb, String sheetName, List head) { - HSSFSheet sheet = wb.createSheet(sheetName); + HSSFSheet sheet = wb.createSheet(HSSFUtil.getSheetNameValid(sheetName)); HSSFRow headRow = sheet.createRow(0); headRow.setHeight((short) 500); HSSFCellStyle headStyle = wb.createCellStyle(); @@ -3284,7 +3284,7 @@ private HSSFCell createCellNumeric(HSSFRow row, int index) { protected HSSFWorkbook createHSSFWorkbook(List head, String sheetName) { HSSFWorkbook wb = new HSSFWorkbook(); - HSSFSheet sheet = wb.createSheet(sheetName); + HSSFSheet sheet = wb.createSheet(HSSFUtil.getSheetNameValid(sheetName)); HSSFRow headRow = sheet.createRow(0); headRow.setHeight((short) 500); HSSFCellStyle headStyle = wb.createCellStyle(); diff --git a/cool-jconon-backend/src/main/java/it/cnr/si/cool/jconon/service/application/ApplicationService.java b/cool-jconon-backend/src/main/java/it/cnr/si/cool/jconon/service/application/ApplicationService.java index cee31e871b..49310b74b9 100644 --- a/cool-jconon-backend/src/main/java/it/cnr/si/cool/jconon/service/application/ApplicationService.java +++ b/cool-jconon-backend/src/main/java/it/cnr/si/cool/jconon/service/application/ApplicationService.java @@ -1518,7 +1518,7 @@ public String exportSchedeValutazione(Session currentCMISSession, String idCall, for (HSSFPictureData picture : workbook.getAllPictures()) { pictureId = wb.addPicture(picture.getData(), picture.getFormat()); } - HSSFSheet newSheet = wb.createSheet(sheetName); + HSSFSheet newSheet = wb.createSheet(HSSFUtil.getSheetNameValid(sheetName)); HSSFPrintSetup ps = newSheet.getPrintSetup(); ps.setLandscape(false); HSSFUtil.copySheets(newSheet, workbook.getSheetAt(0), styleMap, pictureId); diff --git a/cool-jconon-backend/src/main/java/it/cnr/si/cool/jconon/util/HSSFUtil.java b/cool-jconon-backend/src/main/java/it/cnr/si/cool/jconon/util/HSSFUtil.java index 883be2c353..8e5286fc5d 100644 --- a/cool-jconon-backend/src/main/java/it/cnr/si/cool/jconon/util/HSSFUtil.java +++ b/cool-jconon-backend/src/main/java/it/cnr/si/cool/jconon/util/HSSFUtil.java @@ -20,7 +20,8 @@ import org.apache.poi.ss.util.CellRangeAddress; import java.util.Map; - +import java.util.regex.Pattern; + /** * * @author jk @@ -119,5 +120,15 @@ public static void copyCell(HSSFCell oldCell, HSSFCell newCell, Map