Tag: cws_dev300_rptchart02 User: oj Date: 2008-05-15 06:05:45+0000 Modified: dba/reportdesign/java/com/sun/star/report/pentaho/layoutprocessor/VariablesDeclarationLayoutController.java dba/reportdesign/java/com/sun/star/report/pentaho/output/ImageProducer.java
Log: #i87576# use new date function File Changes: Directory: /dba/reportdesign/java/com/sun/star/report/pentaho/layoutprocessor/ ============================================================================== File [changed]: VariablesDeclarationLayoutController.java Url: http://dba.openoffice.org/source/browse/dba/reportdesign/java/com/sun/star/report/pentaho/layoutprocessor/VariablesDeclarationLayoutController.java?r1=1.2.100.3&r2=1.2.100.4 Delta lines: +9 -1 ------------------- --- VariablesDeclarationLayoutController.java 2008-04-22 11:08:46+0000 1.2.100.3 +++ VariablesDeclarationLayoutController.java 2008-05-15 06:05:42+0000 1.2.100.4 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: VariablesDeclarationLayoutController.java,v $ - * $Revision: 1.2.100.3 $ + * $Revision: 1.2.100.4 $ * * This file is part of OpenOffice.org. * @@ -45,6 +45,8 @@ import org.jfree.report.flow.layoutprocessor.LayoutController; import org.jfree.report.flow.layoutprocessor.LayoutControllerUtil; import org.jfree.report.structure.Element; +import java.util.Date; +import java.text.SimpleDateFormat; /** * Writes a full variables-declaration section. @@ -148,6 +150,12 @@ String formula = FormatValueUtility.applyValueForVariable(value, variableSection); if ( formula == null ) formula = "" + value; + if (value instanceof Date) + { + Date date = (Date)value; + final SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy;MM;dd"); + formula = "Date(" + dateFormat.format(date) + ")"; + } variableSection.setAttribute(OfficeNamespaces.TEXT_NS, "formula", "ooow:" + formula); return variableSection; } Directory: /dba/reportdesign/java/com/sun/star/report/pentaho/output/ ===================================================================== File [changed]: ImageProducer.java Url: http://dba.openoffice.org/source/browse/dba/reportdesign/java/com/sun/star/report/pentaho/output/ImageProducer.java?r1=1.3.4.2&r2=1.3.4.3 Delta lines: +3 -3 ------------------- --- ImageProducer.java 2008-04-16 06:23:28+0000 1.3.4.2 +++ ImageProducer.java 2008-05-15 06:05:42+0000 1.3.4.3 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: ImageProducer.java,v $ - * $Revision: 1.3.4.2 $ + * $Revision: 1.3.4.3 $ * * This file is part of OpenOffice.org. * @@ -394,7 +394,7 @@ final CSSNumericValue widthVal = CSSNumericValue.createValue(CSSNumericType.MM, dims.getWidth() / 100.0); final CSSNumericValue heightVal = CSSNumericValue.createValue(CSSNumericType.MM, dims.getHeight() / 100.0); - if (!preserveIRI) + if (preserveIRI) { final OfficeImage retval = new OfficeImage(url.toString(), widthVal, heightVal); imageCache.put(url, retval); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
