From e29c22ec424587497c2d0f1a74fb719844043f07 Mon Sep 17 00:00:00 2001 From: Tim Allison Date: Thu, 31 Aug 2017 19:14:43 +0000 Subject: [PATCH] 61475 -- append text from pictures only once...bug from my work on 61470. git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1806839 13f79535-47bb-0310-9956-ffa450edef68 --- .../java/org/apache/poi/xwpf/usermodel/XWPFRun.java | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFRun.java b/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFRun.java index 6c16b1618d..ae66ac9661 100644 --- a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFRun.java +++ b/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFRun.java @@ -1096,6 +1096,10 @@ public class XWPFRun implements ISDTContents, IRunElement, CharacterRun { handleRuby(o, text, true); } } + // Any picture text? + if (pictureText != null && pictureText.length() > 0) { + text.append("\n").append(pictureText); + } c.dispose(); return text.toString(); } @@ -1194,13 +1198,6 @@ public class XWPFRun implements ISDTContents, IRunElement, CharacterRun { "[footnoteRef:" + ftn.getId().intValue() + "]" : "[endnoteRef:" + ftn.getId().intValue() + "]"; text.append(footnoteRef); } - - - // Any picture text? - if (pictureText != null && pictureText.length() > 0) { - text.append("\n").append(pictureText); - } - } /** -- 2.39.5