Author: fanningpj
Date: Mon Dec 12 21:09:09 2022
New Revision: 1905943
URL: http://svn.apache.org/viewvc?rev=1905943&view=rev
Log:
[bug-66319] do not create HSSF patriarch to find comments (only use one that
pre-exists)
Added:
poi/trunk/test-data/spreadsheet/bug66319.xls (with props)
Modified:
poi/trunk/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFSheet.java
poi/trunk/poi/src/test/java/org/apache/poi/hssf/usermodel/TestBugs.java
Modified:
poi/trunk/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFSheet.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFSheet.java?rev=1905943&r1=1905942&r2=1905943&view=diff
==============================================================================
--- poi/trunk/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFSheet.java
(original)
+++ poi/trunk/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFSheet.java
Mon Dec 12 21:09:09 2022
@@ -2527,10 +2527,7 @@ public final class HSSFSheet implements
protected HSSFComment findCellComment(int row, int column) {
HSSFPatriarch patriarch = getDrawingPatriarch();
- if (null == patriarch) {
- patriarch = createDrawingPatriarch();
- }
- return lookForComment(patriarch, row, column);
+ return patriarch == null ? null : lookForComment(patriarch, row,
column);
}
private HSSFComment lookForComment(HSSFShapeContainer container, int row,
int column) {
Modified:
poi/trunk/poi/src/test/java/org/apache/poi/hssf/usermodel/TestBugs.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi/src/test/java/org/apache/poi/hssf/usermodel/TestBugs.java?rev=1905943&r1=1905942&r2=1905943&view=diff
==============================================================================
--- poi/trunk/poi/src/test/java/org/apache/poi/hssf/usermodel/TestBugs.java
(original)
+++ poi/trunk/poi/src/test/java/org/apache/poi/hssf/usermodel/TestBugs.java Mon
Dec 12 21:09:09 2022
@@ -2609,4 +2609,38 @@ final class TestBugs extends BaseTestBug
assertNotNull(wb);
}
}
+
+ @Test
+ void test66319() throws IOException {
+ try (
+ HSSFWorkbook workbook = openSampleWorkbook("bug66319.xls");
+ UnsynchronizedByteArrayOutputStream bos = new
UnsynchronizedByteArrayOutputStream()
+ ) {
+ for (Sheet sheet : workbook) {
+ for (Row row : sheet) {
+ for (Cell cell : row) {
+ cell.getCellComment();
+ }
+ }
+ }
+ workbook.write(bos);
+ }
+ }
+
+ @Test
+ void test66319WithRemove() throws IOException {
+ try (
+ HSSFWorkbook workbook = openSampleWorkbook("bug66319.xls");
+ UnsynchronizedByteArrayOutputStream bos = new
UnsynchronizedByteArrayOutputStream()
+ ) {
+ for (Sheet sheet : workbook) {
+ for (Row row : sheet) {
+ for (Cell cell : row) {
+ cell.removeCellComment();
+ }
+ }
+ }
+ workbook.write(bos);
+ }
+ }
}
Added: poi/trunk/test-data/spreadsheet/bug66319.xls
URL:
http://svn.apache.org/viewvc/poi/trunk/test-data/spreadsheet/bug66319.xls?rev=1905943&view=auto
==============================================================================
Binary file - no diff available.
Propchange: poi/trunk/test-data/spreadsheet/bug66319.xls
------------------------------------------------------------------------------
svn:mime-type = application/vnd.ms-excel
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
