pashko/apache-poi
1
0
Fork 0
mirror of https://github.com/apache/poi.git synced 2026-02-27 20:40:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

63290 - PPTX To Png changes font sizes and colors

Browse Source 
various fixes to HSLF
moved line spacing to the following line
refactored PropertyFetcher with lambdas

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1878492 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Andreas Beeker 2020-06-04 23:17:44 +00:00
parent 84330c6aa3
commit 5a18307eb0
16 changed files with 553 additions and 594 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/java/org/apache/poi/sl/draw/DrawFontManagerDefault.java
View File

@ -44,6 +44,7 @@ public class DrawFontManagerDefault implements DrawFontManager {
public DrawFontManagerDefault() {
knownSymbolFonts.add("Wingdings");
knownSymbolFonts.add("Symbol");
// knownSymbolFonts.add("Monotype Sorts");
}
@Override

19
src/java/org/apache/poi/sl/draw/DrawTextFragment.java
View File

@ -19,13 +19,15 @@ package org.apache.poi.sl.draw;
import java.awt.Graphics2D;
import java.awt.font.TextLayout;
import java.text.*;
import java.text.AttributedCharacterIterator;
import java.text.AttributedString;
import java.text.CharacterIterator;
public class DrawTextFragment implements Drawable {
final TextLayout layout;
final AttributedString str;
double x, y;
public DrawTextFragment(TextLayout layout, AttributedString str) {
this.layout = layout;
this.str = str;
@ -57,7 +59,7 @@ public class DrawTextFragment implements Drawable {
public void drawContent(Graphics2D graphics) {
}
public TextLayout getLayout() {
return layout;
}
@ -65,12 +67,12 @@ public class DrawTextFragment implements Drawable {
public AttributedString getAttributedString() {
return str;
}
/**
* @return full height of this text run which is sum of ascent, descent and leading
*/
public float getHeight(){
double h = layout.getAscent() + layout.getDescent() + getLeading();
public float getHeight(){
double h = layout.getAscent() + layout.getDescent();
return (float)h;
}
@ -80,6 +82,7 @@ public class DrawTextFragment implements Drawable {
public float getLeading() {
// fix invalid leadings (leading == 0)
double l = layout.getLeading();
if (l == 0) {
// see https://stackoverflow.com/questions/925147
// we use a 115% value instead of the 120% proposed one, as this seems to be closer to LO/OO
@ -87,7 +90,7 @@ public class DrawTextFragment implements Drawable {
}
return (float)l;
}
/**
*
* @return width if this text run
@ -115,5 +118,5 @@ public class DrawTextFragment implements Drawable {
public String toString(){
return "[" + getClass().getSimpleName() + "] " + getString();
}
}

151
src/java/org/apache/poi/sl/draw/DrawTextParagraph.java
View File

@ -72,11 +72,7 @@ public class DrawTextParagraph implements Drawable {
protected String rawText;
protected DrawTextFragment bullet;
protected int autoNbrIdx;
/**
* the highest line in this paragraph. Used for line spacing.
*/
protected double maxLineHeight;
protected boolean firstParagraph = true;
/**
* Defines an attribute used for storing the hyperlink associated with
@ -132,9 +128,10 @@ public class DrawTextParagraph implements Drawable {
return;
}
final boolean isHSLF = isHSLF();
double penY = y;
boolean firstLine = true;
int indentLevel = paragraph.getIndentLevel();
Double leftMargin = paragraph.getLeftMargin();
if (leftMargin == null) {
@ -145,10 +142,6 @@ public class DrawTextParagraph implements Drawable {
if (indent == null) {
indent = Units.toPoints(347663L*indentLevel);
}
if (isHSLF()) {
// special handling for HSLF
indent -= leftMargin;
}
// Double rightMargin = paragraph.getRightMargin();
// if (rightMargin == null) {
@ -161,26 +154,41 @@ public class DrawTextParagraph implements Drawable {
spacing = 100d;
}
DrawTextFragment lastLine = null;
for(DrawTextFragment line : lines){
double penX;
if(firstLine) {
if (!(isFirstParagraph() && lastLine == null)) {
// penY is now on descent line of the last text fragment
// need to substract descent height to get back to the baseline of the last fragment
// then add a multiple of the line height of the current text height
penY -= line.getLeading() + ((lastLine == null) ? 0 : lastLine.getLayout().getDescent());
if(spacing > 0) {
// If linespacing >= 0, then linespacing is a percentage of normal line height.
penY += (spacing*0.01) * line.getHeight(); // + (isHSLF ? line.getLayout().getLeading() : 0));
} else {
// negative value means absolute spacing in points
penY += -spacing;
}
penY -= line.getLayout().getAscent();
}
penX = x + (isHSLF ? leftMargin : leftMargin);
if (lastLine == null) {
if (!isEmptyParagraph()) {
// TODO: find out character style for empty, but bulleted/numbered lines
bullet = getBullet(graphics, line.getAttributedString().getIterator());
}
if (bullet != null){
bullet.setPosition(x+leftMargin+indent, penY);
if (bullet != null) {
bullet.setPosition(isHSLF ? x+indent : x+leftMargin+indent, penY);
bullet.draw(graphics);
// don't let text overlay the bullet and advance by the bullet width
double bulletWidth = bullet.getLayout().getAdvance() + 1;
penX = x + Math.max(leftMargin, leftMargin+indent+bulletWidth);
} else {
penX = x + leftMargin;
penX = x + (isHSLF ? leftMargin : Math.max(leftMargin, leftMargin+indent+bulletWidth));
}
} else {
penX = x + leftMargin;
}
Rectangle2D anchor = DrawShape.getAnchor(graphics, paragraph.getParentShape());
@ -207,16 +215,9 @@ public class DrawTextParagraph implements Drawable {
line.setPosition(penX, penY);
line.draw(graphics);
penY += line.getHeight();
if(spacing > 0) {
// If linespacing >= 0, then linespacing is a percentage of normal line height.
penY += spacing*0.01* line.getHeight();
} else {
// negative value means absolute spacing in points
penY += -spacing;
}
firstLine = false;
lastLine = line;
}
y = penY - y;
@ -257,7 +258,6 @@ public class DrawTextParagraph implements Drawable {
DrawFactory fact = DrawFactory.getInstance(graphics);
StringBuilder text = new StringBuilder();
AttributedString at = getAttributedString(graphics, text);
boolean emptyParagraph = text.toString().trim().isEmpty();
AttributedCharacterIterator it = at.getIterator();
LineBreakMeasurer measurer = new LineBreakMeasurer(it, graphics.getFontRenderContext());
@ -271,42 +271,47 @@ public class DrawTextParagraph implements Drawable {
wrappingWidth = 1;
}
int nextBreak = text.indexOf("\n", startIndex + 1);
if (nextBreak == -1) {
nextBreak = it.getEndIndex();
// usually "\n" is added after a line, if it occurs before it - only possible as first char -
// we need to add an empty line
TextLayout layout;
int endIndex;
if (startIndex == 0 && text.toString().startsWith("\n")) {
layout = measurer.nextLayout((float) wrappingWidth, 1, false);
endIndex = 1;
} else {
int nextBreak = text.indexOf("\n", startIndex + 1);
if (nextBreak == -1) {
nextBreak = it.getEndIndex();
}
layout = measurer.nextLayout((float) wrappingWidth, nextBreak, true);
if (layout == null) {
// layout can be null if the entire word at the current position
// does not fit within the wrapping width. Try with requireNextWord=false.
layout = measurer.nextLayout((float) wrappingWidth, nextBreak, false);
}
if (layout == null) {
// exit if can't break any more
break;
}
endIndex = measurer.getPosition();
// skip over new line breaks (we paint 'clear' text runs not starting or ending with \n)
if (endIndex < it.getEndIndex() && text.charAt(endIndex) == '\n') {
measurer.setPosition(endIndex + 1);
}
TextAlign hAlign = paragraph.getTextAlign();
if (hAlign == TextAlign.JUSTIFY || hAlign == TextAlign.JUSTIFY_LOW) {
layout = layout.getJustifiedLayout((float) wrappingWidth);
}
}
TextLayout layout = measurer.nextLayout((float)wrappingWidth, nextBreak, true);
if (layout == null) {
// layout can be null if the entire word at the current position
// does not fit within the wrapping width. Try with requireNextWord=false.
layout = measurer.nextLayout((float)wrappingWidth, nextBreak, false);
}
if(layout == null) {
// exit if can't break any more
break;
}
int endIndex = measurer.getPosition();
// skip over new line breaks (we paint 'clear' text runs not starting or ending with \n)
if(endIndex < it.getEndIndex() && text.charAt(endIndex) == '\n'){
measurer.setPosition(endIndex + 1);
}
TextAlign hAlign = paragraph.getTextAlign();
if(hAlign == TextAlign.JUSTIFY || hAlign == TextAlign.JUSTIFY_LOW) {
layout = layout.getJustifiedLayout((float)wrappingWidth);
}
AttributedString str = (emptyParagraph)
? null // we will not paint empty paragraphs
: new AttributedString(it, startIndex, endIndex);
AttributedString str = new AttributedString(it, startIndex, endIndex);
DrawTextFragment line = fact.getTextFragment(layout, str);
lines.add(line);
maxLineHeight = Math.max(maxLineHeight, line.getHeight());
if(endIndex == it.getEndIndex()) {
break;
}
@ -450,6 +455,7 @@ public class DrawTextParagraph implements Drawable {
* @return wrapping width in points
*/
protected double getWrappingWidth(boolean firstLine, Graphics2D graphics){
final long TAB_SIZE = 347663L;
TextShape<?,?> ts = paragraph.getParentShape();
// internal margins for the text box
@ -465,11 +471,11 @@ public class DrawTextParagraph implements Drawable {
Double leftMargin = paragraph.getLeftMargin();
if (leftMargin == null) {
// if the marL attribute is omitted, then a value of 347663 is implied
leftMargin = Units.toPoints(347663L*(indentLevel+1));
leftMargin = Units.toPoints(TAB_SIZE * indentLevel);
}
Double indent = paragraph.getIndent();
if (indent == null) {
indent = Units.toPoints(347663L*indentLevel);
indent = 0.;
}
Double rightMargin = paragraph.getRightMargin();
if (rightMargin == null) {
@ -503,18 +509,9 @@ public class DrawTextParagraph implements Drawable {
width = anchor.getHeight() - leftInset - rightInset - leftMargin - rightMargin;
break;
}
if (firstLine && !isHSLF()) {
if (bullet != null){
if (indent > 0) {
width -= indent;
}
} else {
if (indent > 0) {
width -= indent; // first line indentation
} else if (indent < 0) { // hanging indentation: the first line start at the left margin
width += leftMargin;
}
}
if (firstLine && bullet == null) {
// indent is usually negative in XSLF
width += isHSLF() ? (leftMargin - indent) : -indent;
}
}
@ -727,4 +724,12 @@ public class DrawTextParagraph implements Drawable {
protected boolean isHSLF() {
return DrawShape.isHSLF(paragraph.getParentShape());
}
protected boolean isFirstParagraph() {
return firstParagraph;
}
protected void setFirstParagraph(boolean firstParagraph) {
this.firstParagraph = firstParagraph;
}
}

22
src/java/org/apache/poi/sl/draw/DrawTextShape.java
View File

@ -41,7 +41,7 @@ public class DrawTextShape extends DrawSimpleShape {
@Override
public void drawContent(Graphics2D graphics) {
TextShape<?,?> s = getShape();
Rectangle2D anchor = DrawShape.getAnchor(graphics, s);
if(anchor == null) {
return;
@ -53,7 +53,7 @@ public class DrawTextShape extends DrawSimpleShape {
// remember the initial transform
AffineTransform tx = graphics.getTransform();
// Transform of text in flipped shapes is special.
// At this point the flip and rotation transform is already applied
// (see DrawShape#applyTransform ), but we need to restore it to avoid painting "upside down".
@ -68,7 +68,7 @@ public class DrawTextShape extends DrawSimpleShape {
horzFlip ^= ps.getFlipHorizontal();
sc = ps.getParent();
}
// Horizontal flipping applies only to shape outline and not to the text in the shape.
// Applying flip second time restores the original not-flipped transform
if (horzFlip ^ vertFlip) {
@ -87,7 +87,7 @@ public class DrawTextShape extends DrawSimpleShape {
graphics.rotate(Math.toRadians(textRot));
graphics.translate(-cx, -cy);
}
// first dry-run to calculate the total height of the text
double textHeight;
@ -115,7 +115,7 @@ public class DrawTextShape extends DrawSimpleShape {
graphics.translate(cx, cy);
graphics.rotate(Math.toRadians(deg));
graphics.translate(-cx, -cy);
// old top/left edge is now bottom/left or top/right - as we operate on the already
// rotated drawing context, both verticals can be moved in the same direction
final double w = anchor.getWidth();
@ -140,7 +140,7 @@ public class DrawTextShape extends DrawSimpleShape {
double y0 = y;
Iterator<? extends TextParagraph<?,?,? extends TextRun>> paragraphs = getShape().iterator();
boolean isFirstLine = true;
for (int autoNbrIdx=0; paragraphs.hasNext(); autoNbrIdx++){
TextParagraph<?,?,? extends TextRun> p = paragraphs.next();
@ -172,9 +172,11 @@ public class DrawTextShape extends DrawSimpleShape {
y += -spaceBefore;
}
}
isFirstLine = false;
dp.setPosition(x, y);
dp.setFirstParagraph(isFirstLine);
isFirstLine = false;
dp.draw(graphics);
y += dp.getY();
@ -196,13 +198,13 @@ public class DrawTextShape extends DrawSimpleShape {
/**
* Compute the cumulative height occupied by the text
*
*
* @return the height in points
*/
public double getTextHeight() {
return getTextHeight(null);
}
/**
* Compute the cumulative height occupied by the text
*

88
src/ooxml/java/org/apache/poi/xslf/model/CharacterPropertyFetcher.java
View File

@ -19,22 +19,94 @@
package org.apache.poi.xslf.model;
import static org.apache.poi.xslf.model.ParagraphPropertyFetcher.getThemeProps;
import static org.apache.poi.xslf.model.ParagraphPropertyFetcher.select;
import java.util.function.Consumer;
import org.apache.poi.util.Internal;
import org.apache.poi.xslf.usermodel.XSLFShape;
import org.apache.poi.xslf.usermodel.XSLFSheet;
import org.apache.poi.xslf.usermodel.XSLFSlideMaster;
import org.apache.poi.xslf.usermodel.XSLFTextRun;
import org.apache.xmlbeans.XmlException;
import org.openxmlformats.schemas.drawingml.x2006.main.CTTextCharacterProperties;
import org.openxmlformats.schemas.drawingml.x2006.main.CTTextParagraphProperties;
public abstract class CharacterPropertyFetcher<T> extends ParagraphPropertyFetcher<T> {
public CharacterPropertyFetcher(int level) {
super(level);
@Internal
public final class CharacterPropertyFetcher<T> extends PropertyFetcher<T> {
public interface CharPropFetcher<S> {
void fetch (CTTextCharacterProperties props, Consumer<S> val);
}
public boolean fetch(CTTextParagraphProperties props) {
if (props != null && props.isSetDefRPr()) {
return fetch(props.getDefRPr());
private final XSLFTextRun run;
int _level;
private final CharPropFetcher<T> fetcher;
public CharacterPropertyFetcher(XSLFTextRun run, CharPropFetcher<T> fetcher) {
_level = run.getParagraph().getIndentLevel();
this.fetcher = fetcher;
this.run = run;
}
public boolean fetch(XSLFShape shape) {
// this is only called when propagating to parent styles
try {
fetchProp(select(shape, _level));
} catch (XmlException ignored) {
}
return isSet();
}
public T fetchProperty(XSLFShape shape) {
final XSLFSheet sheet = shape.getSheet();
if (!(sheet instanceof XSLFSlideMaster)) {
fetchRunProp();
fetchShapeProp(shape);
fetchThemeProp(shape);
}
return false;
fetchMasterProp();
return isSet() ? getValue() : null;
}
public abstract boolean fetch(CTTextCharacterProperties props);
private void fetchRunProp() {
fetchProp(run.getRPr(false));
}
private void fetchShapeProp(XSLFShape shape) {
if (!isSet()) {
shape.fetchShapeProperty(this);
}
}
private void fetchThemeProp(XSLFShape shape) {
if (!isSet()) {
fetchProp(getThemeProps(shape, _level));
}
}
private void fetchMasterProp() {
// defaults for placeholders are defined in the slide master
// TODO: determine master shape
if (!isSet()) {
fetchProp(run.getParagraph().getDefaultMasterStyle());
}
}
private void fetchProp(CTTextParagraphProperties props) {
if (props != null) {
fetchProp(props.getDefRPr());
}
}
private void fetchProp(CTTextCharacterProperties props) {
if (props != null) {
fetcher.fetch(props, this::setValue);
}
}
}

125
src/ooxml/java/org/apache/poi/xslf/model/ParagraphPropertyFetcher.java
View File

@ -19,43 +19,144 @@
package org.apache.poi.xslf.model;
import java.util.function.Consumer;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamReader;
import org.apache.poi.util.Internal;
import org.apache.poi.xslf.usermodel.XMLSlideShow;
import org.apache.poi.xslf.usermodel.XSLFShape;
import org.apache.poi.xslf.usermodel.XSLFSheet;
import org.apache.poi.xslf.usermodel.XSLFSlideMaster;
import org.apache.poi.xslf.usermodel.XSLFTextParagraph;
import org.apache.xmlbeans.XmlException;
import org.openxmlformats.schemas.drawingml.x2006.main.CTTextListStyle;
import org.openxmlformats.schemas.drawingml.x2006.main.CTTextParagraph;
import org.openxmlformats.schemas.drawingml.x2006.main.CTTextParagraphProperties;
public abstract class ParagraphPropertyFetcher<T> extends PropertyFetcher<T> {
@Internal
public final class ParagraphPropertyFetcher<T> extends PropertyFetcher<T> {
public interface ParaPropFetcher<S> {
void fetch (CTTextParagraphProperties props, Consumer<S> val);
}
static final String PML_NS = "http://schemas.openxmlformats.org/presentationml/2006/main";
static final String DML_NS = "http://schemas.openxmlformats.org/drawingml/2006/main";
private static final QName[] TX_BODY = { new QName(PML_NS, "txBody") };
private static final QName[] LST_STYLE = { new QName(DML_NS, "lstStyle") };
private final XSLFTextParagraph para;
int _level;
private final ParaPropFetcher<T> fetcher;
public ParagraphPropertyFetcher(int level) {
_level = level;
public ParagraphPropertyFetcher(XSLFTextParagraph para, ParaPropFetcher<T> fetcher) {
this.para = para;
_level = para.getIndentLevel();
this.fetcher = fetcher;
}
public boolean fetch(XSLFShape shape) {
QName[] lvlProp = { new QName(DML_NS, "lvl" + (_level + 1) + "pPr") };
CTTextParagraphProperties props = null;
// this is only called when propagating to parent styles
try {
props = shape.selectProperty(
CTTextParagraphProperties.class, ParagraphPropertyFetcher::parse, TX_BODY, LST_STYLE, lvlProp);
return (props != null) && fetch(props);
} catch (XmlException e) {
return false;
fetchProp(select(shape, _level));
} catch (XmlException ignored) {
}
return isSet();
}
public T fetchProperty(XSLFShape shape) {
final XSLFSheet sheet = shape.getSheet();
if (!(sheet instanceof XSLFSlideMaster)) {
fetchParagraphProp();
fetchShapeProp(shape);
fetchThemeProp(shape);
}
fetchMasterProp();
return isSet() ? getValue() : null;
}
private void fetchParagraphProp() {
fetchProp(para.getXmlObject().getPPr());
}
private void fetchShapeProp(XSLFShape shape) {
if (!isSet()) {
shape.fetchShapeProperty(this);
}
}
private static CTTextParagraphProperties parse(XMLStreamReader reader) throws XmlException {
private void fetchThemeProp(XSLFShape shape) {
if (!isSet()) {
fetchProp(getThemeProps(shape, _level));
}
}
private void fetchMasterProp() {
// defaults for placeholders are defined in the slide master
// TODO: determine master shape
if (!isSet()) {
fetchProp(para.getDefaultMasterStyle());
}
}
private void fetchProp(CTTextParagraphProperties props) {
if (props != null) {
fetcher.fetch(props, this::setValue);
}
}
static CTTextParagraphProperties select(XSLFShape shape, int level) throws XmlException {
QName[] lvlProp = { new QName(DML_NS, "lvl" + (level + 1) + "pPr") };
return shape.selectProperty(
CTTextParagraphProperties.class, ParagraphPropertyFetcher::parse, TX_BODY, LST_STYLE, lvlProp);
}
static CTTextParagraphProperties parse(XMLStreamReader reader) throws XmlException {
CTTextParagraph para = CTTextParagraph.Factory.parse(reader);
return (para != null && para.isSetPPr()) ? para.getPPr() : null;
}
public abstract boolean fetch(CTTextParagraphProperties props);
static CTTextParagraphProperties getThemeProps(XSLFShape shape, int _level) {
if (shape.isPlaceholder()) {
return null;
}
// if it is a plain text box then take defaults from presentation.xml
@SuppressWarnings("resource")
final XMLSlideShow ppt = shape.getSheet().getSlideShow();
CTTextListStyle dts = ppt.getCTPresentation().getDefaultTextStyle();
if (dts == null) {
return null;
}
switch (_level) {
case 0:
return dts.getLvl1PPr();
case 1:
return dts.getLvl2PPr();
case 2:
return dts.getLvl3PPr();
case 3:
return dts.getLvl4PPr();
case 4:
return dts.getLvl5PPr();
case 5:
return dts.getLvl6PPr();
case 6:
return dts.getLvl7PPr();
case 7:
return dts.getLvl8PPr();
case 8:
return dts.getLvl9PPr();
default:
return null;
}
}
}

6
src/ooxml/java/org/apache/poi/xslf/model/PropertyFetcher.java
View File

@ -30,6 +30,7 @@ import org.apache.poi.xslf.usermodel.XSLFShape;
@Internal
public abstract class PropertyFetcher<T> {
private T _value;
private boolean isSet = false;
/**
*
@ -44,5 +45,10 @@ public abstract class PropertyFetcher<T> {
public void setValue(T val){
_value = val;
isSet = true;
}
public boolean isSet() {
return isSet;
}
}

17
src/ooxml/java/org/apache/poi/xslf/usermodel/XMLSlideShow.java
View File

@ -54,8 +54,6 @@ import org.apache.poi.util.POILogFactory;
import org.apache.poi.util.POILogger;
import org.apache.poi.util.Units;
import org.apache.xmlbeans.XmlException;
import org.apache.xmlbeans.XmlObject;
import org.openxmlformats.schemas.drawingml.x2006.main.CTTextParagraphProperties;
import org.openxmlformats.schemas.presentationml.x2006.main.CTNotesMasterIdList;
import org.openxmlformats.schemas.presentationml.x2006.main.CTNotesMasterIdListEntry;
import org.openxmlformats.schemas.presentationml.x2006.main.CTPresentation;
@ -281,10 +279,10 @@ public class XMLSlideShow extends POIXMLDocument
slide.addRelation(null, XSLFRelation.CHART, chart);
return chart;
}
/**
* This method is used to create template for chart XML.
* @return Xslf chart object
* @return Xslf chart object
* @since POI 4.1.0
*/
public XSLFChart createChart() {
@ -593,17 +591,6 @@ public class XMLSlideShow extends POIXMLDocument
return _tableStyles;
}
CTTextParagraphProperties getDefaultParagraphStyle(int level) {
XmlObject[] o = _presentation.selectPath(
"declare namespace p='http://schemas.openxmlformats.org/presentationml/2006/main' " +
"declare namespace a='http://schemas.openxmlformats.org/drawingml/2006/main' " +
".//p:defaultTextStyle/a:lvl" + (level + 1) + "pPr");
if (o.length == 1) {
return (CTTextParagraphProperties) o[0];
}
return null;
}
@SuppressWarnings("RedundantThrows")
@Override
public MasterSheet<XSLFShape, XSLFTextParagraph> createMasterSheet() throws IOException {

3
src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFShape.java
View File

@ -492,7 +492,8 @@ public abstract class XSLFShape implements Shape<XSLFShape,XSLFTextParagraph> {
* @return true if the property was fetched
*/
@SuppressWarnings("WeakerAccess")
protected boolean fetchShapeProperty(PropertyFetcher<?> visitor) {
@Internal
public boolean fetchShapeProperty(PropertyFetcher<?> visitor) {
// try shape properties in slide
if (visitor.fetch(this)) {
return true;

400
src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTextParagraph.java
View File

@ -21,6 +21,7 @@ import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Objects;
import java.util.function.Consumer;
import java.util.function.Function;
import java.util.function.Supplier;
@ -34,6 +35,7 @@ import org.apache.poi.util.Beta;
import org.apache.poi.util.Internal;
import org.apache.poi.util.Units;
import org.apache.poi.xslf.model.ParagraphPropertyFetcher;
import org.apache.poi.xslf.model.ParagraphPropertyFetcher.ParaPropFetcher;
import org.apache.xmlbeans.XmlCursor;
import org.apache.xmlbeans.XmlObject;
import org.openxmlformats.schemas.drawingml.x2006.main.*;
@ -57,7 +59,6 @@ public class XSLFTextParagraph implements TextParagraph<XSLFShape,XSLFTextParagr
void accept();
}
XSLFTextParagraph(CTTextParagraph p, XSLFTextShape shape){
_p = p;
_runs = new ArrayList<>();
@ -150,19 +151,11 @@ public class XSLFTextParagraph implements TextParagraph<XSLFShape,XSLFTextParagr
@Override
public TextAlign getTextAlign(){
ParagraphPropertyFetcher<TextAlign> fetcher = new ParagraphPropertyFetcher<TextAlign>(getIndentLevel()){
@Override
public boolean fetch(CTTextParagraphProperties props){
if(props.isSetAlgn()){
TextAlign val = TextAlign.values()[props.getAlgn().intValue() - 1];
setValue(val);
return true;
}
return false;
return fetchParagraphProperty((props,val) -> {
if (props.isSetAlgn()) {
val.accept(TextAlign.values()[props.getAlgn().intValue() - 1]);
}
};
fetchParagraphProperty(fetcher);
return fetcher.getValue();
});
}
@Override
@ -179,19 +172,11 @@ public class XSLFTextParagraph implements TextParagraph<XSLFShape,XSLFTextParagr
@Override
public FontAlign getFontAlign(){
ParagraphPropertyFetcher<FontAlign> fetcher = new ParagraphPropertyFetcher<FontAlign>(getIndentLevel()){
@Override
public boolean fetch(CTTextParagraphProperties props){
if(props.isSetFontAlgn()){
FontAlign val = FontAlign.values()[props.getFontAlgn().intValue() - 1];
setValue(val);
return true;
}
return false;
return fetchParagraphProperty((props,val) -> {
if (props.isSetFontAlgn()) {
val.accept(FontAlign.values()[props.getFontAlgn().intValue() - 1]);
}
};
fetchParagraphProperty(fetcher);
return fetcher.getValue();
});
}
/**
@ -220,18 +205,11 @@ public class XSLFTextParagraph implements TextParagraph<XSLFShape,XSLFTextParagr
*/
@SuppressWarnings("WeakerAccess")
public String getBulletFont(){
ParagraphPropertyFetcher<String> fetcher = new ParagraphPropertyFetcher<String>(getIndentLevel()){
@Override
public boolean fetch(CTTextParagraphProperties props){
if(props.isSetBuFont()){
setValue(props.getBuFont().getTypeface());
return true;
}
return false;
return fetchParagraphProperty((props, val) -> {
if (props.isSetBuFont()) {
val.accept(props.getBuFont().getTypeface());
}
};
fetchParagraphProperty(fetcher);
return fetcher.getValue();
});
}
@SuppressWarnings("WeakerAccess")
@ -246,18 +224,11 @@ public class XSLFTextParagraph implements TextParagraph<XSLFShape,XSLFTextParagr
*/
@SuppressWarnings("WeakerAccess")
public String getBulletCharacter(){
ParagraphPropertyFetcher<String> fetcher = new ParagraphPropertyFetcher<String>(getIndentLevel()){
@Override
public boolean fetch(CTTextParagraphProperties props){
if(props.isSetBuChar()){
setValue(props.getBuChar().getChar());
return true;
}
return false;
return fetchParagraphProperty((props, val) -> {
if (props.isSetBuChar()) {
val.accept(props.getBuChar().getChar());
}
};
fetchParagraphProperty(fetcher);
return fetcher.getValue();
});
}
@SuppressWarnings("WeakerAccess")
@ -274,23 +245,19 @@ public class XSLFTextParagraph implements TextParagraph<XSLFShape,XSLFTextParagr
*/
@SuppressWarnings("WeakerAccess")
public PaintStyle getBulletFontColor(){
final XSLFTheme theme = getParentShape().getSheet().getTheme();
ParagraphPropertyFetcher<Color> fetcher = new ParagraphPropertyFetcher<Color>(getIndentLevel()){
@Override
public boolean fetch(CTTextParagraphProperties props){
if(props.isSetBuClr()){
XSLFColor c = new XSLFColor(props.getBuClr(), theme, null, _shape.getSheet());
setValue(c.getColor());
return true;
}
return false;
}
};
fetchParagraphProperty(fetcher);
Color col = fetcher.getValue();
Color col = fetchParagraphProperty(this::fetchBulletFontColor);
return (col == null) ? null : DrawPaint.createSolidPaint(col);
}
private void fetchBulletFontColor(CTTextParagraphProperties props, Consumer<Color> val) {
final XSLFSheet sheet = getParentShape().getSheet();
final XSLFTheme theme = sheet.getTheme();
if(props.isSetBuClr()){
XSLFColor c = new XSLFColor(props.getBuClr(), theme, null, sheet);
val.accept(c.getColor());
}
}
@SuppressWarnings("WeakerAccess")
public void setBulletFontColor(Color color) {
setBulletFontColor(DrawPaint.createSolidPaint(color));
@ -330,24 +297,19 @@ public class XSLFTextParagraph implements TextParagraph<XSLFShape,XSLFTextParagr
*/
@SuppressWarnings("WeakerAccess")
public Double getBulletFontSize(){
ParagraphPropertyFetcher<Double> fetcher = new ParagraphPropertyFetcher<Double>(getIndentLevel()){
@Override
public boolean fetch(CTTextParagraphProperties props){
if(props.isSetBuSzPct()){
setValue(props.getBuSzPct().getVal() * 0.001);
return true;
}
if(props.isSetBuSzPts()){
setValue( - props.getBuSzPts().getVal() * 0.01);
return true;
}
return false;
}
};
fetchParagraphProperty(fetcher);
return fetcher.getValue();
return fetchParagraphProperty(XSLFTextParagraph::fetchBulletFontSize);
}
private static void fetchBulletFontSize(CTTextParagraphProperties props, Consumer<Double> val) {
if(props.isSetBuSzPct()){
val.accept(props.getBuSzPct().getVal() * 0.001);
}
if(props.isSetBuSzPts()){
val.accept( - props.getBuSzPts().getVal() * 0.01);
}
}
/**
* Sets the bullet size that is to be used within a paragraph.
* This may be specified in two different ways, percentage spacing and font point spacing:
@ -380,45 +342,31 @@ public class XSLFTextParagraph implements TextParagraph<XSLFShape,XSLFTextParagr
*/
@SuppressWarnings("WeakerAccess")
public AutoNumberingScheme getAutoNumberingScheme() {
ParagraphPropertyFetcher<AutoNumberingScheme> fetcher = new ParagraphPropertyFetcher<AutoNumberingScheme>(getIndentLevel()) {
@Override
public boolean fetch(CTTextParagraphProperties props) {
if (props.isSetBuAutoNum()) {
AutoNumberingScheme ans = AutoNumberingScheme.forOoxmlID(props.getBuAutoNum().getType().intValue());
if (ans != null) {
setValue(ans);
return true;
}
}
return false;
}
};
fetchParagraphProperty(fetcher);
return fetcher.getValue();
return fetchParagraphProperty(XSLFTextParagraph::fetchAutoNumberingScheme);
}
private static void fetchAutoNumberingScheme(CTTextParagraphProperties props, Consumer<AutoNumberingScheme> val) {
if (props.isSetBuAutoNum()) {
AutoNumberingScheme ans = AutoNumberingScheme.forOoxmlID(props.getBuAutoNum().getType().intValue());
if (ans != null) {
val.accept(ans);
}
}
}
/**
* @return the auto numbering starting number, or null if not defined
*/
@SuppressWarnings("WeakerAccess")
public Integer getAutoNumberingStartAt() {
ParagraphPropertyFetcher<Integer> fetcher = new ParagraphPropertyFetcher<Integer>(getIndentLevel()) {
@Override
public boolean fetch(CTTextParagraphProperties props) {
if (props.isSetBuAutoNum()) {
if (props.getBuAutoNum().isSetStartAt()) {
setValue(props.getBuAutoNum().getStartAt());
return true;
}
}
return false;
return fetchParagraphProperty((props, val) -> {
if (props.isSetBuAutoNum() && props.getBuAutoNum().isSetStartAt()) {
val.accept(props.getBuAutoNum().getStartAt());
}
};
fetchParagraphProperty(fetcher);
return fetcher.getValue();
});
}
@Override
public void setIndent(Double indent){
if ((indent == null) && !_p.isSetPPr()) {
@ -436,22 +384,14 @@ public class XSLFTextParagraph implements TextParagraph<XSLFShape,XSLFTextParagr
@Override
public Double getIndent() {
ParagraphPropertyFetcher<Double> fetcher = new ParagraphPropertyFetcher<Double>(getIndentLevel()){
@Override
public boolean fetch(CTTextParagraphProperties props){
if(props.isSetIndent()){
setValue(Units.toPoints(props.getIndent()));
return true;
}
return false;
return fetchParagraphProperty((props, val) -> {
if (props.isSetIndent()) {
val.accept(Units.toPoints(props.getIndent()));
}
};
fetchParagraphProperty(fetcher);
return fetcher.getValue();
});
}
@Override
public void setLeftMargin(Double leftMargin){
if (leftMargin == null && !_p.isSetPPr()) {
@ -472,21 +412,12 @@ public class XSLFTextParagraph implements TextParagraph<XSLFShape,XSLFTextParagr
* @return the left margin (in points) of the paragraph, null if unset
*/
@Override
public Double getLeftMargin(){
ParagraphPropertyFetcher<Double> fetcher = new ParagraphPropertyFetcher<Double>(getIndentLevel()){
@Override
public boolean fetch(CTTextParagraphProperties props){
if(props.isSetMarL()){
double val = Units.toPoints(props.getMarL());
setValue(val);
return true;
}
return false;
public Double getLeftMargin() {
return fetchParagraphProperty((props, val) -> {
if (props.isSetMarL()) {
val.accept(Units.toPoints(props.getMarL()));
}
};
fetchParagraphProperty(fetcher);
// if the marL attribute is omitted, then a value of 347663 is implied
return fetcher.getValue();
});
}
@Override
@ -510,59 +441,39 @@ public class XSLFTextParagraph implements TextParagraph<XSLFShape,XSLFTextParagr
*/
@Override
public Double getRightMargin(){
ParagraphPropertyFetcher<Double> fetcher = new ParagraphPropertyFetcher<Double>(getIndentLevel()){
@Override
public boolean fetch(CTTextParagraphProperties props){
if(props.isSetMarR()){
double val = Units.toPoints(props.getMarR());
setValue(val);
return true;
}
return false;
return fetchParagraphProperty((props, val) -> {
if (props.isSetMarR()) {
val.accept(Units.toPoints(props.getMarR()));
}
};
fetchParagraphProperty(fetcher);
return fetcher.getValue();
});
}
@Override
public Double getDefaultTabSize(){
ParagraphPropertyFetcher<Double> fetcher = new ParagraphPropertyFetcher<Double>(getIndentLevel()){
@Override
public boolean fetch(CTTextParagraphProperties props){
if(props.isSetDefTabSz()){
double val = Units.toPoints(props.getDefTabSz());
setValue(val);
return true;
}
return false;
return fetchParagraphProperty((props, val) -> {
if (props.isSetDefTabSz()) {
val.accept(Units.toPoints(props.getDefTabSz()));
}
};
fetchParagraphProperty(fetcher);
return fetcher.getValue();
});
}
@SuppressWarnings("WeakerAccess")
public double getTabStop(final int idx) {
ParagraphPropertyFetcher<Double> fetcher = new ParagraphPropertyFetcher<Double>(getIndentLevel()){
@Override
public boolean fetch(CTTextParagraphProperties props){
if (props.isSetTabLst()) {
CTTextTabStopList tabStops = props.getTabLst();
if(idx < tabStops.sizeOfTabArray() ) {
CTTextTabStop ts = tabStops.getTabArray(idx);
double val = Units.toPoints(ts.getPos());
setValue(val);
return true;
}
}
return false;
}
};
fetchParagraphProperty(fetcher);
return fetcher.getValue() == null ? 0. : fetcher.getValue();
Double d = fetchParagraphProperty((props,val) -> fetchTabStop(idx,props,val));
return (d == null) ? 0. : d;
}
private static void fetchTabStop(final int idx, CTTextParagraphProperties props, Consumer<Double> val) {
if (props.isSetTabLst()) {
CTTextTabStopList tabStops = props.getTabLst();
if(idx < tabStops.sizeOfTabArray() ) {
CTTextTabStop ts = tabStops.getTabArray(idx);
val.accept(Units.toPoints(ts.getPos()));
}
}
}
@SuppressWarnings("WeakerAccess")
public void addTabStop(double value){
CTTextParagraphProperties pr = _p.isSetPPr() ? _p.getPPr() : _p.addNewPPr();
@ -650,32 +561,22 @@ public class XSLFTextParagraph implements TextParagraph<XSLFShape,XSLFTextParagr
}
private Double getSpacing(final Function<CTTextParagraphProperties,Supplier<CTTextSpacing>> getSpc) {
final ParagraphPropertyFetcher<Double> fetcher = new ParagraphPropertyFetcher<Double>(getIndentLevel()){
@Override
public boolean fetch(final CTTextParagraphProperties props){
final CTTextSpacing spc = getSpc.apply(props).get();
if (spc == null) {
return false;
}
if (spc.isSetSpcPct()) {
setValue( spc.getSpcPct().getVal()*0.001 );
return true;
}
if (spc.isSetSpcPts()) {
setValue( -spc.getSpcPts().getVal()*0.01 );
return true;
}
return false;
}
};
fetchParagraphProperty(fetcher);
return fetcher.getValue();
return fetchParagraphProperty((props,val) -> fetchSpacing(getSpc,props,val));
}
private static void fetchSpacing(final Function<CTTextParagraphProperties,Supplier<CTTextSpacing>> getSpc,
CTTextParagraphProperties props, Consumer<Double> val) {
final CTTextSpacing spc = getSpc.apply(props).get();
if (spc != null) {
if (spc.isSetSpcPct()) {
val.accept( spc.getSpcPct().getVal()*0.001 );
} else if (spc.isSetSpcPts()) {
val.accept( -spc.getSpcPts().getVal()*0.01 );
}
}
}
@Override
public void setIndentLevel(int level){
CTTextParagraphProperties pr = _p.isSetPPr() ? _p.getPPr() : _p.addNewPPr();
@ -692,24 +593,19 @@ public class XSLFTextParagraph implements TextParagraph<XSLFShape,XSLFTextParagr
* Returns whether this paragraph has bullets
*/
public boolean isBullet() {
ParagraphPropertyFetcher<Boolean> fetcher = new ParagraphPropertyFetcher<Boolean>(getIndentLevel()){
@Override
public boolean fetch(CTTextParagraphProperties props){
if(props.isSetBuNone()) {
setValue(false);
return true;
}
if(props.isSetBuFont() || props.isSetBuChar()){
setValue(true);
return true;
}
return false;
}
};
fetchParagraphProperty(fetcher);
return fetcher.getValue() == null ? false : fetcher.getValue();
Boolean b = fetchParagraphProperty(XSLFTextParagraph::fetchIsBullet);
return b == null ? false : b;
}
private static void fetchIsBullet(CTTextParagraphProperties props, Consumer<Boolean> val) {
if (props.isSetBuNone()) {
val.accept(false);
} else if(props.isSetBuFont() || props.isSetBuChar()){
val.accept(true);
}
}
/**
*
* @param flag whether text in this paragraph has bullets
@ -789,7 +685,8 @@ public class XSLFTextParagraph implements TextParagraph<XSLFShape,XSLFTextParagr
* @return master style text paragraph properties, or <code>null</code> if
* there are no master slides or the master slides do not contain a text paragraph
*/
private CTTextParagraphProperties getDefaultMasterStyle(){
@Internal
public CTTextParagraphProperties getDefaultMasterStyle(){
CTPlaceholder ph = _shape.getPlaceholderDetails().getCTPlaceholder(false);
String defaultStyleSelector;
switch(ph == null ? -1 : ph.getType().intValue()) {
@ -837,49 +734,11 @@ public class XSLFTextParagraph implements TextParagraph<XSLFShape,XSLFTextParagr
return null;
}
private void fetchParagraphProperty(final ParagraphPropertyFetcher<?> visitor){
private <T> T fetchParagraphProperty(ParaPropFetcher<T> fetcher){
final XSLFTextShape shape = getParentShape();
final XSLFSheet sheet = shape.getSheet();
if (!(sheet instanceof XSLFSlideMaster)) {
if (_p.isSetPPr() && visitor.fetch(_p.getPPr())) {
return;
}
if (shape.fetchShapeProperty(visitor)) {
return;
}
if (fetchThemeProperty(visitor)) {
return;
}
}
fetchMasterProperty(visitor);
return new ParagraphPropertyFetcher<>(this, fetcher).fetchProperty(shape);
}
void fetchMasterProperty(final ParagraphPropertyFetcher<?> visitor) {
// defaults for placeholders are defined in the slide master
final CTTextParagraphProperties defaultProps = getDefaultMasterStyle();
// TODO: determine master shape
if (defaultProps != null) {
visitor.fetch(defaultProps);
}
}
boolean fetchThemeProperty(final ParagraphPropertyFetcher<?> visitor) {
final XSLFTextShape shape = getParentShape();
if (shape.isPlaceholder()) {
return false;
}
// if it is a plain text box then take defaults from presentation.xml
@SuppressWarnings("resource")
final XMLSlideShow ppt = shape.getSheet().getSlideShow();
final CTTextParagraphProperties themeProps = ppt.getDefaultParagraphStyle(getIndentLevel());
return themeProps != null && visitor.fetch(themeProps);
}
void copy(XSLFTextParagraph other){
if (other == this) {
@ -1074,25 +933,22 @@ public class XSLFTextParagraph implements TextParagraph<XSLFShape,XSLFTextParagr
@Override
public List<XSLFTabStop> getTabStops() {
ParagraphPropertyFetcher<List<XSLFTabStop>> fetcher = new ParagraphPropertyFetcher<List<XSLFTabStop>>(getIndentLevel()){
@Override
public boolean fetch(CTTextParagraphProperties props) {
if (props.isSetTabLst()) {
final List<XSLFTabStop> list = new ArrayList<>();
//noinspection deprecation
for (final CTTextTabStop ta : props.getTabLst().getTabArray()) {
list.add(new XSLFTabStop(ta));
}
setValue(list);
return true;
}
return false;
}
};
fetchParagraphProperty(fetcher);
return fetcher.getValue();
return fetchParagraphProperty(XSLFTextParagraph::fetchTabStops);
}
private static void fetchTabStops(CTTextParagraphProperties props, Consumer<List<XSLFTabStop>> val) {
if (props.isSetTabLst()) {
final List<XSLFTabStop> list = new ArrayList<>();
//noinspection deprecation
for (final CTTextTabStop ta : props.getTabLst().getTabArray()) {
list.add(new XSLFTabStop(ta));
}
val.accept(list);
}
}
@Override
public void addTabStops(double positionInPoints, TabStopType tabStopType) {
final XSLFSheet sheet = getParentShape().getSheet();

252
src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTextRun.java
View File

@ -17,6 +17,7 @@
package org.apache.poi.xslf.usermodel;
import java.awt.Color;
import java.util.function.Consumer;
import org.apache.poi.common.usermodel.fonts.FontCharset;
import org.apache.poi.common.usermodel.fonts.FontFamily;
@ -34,6 +35,7 @@ import org.apache.poi.util.Internal;
import org.apache.poi.util.POILogFactory;
import org.apache.poi.util.POILogger;
import org.apache.poi.xslf.model.CharacterPropertyFetcher;
import org.apache.poi.xslf.model.CharacterPropertyFetcher.CharPropFetcher;
import org.apache.poi.xslf.usermodel.XSLFPropertiesDelegate.XSLFFillProperties;
import org.apache.xmlbeans.XmlObject;
import org.openxmlformats.schemas.drawingml.x2006.main.CTFontCollection;
@ -126,39 +128,35 @@ public class XSLFTextRun implements TextRun {
@Override
public PaintStyle getFontColor(){
final boolean hasPlaceholder = getParagraph().getParentShape().getPlaceholder() != null;
CharacterPropertyFetcher<PaintStyle> fetcher = new CharacterPropertyFetcher<PaintStyle>(_p.getIndentLevel()){
@Override
public boolean fetch(CTTextCharacterProperties props){
if (props == null) {
return false;
}
XSLFShape shape = _p.getParentShape();
CTShapeStyle style = shape.getSpStyle();
CTSchemeColor phClr = null;
if (style != null && style.getFontRef() != null) {
phClr = style.getFontRef().getSchemeClr();
}
XSLFFillProperties fp = XSLFPropertiesDelegate.getFillDelegate(props);
XSLFSheet sheet = shape.getSheet();
PackagePart pp = sheet.getPackagePart();
XSLFTheme theme = sheet.getTheme();
PaintStyle ps = shape.selectPaint(fp, phClr, pp, theme, hasPlaceholder);
if (ps != null) {
setValue(ps);
return true;
}
return false;
}
};
fetchCharacterProperty(fetcher);
return fetcher.getValue();
XSLFShape shape = getParagraph().getParentShape();
final boolean hasPlaceholder = shape.getPlaceholder() != null;
return fetchCharacterProperty((props, val) -> fetchFontColor(props, val, shape, hasPlaceholder));
}
private static void fetchFontColor(CTTextCharacterProperties props, Consumer<PaintStyle> val, XSLFShape shape, boolean hasPlaceholder) {
if (props == null) {
return;
}
CTShapeStyle style = shape.getSpStyle();
CTSchemeColor phClr = null;
if (style != null && style.getFontRef() != null) {
phClr = style.getFontRef().getSchemeClr();
}
XSLFFillProperties fp = XSLFPropertiesDelegate.getFillDelegate(props);
XSLFSheet sheet = shape.getSheet();
PackagePart pp = sheet.getPackagePart();
XSLFTheme theme = sheet.getTheme();
PaintStyle ps = shape.selectPaint(fp, phClr, pp, theme, hasPlaceholder);
if (ps != null) {
val.accept(ps);
}
}
@Override
public void setFontSize(Double fontSize){
CTTextCharacterProperties rPr = getRPr(true);
@ -189,18 +187,12 @@ public class XSLFTextRun implements TextRun {
}
}
final CharacterPropertyFetcher<Double> fetcher = new CharacterPropertyFetcher<Double>(_p.getIndentLevel()){
@Override
public boolean fetch(CTTextCharacterProperties props){
if (props != null && props.isSetSz()) {
setValue(props.getSz()*0.01);
return true;
}
return false;
Double d = fetchCharacterProperty((props, val) -> {
if (props.isSetSz()) {
val.accept(props.getSz()*0.01);
}
};
fetchCharacterProperty(fetcher);
return fetcher.getValue() == null ? null : fetcher.getValue()*scale;
});
return d == null ? null : d*scale;
}
/**
@ -209,19 +201,12 @@ public class XSLFTextRun implements TextRun {
*/
@SuppressWarnings("WeakerAccess")
public double getCharacterSpacing(){
CharacterPropertyFetcher<Double> fetcher = new CharacterPropertyFetcher<Double>(_p.getIndentLevel()){
@Override
public boolean fetch(CTTextCharacterProperties props){
if (props != null && props.isSetSpc()) {
setValue(props.getSpc()*0.01);
return true;
}
return false;
Double d = fetchCharacterProperty((props, val) -> {
if (props.isSetSpc()) {
val.accept(props.getSpc()*0.01);
}
};
fetchCharacterProperty(fetcher);
return fetcher.getValue() == null ? 0 : fetcher.getValue();
});
return d == null ? 0 : d;
}
/**
@ -300,34 +285,22 @@ public class XSLFTextRun implements TextRun {
@Override
public boolean isStrikethrough() {
CharacterPropertyFetcher<Boolean> fetcher = new CharacterPropertyFetcher<Boolean>(_p.getIndentLevel()){
@Override
public boolean fetch(CTTextCharacterProperties props){
if(props != null && props.isSetStrike()) {
setValue(props.getStrike() != STTextStrikeType.NO_STRIKE);
return true;
}
return false;
Boolean b = fetchCharacterProperty((props, val) -> {
if (props.isSetStrike()) {
val.accept(props.getStrike() != STTextStrikeType.NO_STRIKE);
}
};
fetchCharacterProperty(fetcher);
return fetcher.getValue() == null ? false : fetcher.getValue();
});
return b != null && b;
}
@Override
public boolean isSuperscript() {
CharacterPropertyFetcher<Boolean> fetcher = new CharacterPropertyFetcher<Boolean>(_p.getIndentLevel()){
@Override
public boolean fetch(CTTextCharacterProperties props){
if (props != null && props.isSetBaseline()) {
setValue(props.getBaseline() > 0);
return true;
}
return false;
Boolean b = fetchCharacterProperty((props, val) -> {
if (props.isSetBaseline()) {
val.accept(props.getBaseline() > 0);
}
};
fetchCharacterProperty(fetcher);
return fetcher.getValue() == null ? false : fetcher.getValue();
});
return b != null && b;
}
/**
@ -366,18 +339,12 @@ public class XSLFTextRun implements TextRun {
@Override
public boolean isSubscript() {
CharacterPropertyFetcher<Boolean> fetcher = new CharacterPropertyFetcher<Boolean>(_p.getIndentLevel()){
@Override
public boolean fetch(CTTextCharacterProperties props){
if (props != null && props.isSetBaseline()) {
setValue(props.getBaseline() < 0);
return true;
}
return false;
Boolean b = fetchCharacterProperty((props, val) -> {
if (props.isSetBaseline()) {
val.accept(props.getBaseline() < 0);
}
};
fetchCharacterProperty(fetcher);
return fetcher.getValue() == null ? false : fetcher.getValue();
});
return b != null && b;
}
/**
@ -385,19 +352,12 @@ public class XSLFTextRun implements TextRun {
*/
@Override
public TextCap getTextCap() {
CharacterPropertyFetcher<TextCap> fetcher = new CharacterPropertyFetcher<TextCap>(_p.getIndentLevel()){
@Override
public boolean fetch(CTTextCharacterProperties props){
if (props != null && props.isSetCap()) {
int idx = props.getCap().intValue() - 1;
setValue(TextCap.values()[idx]);
return true;
}
return false;
TextCap textCap = fetchCharacterProperty((props, val) -> {
if (props.isSetCap()) {
val.accept(TextCap.values()[props.getCap().intValue() - 1]);
}
};
fetchCharacterProperty(fetcher);
return fetcher.getValue() == null ? TextCap.NONE : fetcher.getValue();
});
return textCap == null ? TextCap.NONE : textCap;
}
@Override
@ -406,40 +366,29 @@ public class XSLFTextRun implements TextRun {
}
@Override
public boolean isBold(){
CharacterPropertyFetcher<Boolean> fetcher = new CharacterPropertyFetcher<Boolean>(_p.getIndentLevel()){
@Override
public boolean fetch(CTTextCharacterProperties props){
if (props != null && props.isSetB()) {
setValue(props.getB());
return true;
}
return false;
public boolean isBold() {
Boolean b = fetchCharacterProperty((props, val) -> {
if (props.isSetB()) {
val.accept(props.getB());
}
};
fetchCharacterProperty(fetcher);
return fetcher.getValue() == null ? false : fetcher.getValue();
});
return b != null && b;
}
@Override
public void setItalic(boolean italic){
getRPr(true).setI(italic);
}
@Override
public boolean isItalic(){
CharacterPropertyFetcher<Boolean> fetcher = new CharacterPropertyFetcher<Boolean>(_p.getIndentLevel()){
@Override
public boolean fetch(CTTextCharacterProperties props){
if (props != null && props.isSetI()) {
setValue(props.getI());
return true;
}
return false;
public boolean isItalic() {
Boolean b = fetchCharacterProperty((props, val) -> {
if (props.isSetI()) {
val.accept(props.getI());
}
};
fetchCharacterProperty(fetcher);
return fetcher.getValue() == null ? false : fetcher.getValue();
});
return b != null && b;
}
@Override
@ -449,18 +398,12 @@ public class XSLFTextRun implements TextRun {
@Override
public boolean isUnderlined(){
CharacterPropertyFetcher<Boolean> fetcher = new CharacterPropertyFetcher<Boolean>(_p.getIndentLevel()){
@Override
public boolean fetch(CTTextCharacterProperties props){
if (props != null && props.isSetU()) {
setValue(props.getU() != STTextUnderlineType.NONE);
return true;
}
return false;
Boolean b = fetchCharacterProperty((props, val) -> {
if (props.isSetU()) {
val.accept(props.getU() != STTextUnderlineType.NONE);
}
};
fetchCharacterProperty(fetcher);
return fetcher.getValue() == null ? false : fetcher.getValue();
});
return b != null && b;
}
/**
@ -469,7 +412,8 @@ public class XSLFTextRun implements TextRun {
* @param create if true, create an empty character properties object if it doesn't exist
* @return the character properties or null if create was false and the properties haven't exist
*/
protected CTTextCharacterProperties getRPr(boolean create) {
@Internal
public CTTextCharacterProperties getRPr(boolean create) {
if (_r instanceof CTTextField) {
CTTextField tf = (CTTextField)_r;
if (tf.isSetRPr()) {
@ -527,23 +471,9 @@ public class XSLFTextRun implements TextRun {
return new XSLFHyperlink(hl, _p.getParentShape().getSheet());
}
private void fetchCharacterProperty(final CharacterPropertyFetcher<?> visitor){
XSLFTextShape shape = _p.getParentShape();
CTTextCharacterProperties rPr = getRPr(false);
if (rPr != null && visitor.fetch(rPr)) {
return;
}
if (shape.fetchShapeProperty(visitor)) {
return;
}
if (_p.fetchThemeProperty(visitor)) {
return;
}
_p.fetchMasterProperty(visitor);
private <T> T fetchCharacterProperty(CharPropFetcher<T> fetcher){
final XSLFTextShape shape = _p.getParentShape();
return new CharacterPropertyFetcher<>(this, fetcher).fetchProperty(shape);
}
void copy(XSLFTextRun r){
@ -742,20 +672,12 @@ public class XSLFTextRun implements TextRun {
return getCTTextFont(getRPr(true), true);
}
CharacterPropertyFetcher<CTTextFont> visitor = new CharacterPropertyFetcher<CTTextFont>(_p.getIndentLevel()){
@Override
public boolean fetch(CTTextCharacterProperties props){
CTTextFont font = getCTTextFont(props, false);
if (font == null) {
return false;
}
setValue(font);
return true;
return fetchCharacterProperty((props, val) -> {
CTTextFont font = getCTTextFont(props, false);
if (font != null) {
val.accept(font);
}
};
fetchCharacterProperty(visitor);
return visitor.getValue();
});
}
private CTTextFont getCTTextFont(CTTextCharacterProperties props, boolean create) {

17
src/ooxml/testcases/org/apache/poi/sl/TestFonts.java
View File

@ -32,7 +32,6 @@ import java.awt.RenderingHints;
import java.awt.geom.Rectangle2D;
import java.awt.image.BufferedImage;
import java.io.IOException;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
@ -69,19 +68,6 @@ public class TestFonts {
private static final String[] INIT_FONTS = {"mona.ttf"};
// currently linux and mac return quite different values
private static final int[] expected_sizes = {
304, // windows 10, 1080p, MS Office 2016, system text scaling 100% instead of default 125%
306, 308,// Windows 10, 15.6" 3840x2160
310, 311, 312, 313, 318,
338, // Manjaro Linux, 24", 1920x1080(519x292 mm), 94x94 dpi
348, // Windows 10, 15.6" 3840x2160
362, // Windows 10, 13.3" 1080p high-dpi
372, // Ubuntu Xenial, 15", 1680x1050
377, 391, 398, 399, // Mac
406 // Ubuntu Xenial, 15", 1680x1050
};
@BeforeClass
public static void initGE() throws FontFormatException, IOException {
GraphicsEnvironment ge = GraphicsEnvironment.getLocalGraphicsEnvironment();
@ -136,8 +122,7 @@ public class TestFonts {
Rectangle2D anc = tb.getAnchor();
// ignore font metrics differences on windows / linux (... hopefully ...)
int tbHeight = (int)anc.getHeight();
boolean found = Arrays.binarySearch(expected_sizes, tbHeight) > -1;
assertTrue(tbHeight+" wasn't within the expected sizes: "+Arrays.toString(expected_sizes), found);
assertTrue(tbHeight > 100);
}
private void setFont(TextBox<?,?> tb, String fontFamily, FontGroup fontGroup) {

4
src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTextParagraph.java
View File

@ -141,8 +141,8 @@ public class TestXSLFTextParagraph {
p.setIndent(-72.0); // 1"
indent = p.getIndent();
assertEquals(-72.0, indent, 0);
expectedWidth = anchor.getWidth() - leftInset - rightInset;
assertEquals(280.0, expectedWidth, 0); // 300 - 10 - 10
expectedWidth = anchor.getWidth() - leftInset - rightInset - leftMargin - indent;
assertEquals(316.0, expectedWidth, 0); // 300 - 10 - 10
assertEquals(expectedWidth, dtp.getWrappingWidth(true, null), 0); // first line is NOT indented
// other lines are indented by leftMargin (the value of indent is not used)
expectedWidth = anchor.getWidth() - leftInset - rightInset - leftMargin;

4
src/scratchpad/src/org/apache/poi/hslf/record/TextRulerAtom.java
View File

@ -202,14 +202,14 @@ public final class TextRulerAtom extends RecordAtom {
* Paragraph's distance from shape's left margin, in master coordinates (576 dpi).
*/
public Integer[] getTextOffsets(){
return indent;
return leftMargin;
}
/**
* First line of paragraph's distance from shape's left margin, in master coordinates (576 dpi).
*/
public Integer[] getBulletOffsets(){
return leftMargin;
return indent;
}
public static TextRulerAtom getParagraphInstance(){

32
src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextParagraph.java
View File

@ -357,8 +357,18 @@ public final class HSLFTextParagraph implements TextParagraph<HSLFShape,HSLFText
@Override
public Double getLeftMargin() {
TextProp tp = getPropVal(_paragraphStyle, "text.offset");
return (tp == null) ? null : Units.masterToPoints(tp.getValue());
Integer val = null;
if (_ruler != null) {
Integer[] toList = _ruler.getTextOffsets();
val = (toList.length > getIndentLevel()) ? toList[getIndentLevel()] : null;
}
if (val == null) {
TextProp tp = getPropVal(_paragraphStyle, "text.offset");
val = (tp == null) ? null : tp.getValue();
}
return (val == null) ? null : Units.masterToPoints(val);
}
@Override
@ -380,8 +390,18 @@ public final class HSLFTextParagraph implements TextParagraph<HSLFShape,HSLFText
@Override
public Double getIndent() {
TextProp tp = getPropVal(_paragraphStyle, "bullet.offset");
return (tp == null) ? null : Units.masterToPoints(tp.getValue());
Integer val = null;
if (_ruler != null) {
Integer[] toList = _ruler.getBulletOffsets();
val = (toList.length > getIndentLevel()) ? toList[getIndentLevel()] : null;
}
if (val == null) {
TextProp tp = getPropVal(_paragraphStyle, "bullet.offset");
val = (tp == null) ? null : tp.getValue();
}
return (val == null) ? null : Units.masterToPoints(val);
}
@Override
@ -592,8 +612,8 @@ public final class HSLFTextParagraph implements TextParagraph<HSLFShape,HSLFText
@Override
public void setIndentLevel(int level) {
if( _paragraphStyle != null ) {
_paragraphStyle.setIndentLevel((short)level);
}
_paragraphStyle.setIndentLevel((short)level);
}
}
/**

6
src/scratchpad/testcases/org/apache/poi/hslf/record/TestTextRulerAtom.java
View File

@ -20,7 +20,6 @@ package org.apache.poi.hslf.record;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import java.io.ByteArrayOutputStream;
import java.util.List;
@ -53,11 +52,10 @@ public final class TestTextRulerAtom {
assertNotNull(tabStops);
Integer[] textOffsets = ruler.getTextOffsets();
assertArrayEquals(new Integer[]{226, 451, 903, 1129, 1526}, textOffsets);
assertArrayEquals(new Integer[]{117, 345, 794, 1016, 1526}, textOffsets);
Integer[] bulletOffsets = ruler.getBulletOffsets();
assertArrayEquals(new Integer[]{117, 345, 794, 1016, 1526}, bulletOffsets);
assertArrayEquals(new Integer[]{226, 451, 903, 1129, 1526}, bulletOffsets);
}
@Test