Tag: cws_src680_reportdesign02 User: oj Date: 2007-11-06 14:22:46+0000 Modified: dba/reportdesign/java/com/sun/star/report/SOImageService.java dba/reportdesign/java/com/sun/star/report/pentaho/layoutprocessor/ImageElementLayoutController.java
Log: #i83168# count also covered table cells 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.2&r2=1.2.44.1 Delta lines: +5 -5 ------------------- --- SOImageService.java 2007-07-09 11:56:04+0000 1.2 +++ SOImageService.java 2007-11-06 14:22:43+0000 1.2.44.1 @@ -111,7 +111,7 @@ { imageSize = (Size) xImage.getPropertyValue("SizePixel"); final int dpi = java.awt.Toolkit.getDefaultToolkit().getScreenResolution(); - final double fac = 25400 / dpi; + final double fac = 2540 / dpi; dim.setSize(imageSize.Width * fac, imageSize.Height * fac); } } @@ -119,7 +119,7 @@ { final Size imageSize = (Size) xImage.getPropertyValue("SizePixel"); final int dpi = java.awt.Toolkit.getDefaultToolkit().getScreenResolution(); - final double fac = 25400 / dpi; + final double fac = 2540 / dpi; dim.setSize(imageSize.Width * fac, imageSize.Height * fac); } } Directory: /dba/reportdesign/java/com/sun/star/report/pentaho/layoutprocessor/ ============================================================================== File [changed]: ImageElementLayoutController.java Url: http://dba.openoffice.org/source/browse/dba/reportdesign/java/com/sun/star/report/pentaho/layoutprocessor/ImageElementLayoutController.java?r1=1.2&r2=1.2.44.1 Delta lines: +5 -4 ------------------- --- ImageElementLayoutController.java 2007-07-09 11:56:05+0000 1.2 +++ ImageElementLayoutController.java 2007-11-06 14:22:43+0000 1.2.44.1 @@ -4,9 +4,9 @@ * * $RCSfile: ImageElementLayoutController.java,v $ * - * $Revision: 1.2 $ + * $Revision: 1.2.44.1 $ * - * last change: $Author: rt $ $Date: 2007/07/09 11:56:05 $ + * last change: $Author: oj $ $Date: 2007/11/06 14:22:43 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -263,8 +263,9 @@ continue; } final Element child = (Element) node; - if (ObjectUtilities.equal(child.getNamespace(), namespace) == false || - ObjectUtilities.equal(child.getType(), type) == false) + if (! "covered-table-cell".equals(child.getType()) && + (ObjectUtilities.equal(child.getNamespace(), namespace) == false || + ObjectUtilities.equal(child.getType(), type) == false)) { continue; } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
