diff options
Diffstat (limited to 'reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor')
17 files changed, 111 insertions, 83 deletions
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/AbstractReportElementLayoutController.java b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/AbstractReportElementLayoutController.java index 385c0457bf2f..85f841a11338 100644 --- a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/AbstractReportElementLayoutController.java +++ b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/AbstractReportElementLayoutController.java @@ -26,15 +26,14 @@ ************************************************************************/ package com.sun.star.report.pentaho.layoutprocessor; -import com.sun.star.report.pentaho.model.ReportElement; import com.sun.star.report.pentaho.model.OfficeGroupSection; +import com.sun.star.report.pentaho.model.ReportElement; + +import org.jfree.report.DataFlags; +import org.jfree.report.DataRow; import org.jfree.report.DataSourceException; import org.jfree.report.ReportDataFactoryException; import org.jfree.report.ReportProcessingException; -import org.jfree.report.DataRow; -import org.jfree.report.DataFlags; -import org.jfree.report.structure.Element; -import org.jfree.report.structure.Group; import org.jfree.report.expressions.Expression; import org.jfree.report.flow.FlowController; import org.jfree.report.flow.ReportTarget; @@ -42,8 +41,11 @@ import org.jfree.report.flow.layoutprocessor.AbstractLayoutController; import org.jfree.report.flow.layoutprocessor.LayoutController; import org.jfree.report.flow.layoutprocessor.LayoutControllerUtil; import org.jfree.report.flow.layoutprocessor.SectionLayoutController; -import org.pentaho.reporting.libraries.formula.lvalues.LValue; +import org.jfree.report.structure.Element; +import org.jfree.report.structure.Group; + import org.pentaho.reporting.libraries.formula.lvalues.ContextLookup; +import org.pentaho.reporting.libraries.formula.lvalues.LValue; /** * Todo: Document me! diff --git a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FixedTextLayoutController.java b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FixedTextLayoutController.java index 90292e93657a..6ac7b7551bec 100644 --- a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FixedTextLayoutController.java +++ b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FixedTextLayoutController.java @@ -26,18 +26,19 @@ ************************************************************************/ package com.sun.star.report.pentaho.layoutprocessor; -import org.jfree.report.flow.layoutprocessor.LayoutController; -import org.jfree.report.flow.layoutprocessor.LayoutControllerFactory; -import org.jfree.report.flow.ReportTarget; -import org.jfree.report.flow.FlowController; -import org.jfree.report.flow.ReportContext; +import com.sun.star.report.pentaho.model.FixedTextElement; + +import org.jfree.report.DataSourceException; +import org.jfree.report.ReportDataFactoryException; +import org.jfree.report.ReportProcessingException; import org.jfree.report.data.GlobalMasterRow; import org.jfree.report.data.ReportDataRow; +import org.jfree.report.flow.FlowController; +import org.jfree.report.flow.ReportContext; +import org.jfree.report.flow.ReportTarget; +import org.jfree.report.flow.layoutprocessor.LayoutController; +import org.jfree.report.flow.layoutprocessor.LayoutControllerFactory; import org.jfree.report.structure.Section; -import org.jfree.report.ReportProcessingException; -import org.jfree.report.ReportDataFactoryException; -import org.jfree.report.DataSourceException; -import com.sun.star.report.pentaho.model.FixedTextElement; /** * Processes a fixed-text element of the OpenOffice reporting specifciation. diff --git a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FormatValueUtility.java b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FormatValueUtility.java index 8be077b4375b..c8c98692a7a0 100755 --- a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FormatValueUtility.java +++ b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FormatValueUtility.java @@ -26,13 +26,16 @@ ************************************************************************/ package com.sun.star.report.pentaho.layoutprocessor; +import com.sun.star.report.OfficeToken; +import com.sun.star.report.pentaho.OfficeNamespaces; +import com.sun.star.report.pentaho.model.FormattedTextElement; + +import java.sql.Time; + import java.text.SimpleDateFormat; + import java.util.Date; -import java.sql.Time; -import com.sun.star.report.pentaho.OfficeNamespaces; -import com.sun.star.report.OfficeToken; -import com.sun.star.report.pentaho.model.FormattedTextElement; import org.jfree.layouting.util.AttributeMap; import org.jfree.report.DataFlags; import org.jfree.report.DataSourceException; @@ -40,9 +43,10 @@ import org.jfree.report.data.DefaultDataFlags; import org.jfree.report.expressions.FormulaExpression; import org.jfree.report.flow.FlowController; import org.jfree.report.flow.layoutprocessor.LayoutControllerUtil; -import org.pentaho.reporting.libraries.formula.util.DateUtil; + import org.pentaho.reporting.libraries.formula.util.HSSFDateUtil; + /** * Creation-Date: 06.06.2007, 17:03:30 * diff --git a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FormattedTextLayoutController.java b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FormattedTextLayoutController.java index e6995cfcc876..7a0a496ffb26 100644 --- a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FormattedTextLayoutController.java +++ b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FormattedTextLayoutController.java @@ -26,14 +26,16 @@ ************************************************************************/ package com.sun.star.report.pentaho.layoutprocessor; -import com.sun.star.report.pentaho.OfficeNamespaces; import com.sun.star.report.OfficeToken; +import com.sun.star.report.pentaho.OfficeNamespaces; import com.sun.star.report.pentaho.model.FormattedTextElement; import com.sun.star.report.pentaho.model.OfficeDocument; import com.sun.star.report.pentaho.model.OfficeStyle; -import org.pentaho.reporting.libraries.formula.Formula; -import org.pentaho.reporting.libraries.formula.lvalues.LValue; -import org.pentaho.reporting.libraries.formula.parser.ParseException; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import org.jfree.layouting.util.AttributeMap; import org.jfree.report.DataFlags; import org.jfree.report.DataSourceException; import org.jfree.report.JFreeReportInfo; @@ -43,9 +45,10 @@ import org.jfree.report.expressions.FormulaExpression; import org.jfree.report.flow.ReportTarget; import org.jfree.report.flow.layoutprocessor.LayoutController; import org.jfree.report.structure.Element; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.jfree.layouting.util.AttributeMap; + +import org.pentaho.reporting.libraries.formula.Formula; +import org.pentaho.reporting.libraries.formula.lvalues.LValue; +import org.pentaho.reporting.libraries.formula.parser.ParseException; /** * Todo: Document me! diff --git a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/ImageElementLayoutController.java b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/ImageElementLayoutController.java index 80ebbcc5f118..78f504107348 100644 --- a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/ImageElementLayoutController.java +++ b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/ImageElementLayoutController.java @@ -26,18 +26,18 @@ ************************************************************************/ package com.sun.star.report.pentaho.layoutprocessor; -import com.sun.star.report.pentaho.OfficeNamespaces; import com.sun.star.report.OfficeToken; +import com.sun.star.report.pentaho.OfficeNamespaces; import com.sun.star.report.pentaho.model.ImageElement; -import org.pentaho.reporting.libraries.formula.Formula; -import org.pentaho.reporting.libraries.formula.lvalues.LValue; -import org.pentaho.reporting.libraries.formula.parser.ParseException; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + import org.jfree.layouting.util.AttributeMap; import org.jfree.report.DataSourceException; import org.jfree.report.JFreeReportInfo; import org.jfree.report.ReportDataFactoryException; import org.jfree.report.ReportProcessingException; -import org.jfree.report.util.TextUtilities; import org.jfree.report.data.GlobalMasterRow; import org.jfree.report.data.ReportDataRow; import org.jfree.report.expressions.FormulaExpression; @@ -46,11 +46,14 @@ import org.jfree.report.flow.ReportTarget; import org.jfree.report.flow.layoutprocessor.LayoutController; import org.jfree.report.flow.layoutprocessor.LayoutControllerUtil; import org.jfree.report.structure.Element; -import org.jfree.report.structure.Section; import org.jfree.report.structure.Node; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.jfree.report.structure.Section; +import org.jfree.report.util.TextUtilities; + import org.pentaho.reporting.libraries.base.util.ObjectUtilities; +import org.pentaho.reporting.libraries.formula.Formula; +import org.pentaho.reporting.libraries.formula.lvalues.LValue; +import org.pentaho.reporting.libraries.formula.parser.ParseException; /** * Produces an image. The image-structures itself (draw:frame and so on) are not generated here. This element produces a diff --git a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/ObjectOleLayoutController.java b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/ObjectOleLayoutController.java index 08ab0ae0d792..1fcb1b67ec81 100644 --- a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/ObjectOleLayoutController.java +++ b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/ObjectOleLayoutController.java @@ -26,21 +26,23 @@ ************************************************************************/ package com.sun.star.report.pentaho.layoutprocessor; -import com.sun.star.report.SDBCReportDataFactory; import com.sun.star.report.OfficeToken; +import com.sun.star.report.SDBCReportDataFactory; import com.sun.star.report.pentaho.model.ObjectOleElement; + import java.util.ArrayList; import java.util.Iterator; import java.util.List; + +import org.jfree.layouting.util.AttributeMap; +import org.jfree.report.DataFlags; +import org.jfree.report.DataRow; import org.jfree.report.DataSourceException; +import org.jfree.report.JFreeReportInfo; import org.jfree.report.ReportDataFactoryException; import org.jfree.report.ReportProcessingException; import org.jfree.report.flow.ReportTarget; import org.jfree.report.flow.layoutprocessor.LayoutController; -import org.jfree.layouting.util.AttributeMap; -import org.jfree.report.DataFlags; -import org.jfree.report.DataRow; -import org.jfree.report.JFreeReportInfo; import org.jfree.report.structure.Element; /** diff --git a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeDetailLayoutController.java b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeDetailLayoutController.java index 83d8686e8bf6..b5f77d2a2971 100644 --- a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeDetailLayoutController.java +++ b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeDetailLayoutController.java @@ -27,10 +27,11 @@ package com.sun.star.report.pentaho.layoutprocessor; import com.sun.star.report.pentaho.model.VariablesDeclarationSection; + import org.jfree.report.DataSourceException; +import org.jfree.report.ReportData; import org.jfree.report.ReportDataFactoryException; import org.jfree.report.ReportProcessingException; -import org.jfree.report.ReportData; import org.jfree.report.data.GlobalMasterRow; import org.jfree.report.data.ReportDataRow; import org.jfree.report.flow.FlowController; diff --git a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeGroupInstanceSectionLayoutController.java b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeGroupInstanceSectionLayoutController.java index 047e46f2e07a..1be93d70d7d1 100644 --- a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeGroupInstanceSectionLayoutController.java +++ b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeGroupInstanceSectionLayoutController.java @@ -1,23 +1,24 @@ package com.sun.star.report.pentaho.layoutprocessor; -import org.jfree.report.flow.layoutprocessor.SectionLayoutController; -import org.jfree.report.flow.layoutprocessor.LayoutController; -import org.jfree.report.flow.layoutprocessor.ElementLayoutController; -import org.jfree.report.flow.layoutprocessor.LayoutControllerFactory; -import org.jfree.report.flow.layoutprocessor.LayoutControllerUtil; -import org.jfree.report.flow.FlowController; -import org.jfree.report.flow.ReportTarget; -import org.jfree.report.flow.ReportContext; +import com.sun.star.report.pentaho.model.OfficeGroupSection; +import com.sun.star.report.pentaho.model.VariablesDeclarationSection; + +import org.jfree.layouting.util.AttributeMap; import org.jfree.report.DataSourceException; +import org.jfree.report.JFreeReportInfo; import org.jfree.report.ReportDataFactoryException; import org.jfree.report.ReportProcessingException; import org.jfree.report.expressions.Expression; +import org.jfree.report.flow.FlowController; +import org.jfree.report.flow.ReportContext; +import org.jfree.report.flow.ReportTarget; +import org.jfree.report.flow.layoutprocessor.ElementLayoutController; +import org.jfree.report.flow.layoutprocessor.LayoutController; +import org.jfree.report.flow.layoutprocessor.LayoutControllerFactory; +import org.jfree.report.flow.layoutprocessor.LayoutControllerUtil; +import org.jfree.report.flow.layoutprocessor.SectionLayoutController; import org.jfree.report.structure.Element; import org.jfree.report.structure.Node; -import org.jfree.layouting.util.AttributeMap; -import com.sun.star.report.pentaho.model.VariablesDeclarationSection; -import com.sun.star.report.pentaho.model.OfficeGroupSection; -import org.jfree.report.JFreeReportInfo; /** * Creation-Date: 25.07.2007, 14:50:45 diff --git a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeGroupLayoutController.java b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeGroupLayoutController.java index fa7852fbc156..9055c2a5bdd1 100644 --- a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeGroupLayoutController.java +++ b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeGroupLayoutController.java @@ -28,6 +28,7 @@ package com.sun.star.report.pentaho.layoutprocessor; import com.sun.star.report.pentaho.model.OfficeGroup; import com.sun.star.report.pentaho.model.OfficeGroupSection; + import org.jfree.layouting.util.AttributeMap; import org.jfree.report.DataSourceException; import org.jfree.report.JFreeReportInfo; diff --git a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeGroupSectionLayoutController.java b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeGroupSectionLayoutController.java index f89d3c047d15..21086d6584d9 100644 --- a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeGroupSectionLayoutController.java +++ b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeGroupSectionLayoutController.java @@ -26,19 +26,20 @@ ************************************************************************/ package com.sun.star.report.pentaho.layoutprocessor; -import org.jfree.report.flow.layoutprocessor.SectionLayoutController; -import org.jfree.report.flow.layoutprocessor.LayoutController; -import org.jfree.report.flow.layoutprocessor.ElementLayoutController; -import org.jfree.report.flow.FlowController; -import org.jfree.report.flow.ReportTarget; -import org.jfree.report.structure.Element; -import org.jfree.report.DataSourceException; -import org.jfree.report.ReportProcessingException; -import org.jfree.report.ReportDataFactoryException; -import org.jfree.layouting.util.AttributeMap; import com.sun.star.report.OfficeToken; import com.sun.star.report.pentaho.model.OfficeGroupSection; + +import org.jfree.layouting.util.AttributeMap; +import org.jfree.report.DataSourceException; import org.jfree.report.JFreeReportInfo; +import org.jfree.report.ReportDataFactoryException; +import org.jfree.report.ReportProcessingException; +import org.jfree.report.flow.FlowController; +import org.jfree.report.flow.ReportTarget; +import org.jfree.report.flow.layoutprocessor.ElementLayoutController; +import org.jfree.report.flow.layoutprocessor.LayoutController; +import org.jfree.report.flow.layoutprocessor.SectionLayoutController; +import org.jfree.report.structure.Element; /** * This layoutcontroller simply checks, whether the parent layout controller diff --git a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficePageSectionLayoutController.java b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficePageSectionLayoutController.java index b98db5f34479..2eb3dd363f91 100644 --- a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficePageSectionLayoutController.java +++ b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficePageSectionLayoutController.java @@ -1,12 +1,12 @@ package com.sun.star.report.pentaho.layoutprocessor; -import org.jfree.report.flow.layoutprocessor.SectionLayoutController; +import org.jfree.layouting.util.AttributeMap; +import org.jfree.report.DataSourceException; +import org.jfree.report.JFreeReportInfo; import org.jfree.report.flow.FlowController; import org.jfree.report.flow.ReportTarget; +import org.jfree.report.flow.layoutprocessor.SectionLayoutController; import org.jfree.report.structure.Element; -import org.jfree.report.DataSourceException; -import org.jfree.layouting.util.AttributeMap; -import org.jfree.report.JFreeReportInfo; /** * Todo: Document Me diff --git a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeReportLayoutController.java b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeReportLayoutController.java index 119c277bcf36..2ad88388b347 100644 --- a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeReportLayoutController.java +++ b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeReportLayoutController.java @@ -28,6 +28,7 @@ package com.sun.star.report.pentaho.layoutprocessor; import com.sun.star.report.pentaho.model.OfficeReport; import com.sun.star.report.pentaho.model.VariablesDeclarationSection; + import org.jfree.report.DataSourceException; import org.jfree.report.ReportDataFactoryException; import org.jfree.report.ReportProcessingException; diff --git a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeTableLayoutController.java b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeTableLayoutController.java index 5c0e95a190ec..9ce1be656b53 100644 --- a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeTableLayoutController.java +++ b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeTableLayoutController.java @@ -26,18 +26,19 @@ ************************************************************************/ package com.sun.star.report.pentaho.layoutprocessor; -import org.jfree.report.flow.layoutprocessor.SectionLayoutController; +import com.sun.star.report.OfficeToken; +import com.sun.star.report.pentaho.OfficeNamespaces; + +import org.jfree.layouting.util.AttributeMap; +import org.jfree.report.DataSourceException; +import org.jfree.report.JFreeReportInfo; import org.jfree.report.flow.FlowController; import org.jfree.report.flow.ReportTarget; +import org.jfree.report.flow.layoutprocessor.SectionLayoutController; import org.jfree.report.structure.Element; -import org.jfree.report.structure.Section; import org.jfree.report.structure.Node; -import org.jfree.report.DataSourceException; +import org.jfree.report.structure.Section; import org.jfree.report.util.IntegerCache; -import org.jfree.layouting.util.AttributeMap; -import com.sun.star.report.pentaho.OfficeNamespaces; -import com.sun.star.report.OfficeToken; -import org.jfree.report.JFreeReportInfo; /** * Creation-Date: 24.04.2007, 14:40:20 diff --git a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeTableTemplateLayoutController.java b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeTableTemplateLayoutController.java index 7b83c6976fea..6c6f997d84aa 100644 --- a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeTableTemplateLayoutController.java +++ b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeTableTemplateLayoutController.java @@ -26,12 +26,13 @@ ************************************************************************/ package com.sun.star.report.pentaho.layoutprocessor; -import java.util.ArrayList; - import com.sun.star.report.pentaho.OfficeNamespaces; import com.sun.star.report.pentaho.model.OfficeGroup; import com.sun.star.report.pentaho.model.OfficeReport; + +import java.util.ArrayList; import java.util.List; + import org.jfree.report.DataSourceException; import org.jfree.report.JFreeReportInfo; import org.jfree.report.ReportDataFactoryException; @@ -43,6 +44,7 @@ import org.jfree.report.structure.Element; import org.jfree.report.structure.Node; import org.jfree.report.structure.Section; + /** * Creation-Date: 24.04.2007, 16:06:52 * diff --git a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/TableCellLayoutController.java b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/TableCellLayoutController.java index 681b8d8e4f0c..74fe1728fc5f 100644 --- a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/TableCellLayoutController.java +++ b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/TableCellLayoutController.java @@ -26,14 +26,15 @@ ************************************************************************/ package com.sun.star.report.pentaho.layoutprocessor; -import com.sun.star.report.pentaho.OfficeNamespaces; import com.sun.star.report.OfficeToken; +import com.sun.star.report.pentaho.OfficeNamespaces; import com.sun.star.report.pentaho.model.FormatCondition; import com.sun.star.report.pentaho.model.FormattedTextElement; import com.sun.star.report.pentaho.model.ReportElement; + import org.jfree.layouting.util.AttributeMap; -import org.jfree.report.DataSourceException; import org.jfree.report.DataFlags; +import org.jfree.report.DataSourceException; import org.jfree.report.expressions.Expression; import org.jfree.report.flow.FlowController; import org.jfree.report.flow.ReportTarget; @@ -42,6 +43,7 @@ import org.jfree.report.flow.layoutprocessor.SectionLayoutController; import org.jfree.report.structure.Element; import org.jfree.report.structure.Node; import org.jfree.report.structure.Section; + import org.pentaho.reporting.libraries.base.util.ObjectUtilities; /** diff --git a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/VariablesCollection.java b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/VariablesCollection.java index e5a9eb60e4f8..a0ca9d8c98b6 100644 --- a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/VariablesCollection.java +++ b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/VariablesCollection.java @@ -26,11 +26,12 @@ ************************************************************************/ package com.sun.star.report.pentaho.layoutprocessor; -import java.util.ArrayList; - import com.sun.star.report.pentaho.model.FormattedTextElement; + +import java.util.ArrayList; import java.util.List; + /** * A variables collection is used to collect all FormattedTextElement objects * of a repeated header or footer. Later, for each of these elements a variable diff --git a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/VariablesDeclarationLayoutController.java b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/VariablesDeclarationLayoutController.java index e00255ed824a..ba54e200f652 100644 --- a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/VariablesDeclarationLayoutController.java +++ b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/VariablesDeclarationLayoutController.java @@ -28,6 +28,11 @@ package com.sun.star.report.pentaho.layoutprocessor; import com.sun.star.report.pentaho.OfficeNamespaces; import com.sun.star.report.pentaho.model.FormattedTextElement; + +import java.text.SimpleDateFormat; + +import java.util.Date; + import org.jfree.layouting.util.AttributeMap; import org.jfree.report.DataSourceException; import org.jfree.report.JFreeReportInfo; @@ -39,10 +44,7 @@ import org.jfree.report.flow.ReportTarget; import org.jfree.report.flow.layoutprocessor.AbstractLayoutController; import org.jfree.report.flow.layoutprocessor.LayoutController; import org.jfree.report.flow.layoutprocessor.LayoutControllerUtil; -import org.pentaho.reporting.libraries.formula.util.HSSFDateUtil; import org.jfree.report.structure.Element; -import java.util.Date; -import java.text.SimpleDateFormat; /** * Writes a full variables-declaration section. |