Author: fanningpj
Date: Mon Jul 13 17:45:14 2020
New Revision: 1879838
URL: http://svn.apache.org/viewvc?rev=1879838&view=rev
Log:
rename internal method
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/SheetDataWriter.java
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSheetDataWriter.java
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/SheetDataWriter.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/SheetDataWriter.java?rev=1879838&r1=1879837&r2=1879838&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/SheetDataWriter.java
(original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/SheetDataWriter.java
Mon Jul 13 17:45:14 2020
@@ -283,7 +283,7 @@ public class SheetDataWriter implements
break;
}
_out.write("><f>");
- outputQuotedString(cell.getCellFormula());
+ outputEscapedString(cell.getCellFormula());
_out.write("</f>");
switch (cell.getCachedFormulaResultType()) {
case NUMERIC:
@@ -298,7 +298,7 @@ public class SheetDataWriter implements
String value = cell.getStringCellValue();
if(value != null && !value.isEmpty()) {
_out.write("<v>");
- outputQuotedString(value);
+ outputEscapedString(value);
_out.write("</v>");
}
break;
@@ -311,7 +311,7 @@ public class SheetDataWriter implements
FormulaError error =
FormulaError.forInt(cell.getErrorCellValue());
_out.write("><v>");
- outputQuotedString(error.getString());
+ outputEscapedString(error.getString());
_out.write("</v>");
break;
}
@@ -334,7 +334,7 @@ public class SheetDataWriter implements
writeAttribute("xml:space", "preserve");
}
_out.write(">");
- outputQuotedString(cell.getStringCellValue());
+ outputEscapedString(cell.getStringCellValue());
_out.write("</t></is>");
}
break;
@@ -358,7 +358,7 @@ public class SheetDataWriter implements
writeAttribute("t", "e");
_out.write("><v>");
- outputQuotedString(error.getString());
+ outputEscapedString(error.getString());
_out.write("</v>");
break;
}
@@ -390,7 +390,7 @@ public class SheetDataWriter implements
return false;
}
- protected void outputQuotedString(String s) throws IOException {
+ protected void outputEscapedString(String s) throws IOException {
if (s == null || s.length() == 0) {
return;
}
Modified:
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSheetDataWriter.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSheetDataWriter.java?rev=1879838&r1=1879837&r2=1879838&view=diff
==============================================================================
---
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSheetDataWriter.java
(original)
+++
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSheetDataWriter.java
Mon Jul 13 17:45:14 2020
@@ -58,7 +58,7 @@ public final class TestSheetDataWriter {
public void testWriteUnicodeSurrogates() throws IOException {
SheetDataWriter writer = new SheetDataWriter();
try {
- writer.outputQuotedString(unicodeSurrogates);
+ writer.outputEscapedString(unicodeSurrogates);
writer.close();
File file = writer.getTempFile();
try (FileInputStream is = new FileInputStream(file)) {
@@ -73,7 +73,7 @@ public final class TestSheetDataWriter {
public void testWriteNewLines() throws IOException {
SheetDataWriter writer = new SheetDataWriter();
try {
- writer.outputQuotedString("\r\n");
+ writer.outputEscapedString("\r\n");
writer.close();
File file = writer.getTempFile();
try (FileInputStream is = new FileInputStream(file)) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@poi.apache.org
For additional commands, e-mail: commits-h...@poi.apache.org
