User: kz Date: 2008-03-05 17:27:53+0000 Modified: dba/reportdesign/java/com/sun/star/report/SOImageService.java
Log: INTEGRATION: CWS rptchart01_DEV300 (1.3.22); FILE MERGED 2008/02/21 09:57:23 oj 1.3.22.3: #i85225# fixes found with PMD 2008/02/20 10:52:55 oj 1.3.22.2: format changes 2008/02/13 07:04:21 oj 1.3.22.1: #i85225# impl chart readhandler and oleproducer 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.4&r2=1.5 Delta lines: +103 -115 ----------------------- --- SOImageService.java 2008-01-29 13:43:19+0000 1.4 +++ SOImageService.java 2008-03-05 17:27:50+0000 1.5 @@ -32,7 +32,6 @@ * MA 02111-1307 USA * ************************************************************************/ - package com.sun.star.report; import java.awt.Dimension; @@ -58,6 +57,7 @@ */ public class SOImageService implements ImageService { + private XGraphicProvider m_xGraphicProvider; /** @@ -97,8 +97,8 @@ value[0].Name = "InputStream"; value[0].Value = image; - final XPropertySet xImage = (XPropertySet)UnoRuntime.queryInterface( XPropertySet.class, - m_xGraphicProvider.queryGraphic( value ) ); + final XPropertySet xImage = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, + m_xGraphicProvider.queryGraphic(value)); if (xImage != null) { @@ -124,19 +124,7 @@ } } } - catch (UnknownPropertyException ex) - { - throw new ReportExecutionException("Failed to query Image-Size", ex); - } - catch (WrappedTargetException ex) - { - throw new ReportExecutionException("Failed to query Image-Size", ex); - } - catch (com.sun.star.lang.IllegalArgumentException ex) - { - throw new ReportExecutionException("Failed to query Image-Size", ex); - } - catch (IOException ex) + catch (Exception ex) { throw new ReportExecutionException("Failed to query Image-Size", ex); } @@ -153,11 +141,11 @@ String mimeType = null; try { - final PropertyValue[] value = new PropertyValue[] { new PropertyValue() }; + final PropertyValue[] value = new PropertyValue[]{new PropertyValue()}; value[0].Name = "InputStream"; value[0].Value = image; - final XPropertySet xImage = (XPropertySet)UnoRuntime.queryInterface(XPropertySet.class, + final XPropertySet xImage = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, m_xGraphicProvider.queryGraphic(value)); if (xImage != null) --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
