From 4342180475bb36efb7b9b58ed7e3c62365cedd01 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Alain=20B=C3=A9arez?= Date: Fri, 27 Mar 2020 03:13:37 +0000 Subject: [PATCH] XWPFTableCell does not process bodyElements when handle paragraph git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1875746 13f79535-47bb-0310-9956-ffa450edef68 --- .../poi/xwpf/usermodel/XWPFTableCell.java | 3 ++ .../poi/xwpf/usermodel/TestXWPFTableCell.java | 52 +++++++++++++++++++ 2 files changed, 55 insertions(+) diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFTableCell.java b/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFTableCell.java index d9d0a19b89..257b6b0146 100644 --- a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFTableCell.java +++ b/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFTableCell.java @@ -160,6 +160,7 @@ public class XWPFTableCell implements IBody, ICell { */ public void addParagraph(XWPFParagraph p) { paragraphs.add(p); + bodyElements.add(p); } /** @@ -168,8 +169,10 @@ public class XWPFTableCell implements IBody, ICell { * @param pos The position in the list of paragraphs, 0-based */ public void removeParagraph(int pos) { + XWPFParagraph removedParagraph = paragraphs.get(pos); paragraphs.remove(pos); ctTc.removeP(pos); + bodyElements.remove(removedParagraph); } /** diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFTableCell.java b/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFTableCell.java index 47076649f9..8b65434ec0 100644 --- a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFTableCell.java +++ b/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFTableCell.java @@ -150,6 +150,58 @@ public class TestXWPFTableCell { doc.close(); } + @Test + public void testAddParagraph() throws Exception { + XWPFDocument doc = new XWPFDocument(); + XWPFTable table = doc.createTable(); + XWPFTableRow tr = table.createRow(); + XWPFTableCell cell = tr.addNewTableCell(); + + // cell have at least one paragraph by default + assertEquals(1, cell.getParagraphs().size()); + assertEquals(1, cell.getBodyElements().size()); + assertEquals(cell.getParagraphArray(0), cell.getBodyElements().get(0)); + + XWPFParagraph p = cell.addParagraph(); + assertEquals(2, cell.getParagraphs().size()); + assertEquals(2, cell.getBodyElements().size()); + assertEquals(p, cell.getParagraphArray(1)); + assertEquals(cell.getParagraphArray(1), cell.getBodyElements().get(1)); + + doc.close(); + } + + @Test + public void testRemoveParagraph() throws Exception { + XWPFDocument doc = new XWPFDocument(); + XWPFTable table = doc.createTable(); + XWPFTableRow tr = table.createRow(); + XWPFTableCell cell = tr.addNewTableCell(); + + // cell have at least one paragraph by default + XWPFParagraph p0 = cell.getParagraphArray(0); + XWPFParagraph p1 = cell.addParagraph(); + cell.addParagraph(); + + // remove 3rd + cell.removeParagraph(2); + assertEquals(2, cell.getParagraphs().size()); + assertEquals(2, cell.getBodyElements().size()); + assertEquals(p0, cell.getParagraphArray(0)); + assertEquals(p1, cell.getParagraphArray(1)); + assertEquals(p0, cell.getBodyElements().get(0)); + assertEquals(p1, cell.getBodyElements().get(1)); + + // remove 2nd + cell.removeParagraph(1); + assertEquals(1, cell.getParagraphs().size()); + assertEquals(1, cell.getBodyElements().size()); + assertEquals(p0, cell.getParagraphArray(0)); + assertEquals(p0, cell.getBodyElements().get(0)); + + doc.close(); + } + @Test public void testBug63624() throws Exception { XWPFDocument doc = new XWPFDocument(); -- 2.39.5