User: rt Date: 2008-01-29 13:43:48+0000 Modified: dba/reportdesign/java/com/sun/star/report/pentaho/layoutprocessor/ImageElementLayoutController.java
Log: INTEGRATION: CWS reportdesign02 (1.2.44); FILE MERGED 2007/12/20 07:48:02 oj 1.2.44.2: RESYNC: (1.2-1.3); FILE MERGED 2007/11/06 14:22:43 oj 1.2.44.1: #i83168# count also covered table cells File Changes: 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.3&r2=1.4 Delta lines: +5 -0 ------------------- --- ImageElementLayoutController.java 2007-11-02 11:24:30+0000 1.3 +++ ImageElementLayoutController.java 2008-01-29 13:43:46+0000 1.4 @@ -264,6 +264,11 @@ continue; } final Element child = (Element) node; +/* + if (! "covered-table-cell".equals(child.getType()) && + (ObjectUtilities.equal(child.getNamespace(), namespace) == false || + ObjectUtilities.equal(child.getType(), type) == false)) +*/ if (ObjectUtilities.equal(child.getNamespace(), namespace) == false || (ObjectUtilities.equal(child.getType(), type) == false && (secondType == null || ObjectUtilities.equal(child.getType(), secondType) == false)) ) --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
