You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by ni...@apache.org on 2014/07/30 09:41:01 UTC
svn commit: r1614576 - in /poi/trunk/src/ooxml/java/org/apache/poi/xssf:
eventusermodel/XSSFSheetXMLHandler.java
extractor/XSSFEventBasedExcelExtractor.java
Author: nick
Date: Wed Jul 30 07:41:01 2014
New Revision: 1614576
URL: http://svn.apache.org/r1614576
Log:
Change XSSFSheetXMLHandler.SheetContentsHandler to require fewer backwards incompatible changes for #56023
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/xssf/eventusermodel/XSSFSheetXMLHandler.java
poi/trunk/src/ooxml/java/org/apache/poi/xssf/extractor/XSSFEventBasedExcelExtractor.java
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=1614576&r1=1614575&r2=1614576&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 Wed Jul 30 07:41:01 2014
@@ -466,7 +466,7 @@ public class XSSFSheetXMLHandler extends
private void outputEmptyCellComment(CellReference cellRef) {
String cellRefString = cellRef.formatAsString();
XSSFComment comment = commentsTable.findCellComment(cellRefString);
- output.emptyCellComment(cellRefString, comment);
+ output.cell(cellRefString, null, comment);
}
private enum EmptyCellCommentsCheckType {
@@ -497,10 +497,10 @@ public class XSSFSheetXMLHandler extends
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, and possibly a comment, was encountered */
+ /**
+ * 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 comment for an otherwise-empty cell was encountered */
- public void emptyCellComment(String cellReference, XSSFComment comment);
/** A header or footer has been encountered */
public void headerFooter(String text, boolean isHeader, String tagName);
}
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=1614576&r1=1614575&r2=1614576&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 Wed Jul 30 07:41:01 2014
@@ -268,14 +268,17 @@ public class XSSFEventBasedExcelExtracto
this.headerFooterMap = includeHeadersFooters ? new HashMap<String, String>() : null;
}
+ @Override
public void startRow(int rowNum) {
firstCellOfRow = true;
}
+ @Override
public void endRow(int rowNum) {
output.append('\n');
}
+ @Override
public void cell(String cellRef, String formattedValue, XSSFComment comment) {
if(firstCellOfRow) {
firstCellOfRow = false;
@@ -296,10 +299,7 @@ public class XSSFEventBasedExcelExtracto
}
}
- public void emptyCellComment(String cellRef, XSSFComment comment) {
- cell(cellRef, null, comment);
- }
-
+ @Override
public void headerFooter(String text, boolean isHeader, String tagName) {
if (headerFooterMap != null) {
headerFooterMap.put(tagName, text);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org