From c1ae6ef0e9c37f502b58f70be5a041815f76b71b Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Sat, 23 Oct 2021 14:23:19 +0000 Subject: [PATCH] XSSFReader extensibility git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1894513 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/poi/xssf/eventusermodel/XSSFBReader.java | 4 ++-- .../apache/poi/xssf/eventusermodel/XSSFReader.java | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/poi-ooxml/src/main/java/org/apache/poi/xssf/eventusermodel/XSSFBReader.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/eventusermodel/XSSFBReader.java index e26bfdeb0e..883fce2c9b 100644 --- a/poi-ooxml/src/main/java/org/apache/poi/xssf/eventusermodel/XSSFBReader.java +++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/eventusermodel/XSSFBReader.java @@ -127,12 +127,12 @@ public class XSSFBReader extends XSSFReader { } @Override - Set getSheetRelationships() { + protected Set getSheetRelationships() { return WORKSHEET_RELS; } @Override - Iterator createSheetIteratorFromWB(PackagePart wb) throws IOException { + protected Iterator createSheetIteratorFromWB(PackagePart wb) throws IOException { SheetRefLoader sheetRefLoader = new SheetRefLoader(wb.getInputStream()); sheetRefLoader.parse(); return sheetRefLoader.getSheets().iterator(); diff --git a/poi-ooxml/src/main/java/org/apache/poi/xssf/eventusermodel/XSSFReader.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/eventusermodel/XSSFReader.java index 47eeecf396..bb795333ed 100644 --- a/poi-ooxml/src/main/java/org/apache/poi/xssf/eventusermodel/XSSFReader.java +++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/eventusermodel/XSSFReader.java @@ -215,26 +215,26 @@ public class XSSFReader { /** * Maps relId and the corresponding PackagePart */ - private final Map sheetMap; + protected final Map sheetMap; /** * Current sheet reference */ - XSSFSheetRef xssfSheetRef; + protected XSSFSheetRef xssfSheetRef; /** * Iterator over CTSheet objects, returns sheets in {@code logical} order. * We can't rely on the Ooxml4J's relationship iterator because it returns objects in physical order, * i.e. as they are stored in the underlying package */ - final Iterator sheetIterator; + protected final Iterator sheetIterator; /** * Construct a new SheetIterator * * @param wb package part holding workbook.xml */ - SheetIterator(PackagePart wb) throws IOException { + protected SheetIterator(PackagePart wb) throws IOException { /* * The order of sheets is defined by the order of CTSheet elements in workbook.xml @@ -259,7 +259,7 @@ public class XSSFReader { } } - Iterator createSheetIteratorFromWB(PackagePart wb) throws IOException { + protected Iterator createSheetIteratorFromWB(PackagePart wb) throws IOException { XMLSheetRefReader xmlSheetRefReader = new XMLSheetRefReader(); XMLReader xmlReader; @@ -294,7 +294,7 @@ public class XSSFReader { * * @return all relationships that are sheet-like */ - Set getSheetRelationships() { + protected Set getSheetRelationships() { return WORKSHEET_RELS; }