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
This commit is contained in:
parent
e520f5b82f
commit
a7e39ad6c2
@ -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");
|
||||
|
@ -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",
|
||||
|
Loading…
Reference in New Issue
Block a user