User: kz Date: 2008-05-05 13:33:34+0000 Modified: dba/reportdesign/java/com/sun/star/report/SOImageService.java
Log: INTEGRATION: CWS dba30beta (1.6.6); FILE MERGED 2008/04/22 10:30:24 oj 1.6.6.1: #i88503# merge changes from rptchart02 File Changes: Directory: /dba/reportdesign/java/com/sun/star/report/ ====================================================== File [changed]: SOImageService.java Url: http://dba.openoffice.org/source/browse/dba/reportdesign/java/com/sun/star/report/SOImageService.java?r1=1.6&r2=1.7 Delta lines: +5 -6 ------------------- --- SOImageService.java 2008-04-10 17:17:13+0000 1.6 +++ SOImageService.java 2008-05-05 13:33:32+0000 1.7 @@ -53,7 +53,7 @@ public class SOImageService implements ImageService { - private XGraphicProvider m_xGraphicProvider; + private final XGraphicProvider m_xGraphicProvider; /** * Creates a new instance of SOImageService @@ -87,8 +87,8 @@ final Dimension dim = new Dimension(); try { - final PropertyValue[] value = new PropertyValue[1]; - value[0] = new PropertyValue(); + final PropertyValue[] value = new PropertyValue[]{new PropertyValue()}; + // value[0] = new PropertyValue(); value[0].Name = "InputStream"; value[0].Value = image; @@ -133,7 +133,6 @@ private String getMimeType(final XInputStream image) throws ReportExecutionException { - String mimeType = null; try { final PropertyValue[] value = new PropertyValue[]{new PropertyValue()}; @@ -148,7 +147,7 @@ final XPropertySetInfo xInfo = xImage.getPropertySetInfo(); if (xInfo.hasPropertyByName("MimeType")) { - mimeType = (String) xImage.getPropertyValue("MimeType"); + return (String) xImage.getPropertyValue("MimeType"); } } } @@ -168,7 +167,7 @@ { throw new ReportExecutionException(); } - return mimeType; + return null; } public String getMimeType(final InputStream image) throws ReportExecutionException --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
