From: Andreas Beeker <kiwiwings@apache.org>
Date: Sun, 22 May 2016 23:57:14 +0000 (+0000)
Subject: XSLF: remove creation of empty paragraph in XSLFTextShape.addNewTextParagraph()
X-Git-Tag: REL_3_15_BETA2~232
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=74f28fbaecea2141ae08fb7434f1c0f22d49bcdd;p=poi.git

XSLF: remove creation of empty paragraph in XSLFTextShape.addNewTextParagraph()

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

diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTextShape.java b/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTextShape.java
index 5aa11f1deb..f38ea9701e 100644
--- a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTextShape.java
+++ b/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTextShape.java
@@ -175,8 +175,15 @@ public abstract class XSLFTextShape extends XSLFSimpleShape
      * @return created paragraph run
      */
     public XSLFTextParagraph addNewTextParagraph() {
-        CTTextBody txBody = getTextBody(true);
-        CTTextParagraph p = txBody.addNewP();
+        CTTextBody txBody = getTextBody(false);
+        CTTextParagraph p;
+        if (txBody == null) {
+            txBody = getTextBody(true);
+            p = txBody.getPArray(0);
+            p.removeR(0);
+        } else {
+            p = txBody.addNewP();
+        }
         XSLFTextParagraph paragraph = new XSLFTextParagraph(p, this);
         _paragraphs.add(paragraph);
         return paragraph;
diff --git a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFAutoShape.java b/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFAutoShape.java
index 525f55ef7b..798dc472aa 100644
--- a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFAutoShape.java
+++ b/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFAutoShape.java
@@ -194,7 +194,8 @@ public class TestXSLFAutoShape {
         assertEquals(1000, p.getXmlObject().getPPr().getLnSpc().getSpcPts().getVal());
         assertFalse(p.getXmlObject().getPPr().getLnSpc().isSetSpcPct());
 
-        assertFalse(p.getXmlObject().getPPr().isSetAlgn());
+        // align is set in autoshape prototype
+        assertTrue(p.getXmlObject().getPPr().isSetAlgn());
         assertEquals(TextAlign.LEFT, p.getTextAlign());
         p.setTextAlign(TextAlign.LEFT);
         assertTrue(p.getXmlObject().getPPr().isSetAlgn());