poi-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kiwiwi...@apache.org
Subject svn commit: r1782722 - in /poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel: HSLFTextRun.java HSLFTextShape.java
Date Mon, 13 Feb 2017 06:46:59 GMT
Author: kiwiwings
Date: Mon Feb 13 06:46:59 2017
New Revision: 1782722

URL: http://svn.apache.org/viewvc?rev=1782722&view=rev
Log:
Generics fix for metro shapes

Modified:
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextRun.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextShape.java

Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextRun.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextRun.java?rev=1782722&r1=1782721&r2=1782722&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextRun.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextRun.java Mon Feb 13
06:46:59 2017
@@ -444,7 +444,7 @@ public final class HSLFTextRun implement
         }
 
         if (ts.getSheet() instanceof MasterSheet) {
-            TextShape<?,? extends TextParagraph<?,?,TextRun>> ms = ts.getMetroShape();
+            TextShape<?,? extends TextParagraph<?,?,? extends TextRun>> ms =
ts.getMetroShape();
             if (ms == null) {
                 return null;
             }

Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextShape.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextShape.java?rev=1782722&r1=1782721&r2=1782722&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextShape.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextShape.java Mon Feb
13 06:46:59 2017
@@ -927,8 +927,8 @@ implements TextShape<HSLFShape,HSLFTextP
      *
      * @return null, if there's no alternative representation, otherwise the text shape
      */
-    public TextShape<?,? extends TextParagraph<?,?,TextRun>> getMetroShape()
{
-        HSLFMetroShape<TextShape<?,? extends TextParagraph<?,?,TextRun>>>
mbs = new HSLFMetroShape<TextShape<?,? extends TextParagraph<?,?,TextRun>>>(this);
+    public TextShape<?,? extends TextParagraph<?,?,? extends TextRun>> getMetroShape()
{
+        HSLFMetroShape<TextShape<?,? extends TextParagraph<?,?,? extends TextRun>>>
mbs = new HSLFMetroShape<TextShape<?,? extends TextParagraph<?,?,? extends TextRun>>>(this);
         return mbs.getShape();
     }
 }
\ No newline at end of file



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org


Mime
View raw message