Apache
/
poi
mirror of https://github.com/apache/poi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bug 63788: Remove AbstractNum by abstractNumId, not list index 

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1872187 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Dominik Stadler 2020-01-01 19:22:30 +00:00
parent 9f35db4f51
commit 07b5bc667c
2 changed files with 66 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFNumbering.java
View File

@ -254,11 +254,15 @@ public class XWPFNumbering extends POIXMLDocumentPart {
* false if abstractNum with abstractNumID not exists
*/
public boolean removeAbstractNum(BigInteger abstractNumID) {
if (abstractNumID.byteValue() < abstractNums.size()) {
ctNumbering.removeAbstractNum(abstractNumID.byteValue());
abstractNums.remove(abstractNumID.byteValue());
return true;
for (XWPFAbstractNum abstractNum : abstractNums) {
BigInteger foundNumId = abstractNum.getAbstractNum().getAbstractNumId();
if(abstractNumID.equals(foundNumId)) {
ctNumbering.removeAbstractNum(foundNumId.byteValue());
abstractNums.remove(abstractNum);
return true;
}
}
return false;
}

54
src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFBugs.java
View File

@ -17,16 +17,21 @@
package org.apache.poi.xwpf.usermodel;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.math.BigInteger;
import org.apache.poi.util.Units;
import org.apache.poi.xwpf.XWPFTestDataSamples;
import org.apache.poi.xwpf.usermodel.XWPFRun.FontCharRange;
import org.junit.Test;
import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTAbstractNum;
public class TestXWPFBugs {
@Test
@ -174,4 +179,53 @@ public class TestXWPFBugs {
docBack.close();
}
}
@Test
public void test63788() throws IOException {
try (XWPFDocument doc = new XWPFDocument()) {
XWPFNumbering numbering = doc.createNumbering();
for (int i = 10; i >= 0; i--) {
addNumberingWithAbstractId(numbering, i); //add numbers in reverse order
}
for (int i = 0; i <= 10; i++) {
assertEquals(i, numbering.getAbstractNum(BigInteger.valueOf(i)).getAbstractNum().getAbstractNumId().longValue());
}
//attempt to remove item with numId 2
assertTrue(numbering.removeAbstractNum(BigInteger.valueOf(2)));
for (int i = 0; i <= 10; i++) {
XWPFAbstractNum abstractNum = numbering.getAbstractNum(BigInteger.valueOf(i));
// we removed id "2", so this one should be empty, all others not
if (i == 2) {
assertNull("Failed for " + i, abstractNum);
} else {
assertNotNull("Failed for " + i, abstractNum);
assertEquals(i, abstractNum.getAbstractNum().getAbstractNumId().longValue());
}
}
// removing the same again fails
assertFalse(numbering.removeAbstractNum(BigInteger.valueOf(2)));
// removing another one works
assertTrue(numbering.removeAbstractNum(BigInteger.valueOf(4)));
}
}
private static void addNumberingWithAbstractId(XWPFNumbering documentNumbering, int id){
// create a numbering scheme
CTAbstractNum cTAbstractNum = CTAbstractNum.Factory.newInstance();
// give the scheme an ID
cTAbstractNum.setAbstractNumId(BigInteger.valueOf(id));
XWPFAbstractNum abstractNum = new XWPFAbstractNum(cTAbstractNum);
BigInteger abstractNumID = documentNumbering.addAbstractNum(abstractNum);
documentNumbering.addNum(abstractNumID);
}
}