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
This commit is contained in:
Tim Allison 2017-08-31 19:14:43 +00:00
parent 3b32a00aa7
commit 235d102f26

View File

@ -1096,6 +1096,10 @@ public class XWPFRun implements ISDTContents, IRunElement, CharacterRun {
handleRuby(o, text, true); handleRuby(o, text, true);
} }
} }
// Any picture text?
if (pictureText != null && pictureText.length() > 0) {
text.append("\n").append(pictureText);
}
c.dispose(); c.dispose();
return text.toString(); return text.toString();
} }
@ -1194,13 +1198,6 @@ public class XWPFRun implements ISDTContents, IRunElement, CharacterRun {
"[footnoteRef:" + ftn.getId().intValue() + "]" : "[endnoteRef:" + ftn.getId().intValue() + "]"; "[footnoteRef:" + ftn.getId().intValue() + "]" : "[endnoteRef:" + ftn.getId().intValue() + "]";
text.append(footnoteRef); text.append(footnoteRef);
} }
// Any picture text?
if (pictureText != null && pictureText.length() > 0) {
text.append("\n").append(pictureText);
}
} }
/** /**