Apache
/
poi
mirror of https://github.com/apache/poi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[bug-65973] partial fix for removing hyperlinks that span multiple cells 

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1899137 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
PJ Fanning 2022-03-22 17:54:37 +00:00
parent a1463e32e5
commit d41a40abc8
2 changed files with 51 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFSheet.java
View File

@ -3083,7 +3083,7 @@ public class XSSFSheet extends POIXMLDocumentPart implements Sheet, OoxmlSheetEx
// also remove any hyperlinks associated with this row // also remove any hyperlinks associated with this row
if (hyperlinks != null) { if (hyperlinks != null) {
for (XSSFHyperlink link : getHyperlinkList()) { for (XSSFHyperlink link : new ArrayList<>(hyperlinks)) {
CellRangeAddress range = CellRangeAddress.valueOf(link.getCellRef()); CellRangeAddress range = CellRangeAddress.valueOf(link.getCellRef());
//TODO handle case where hyperlink ref spans many rows (https://bz.apache.org/bugzilla/show_bug.cgi?id=65973) //TODO handle case where hyperlink ref spans many rows (https://bz.apache.org/bugzilla/show_bug.cgi?id=65973)
//but where only some rows are being removed and others are not (range will need to be modified) //but where only some rows are being removed and others are not (range will need to be modified)

50
poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFSheet.java
View File

@ -47,6 +47,7 @@ import java.util.stream.Collectors;
import java.util.stream.StreamSupport; import java.util.stream.StreamSupport;
import org.apache.commons.io.output.UnsynchronizedByteArrayOutputStream; import org.apache.commons.io.output.UnsynchronizedByteArrayOutputStream;
import org.apache.poi.common.usermodel.HyperlinkType;
import org.apache.poi.hssf.HSSFTestDataSamples; import org.apache.poi.hssf.HSSFTestDataSamples;
import org.apache.poi.ooxml.POIXMLException; import org.apache.poi.ooxml.POIXMLException;
import org.apache.poi.poifs.crypt.CryptoFunctions; import org.apache.poi.poifs.crypt.CryptoFunctions;
@ -2285,4 +2286,53 @@ public final class TestXSSFSheet extends BaseTestXSheet {
assertEquals(CellRangeAddress.valueOf("A1"), sheet.getDimension()); assertEquals(CellRangeAddress.valueOf("A1"), sheet.getDimension());
} }
} }
@Test
void testRowShiftWithHyperlink() throws IOException {
try (XSSFWorkbook wb = createWorkbookForRowShiftWithHyperlink1(true)) {
XSSFSheet sheet = wb.getSheetAt(0);
List<XSSFHyperlink> hyperlinks = sheet.getHyperlinkList();
assertEquals(1, hyperlinks.size());
assertEquals("B1:C1", hyperlinks.get(0).getCellRef());
assertEquals(3, sheet.getLastRowNum());
sheet.shiftRows(2, 3, -2);
assertEquals(1, sheet.getLastRowNum());
XSSFRow row0 = sheet.getRow(0);
XSSFRow row1 = sheet.getRow(1);
assertEquals("row2", row0.getCell(0).getStringCellValue());
assertEquals("row3", row1.getCell(0).getStringCellValue());
assertEquals(0, sheet.getHyperlinkList().size());
}
}
private XSSFWorkbook createWorkbookForRowShiftWithHyperlink1(boolean hyperlinkOneRow) {
XSSFWorkbook wb = new XSSFWorkbook();
XSSFSheet sheet = wb.createSheet("Sheet1");
XSSFRow row0 = sheet.createRow(0);
XSSFRow row1 = sheet.createRow(1);
XSSFRow row2 = sheet.createRow(2);
XSSFRow row3 = sheet.createRow(3);
row0.createCell(0).setCellValue("row0");
row1.createCell(0).setCellValue("row1");
row2.createCell(0).setCellValue("row2");
row3.createCell(0).setCellValue("row3");
row0.createCell(1).setCellValue("https://www.example.com");
if (hyperlinkOneRow) {
row0.createCell(2).setCellValue("https://www.example.com");
} else {
row1.createCell(1).setCellValue("https://www.example.com");
}
XSSFHyperlink hyperlink = new XSSFHyperlink(HyperlinkType.URL);
hyperlink.setAddress("https://www.example.com");
hyperlink.setFirstRow(0);
hyperlink.setFirstColumn(1);
if (hyperlinkOneRow) {
hyperlink.setLastColumn(2);
} else {
hyperlink.setLastRow(1);
}
sheet.addHyperlink(hyperlink);
return wb;
}
} }