Skip to content

Bump poi libraries from version 4.1.2 to version 5.2.2 #552

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jun 27, 2022
Merged

Bump poi libraries from version 4.1.2 to version 5.2.2 #552

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9ce13ae
Bump poi libraries from version 4.1.2 to version 5.2.2
sgrampone Mar 31, 2022
f506729
Merge branch 'master' into issue#95281
sgrampone May 27, 2022
8d2433d
Merge branch 'master' into issue#95281
sgrampone Jun 14, 2022
bb27641
Merge branch 'master' into issue#95281
sgrampone Jun 22, 2022
a80bfcd
Merge branch 'master' into issue#95281
sgrampone Jun 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions gxoffice/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-scratchpad</artifactId>
<version>4.1.2</version>
<version>${poi.version}</version>
</dependency>
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml</artifactId>
<version>4.1.2</version>
<version>${poi.version}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
Expand All @@ -42,7 +42,7 @@
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi</artifactId>
<version>4.1.2</version>
<version>${poi.version}</version>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
Expand Down
12 changes: 6 additions & 6 deletions gxoffice/src/main/java/com/genexus/gxoffice/poi/hssf/ExcelCells.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -753,15 +753,15 @@ public void setColor(long value) // 05/07/05 B@tero
}

private void copyPropertiesStyle(HSSFCellStyle dest, HSSFCellStyle source) {
dest.setAlignment(source.getAlignmentEnum());
dest.setBorderBottom(source.getBorderBottomEnum());
dest.setBorderLeft(source.getBorderLeftEnum());
dest.setBorderTop(source.getBorderTopEnum());
dest.setAlignment(source.getAlignment());
dest.setBorderBottom(source.getBorderBottom());
dest.setBorderLeft(source.getBorderLeft());
dest.setBorderTop(source.getBorderTop());
dest.setBottomBorderColor(source.getBottomBorderColor());
dest.setDataFormat(source.getDataFormat());
dest.setFillBackgroundColor(source.getFillBackgroundColor());
dest.setFillForegroundColor(source.getFillForegroundColor());
dest.setFillPattern(source.getFillPatternEnum());
dest.setFillPattern(source.getFillPattern());
dest.setFont(pWorkbook.getFontAt(source.getFontIndexAsInt()));
dest.setHidden(source.getHidden());
dest.setIndention(source.getIndention());
Expand All @@ -770,7 +770,7 @@ private void copyPropertiesStyle(HSSFCellStyle dest, HSSFCellStyle source) {
dest.setRightBorderColor(source.getRightBorderColor());
dest.setRotation(source.getRotation());
dest.setTopBorderColor(source.getTopBorderColor());
dest.setVerticalAlignment(source.getVerticalAlignmentEnum());
dest.setVerticalAlignment(source.getVerticalAlignment());
dest.setWrapText(source.getWrapText());
}

Expand Down
8 changes: 4 additions & 4 deletions gxoffice/src/main/java/com/genexus/msoffice/excel/poi/xssf/ExcelCells.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ else if (pCells[1].getCellType() == CellType.NUMERIC) {
public BigDecimal getValue() throws ExcelException {
BigDecimal value = new BigDecimal(0);
try {
CellType cType = pCells[1].getCellTypeEnum();
CellType cType = pCells[1].getCellType();
switch (cType) {
case FORMULA:
String type = getFormulaType();
Expand Down Expand Up @@ -654,7 +654,7 @@ public void setColor(long value) throws ExcelException // 05/07/05 B@tero
// System.out.println("Automatic color.");

if ((red + green + blue) != 0) {
newColor = new XSSFColor(new java.awt.Color(red, green, blue));
newColor = new XSSFColor(new java.awt.Color(red, green, blue), new DefaultIndexedColorMap());

newFont = (XSSFFont) pWorkbook.createFont();
copyPropertiesFont(newFont, fontCell);
Expand All @@ -672,7 +672,7 @@ public void setColor(long value) throws ExcelException // 05/07/05 B@tero
byte[] triplet = fontColor.getRGB();

if (triplet[0] != red || triplet[1] != green || triplet[2] != blue) {
newColor = new XSSFColor(new java.awt.Color(red, green, blue));
newColor = new XSSFColor( new java.awt.Color(red, green, blue), new DefaultIndexedColorMap());

newFont = (XSSFFont) pWorkbook.createFont();
copyPropertiesFont(newFont, fontCell);
Expand Down Expand Up @@ -927,7 +927,7 @@ public Boolean setCellStyle(ExcelStyle newCellStyle) {
}

private XSSFColor toColor(ExcelColor color) {
return new XSSFColor(new java.awt.Color(color.getRed(), color.getGreen(), color.getBlue()));
return new XSSFColor( new java.awt.Color(color.getRed(), color.getGreen(), color.getBlue()), new DefaultIndexedColorMap());
}

private XSSFCellStyle applyNewCellStyle(XSSFCellStyle cellStyle, ExcelStyle newCellStyle) {
Expand Down
4 changes: 2 additions & 2 deletions gxoffice/src/main/java/com/genexus/msoffice/excel/poi/xssf/ExcelSpreadsheet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@ private Boolean deleteColumnImpl(XSSFSheet sheet, int columnToDelete) {
}
Cell cNext = row.getCell(cID + 1);
if (cNext != null) {
Cell cNew = row.createCell(cID, cNext.getCellTypeEnum());
Cell cNew = row.createCell(cID, cNext.getCellType());
cloneCell(cNew, cNext);
//Set the column width only on the first row.
//Other wise the second row will overwrite the original column width set previously.
Expand Down Expand Up @@ -363,7 +363,7 @@ public void insertNewColumnBefore(XSSFSheet sheet, int columnIndex) {
Cell leftCell = r.getCell(col - 1);

if (leftCell != null) {
Cell newCell = r.createCell(col, leftCell.getCellTypeEnum());
Cell newCell = r.createCell(col, leftCell.getCellType());
cloneCell(newCell, leftCell);
/*if (newCell.getCellTypeEnum() == CellType.FORMULA) {
newCell.setCellFormula(ExcelHelper.updateFormula(newCell.getCellFormula(), columnIndex));
Expand Down
6 changes: 3 additions & 3 deletions gxsearch/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,17 +22,17 @@
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-scratchpad</artifactId>
<version>4.1.2</version>
<version>${poi.version}</version>
</dependency>
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml</artifactId>
<version>4.1.2</version>
<version>${poi.version}</version>
</dependency>
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi</artifactId>
<version>4.1.2</version>
<version>${poi.version}</version>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
Expand Down
1 change: 1 addition & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jersey.javax.version>2.34</jersey.javax.version>
<jersey.jakarta.version>3.0.1</jersey.jakarta.version>
<poi.version>5.2.2</poi.version>
<jackson.version>2.13.2</jackson.version>
<junit.version>4.13.2</junit.version>
<software.awssdk.version>2.17.213</software.awssdk.version>
Expand Down