Author: tallison
Date: Thu Aug 31 19:14:43 2017
New Revision: 1806839
URL: http://svn.apache.org/viewvc?rev=1806839&view=rev
Log:
61475 -- append text from pictures only once...bug from my work on 61470.
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFRun.java
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFRun.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFRun.java?rev=1806839&r1=1806838&r2=1806839&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFRun.java
(original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFRun.java Thu Aug
31 19:14:43 2017
@@ -1096,6 +1096,10 @@ public class XWPFRun implements ISDTCont
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 ISDTCont
"[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);
- }
-
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]