Skip to content

XWPF: fix _getText in XWPFRun(ignore w:delInstrText, convert w:noBreakHyphen to "‑") #670

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
fangd1997 wants to merge 5 commits into from
Closed

XWPF: fix _getText in XWPFRun(ignore w:delInstrText, convert w:noBreakHyphen to "‑") #670

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8780f9c
fix _getText in XWPFRun
fangd1997 Aug 12, 2024
afea1e4
Initial commit
fangd1997 Aug 12, 2024
025844c
fix
fangd1997 Aug 14, 2024
00bd2ce
fix
fangd1997 Aug 14, 2024
2d95fd7
add testText
fangd1997 Aug 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFRun.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1521,10 +1521,10 @@ private void _getText(XmlObject o, StringBuilder text) {

if (o instanceof CTText) {
final Node node = o.getDomNode();
// Field Codes (w:instrText, defined in spec sec. 17.16.23)
// Field Codes (w:instrText, defined in spec sec. 17.16.23 and w:delInstrText, defined in spec sec. 17.16.13)
// come up as instances of CTText, but we don't want them
// in the normal text output
if (!("instrText".equals(node.getLocalName()) && XSSFRelation.NS_WORDPROCESSINGML.equals(node.getNamespaceURI()))) {
if (!(("instrText".equals(node.getLocalName()) || "delInstrText".equals(node.getLocalName())) && XSSFRelation.NS_WORDPROCESSINGML.equals(node.getNamespaceURI()))) {
String textValue = ((CTText) o).getStringValue();
if (textValue != null) {
if (isCapitalized() || isSmallCaps()) {
Expand Down Expand Up @@ -1564,6 +1564,9 @@ private void _getText(XmlObject o, StringBuilder text) {
final Node node = o.getDomNode();
if (XSSFRelation.NS_WORDPROCESSINGML.equals(node.getNamespaceURI())) {
switch (node.getLocalName()) {
case "noBreakHyphen":
text.append('‑');
break;
case "tab":
text.append('\t');
break;
Expand Down
11 changes: 11 additions & 0 deletions poi-ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFRun.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,17 @@ void testSetGetText() {
//fail("Position wrong");
}

@Test
void testText() {
ctRun.addNewT().setStringValue("TEST STRING 1");
ctRun.addNewInstrText().setStringValue("InstrText");
ctRun.addNewNoBreakHyphen();
ctRun.addNewDelInstrText().setStringValue("DelInstrText");
ctRun.addNewT().setStringValue("1");
XWPFRun run = new XWPFRun(ctRun, irb);
assertEquals("TEST STRING 1‑1", run.text());
}

/*
* bug 59208
* Purpose: test all valid boolean-like values
Expand Down