moparisthebest/poi
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Generics fix for metro shapes

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1782722 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Andreas Beeker 2017-02-13 06:46:59 +00:00
parent f316a0f115
commit d74cfc4df5
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextRun.java
View File

@ -444,7 +444,7 @@ public final class HSLFTextRun implements TextRun {
} }
if (ts.getSheet() instanceof MasterSheet) { if (ts.getSheet() instanceof MasterSheet) {
TextShape<?,? extends TextParagraph<?,?,TextRun>> ms = ts.getMetroShape(); TextShape<?,? extends TextParagraph<?,?,? extends TextRun>> ms = ts.getMetroShape();
if (ms == null) { if (ms == null) {
return null; return null;
} }

4
src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextShape.java
View File

@ -927,8 +927,8 @@ implements TextShape<HSLFShape,HSLFTextParagraph> {
* *
* @return null, if there's no alternative representation, otherwise the text shape * @return null, if there's no alternative representation, otherwise the text shape
*/ */
public TextShape<?,? extends TextParagraph<?,?,TextRun>> getMetroShape() { public TextShape<?,? extends TextParagraph<?,?,? extends TextRun>> getMetroShape() {
HSLFMetroShape<TextShape<?,? extends TextParagraph<?,?,TextRun>>> mbs = new HSLFMetroShape<TextShape<?,? extends TextParagraph<?,?,TextRun>>>(this); HSLFMetroShape<TextShape<?,? extends TextParagraph<?,?,? extends TextRun>>> mbs = new HSLFMetroShape<TextShape<?,? extends TextParagraph<?,?,? extends TextRun>>>(this);
return mbs.getShape(); return mbs.getShape();
} }
} }