Author: centic
Date: Sat Sep 23 07:41:27 2017
New Revision: 1809371
URL: http://svn.apache.org/viewvc?rev=1809371&view=rev
Log:
Apply patch to add endSheet() to the XSSFEventBasedExcelExtractor, fixes bug
60737, thanks to user zakim for the patch
Modified:
poi/site/src/documentation/content/xdocs/status.xml
poi/trunk/src/java/org/apache/poi/hssf/extractor/EventBasedExcelExtractor.java
poi/trunk/src/ooxml/java/org/apache/poi/xssf/eventusermodel/XSSFSheetXMLHandler.java
poi/trunk/src/ooxml/java/org/apache/poi/xssf/extractor/XSSFBEventBasedExcelExtractor.java
poi/trunk/src/ooxml/java/org/apache/poi/xssf/extractor/XSSFEventBasedExcelExtractor.java
Modified: poi/site/src/documentation/content/xdocs/status.xml
URL:
http://svn.apache.org/viewvc/poi/site/src/documentation/content/xdocs/status.xml?rev=1809371&r1=1809370&r2=1809371&view=diff
==============================================================================
--- poi/site/src/documentation/content/xdocs/status.xml (original)
+++ poi/site/src/documentation/content/xdocs/status.xml Sat Sep 23 07:41:27 2017
@@ -65,6 +65,7 @@
<summary-item>Removal of deprecated classes and methods that were
marked for removal in v3.18</summary-item>
</summary>
<actions>
+ <action dev="PD" type="add" fixes-bug="60737" module="XSSF">Add
endSheet() to XSSFEventBasedExcelExtractor</action>
<action dev="PD" type="fix" fixes-bug="59747" module="OPC">Exchange
order of writing parts into Zip to allow some tools to handle files
better</action>
<action dev="PD" type="add" fixes-bug="github-69" module="SS
Common">Support matrix functions</action>
<action dev="PD" type="fix" fixes-bug="60499" module="OPC">Deleting a
picture that is used twice on a slide corrupt the slide</action>
Modified:
poi/trunk/src/java/org/apache/poi/hssf/extractor/EventBasedExcelExtractor.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/extractor/EventBasedExcelExtractor.java?rev=1809371&r1=1809370&r2=1809371&view=diff
==============================================================================
---
poi/trunk/src/java/org/apache/poi/hssf/extractor/EventBasedExcelExtractor.java
(original)
+++
poi/trunk/src/java/org/apache/poi/hssf/extractor/EventBasedExcelExtractor.java
Sat Sep 23 07:41:27 2017
@@ -40,7 +40,6 @@ import org.apache.poi.hssf.record.Number
import org.apache.poi.hssf.record.Record;
import org.apache.poi.hssf.record.SSTRecord;
import org.apache.poi.hssf.record.StringRecord;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.poifs.filesystem.DirectoryNode;
import org.apache.poi.poifs.filesystem.POIFSFileSystem;
@@ -128,7 +127,7 @@ public class EventBasedExcelExtractor ex
* Retreives the text contents of the file
*/
public String getText() {
- String text = null;
+ String text;
try {
TextListener tl = triggerExtraction();
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/xssf/eventusermodel/XSSFSheetXMLHandler.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/eventusermodel/XSSFSheetXMLHandler.java?rev=1809371&r1=1809370&r2=1809371&view=diff
==============================================================================
---
poi/trunk/src/ooxml/java/org/apache/poi/xssf/eventusermodel/XSSFSheetXMLHandler.java
(original)
+++
poi/trunk/src/ooxml/java/org/apache/poi/xssf/eventusermodel/XSSFSheetXMLHandler.java
Sat Sep 23 07:41:27 2017
@@ -394,6 +394,9 @@ public class XSSFSheetXMLHandler extends
} else if ("sheetData".equals(localName)) {
// Handle any "missing" cells which had comments attached
checkForEmptyCellComments(EmptyCellCommentsCheckType.END_OF_SHEET_DATA);
+
+ // indicate that this sheet is now done
+ output.endSheet();
}
else if("oddHeader".equals(localName) || "evenHeader".equals(localName)
||
"firstHeader".equals(localName)) {
@@ -502,13 +505,19 @@ public class XSSFSheetXMLHandler extends
public interface SheetContentsHandler {
/** A row with the (zero based) row number has started */
public void startRow(int rowNum);
+
/** A row with the (zero based) row number has ended */
public void endRow(int rowNum);
- /**
+
+ /**
* A cell, with the given formatted value (may be null),
* and possibly a comment (may be null), was encountered */
public void cell(String cellReference, String formattedValue,
XSSFComment comment);
+
/** A header or footer has been encountered */
public void headerFooter(String text, boolean isHeader, String tagName);
+
+ /** Signal that the end of a sheet was been reached */
+ public void endSheet();
}
}
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/xssf/extractor/XSSFBEventBasedExcelExtractor.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/extractor/XSSFBEventBasedExcelExtractor.java?rev=1809371&r1=1809370&r2=1809371&view=diff
==============================================================================
---
poi/trunk/src/ooxml/java/org/apache/poi/xssf/extractor/XSSFBEventBasedExcelExtractor.java
(original)
+++
poi/trunk/src/ooxml/java/org/apache/poi/xssf/extractor/XSSFBEventBasedExcelExtractor.java
Sat Sep 23 07:41:27 2017
@@ -151,15 +151,9 @@ public class XSSFBEventBasedExcelExtract
}
return text.toString();
- } catch (IOException e) {
+ } catch (IOException | OpenXML4JException | SAXException e) {
LOGGER.log(POILogger.WARN, e);
return null;
- } catch (SAXException se) {
- LOGGER.log(POILogger.WARN, se);
- return null;
- } catch (OpenXML4JException o4je) {
- LOGGER.log(POILogger.WARN, o4je);
- return null;
}
}
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/xssf/extractor/XSSFEventBasedExcelExtractor.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/extractor/XSSFEventBasedExcelExtractor.java?rev=1809371&r1=1809370&r2=1809371&view=diff
==============================================================================
---
poi/trunk/src/ooxml/java/org/apache/poi/xssf/extractor/XSSFEventBasedExcelExtractor.java
(original)
+++
poi/trunk/src/ooxml/java/org/apache/poi/xssf/extractor/XSSFEventBasedExcelExtractor.java
Sat Sep 23 07:41:27 2017
@@ -178,7 +178,7 @@ public class XSSFEventBasedExcelExtracto
/**
* Concatenate text from <rPh> text elements in SharedStringsTable
* Default is true;
- * @param concatenatePhoneticRuns
+ * @param concatenatePhoneticRuns true if runs should be concatenated,
false otherwise
*/
public void setConcatenatePhoneticRuns(boolean concatenatePhoneticRuns) {
this.concatenatePhoneticRuns = concatenatePhoneticRuns;
@@ -293,15 +293,9 @@ public class XSSFEventBasedExcelExtracto
}
return text.toString();
- } catch(IOException e) {
+ } catch(IOException | OpenXML4JException | SAXException e) {
LOGGER.log(POILogger.WARN, e);
return null;
- } catch(SAXException se) {
- LOGGER.log(POILogger.WARN, se);
- return null;
- } catch(OpenXML4JException o4je) {
- LOGGER.log(POILogger.WARN, o4je);
- return null;
}
}
@@ -349,6 +343,10 @@ public class XSSFEventBasedExcelExtracto
}
@Override
+ public void endSheet() {
+ }
+
+ @Override
public void cell(String cellRef, String formattedValue, XSSFComment
comment) {
if(firstCellOfRow) {
firstCellOfRow = false;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
