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 2011/03/25 18:00:31 UTC
svn commit: r1085471 - in /poi/trunk/src/ooxml:
java/org/apache/poi/xwpf/usermodel/XWPFRun.java
testcases/org/apache/poi/xwpf/extractor/TestXWPFWordExtractor.java
Author: nick
Date: Fri Mar 25 17:00:30 2011
New Revision: 1085471
URL: http://svn.apache.org/viewvc?rev=1085471&view=rev
Log:
Add XWPF <br> detection for the other kind of ooxml schemas
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFRun.java
poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/extractor/TestXWPFWordExtractor.java
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFRun.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFRun.java?rev=1085471&r1=1085470&r2=1085471&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFRun.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFRun.java Fri Mar 25 17:00:30 2011
@@ -609,13 +609,19 @@ public class XWPFRun {
text.append(((CTText) o).getStringValue());
}
}
+
if (o instanceof CTPTab) {
text.append("\t");
}
+ if (o instanceof CTBr) {
+ text.append("\n");
+ }
if (o instanceof CTEmpty) {
// Some inline text elements get returned not as
// themselves, but as CTEmpty, owing to some odd
// definitions around line 5642 of the XSDs
+ // This bit works around it, and replicates the above
+ // rules for that case
String tagName = o.getDomNode().getNodeName();
if ("w:tab".equals(tagName)) {
text.append("\t");
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/extractor/TestXWPFWordExtractor.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/extractor/TestXWPFWordExtractor.java?rev=1085471&r1=1085470&r2=1085471&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/extractor/TestXWPFWordExtractor.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/extractor/TestXWPFWordExtractor.java Fri Mar 25 17:00:30 2011
@@ -88,7 +88,7 @@ public class TestXWPFWordExtractor exten
ps++;
}
}
- assertEquals(103, ps);
+ assertEquals(134, ps);
}
public void testGetWithHyperlinks() {
@@ -128,7 +128,7 @@ public class TestXWPFWordExtractor exten
"\n" +
"More on page one\n" +
"\n\n" +
- "End of page 1\n\n" +
+ "End of page 1\n\n\n" +
"This is page two. It also has a three column heading, and a three column footer.\n" +
"Footer Left\tFooter Middle\tFooter Right\n",
extractor.getText()
@@ -151,7 +151,7 @@ public class TestXWPFWordExtractor exten
"\n" +
"More on page one\n" +
"\n\n" +
- "End of page 1\n\n" +
+ "End of page 1\n\n\n" +
"This is page two. It also has a three column heading, and a three column footer.\n" +
"The footer of the first page\n" +
"Footer Left\tFooter Middle\tFooter Right\n",
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org