dba33f: fix import order

reportbuilder/java/com/sun/star/report/ImageService.java

@@ -29,9 +29,10 @@
  ************************************************************************/
 package com.sun.star.report;
 
-import java.io.InputStream;
 import java.awt.Dimension;
 
+import java.io.InputStream;
+
 /**
  *
  * @author oj93728

reportbuilder/java/com/sun/star/report/InputRepository.java

@@ -29,8 +29,8 @@
  ************************************************************************/
 package com.sun.star.report;
 
-import java.io.InputStream;
 import java.io.IOException;
+import java.io.InputStream;
 
 /**
  * This allows the job processor to load data from a repository. It is assumed,

reportbuilder/java/com/sun/star/report/OutputRepository.java

@@ -29,8 +29,8 @@
  ************************************************************************/
 package com.sun.star.report;
 
-import java.io.OutputStream;
 import java.io.IOException;
+import java.io.OutputStream;
 
 /**
  * A repository for writing. Providing a repository always assumes,

reportbuilder/java/com/sun/star/report/SDBCReportData.java

@@ -36,8 +36,6 @@ import com.sun.star.container.XNameAccess;
 import com.sun.star.lang.IndexOutOfBoundsException;
 import com.sun.star.lang.WrappedTargetException;
 import com.sun.star.sdb.XParametersSupplier;
-import java.sql.Timestamp;
-
 import com.sun.star.sdbc.DataType;
 import com.sun.star.sdbc.SQLException;
 import com.sun.star.sdbc.XResultSetMetaData;
@@ -50,6 +48,9 @@ import com.sun.star.uno.UnoRuntime;
 import com.sun.star.util.DateTime;
 import com.sun.star.util.Time;
 
+import java.sql.Timestamp;
+
+
 public class SDBCReportData implements DataSource
 {
 

reportbuilder/java/com/sun/star/report/SDBCReportDataFactory.java

@@ -34,43 +34,42 @@ import com.sun.star.beans.UnknownPropertyException;
 import com.sun.star.beans.XPropertySet;
 import com.sun.star.container.NoSuchElementException;
 import com.sun.star.container.XIndexAccess;
+import com.sun.star.container.XNameAccess;
 import com.sun.star.lang.IllegalArgumentException;
 import com.sun.star.lang.IndexOutOfBoundsException;
 import com.sun.star.lang.WrappedTargetException;
-import com.sun.star.sdbc.XConnection;
-import com.sun.star.container.XNameAccess;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.sdb.CommandType;
 import com.sun.star.sdb.XCompletedExecution;
 import com.sun.star.sdb.XParametersSupplier;
 import com.sun.star.sdb.XQueriesSupplier;
-import com.sun.star.sdb.XResultSetAccess;
 import com.sun.star.sdb.XSingleSelectQueryComposer;
 import com.sun.star.sdb.tools.XConnectionTools;
 import com.sun.star.sdbc.SQLException;
+import com.sun.star.sdbc.XConnection;
 import com.sun.star.sdbc.XParameters;
-import com.sun.star.sdbc.XPreparedStatement;
-import com.sun.star.uno.Exception;
-import java.util.HashMap;
-import java.util.Map;
-
 import com.sun.star.sdbc.XRowSet;
-import com.sun.star.sdbcx.XColumnsSupplier;
-import com.sun.star.sdbcx.XTablesSupplier;
 import com.sun.star.task.XInteractionHandler;
+import com.sun.star.uno.Exception;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XComponentContext;
+
 import java.lang.reflect.Method;
+
 import java.math.BigDecimal;
+
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
+
 /**
  * Very primitive implementation, just to show how this could be used ...
  *

reportbuilder/java/com/sun/star/report/SOImageService.java

@@ -29,9 +29,6 @@
  ************************************************************************/
 package com.sun.star.report;
 
-import java.awt.Dimension;
-import java.io.InputStream;
-
 import com.sun.star.awt.Size;
 import com.sun.star.beans.PropertyValue;
 import com.sun.star.beans.UnknownPropertyException;
@@ -47,6 +44,11 @@ import com.sun.star.lib.uno.adapter.InputStreamToXInputStreamAdapter;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XComponentContext;
 
+import java.awt.Dimension;
+
+import java.io.InputStream;
+
+
 /**
  * @author oj93728
  */

reportbuilder/java/com/sun/star/report/StorageRepository.java

@@ -35,15 +35,21 @@ import com.sun.star.beans.XPropertySet;
 import com.sun.star.container.NoSuchElementException;
 import com.sun.star.embed.ElementModes;
 import com.sun.star.embed.InvalidStorageException;
