User: vg Date: 2008-02-12 13:10:30+0000 Modified: dba/reportdesign/java/com/sun/star/report/pentaho/output/StyleUtilities.java
Log: INTEGRATION: CWS dba24h_SRC680 (1.3.84); FILE MERGED 2008/02/05 08:48:58 oj 1.3.84.1: #i80479# fix currency format File Changes: Directory: /dba/reportdesign/java/com/sun/star/report/pentaho/output/ ===================================================================== File [changed]: StyleUtilities.java Url: http://dba.openoffice.org/source/browse/dba/reportdesign/java/com/sun/star/report/pentaho/output/StyleUtilities.java?r1=1.3&r2=1.4 Delta lines: +19 -0 -------------------- --- StyleUtilities.java 2007-08-03 09:50:59+0000 1.3 +++ StyleUtilities.java 2008-02-12 13:10:27+0000 1.4 @@ -48,6 +48,7 @@ import com.sun.star.report.pentaho.model.OfficeStylesCollection; import org.jfree.report.ReportProcessingException; import org.jfree.report.structure.Element; +import org.jfree.report.structure.Node; import org.jfree.report.util.AttributeNameGenerator; import org.jfree.util.Log; @@ -304,6 +305,24 @@ if (autoDataStyle != null) { final DataStyle derivedStyle = (DataStyle) autoDataStyle.clone(); + Node[] nodes = autoDataStyle.getNodeArray(); + for (int i = 0; i < nodes.length; i++) { + Node node = nodes[i]; + if (node instanceof DataStyle) { + DataStyle element = (DataStyle) node; + final Object apply = element.getAttribute(OfficeNamespaces.STYLE_NS, "apply-style-name"); + if (apply != null) { + final String applyStyleName = String.valueOf(apply); + if (!stylesCollection.getAutomaticStyles().containsDataStyle(applyStyleName)) { + final DataStyle autoApplyDataStyle = automaticStyles.getDataStyle(applyStyleName); + if (autoApplyDataStyle != null) { + stylesCollection.getAutomaticStyles().addDataStyle((DataStyle) autoApplyDataStyle.clone()); + } + } + break; + } + } + } stylesCollection.getAutomaticStyles().addDataStyle(derivedStyle); return; } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
