Apache
/
poi
mirror of https://github.com/apache/poi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Keep last run properties when resetting paragraph text 

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1875977 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Alain Béarez 2020-04-01 01:40:49 +00:00
parent 5976721660
commit c7c3bbb0ed
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/ooxml/java/org/apache/poi/xddf/usermodel/text/XDDFTextParagraph.java
View File

@ -60,7 +60,7 @@ public class XDDFTextParagraph {
final int count = paragraph.sizeOfBrArray() + paragraph.sizeOfFldArray() + paragraph.sizeOfRArray(); final int count = paragraph.sizeOfBrArray() + paragraph.sizeOfFldArray() + paragraph.sizeOfRArray();
this._runs = new ArrayList<>(count); this._runs = new ArrayList<>(count);
for (XmlObject xo : _p.selectChildren(QNameSet.ALL)) { for (XmlObject xo : paragraph.selectChildren(QNameSet.ALL)) {
if (xo instanceof CTTextLineBreak) { if (xo instanceof CTTextLineBreak) {
_runs.add(new XDDFTextRun((CTTextLineBreak) xo, this)); _runs.add(new XDDFTextRun((CTTextLineBreak) xo, this));
} else if (xo instanceof CTTextField) { } else if (xo instanceof CTTextField) {
@ -75,6 +75,11 @@ public class XDDFTextParagraph {
} }
public void setText(String text) { public void setText(String text) {
// keep the properties of current last run
XmlObject existing = null;
if (_runs.size() > 0) {
existing = _runs.get(_runs.size() - 1).getProperties().copy();
}
// remove all runs // remove all runs
for (int i = _p.sizeOfBrArray() - 1; i >= 0; i--) { for (int i = _p.sizeOfBrArray() - 1; i >= 0; i--) {
_p.removeBr(i); _p.removeBr(i);
@ -86,7 +91,10 @@ public class XDDFTextParagraph {
_p.removeR(i); _p.removeR(i);
} }
_runs.clear(); _runs.clear();
appendRegularRun(text); XDDFTextRun run = appendRegularRun(text);
if (existing != null) {
run.getProperties().set(existing);
}
} }
public String getText() { public String getText() {
@ -119,7 +127,7 @@ public class XDDFTextParagraph {
// by default, line break has the font properties of the last text run // by default, line break has the font properties of the last text run
for (XDDFTextRun tr : new IteratorIterable<>(new ReverseListIterator<>(_runs))) { for (XDDFTextRun tr : new IteratorIterable<>(new ReverseListIterator<>(_runs))) {
CTTextCharacterProperties prevProps = tr.getProperties(); CTTextCharacterProperties prevProps = tr.getProperties();
// let's find one that is not undefined // let's find one which is not undefined
if (prevProps != null) { if (prevProps != null) {
br.setRPr((CTTextCharacterProperties) prevProps.copy()); br.setRPr((CTTextCharacterProperties) prevProps.copy());
break; break;