-import com.sun.star.lang.IllegalArgumentException;
-import com.sun.star.lang.WrappedTargetException;
-import java.io.*;
 import com.sun.star.embed.XStorage;
 import com.sun.star.embed.XTransactedObject;
-import com.sun.star.uno.UnoRuntime;
 import com.sun.star.io.XStream;
+import com.sun.star.lang.IllegalArgumentException;
+import com.sun.star.lang.WrappedTargetException;
 import com.sun.star.lib.uno.adapter.XInputStreamToInputStreamAdapter;
 import com.sun.star.lib.uno.adapter.XOutputStreamToOutputStreamAdapter;
+import com.sun.star.uno.UnoRuntime;
+
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 

reportbuilder/java/com/sun/star/report/function/metadata/AuthorFunction.java

@@ -30,6 +30,7 @@
 package com.sun.star.report.function.metadata;
 
 import com.sun.star.report.ReportEngineParameterNames;
+
 import org.pentaho.reporting.libraries.formula.EvaluationException;
 import org.pentaho.reporting.libraries.formula.FormulaContext;
 import org.pentaho.reporting.libraries.formula.LibFormulaErrorValue;

reportbuilder/java/com/sun/star/report/function/metadata/TitleFunction.java

@@ -30,6 +30,7 @@
 package com.sun.star.report.function.metadata;
 
 import com.sun.star.report.ReportEngineParameterNames;
+
 import org.pentaho.reporting.libraries.formula.EvaluationException;
 import org.pentaho.reporting.libraries.formula.FormulaContext;
 import org.pentaho.reporting.libraries.formula.LibFormulaErrorValue;

reportbuilder/java/com/sun/star/report/pentaho/DefaultNameGenerator.java

@@ -29,9 +29,10 @@
  ************************************************************************/
 package com.sun.star.report.pentaho;
 
+import com.sun.star.report.OutputRepository;
+
 import java.io.IOException;
 
