From: Dominik Stadler <centic@apache.org>
Date: Sat, 26 Oct 2019 05:26:36 +0000 (+0000)
Subject: XWPF: Insert newlines between multiple paragraphs in comments.
X-Git-Tag: REL_4_1_2~166
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=00a2a870974837c9e36a58cd613f46fe422c9844;p=poi.git

XWPF: Insert newlines between multiple paragraphs in comments.

Closes PR #161 on GitHub

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

diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFComment.java b/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFComment.java
index 72de790840..0df8111117 100644
--- a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFComment.java
+++ b/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFComment.java
@@ -35,6 +35,10 @@ public class XWPFComment {
         author = comment.getAuthor();
 
         for (CTP ctp : comment.getPArray()) {
+            if(text.length() > 0) {
+                text.append("\n");
+            }
+
             XWPFParagraph p = new XWPFParagraph(ctp, document);
             text.append(p.getText());
         }
diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFComment.java b/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFComment.java
new file mode 100644
index 0000000000..886d15c0a9
--- /dev/null
+++ b/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFComment.java
@@ -0,0 +1,37 @@
+/* ====================================================================
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+==================================================================== */
+package org.apache.poi.xwpf.usermodel;
+
+import org.apache.poi.xwpf.XWPFTestDataSamples;
+import org.junit.Test;
+
+import java.io.IOException;
+
+import static org.junit.Assert.assertEquals;
+
+public class TestXWPFComment {
+    @Test
+    public void testText() throws IOException {
+        try (XWPFDocument doc = XWPFTestDataSamples.openSampleDocument("comment.docx")) {
+            assertEquals(1, doc.getComments().length);
+            XWPFComment comment = doc.getComments()[0];
+            assertEquals("Unbekannter Autor", comment.getAuthor());
+            assertEquals("0", comment.getId());
+            assertEquals("This is the first line\n\nThis is the second line", comment.getText());
+        }
+    }
+}
diff --git a/test-data/document/comment.docx b/test-data/document/comment.docx
new file mode 100644
index 0000000000..dc4bebbf06
Binary files /dev/null and b/test-data/document/comment.docx differ