From: Nick Burch <nick@apache.org>
Date: Tue, 3 May 2011 05:53:24 +0000 (+0000)
Subject: Fix bug #51113 - Correct XWPFParagraph tracking of inserted runs
X-Git-Tag: REL_3_8_BETA3~48
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=3454360494ce88d0acc0adda6aded3479d0670be;p=poi.git

Fix bug #51113 - Correct XWPFParagraph tracking of inserted runs

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

diff --git a/src/documentation/content/xdocs/status.xml b/src/documentation/content/xdocs/status.xml
index b81681a103..ceff12e6ab 100644
--- a/src/documentation/content/xdocs/status.xml
+++ b/src/documentation/content/xdocs/status.xml
@@ -34,6 +34,7 @@
 
     <changes>
         <release version="3.8-beta3" date="2011-??-??">
+           <action dev="poi-developers" type="fix">51113 - Correct XWPFParagraph tracking of inserted runs</action>
            <action dev="poi-developers" type="fix">51111 - Correct XWPFParagraph tracking of new runs</action>
            <action dev="poi-developers" type="fix">51115 - Handle DataFormatter escaping of "." in the same way as "-" and "/"</action>
            <action dev="poi-developers" type="fix">51100 - Fix IOUtils issue for NPOIFS reading from an InputStream where every block is full</action>
diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFParagraph.java b/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFParagraph.java
index a4cccccabe..c46b8da750 100644
--- a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFParagraph.java
+++ b/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFParagraph.java
@@ -1178,7 +1178,7 @@ public class XWPFParagraph implements IBodyElement{
     	 if (pos >= 0 && pos <= paragraph.sizeOfRArray()) {
 	    	CTR ctRun = paragraph.insertNewR(pos);
 	    	XWPFRun newRun = new XWPFRun(ctRun, this);
-	    	runs.add(newRun);
+	    	runs.add(pos, newRun);
 	    	return newRun;
     	 }
     	 return null;
diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFParagraph.java b/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFParagraph.java
index 0fa1b92ba0..bf1c430f25 100644
--- a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFParagraph.java
+++ b/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFParagraph.java
@@ -260,6 +260,12 @@ public final class TestXWPFParagraph extends TestCase {
        
        XWPFRun r = p.createRun();
        assertEquals(3, p.getRuns().size());
+       assertEquals(2, p.getRuns().indexOf(r));
+       
+       XWPFRun r2 = p.insertNewRun(1);
+       assertEquals(4, p.getRuns().size());
+       assertEquals(1, p.getRuns().indexOf(r2));
+       assertEquals(3, p.getRuns().indexOf(r));
     }
     
     public void testPictures() throws Exception {