Add XWPF <br> detection for the other kind of ooxml schemas

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1085471 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFRun.java b/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFRun.java
index 0e8bbb20ad5d028b1226c3a7bfbc805510e6e100..e8689a6b9e16043c50dfe832427ed89eba0ee869 100644 (file)
--- a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFRun.java
+++ b/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFRun.java
@@ -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");

diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/extractor/TestXWPFWordExtractor.java b/src/ooxml/testcases/org/apache/poi/xwpf/extractor/TestXWPFWordExtractor.java
index 116b69906687b86d0bb44d8ac8854412b7042136..d1cc2eea53c1f86827bb2e880451cd8779685ef9 100644 (file)
--- a/src/ooxml/testcases/org/apache/poi/xwpf/extractor/TestXWPFWordExtractor.java
+++ b/src/ooxml/testcases/org/apache/poi/xwpf/extractor/TestXWPFWordExtractor.java
@@ -88,7 +88,7 @@ public class TestXWPFWordExtractor extends TestCase {
                 ps++;
             }
         }
-        assertEquals(103, ps);
+        assertEquals(134, ps);
     }
 
     public void testGetWithHyperlinks() {
@@ -128,7 +128,7 @@ public class TestXWPFWordExtractor extends TestCase {
                         "\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 extends TestCase {
                         "\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",