-import com.sun.star.report.OutputRepository;
 
 public class DefaultNameGenerator
 {

reportbuilder/java/com/sun/star/report/pentaho/PentahoFormulaContext.java

@@ -29,6 +29,7 @@
  ************************************************************************/
 package com.sun.star.report.pentaho;
 
+import org.pentaho.reporting.libraries.base.config.Configuration;
 import org.pentaho.reporting.libraries.formula.ContextEvaluationException;
 import org.pentaho.reporting.libraries.formula.FormulaContext;
 import org.pentaho.reporting.libraries.formula.LocalizationContext;
@@ -36,7 +37,6 @@ import org.pentaho.reporting.libraries.formula.function.FunctionRegistry;
 import org.pentaho.reporting.libraries.formula.operators.OperatorFactory;
 import org.pentaho.reporting.libraries.formula.typing.Type;
 import org.pentaho.reporting.libraries.formula.typing.TypeRegistry;
-import org.pentaho.reporting.libraries.base.config.Configuration;
 
 /**
  *

reportbuilder/java/com/sun/star/report/pentaho/PentahoReportEngine.java

@@ -35,6 +35,7 @@ import com.sun.star.report.ReportEngineMetaData;
 import com.sun.star.report.ReportJob;
 import com.sun.star.report.ReportJobDefinition;
 import com.sun.star.report.util.DefaultReportJobDefinition;
+
 import org.jfree.report.JFreeReportBoot;
 
 public class PentahoReportEngine implements ReportEngine

reportbuilder/java/com/sun/star/report/pentaho/PentahoReportEngineMetaData.java

@@ -29,21 +29,23 @@
  ************************************************************************/
 package com.sun.star.report.pentaho;
 
-import com.sun.star.report.ReportJobFactory;
-import java.util.HashMap;
-import java.util.HashSet;
-
 import com.sun.star.report.DataSourceFactory;
+import com.sun.star.report.ImageService;
 import com.sun.star.report.InputRepository;
 import com.sun.star.report.OutputRepository;
 import com.sun.star.report.ReportEngineMetaData;
 import com.sun.star.report.ReportEngineParameterNames;
-import com.sun.star.report.ImageService;
+import com.sun.star.report.ReportJobFactory;
+
+import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+
 import org.pentaho.reporting.libraries.base.util.HashNMap;
 
+
 public class PentahoReportEngineMetaData
         implements ReportEngineMetaData
 {

reportbuilder/java/com/sun/star/report/pentaho/PentahoReportJob.java

@@ -29,10 +29,8 @@
  ************************************************************************/
 package com.sun.star.report.pentaho;
 
-import java.io.IOException;
-import java.lang.Integer;import java.util.ArrayList;
-
 import com.sun.star.report.DataSourceFactory;
+import com.sun.star.report.ImageService;
 import com.sun.star.report.InputRepository;
 import com.sun.star.report.JobDefinitionException;
 import com.sun.star.report.JobProgressIndicator;
@@ -43,7 +41,6 @@ import com.sun.star.report.ReportEngineParameterNames;
 import com.sun.star.report.ReportExecutionException;
 import com.sun.star.report.ReportJob;
 import com.sun.star.report.ReportJobDefinition;
-import com.sun.star.report.ImageService;
 import com.sun.star.report.SDBCReportDataFactory;
 import com.sun.star.report.pentaho.loader.InputRepositoryLoader;
 import com.sun.star.report.pentaho.model.OfficeDetailSection;
@@ -51,15 +48,19 @@ import com.sun.star.report.pentaho.model.OfficeDocument;
 import com.sun.star.report.pentaho.model.OfficeGroup;
 import com.sun.star.report.pentaho.model.OfficeReport;
 import com.sun.star.report.pentaho.output.chart.ChartRawReportProcessor;
-import com.sun.star.report.pentaho.output.text.TextRawReportProcessor;
 import com.sun.star.report.pentaho.output.spreadsheet.SpreadsheetRawReportProcessor;
+import com.sun.star.report.pentaho.output.text.TextRawReportProcessor;
+
+import java.io.IOException;
+
+import java.lang.Integer;
+
+import java.util.ArrayList;
 import java.util.List;
-import org.pentaho.reporting.libraries.formula.lvalues.ContextLookup;
-import org.pentaho.reporting.libraries.formula.lvalues.FormulaFunction;
-import org.pentaho.reporting.libraries.formula.lvalues.LValue;
-import org.pentaho.reporting.libraries.formula.lvalues.Term;
-import org.pentaho.reporting.libraries.formula.parser.FormulaParser;
-import org.pentaho.reporting.libraries.formula.parser.ParseException;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
 import org.jfree.report.expressions.Expression;
 import org.jfree.report.expressions.FormulaExpression;
 import org.jfree.report.flow.DefaultReportJob;
@@ -68,12 +69,18 @@ import org.jfree.report.flow.raw.XmlPrintReportProcessor;
 import org.jfree.report.structure.Node;
 import org.jfree.report.structure.Section;
 import org.jfree.report.util.ReportParameters;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+
+import org.pentaho.reporting.libraries.formula.lvalues.ContextLookup;
+import org.pentaho.reporting.libraries.formula.lvalues.FormulaFunction;
+import org.pentaho.reporting.libraries.formula.lvalues.LValue;
+import org.pentaho.reporting.libraries.formula.lvalues.Term;
+import org.pentaho.reporting.libraries.formula.parser.FormulaParser;
+import org.pentaho.reporting.libraries.formula.parser.ParseException;
 import org.pentaho.reporting.libraries.resourceloader.Resource;
 import org.pentaho.reporting.libraries.resourceloader.ResourceException;
 import org.pentaho.reporting.libraries.resourceloader.ResourceManager;
 
+
 /**
  * ToDo: Allow interrupting of jobs and report the report progress
  */

reportbuilder/java/com/sun/star/report/pentaho/SOFormulaOpCodeMapper.java

@@ -31,12 +31,12 @@
 package com.sun.star.report.pentaho;
 
 import com.sun.star.lang.XServiceInfo;
-import com.sun.star.uno.XComponentContext;
 import com.sun.star.lib.uno.helper.WeakBase;
 import com.sun.star.sheet.FormulaLanguage;
 import com.sun.star.sheet.FormulaMapGroup;
 import com.sun.star.sheet.FormulaOpCodeMapEntry;
 import com.sun.star.sheet.FormulaToken;
+
 import java.util.ArrayList;
 import java.util.Map;
 

reportbuilder/java/com/sun/star/report/pentaho/SOFormulaParser.java

@@ -30,27 +30,31 @@
  ************************************************************************/
 package com.sun.star.report.pentaho;
 
+
 import com.sun.star.lang.XServiceInfo;
-import com.sun.star.sheet.XFormulaOpCodeMapper;
-import com.sun.star.uno.Exception;
-import com.sun.star.uno.XComponentContext;
 import com.sun.star.lib.uno.helper.ComponentBase;
-import com.sun.star.uno.Type;
 import com.sun.star.lib.uno.helper.PropertySetMixin;
 import com.sun.star.sheet.FormulaLanguage;
 import com.sun.star.sheet.FormulaMapGroup;
 import com.sun.star.sheet.FormulaMapGroupSpecialOffset;
 import com.sun.star.sheet.FormulaOpCodeMapEntry;
 import com.sun.star.sheet.FormulaToken;
+import com.sun.star.sheet.XFormulaOpCodeMapper;
 import com.sun.star.uno.Any;
+import com.sun.star.uno.Exception;
+import com.sun.star.uno.Type;
 import com.sun.star.uno.UnoRuntime;
+import com.sun.star.uno.XComponentContext;
+
 import java.io.StringReader;
+
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import java.util.Vector;
+
+import org.pentaho.reporting.libraries.base.config.Configuration;
 import org.pentaho.reporting.libraries.formula.DefaultFormulaContext;
 import org.pentaho.reporting.libraries.formula.function.FunctionRegistry;
 import org.pentaho.reporting.libraries.formula.parser.FormulaParser;
@@ -60,7 +64,7 @@ import org.pentaho.reporting.libraries.formula.parser.JavaCharStream;
 import org.pentaho.reporting.libraries.formula.parser.ParseException;
 import org.pentaho.reporting.libraries.formula.parser.Token;
 import org.pentaho.reporting.libraries.formula.parser.TokenMgrError;
-import org.pentaho.reporting.libraries.base.config.Configuration;
+
 
 public final class SOFormulaParser extends ComponentBase
         implements com.sun.star.report.meta.XFormulaParser, XServiceInfo

reportbuilder/java/com/sun/star/report/pentaho/SOFunctionManager.java

@@ -32,11 +32,12 @@ package com.sun.star.report.pentaho;
 
 import com.sun.star.container.NoSuchElementException;
 import com.sun.star.lang.XServiceInfo;
-import com.sun.star.report.meta.XFunctionDescription;
-import com.sun.star.uno.XComponentContext;
 import com.sun.star.lib.uno.helper.ComponentBase;
 import com.sun.star.report.meta.XFunctionCategory;
+import com.sun.star.report.meta.XFunctionDescription;
 import com.sun.star.report.meta.XFunctionManager;
+import com.sun.star.uno.XComponentContext;
+
 import org.pentaho.reporting.libraries.formula.DefaultFormulaContext;
 import org.pentaho.reporting.libraries.formula.function.FunctionCategory;
 import org.pentaho.reporting.libraries.formula.function.FunctionDescription;

reportbuilder/java/com/sun/star/report/pentaho/SOReportJobFactory.java

@@ -30,18 +30,18 @@
 package com.sun.star.report.pentaho;
 
 import com.sun.star.beans.NamedValue;
-import com.sun.star.beans.XPropertySet;
-import com.sun.star.beans.UnknownPropertyException;
 import com.sun.star.beans.PropertyVetoException;
+import com.sun.star.beans.UnknownPropertyException;
 import com.sun.star.beans.XPropertyChangeListener;
+import com.sun.star.beans.XPropertySet;
 import com.sun.star.beans.XVetoableChangeListener;
 import com.sun.star.container.XChild;
 import com.sun.star.embed.XStorage;
 import com.sun.star.frame.XModel;
 import com.sun.star.lang.IllegalArgumentException;
+import com.sun.star.lang.WrappedTargetException;
 import com.sun.star.lang.XInitialization;
 import com.sun.star.lang.XServiceInfo;
-import com.sun.star.lang.WrappedTargetException;
 import com.sun.star.lang.XSingleComponentFactory;
 import com.sun.star.lib.uno.helper.Factory;
 import com.sun.star.lib.uno.helper.PropertySetMixin;
@@ -61,7 +61,6 @@ import com.sun.star.report.SDBCReportDataFactory;
 import com.sun.star.report.SOImageService;
 import com.sun.star.report.StorageRepository;
 import com.sun.star.report.XReportDefinition;
-import com.sun.star.report.pentaho.SOReportJobFactory._SOReportJobFactory;
 import com.sun.star.sdb.XDocumentDataSource;
 import com.sun.star.sdbc.XConnection;
 import com.sun.star.sdbc.XRowSet;
@@ -70,8 +69,10 @@ import com.sun.star.uno.Exception;
 import com.sun.star.uno.Type;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XComponentContext;
+
 import java.util.logging.Level;
 import java.util.logging.Logger;
+
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 

reportbuilder/java/com/sun/star/report/pentaho/StarFunctionCategory.java

@@ -30,13 +30,15 @@
  ************************************************************************/
 package com.sun.star.report.pentaho;
 
-import com.sun.star.uno.XComponentContext;
-import com.sun.star.lib.uno.helper.WeakBase;
-import com.sun.star.uno.Type;
 import com.sun.star.lib.uno.helper.PropertySetMixin;
+import com.sun.star.lib.uno.helper.WeakBase;
 import com.sun.star.report.meta.XFunctionDescription;
+import com.sun.star.uno.Type;
+import com.sun.star.uno.XComponentContext;
+
 import java.util.Locale;
 import java.util.MissingResourceException;
+
 import org.pentaho.reporting.libraries.formula.DefaultFormulaContext;
 import org.pentaho.reporting.libraries.formula.function.FunctionCategory;
 import org.pentaho.reporting.libraries.formula.function.FunctionRegistry;

reportbuilder/java/com/sun/star/report/pentaho/StarFunctionDescription.java

@@ -30,17 +30,18 @@
  ************************************************************************/
 package com.sun.star.report.pentaho;
 
-import com.sun.star.uno.XComponentContext;
-import com.sun.star.lib.uno.helper.WeakBase;
-import com.sun.star.uno.Type;
 import com.sun.star.lib.uno.helper.PropertySetMixin;
+import com.sun.star.lib.uno.helper.WeakBase;
 import com.sun.star.report.meta.XFunctionCategory;
 import com.sun.star.sheet.FunctionArgument;
+import com.sun.star.uno.Type;
+import com.sun.star.uno.XComponentContext;
+
 import java.util.Locale;
 import java.util.MissingResourceException;
+
 import org.pentaho.reporting.libraries.formula.DefaultFormulaContext;
 import org.pentaho.reporting.libraries.formula.function.FunctionDescription;
-import org.pentaho.reporting.libraries.formula.function.FunctionRegistry;
 
 public final class StarFunctionDescription extends WeakBase
         implements com.sun.star.report.meta.XFunctionDescription

reportbuilder/java/com/sun/star/report/pentaho/StarReportData.java

@@ -30,6 +30,7 @@
 package com.sun.star.report.pentaho;
 
 import com.sun.star.report.DataSource;
+
 import org.jfree.report.DataSourceException;
 import org.jfree.report.ReportData;
 

reportbuilder/java/com/sun/star/report/pentaho/StarReportDataFactory.java

@@ -29,14 +29,16 @@
  ************************************************************************/
 package com.sun.star.report.pentaho;
 
+import com.sun.star.report.DataSourceException;
+import com.sun.star.report.DataSourceFactory;
+
 import java.util.HashMap;
 
-import org.jfree.report.ReportDataFactory;
-import org.jfree.report.ReportData;
 import org.jfree.report.DataSet;
+import org.jfree.report.ReportData;
+import org.jfree.report.ReportDataFactory;
 import org.jfree.report.ReportDataFactoryException;
-import com.sun.star.report.DataSourceException;
-import com.sun.star.report.DataSourceFactory;
+
 
 public class StarReportDataFactory implements ReportDataFactory, Cloneable
 {

reportbuilder/java/com/sun/star/report/pentaho/expressions/SumExpression.java

@@ -29,8 +29,8 @@
  ************************************************************************/
 package com.sun.star.report.pentaho.expressions;
 
-import com.sun.star.report.ReportExpression;
 import com.sun.star.report.DataRow;
+import com.sun.star.report.ReportExpression;
 
 public class SumExpression implements ReportExpression
 {

reportbuilder/java/com/sun/star/report/pentaho/expressions/SumExpressionMetaData.java

@@ -29,9 +29,10 @@
  ************************************************************************/
 package com.sun.star.report.pentaho.expressions;
 
+import com.sun.star.report.ReportExpressionMetaData;
+
 import java.util.Locale;
 
-import com.sun.star.report.ReportExpressionMetaData;
 
 public class SumExpressionMetaData implements ReportExpressionMetaData
 {

reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/AbstractReportElementLayoutController.java

@@ -29,15 +29,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;
@@ -45,8 +44,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!

reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FixedTextLayoutController.java

@@ -29,18 +29,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.

reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FormatValueUtility.java

@@ -29,13 +29,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;
@@ -43,9 +46,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
  *

reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FormattedTextLayoutController.java

@@ -29,14 +29,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;