You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by fa...@apache.org on 2022/02/01 13:37:47 UTC
svn commit: r1897659 - /poi/trunk/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java
Author: fanningpj
Date: Tue Feb 1 13:37:46 2022
New Revision: 1897659
URL: http://svn.apache.org/viewvc?rev=1897659&view=rev
Log:
java 17 build issues (ambiguous ref to Record class)
Modified:
poi/trunk/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java
Modified: poi/trunk/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java?rev=1897659&r1=1897658&r2=1897659&view=diff
==============================================================================
--- poi/trunk/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java (original)
+++ poi/trunk/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java Tue Feb 1 13:37:46 2022
@@ -367,7 +367,7 @@ public final class HSSFWorkbook extends
// it happens to be spelled.
InputStream stream = directory.createDocumentInputStream(workbookName);
- List<Record> records = RecordFactory.createRecords(stream);
+ List<org.apache.poi.hssf.record.Record> records = RecordFactory.createRecords(stream);
workbook = InternalWorkbook.createWorkbook(records);
setPropertiesFromWorkbook(workbook);
@@ -457,10 +457,10 @@ public final class HSSFWorkbook extends
* @see SSTRecord
*/
- private void convertLabelRecords(List<Record> records, int offset) {
+ private void convertLabelRecords(List<org.apache.poi.hssf.record.Record> records, int offset) {
LOGGER.atDebug().log("convertLabelRecords called");
for (int k = offset; k < records.size(); k++) {
- Record rec = records.get(k);
+ org.apache.poi.hssf.record.Record rec = records.get(k);
if (rec.getSid() == LabelRecord.sid) {
LabelRecord oldrec = (LabelRecord) rec;
@@ -1450,7 +1450,7 @@ public final class HSSFWorkbook extends
*/
private static final class SheetRecordCollector implements RecordVisitor {
- private final List<Record> _list;
+ private final List<org.apache.poi.hssf.record.Record> _list;
private int _totalSize;
public SheetRecordCollector() {
@@ -1463,7 +1463,7 @@ public final class HSSFWorkbook extends
}
@Override
- public void visitRecord(Record r) {
+ public void visitRecord(org.apache.poi.hssf.record.Record r) {
_list.add(r);
_totalSize += r.getRecordSize();
@@ -1471,7 +1471,7 @@ public final class HSSFWorkbook extends
public int serialize(int offset, byte[] data) {
int result = 0;
- for (Record rec : _list) {
+ for (org.apache.poi.hssf.record.Record rec : _list) {
result += rec.serialize(offset + result, data);
}
return result;
@@ -2032,7 +2032,7 @@ public final class HSSFWorkbook extends
public List<HSSFPictureData> getAllPictures() {
// The drawing group record always exists at the top level, so we won't need to do this recursively.
List<HSSFPictureData> pictures = new ArrayList<>();
- for (Record r : workbook.getRecords()) {
+ for (RecordBase r : workbook.getRecords()) {
if (r instanceof AbstractEscherHolderRecord) {
((AbstractEscherHolderRecord) r).decode();
List<EscherRecord> escherRecords = ((AbstractEscherHolderRecord) r).getEscherRecords();
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org