CWS changehid: resync to m84

author: Mathias Bauer <mba@openoffice.org> 2010-07-13 14:38:37 +0200
committer: Mathias Bauer <mba@openoffice.org> 2010-07-13 14:38:37 +0200
commit: 9a619eddb5832f7afe94955b3bc051a82de10fa2 (patch)
tree: 2e9581ce5629ae4c9c577d44927d51084d717478 /reportbuilder
parent: 68c7f8fae5659753748eead42d12ed64db84702e (diff)
parent: 9a1826777ad9e79663a5e942f3bee1d85619b79e (diff)
157 files changed, 706 insertions, 576 deletions
diff --git a/reportbuilder/java/com/sun/star/report/ImageService.java b/reportbuilder/java/com/sun/star/report/ImageService.java
index 3160fac1f718..d7224ed792eb 100644
--- a/reportbuilder/java/com/sun/star/report/ImageService.java
+++ b/reportbuilder/java/com/sun/star/report/ImageService.java
@@ -26,9 +26,10 @@
  ************************************************************************/
 package com.sun.star.report;
 
-import java.io.InputStream;
 import java.awt.Dimension;
 
+import java.io.InputStream;
+
 /**
  *
  * @author oj93728
diff --git a/reportbuilder/java/com/sun/star/report/InputRepository.java b/reportbuilder/java/com/sun/star/report/InputRepository.java
index aefed0461831..2e02abf591b7 100644
--- a/reportbuilder/java/com/sun/star/report/InputRepository.java
+++ b/reportbuilder/java/com/sun/star/report/InputRepository.java
@@ -26,8 +26,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,
diff --git a/reportbuilder/java/com/sun/star/report/OutputRepository.java b/reportbuilder/java/com/sun/star/report/OutputRepository.java
index 3dd0823762d0..c5283b9c1325 100644
--- a/reportbuilder/java/com/sun/star/report/OutputRepository.java
+++ b/reportbuilder/java/com/sun/star/report/OutputRepository.java
@@ -26,8 +26,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,
diff --git a/reportbuilder/java/com/sun/star/report/SDBCReportData.java b/reportbuilder/java/com/sun/star/report/SDBCReportData.java
index 67d662de261f..769657aa6bf5 100644
--- a/reportbuilder/java/com/sun/star/report/SDBCReportData.java
+++ b/reportbuilder/java/com/sun/star/report/SDBCReportData.java
@@ -33,8 +33,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;
@@ -47,6 +45,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
 {
 
diff --git a/reportbuilder/java/com/sun/star/report/SDBCReportDataFactory.java b/reportbuilder/java/com/sun/star/report/SDBCReportDataFactory.java
index de632a3671f9..ba652f14c209 100644
--- a/reportbuilder/java/com/sun/star/report/SDBCReportDataFactory.java
+++ b/reportbuilder/java/com/sun/star/report/SDBCReportDataFactory.java
@@ -31,43 +31,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 ...
  *
diff --git a/reportbuilder/java/com/sun/star/report/SOImageService.java b/reportbuilder/java/com/sun/star/report/SOImageService.java
index 86dfde5d6043..6d67ebabc0d1 100644
--- a/reportbuilder/java/com/sun/star/report/SOImageService.java
+++ b/reportbuilder/java/com/sun/star/report/SOImageService.java
@@ -26,9 +26,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;
@@ -44,6 +41,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
  */
diff --git a/reportbuilder/java/com/sun/star/report/StorageRepository.java b/reportbuilder/java/com/sun/star/report/StorageRepository.java
index d448a71ece2f..9bf610b70606 100644
--- a/reportbuilder/java/com/sun/star/report/StorageRepository.java
+++ b/reportbuilder/java/com/sun/star/report/StorageRepository.java
@@ -32,15 +32,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;
 
diff --git a/reportbuilder/java/com/sun/star/report/function/metadata/Author-Function.properties b/reportbuilder/java/com/sun/star/report/function/metadata/Author-Function.properties
index a8313094932f..287c7155e5ed 100644
--- a/reportbuilder/java/com/sun/star/report/function/metadata/Author-Function.properties
+++ b/reportbuilder/java/com/sun/star/report/function/metadata/Author-Function.properties
@@ -24,6 +24,7 @@
 # for a copy of the LGPLv3 License.
 #
 #*************************************************************************
+# x-no-translate
 
 display-name=AUTHOR
 description=Returns the author of the report.
diff --git a/reportbuilder/java/com/sun/star/report/function/metadata/Author-Function_en_US.properties b/reportbuilder/java/com/sun/star/report/function/metadata/Author-Function_en_US.properties
index a8313094932f..287c7155e5ed 100644
--- a/reportbuilder/java/com/sun/star/report/function/metadata/Author-Function_en_US.properties
+++ b/reportbuilder/java/com/sun/star/report/function/metadata/Author-Function_en_US.properties
@@ -24,6 +24,7 @@
 # for a copy of the LGPLv3 License.
 #
 #*************************************************************************
+# x-no-translate
 
 display-name=AUTHOR
 description=Returns the author of the report.
diff --git a/reportbuilder/java/com/sun/star/report/function/metadata/AuthorFunction.java b/reportbuilder/java/com/sun/star/report/function/metadata/AuthorFunction.java
index fa40e3d9dd10..11eb9e038a60 100644
--- a/reportbuilder/java/com/sun/star/report/function/metadata/AuthorFunction.java
+++ b/reportbuilder/java/com/sun/star/report/function/metadata/AuthorFunction.java
@@ -27,6 +27,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;
diff --git a/reportbuilder/java/com/sun/star/report/function/metadata/Title-Function.properties b/reportbuilder/java/com/sun/star/report/function/metadata/Title-Function.properties
index 6c9ab290bc69..aa0e5bdbd2a5 100644
--- a/reportbuilder/java/com/sun/star/report/function/metadata/Title-Function.properties
+++ b/reportbuilder/java/com/sun/star/report/function/metadata/Title-Function.properties
@@ -24,6 +24,7 @@
 # for a copy of the LGPLv3 License.
 #
 #*************************************************************************
+# x-no-translate
 
 display-name=TITLE
 description=Returns the title of the report.
diff --git a/reportbuilder/java/com/sun/star/report/function/metadata/Title-Function_en_US.properties b/reportbuilder/java/com/sun/star/report/function/metadata/Title-Function_en_US.properties
index 6c9ab290bc69..aa0e5bdbd2a5 100644
--- a/reportbuilder/java/com/sun/star/report/function/metadata/Title-Function_en_US.properties
+++ b/reportbuilder/java/com/sun/star/report/function/metadata/Title-Function_en_US.properties
@@ -24,6 +24,7 @@
 # for a copy of the LGPLv3 License.
 #
 #*************************************************************************
+# x-no-translate
 
 display-name=TITLE
 description=Returns the title of the report.
diff --git a/reportbuilder/java/com/sun/star/report/function/metadata/TitleFunction.java b/reportbuilder/java/com/sun/star/report/function/metadata/TitleFunction.java
index 64e17dfbdfa9..55c3d6ff381c 100644
--- a/reportbuilder/java/com/sun/star/report/function/metadata/TitleFunction.java
+++ b/reportbuilder/java/com/sun/star/report/function/metadata/TitleFunction.java
@@ -27,6 +27,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;
diff --git a/reportbuilder/java/com/sun/star/report/function/metadata/category.properties b/reportbuilder/java/com/sun/star/report/function/metadata/category.properties
index 504df7f45b3f..9192d2fecf7c 100644
--- a/reportbuilder/java/com/sun/star/report/function/metadata/category.properties
+++ b/reportbuilder/java/com/sun/star/report/function/metadata/category.properties
@@ -24,6 +24,7 @@
 # for a copy of the LGPLv3 License.
 #
 #*************************************************************************
+# x-no-translate
 
 display-name=Document Information
 description=Contains functions to access document information.
diff --git a/reportbuilder/java/com/sun/star/report/function/metadata/category_en_US.properties b/reportbuilder/java/com/sun/star/report/function/metadata/category_en_US.properties
index b380d19cc640..5de2933bb2ab 100644
--- a/reportbuilder/java/com/sun/star/report/function/metadata/category_en_US.properties
+++ b/reportbuilder/java/com/sun/star/report/function/metadata/category_en_US.properties
@@ -24,6 +24,7 @@
 # for a copy of the LGPLv3 License.
 #
 #*************************************************************************
+# x-no-translate
 
 display-name=MetaData
 description=Contains functions about meta data
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/DefaultNameGenerator.java b/reportbuilder/java/com/sun/star/report/pentaho/DefaultNameGenerator.java
index a364aeca1119..620ddcee98eb 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/DefaultNameGenerator.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/DefaultNameGenerator.java
@@ -26,9 +26,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
 {
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/PentahoFormulaContext.java b/reportbuilder/java/com/sun/star/report/pentaho/PentahoFormulaContext.java
index c2cf31ef24bd..c68424de99c9 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/PentahoFormulaContext.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/PentahoFormulaContext.java
@@ -26,6 +26,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;
@@ -33,7 +34,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;
 
 /**
  *
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/PentahoReportEngine.java b/reportbuilder/java/com/sun/star/report/pentaho/PentahoReportEngine.java
index 024486071685..8ee9d8547363 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/PentahoReportEngine.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/PentahoReportEngine.java
@@ -32,6 +32,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/PentahoReportEngineMetaData.java b/reportbuilder/java/com/sun/star/report/pentaho/PentahoReportEngineMetaData.java
index 911840e6d2bd..c32f490c9b73 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/PentahoReportEngineMetaData.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/PentahoReportEngineMetaData.java
@@ -26,21 +26,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
 {
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/PentahoReportJob.java b/reportbuilder/java/com/sun/star/report/pentaho/PentahoReportJob.java
index 907bbd230dfd..a30a97a1e7e1 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/PentahoReportJob.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/PentahoReportJob.java
@@ -26,10 +26,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;
@@ -40,7 +38,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;
@@ -48,15 +45,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;
@@ -65,12 +66,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
  */
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/SOFormulaOpCodeMapper.java b/reportbuilder/java/com/sun/star/report/pentaho/SOFormulaOpCodeMapper.java
index 516bf508e698..f5d6d654aa0e 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/SOFormulaOpCodeMapper.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/SOFormulaOpCodeMapper.java
@@ -27,12 +27,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;
 
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/SOFormulaParser.java b/reportbuilder/java/com/sun/star/report/pentaho/SOFormulaParser.java
index 06ede8903733..4dbf435f28ec 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/SOFormulaParser.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/SOFormulaParser.java
@@ -26,27 +26,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;
@@ -56,7 +60,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/SOFunctionManager.java b/reportbuilder/java/com/sun/star/report/pentaho/SOFunctionManager.java
index c6a7a8117dc3..7a7c1e159bf7 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/SOFunctionManager.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/SOFunctionManager.java
@@ -28,11 +28,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;
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/SOReportJobFactory.java b/reportbuilder/java/com/sun/star/report/pentaho/SOReportJobFactory.java
index 0d03edb1555e..b02c2010a14d 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/SOReportJobFactory.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/SOReportJobFactory.java
@@ -27,18 +27,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;
@@ -58,7 +58,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;
@@ -67,8 +66,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;
 
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/StarFunctionCategory.java b/reportbuilder/java/com/sun/star/report/pentaho/StarFunctionCategory.java
index 5dcfa9514700..7825a2b34c4a 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/StarFunctionCategory.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/StarFunctionCategory.java
@@ -26,13 +26,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;
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/StarFunctionDescription.java b/reportbuilder/java/com/sun/star/report/pentaho/StarFunctionDescription.java
index 640aa27e46ac..f0debc672118 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/StarFunctionDescription.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/StarFunctionDescription.java
@@ -26,17 +26,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/StarReportData.java b/reportbuilder/java/com/sun/star/report/pentaho/StarReportData.java
index 0edb8c197054..b53271cb78d1 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/StarReportData.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/StarReportData.java
@@ -27,6 +27,7 @@
 package com.sun.star.report.pentaho;
 
 import com.sun.star.report.DataSource;
+
 import org.jfree.report.DataSourceException;
 import org.jfree.report.ReportData;
 
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/StarReportDataFactory.java b/reportbuilder/java/com/sun/star/report/pentaho/StarReportDataFactory.java
index f021e9c186bd..3f5beae7e6be 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/StarReportDataFactory.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/StarReportDataFactory.java
@@ -26,14 +26,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
 {
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/configuration.properties b/reportbuilder/java/com/sun/star/report/pentaho/configuration.properties
index 1b0cafb0909b..26e8548a9566 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/configuration.properties
+++ b/reportbuilder/java/com/sun/star/report/pentaho/configuration.properties
@@ -24,6 +24,7 @@
 # for a copy of the LGPLv3 License.
 #
 #*************************************************************************
+# x-no-translate
 
 
 ##
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/expressions/SumExpression.java b/reportbuilder/java/com/sun/star/report/pentaho/expressions/SumExpression.java
index 43e85d41a9f9..c86b2186d08e 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/expressions/SumExpression.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/expressions/SumExpression.java
@@ -26,8 +26,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
 {
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/expressions/SumExpressionMetaData.java b/reportbuilder/java/com/sun/star/report/pentaho/expressions/SumExpressionMetaData.java
index 92450f7d97cf..21f8f4c4471b 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/expressions/SumExpressionMetaData.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/expressions/SumExpressionMetaData.java
@@ -26,9 +26,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
 {
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.
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/loader/InputRepositoryLoader.java b/reportbuilder/java/com/sun/star/report/pentaho/loader/InputRepositoryLoader.java
index 9f0c9ca61aac..fc637001d766 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/loader/InputRepositoryLoader.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/loader/InputRepositoryLoader.java
@@ -26,11 +26,13 @@
  ************************************************************************/
 package com.sun.star.report.pentaho.loader;
 
+import com.sun.star.report.InputRepository;
+
 import java.net.URL;
-import java.util.Map;
+
 import java.util.HashMap;
+import java.util.Map;
 
-import com.sun.star.report.InputRepository;
 import org.pentaho.reporting.libraries.resourceloader.ResourceData;
 import org.pentaho.reporting.libraries.resourceloader.ResourceKey;
 import org.pentaho.reporting.libraries.resourceloader.ResourceKeyCreationException;
@@ -39,6 +41,7 @@ import org.pentaho.reporting.libraries.resourceloader.ResourceLoadingException;
 import org.pentaho.reporting.libraries.resourceloader.ResourceManager;
 import org.pentaho.reporting.libraries.resourceloader.loader.LoaderUtils;
 
+
 public class InputRepositoryLoader implements ResourceLoader
 {
 
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/loader/InputRepositoryResourceData.java b/reportbuilder/java/com/sun/star/report/pentaho/loader/InputRepositoryResourceData.java
index 25ad7f232126..4341c386113e 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/loader/InputRepositoryResourceData.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/loader/InputRepositoryResourceData.java
@@ -26,15 +26,17 @@
  ************************************************************************/
 package com.sun.star.report.pentaho.loader;
 
+import com.sun.star.report.InputRepository;
+
 import java.io.IOException;
 import java.io.InputStream;
 
-import com.sun.star.report.InputRepository;
 import org.pentaho.reporting.libraries.resourceloader.ResourceKey;
 import org.pentaho.reporting.libraries.resourceloader.ResourceLoadingException;
 import org.pentaho.reporting.libraries.resourceloader.ResourceManager;
 import org.pentaho.reporting.libraries.resourceloader.loader.AbstractResourceData;
 
+
 public class InputRepositoryResourceData extends AbstractResourceData
 {
 
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/model/DataStyle.java b/reportbuilder/java/com/sun/star/report/pentaho/model/DataStyle.java
index 1a5635f0c492..8e2f62c81a32 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/model/DataStyle.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/model/DataStyle.java
@@ -26,9 +26,10 @@
  ************************************************************************/
 package com.sun.star.report.pentaho.model;
 
-import org.jfree.report.structure.Section;
 import com.sun.star.report.pentaho.OfficeNamespaces;
 
+import org.jfree.report.structure.Section;
+
 /**
  * Represents an automatic or manual data style definition.
  *
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/model/FontFaceDeclsSection.java b/reportbuilder/java/com/sun/star/report/pentaho/model/FontFaceDeclsSection.java
index 615ef535d9bb..0f1a9330e82d 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/model/FontFaceDeclsSection.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/model/FontFaceDeclsSection.java
@@ -26,12 +26,14 @@
  ************************************************************************/
 package com.sun.star.report.pentaho.model;
 
-import java.util.HashMap;
-
 import com.sun.star.report.pentaho.OfficeNamespaces;
+
+import java.util.HashMap;
 import java.util.Map;
+
 import org.jfree.report.structure.Element;
 
+
 /**
  * Todo: Document me!
  *
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/model/FontFaceElement.java b/reportbuilder/java/com/sun/star/report/pentaho/model/FontFaceElement.java
index 76c6efcd82a7..cbd29672a305 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/model/FontFaceElement.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/model/FontFaceElement.java
@@ -26,9 +26,10 @@
  ************************************************************************/
 package com.sun.star.report.pentaho.model;
 
-import org.jfree.report.structure.Section;
 import com.sun.star.report.pentaho.OfficeNamespaces;
 
+import org.jfree.report.structure.Section;
+
 /**
  * Represents an automatic or manual data style definition.
  *
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/model/ImageElement.java b/reportbuilder/java/com/sun/star/report/pentaho/model/ImageElement.java
index 95cbaeeb2b63..176500134191 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/model/ImageElement.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/model/ImageElement.java
@@ -26,9 +26,10 @@
  ************************************************************************/
 package com.sun.star.report.pentaho.model;
 
-import org.jfree.report.expressions.FormulaExpression;
-import com.sun.star.report.pentaho.OfficeNamespaces;
 import com.sun.star.report.OfficeToken;
+import com.sun.star.report.pentaho.OfficeNamespaces;
+
+import org.jfree.report.expressions.FormulaExpression;
 
 /**
  * Todo: Document me!
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeDocument.java b/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeDocument.java
index c3166709337e..f17c1d0d65c0 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeDocument.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeDocument.java
@@ -27,6 +27,7 @@
 package com.sun.star.report.pentaho.model;
 
 import com.sun.star.report.JobProperties;
+
 import org.jfree.report.JFreeReport;
 
 /**
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeGroup.java b/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeGroup.java
index 12ab01c318f3..92e6964ea622 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeGroup.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeGroup.java
@@ -26,8 +26,9 @@
  ************************************************************************/
 package com.sun.star.report.pentaho.model;
 
-import com.sun.star.report.pentaho.OfficeNamespaces;
 import com.sun.star.report.OfficeToken;
+import com.sun.star.report.pentaho.OfficeNamespaces;
+
 import org.jfree.report.JFreeReportInfo;
 import org.jfree.report.expressions.Expression;
 import org.jfree.report.structure.Section;
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeGroupSection.java b/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeGroupSection.java
index 2429d3798224..262d95782572 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeGroupSection.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeGroupSection.java
@@ -26,9 +26,10 @@
  ************************************************************************/
 package com.sun.star.report.pentaho.model;
 
-import org.jfree.report.structure.Section;
-import com.sun.star.report.pentaho.OfficeNamespaces;
 import com.sun.star.report.OfficeToken;
+import com.sun.star.report.pentaho.OfficeNamespaces;
+
+import org.jfree.report.structure.Section;
 
 /**
  * A group header or footer. If such a section is marked as sticky, it will be
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeMasterPage.java b/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeMasterPage.java
index 60b294e62ae8..68d508a4b2bd 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeMasterPage.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeMasterPage.java
@@ -26,9 +26,10 @@
  ************************************************************************/
 package com.sun.star.report.pentaho.model;
 
-import org.jfree.report.structure.Section;
 import com.sun.star.report.pentaho.OfficeNamespaces;
 
+import org.jfree.report.structure.Section;
+
 /**
  * A master page. A master page can contain header and footer and is linked
  * to a page-layout.
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeMasterStyles.java b/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeMasterStyles.java
index f0e44618334a..562f369b9087 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeMasterStyles.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeMasterStyles.java
@@ -27,11 +27,12 @@
 package com.sun.star.report.pentaho.model;
 
 import java.util.HashMap;
-
 import java.util.Map;
+
 import org.jfree.report.structure.Element;
 import org.jfree.report.structure.Section;
 
+
 /**
  * The master-styles section can have either a master-page, handout-master
  * or draw-layer-set. (The latter ones are ignored for the reporting purposes,
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeStyle.java b/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeStyle.java
index 79a824bbcc45..3968df62dcd9 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeStyle.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeStyle.java
@@ -28,6 +28,7 @@ package com.sun.star.report.pentaho.model;
 
 import com.sun.star.report.OfficeToken;
 import com.sun.star.report.pentaho.OfficeNamespaces;
+
 import org.jfree.report.structure.Element;
 import org.jfree.report.structure.Section;
 
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeStyles.java b/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeStyles.java
index c809eec1b485..0af1062505c7 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeStyles.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeStyles.java
@@ -27,13 +27,15 @@
 package com.sun.star.report.pentaho.model;
 
 import java.io.Serializable;
+
 import java.util.ArrayList;
 import java.util.HashMap;
-
 import java.util.List;
 import java.util.Map;
+
 import org.jfree.report.structure.Element;
 
+
 /**
  * Holds one style type, either an automatic, common or master style. This is a
  * marker container that defines the nature of the styles contained within this
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeStylesCollection.java b/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeStylesCollection.java
index f1a958217067..b2fdf3e43f57 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeStylesCollection.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeStylesCollection.java
@@ -27,6 +27,7 @@
 package com.sun.star.report.pentaho.model;
 
 import com.sun.star.report.pentaho.OfficeNamespaces;
+
 import org.jfree.report.structure.Element;
 
 /**
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/model/PageLayout.java b/reportbuilder/java/com/sun/star/report/pentaho/model/PageLayout.java
index 5d89e203ac05..47030c3fe638 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/model/PageLayout.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/model/PageLayout.java
@@ -26,9 +26,10 @@
  ************************************************************************/
 package com.sun.star.report.pentaho.model;
 
-import org.jfree.report.structure.Section;
 import com.sun.star.report.pentaho.OfficeNamespaces;
 
+import org.jfree.report.structure.Section;
+
 /**
  * A page layout describes the physical properties of a page. It is equal to
  * an @page rule in CSS.
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/model/PageSection.java b/reportbuilder/java/com/sun/star/report/pentaho/model/PageSection.java
index fc3532ca70a4..ae4aa55a3d9d 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/model/PageSection.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/model/PageSection.java
@@ -26,10 +26,11 @@
  ************************************************************************/
 package com.sun.star.report.pentaho.model;
 
-import org.jfree.report.structure.Section;
-import org.jfree.layouting.util.AttributeMap;
 import com.sun.star.report.pentaho.OfficeNamespaces;
 
+import org.jfree.layouting.util.AttributeMap;
+import org.jfree.report.structure.Section;
+
 /**
  * This represents either a page header or page footer.
  *
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/model/ReportElement.java b/reportbuilder/java/com/sun/star/report/pentaho/model/ReportElement.java
index 8bab74072f3b..5821351d2d9e 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/model/ReportElement.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/model/ReportElement.java
@@ -26,12 +26,14 @@
  ************************************************************************/
 package com.sun.star.report.pentaho.model;
 
+import com.sun.star.report.OfficeToken;
+import com.sun.star.report.pentaho.OfficeNamespaces;
+
 import java.util.ArrayList;
+import java.util.List;
 
 import org.jfree.report.structure.Element;
-import com.sun.star.report.pentaho.OfficeNamespaces;
-import com.sun.star.report.OfficeToken;
-import java.util.List;
+
 
 /**
  * A report element is the base class for all content generating elements in a
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/module.properties b/reportbuilder/java/com/sun/star/report/pentaho/module.properties
index 7038a47a410c..b3c538048426 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/module.properties
+++ b/reportbuilder/java/com/sun/star/report/pentaho/module.properties
@@ -24,6 +24,7 @@
 # for a copy of the LGPLv3 License.
 #
 #*************************************************************************
+# x-no-translate
 
 
 module-info:
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/output/ImageProducer.java b/reportbuilder/java/com/sun/star/report/pentaho/output/ImageProducer.java
index d307fe1726f4..b3d6485d9195 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/output/ImageProducer.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/output/ImageProducer.java
@@ -26,40 +26,48 @@
  ************************************************************************/
 package com.sun.star.report.pentaho.output;
 
-import java.awt.Image;
+import com.sun.star.report.ImageService;
+import com.sun.star.report.InputRepository;
+import com.sun.star.report.OutputRepository;
+import com.sun.star.report.ReportExecutionException;
+import com.sun.star.report.pentaho.DefaultNameGenerator;
+
 import java.awt.Dimension;
+import java.awt.Image;
+
 import java.io.BufferedInputStream;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+
 import java.net.MalformedURLException;
+import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.URL;
 import java.net.URLConnection;
+
 import java.sql.Blob;
 import java.sql.SQLException;
-import java.util.HashMap;
-import java.util.Arrays;
 
-import com.sun.star.report.InputRepository;
-import com.sun.star.report.OutputRepository;
-import com.sun.star.report.ImageService;
-import com.sun.star.report.ReportExecutionException;
-import com.sun.star.report.pentaho.DefaultNameGenerator;
-import java.net.URI;
+import java.util.Arrays;
+import java.util.HashMap;
 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;
+
 import org.jfree.layouting.input.style.values.CSSNumericType;
 import org.jfree.layouting.input.style.values.CSSNumericValue;
+
 import org.pentaho.reporting.libraries.base.util.IOUtils;
 import org.pentaho.reporting.libraries.base.util.PngEncoder;
 import org.pentaho.reporting.libraries.base.util.WaitingImageObserver;
 
+
 /**
  * This class manages the images embedded in a report.
  *
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/output/OfficeDocumentReportTarget.java b/reportbuilder/java/com/sun/star/report/pentaho/output/OfficeDocumentReportTarget.java
index 23e65b569a29..a3a54f119847 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/output/OfficeDocumentReportTarget.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/output/OfficeDocumentReportTarget.java
@@ -27,26 +27,13 @@
 package com.sun.star.report.pentaho.output;
 
 import com.sun.star.report.DataSourceFactory;
-import java.awt.Image;
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.io.Reader;
-import java.io.StringWriter;
-import java.io.Writer;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.zip.DeflaterOutputStream;
-import java.util.zip.InflaterInputStream;
-import com.sun.star.report.ReportEngineParameterNames;
 import com.sun.star.report.ImageService;
 import com.sun.star.report.InputRepository;
+import com.sun.star.report.OfficeToken;
 import com.sun.star.report.OutputRepository;
+import com.sun.star.report.ReportEngineParameterNames;
 import com.sun.star.report.SDBCReportDataFactory;
 import com.sun.star.report.pentaho.OfficeNamespaces;
-import com.sun.star.report.OfficeToken;
 import com.sun.star.report.pentaho.layoutprocessor.ImageElementContext;
 import com.sun.star.report.pentaho.model.OfficeDocument;
 import com.sun.star.report.pentaho.model.OfficeStyle;
@@ -54,15 +41,33 @@ import com.sun.star.report.pentaho.model.OfficeStyles;
 import com.sun.star.report.pentaho.model.OfficeStylesCollection;
 import com.sun.star.report.pentaho.styles.LengthCalculator;
 import com.sun.star.report.pentaho.styles.StyleMapper;
+
+import java.awt.Image;
+
 import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.Reader;
 import java.io.StringReader;
+import java.io.StringWriter;
+import java.io.Writer;
+
 import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.zip.DeflaterOutputStream;
+import java.util.zip.InflaterInputStream;
+
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+
 import org.jfree.layouting.input.style.parser.CSSValueFactory;
 import org.jfree.layouting.input.style.parser.StyleSheetParserUtil;
-import org.jfree.layouting.input.style.values.CSSNumericValue;
 import org.jfree.layouting.input.style.values.CSSNumericType;
+import org.jfree.layouting.input.style.values.CSSNumericValue;
 import org.jfree.layouting.layouter.style.CSSValueResolverUtility;
 import org.jfree.layouting.namespace.NamespaceDefinition;
 import org.jfree.layouting.namespace.Namespaces;
@@ -82,6 +87,7 @@ import org.jfree.report.structure.Section;
 import org.jfree.report.util.AttributeNameGenerator;
 import org.jfree.report.util.IntegerCache;
 import org.jfree.report.util.MemoryByteArrayOutputStream;
+
 import org.pentaho.reporting.libraries.base.util.FastStack;
 import org.pentaho.reporting.libraries.base.util.IOUtils;
 import org.pentaho.reporting.libraries.resourceloader.ResourceException;
@@ -91,6 +97,7 @@ import org.pentaho.reporting.libraries.xmlns.common.AttributeList;
 import org.pentaho.reporting.libraries.xmlns.writer.DefaultTagDescription;
 import org.pentaho.reporting.libraries.xmlns.writer.XmlWriter;
 import org.pentaho.reporting.libraries.xmlns.writer.XmlWriterSupport;
+
 import org.w3c.css.sac.LexicalUnit;
 
 /**
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/output/OleProducer.java b/reportbuilder/java/com/sun/star/report/pentaho/output/OleProducer.java
index 7194e456a351..ef9296707af3 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/output/OleProducer.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/output/OleProducer.java
@@ -37,8 +37,11 @@ import com.sun.star.report.ReportJobDefinition;
 import com.sun.star.report.pentaho.DefaultNameGenerator;
 import com.sun.star.report.pentaho.PentahoReportEngine;
 import com.sun.star.report.pentaho.PentahoReportEngineMetaData;
+
 import java.io.IOException;
+
 import java.util.List;
+
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/output/StyleUtilities.java b/reportbuilder/java/com/sun/star/report/pentaho/output/StyleUtilities.java
index d901d15fad16..939583be8365 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/output/StyleUtilities.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/output/StyleUtilities.java
@@ -26,8 +26,6 @@
  ************************************************************************/
 package com.sun.star.report.pentaho.output;
 
-import java.util.HashSet;
-
 import com.sun.star.report.pentaho.OfficeNamespaces;
 import com.sun.star.report.pentaho.model.DataStyle;
 import com.sun.star.report.pentaho.model.FontFaceDeclsSection;
@@ -35,14 +33,19 @@ import com.sun.star.report.pentaho.model.FontFaceElement;
 import com.sun.star.report.pentaho.model.OfficeStyle;
 import com.sun.star.report.pentaho.model.OfficeStyles;
 import com.sun.star.report.pentaho.model.OfficeStylesCollection;
+
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.Set;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
 import org.jfree.report.ReportProcessingException;
 import org.jfree.report.structure.Element;
 import org.jfree.report.structure.Section;
 import org.jfree.report.util.AttributeNameGenerator;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+
 
 /**
  * Todo: Document me!
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/output/StylesWriter.java b/reportbuilder/java/com/sun/star/report/pentaho/output/StylesWriter.java
index bf68c10f4b9d..b931ec80820c 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/output/StylesWriter.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/output/StylesWriter.java
@@ -26,23 +26,25 @@
  ************************************************************************/
 package com.sun.star.report.pentaho.output;
 
-import java.io.IOException;
-import java.io.Writer;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.TreeMap;
-
 import com.sun.star.report.pentaho.OfficeNamespaces;
+import com.sun.star.report.pentaho.model.DataStyle;
 import com.sun.star.report.pentaho.model.FontFaceDeclsSection;
 import com.sun.star.report.pentaho.model.FontFaceElement;
+import com.sun.star.report.pentaho.model.OfficeMasterPage;
+import com.sun.star.report.pentaho.model.OfficeMasterStyles;
 import com.sun.star.report.pentaho.model.OfficeStyle;
 import com.sun.star.report.pentaho.model.OfficeStyles;
 import com.sun.star.report.pentaho.model.OfficeStylesCollection;
-import com.sun.star.report.pentaho.model.OfficeMasterStyles;
-import com.sun.star.report.pentaho.model.OfficeMasterPage;
-import com.sun.star.report.pentaho.model.DataStyle;
 import com.sun.star.report.pentaho.model.PageLayout;
 import com.sun.star.report.pentaho.model.RawText;
+
+import java.io.IOException;
+import java.io.Writer;
+
+import java.util.Iterator;
+import java.util.Map;
+import java.util.TreeMap;
+
 import org.jfree.layouting.namespace.Namespaces;
 import org.jfree.layouting.util.AttributeMap;
 import org.jfree.report.JFreeReportBoot;
@@ -52,11 +54,13 @@ import org.jfree.report.structure.Element;
 import org.jfree.report.structure.Node;
 import org.jfree.report.structure.Section;
 import org.jfree.report.structure.StaticText;
+
 import org.pentaho.reporting.libraries.xmlns.common.AttributeList;
 import org.pentaho.reporting.libraries.xmlns.writer.DefaultTagDescription;
 import org.pentaho.reporting.libraries.xmlns.writer.XmlWriter;
 import org.pentaho.reporting.libraries.xmlns.writer.XmlWriterSupport;
 
+
 /**
  * This class writes the style collection into a 'styles.xml' document.
  *
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/output/chart/ChartRawReportProcessor.java b/reportbuilder/java/com/sun/star/report/pentaho/output/chart/ChartRawReportProcessor.java
index 5bf338dedf3c..72d799e1a204 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/output/chart/ChartRawReportProcessor.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/output/chart/ChartRawReportProcessor.java
@@ -30,6 +30,7 @@ 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 org.jfree.report.DataSourceException;
 import org.jfree.report.ReportDataFactoryException;
 import org.jfree.report.ReportProcessingException;
@@ -37,6 +38,7 @@ import org.jfree.report.flow.ReportJob;
 import org.jfree.report.flow.ReportStructureRoot;
 import org.jfree.report.flow.ReportTarget;
 import org.jfree.report.flow.SinglePassReportProcessor;
+
 import org.pentaho.reporting.libraries.resourceloader.ResourceManager;
 
 /**
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/output/chart/ChartRawReportTarget.java b/reportbuilder/java/com/sun/star/report/pentaho/output/chart/ChartRawReportTarget.java
index edf914733067..f76d43bb807a 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/output/chart/ChartRawReportTarget.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/output/chart/ChartRawReportTarget.java
@@ -29,14 +29,16 @@ package com.sun.star.report.pentaho.output.chart;
 import com.sun.star.report.DataSourceFactory;
 import com.sun.star.report.ImageService;
 import com.sun.star.report.InputRepository;
+import com.sun.star.report.OfficeToken;
 import com.sun.star.report.OutputRepository;
 import com.sun.star.report.pentaho.OfficeNamespaces;
-import com.sun.star.report.OfficeToken;
 import com.sun.star.report.pentaho.PentahoReportEngineMetaData;
 import com.sun.star.report.pentaho.output.OfficeDocumentReportTarget;
+
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+
 import org.jfree.layouting.util.AttributeMap;
 import org.jfree.report.DataFlags;
 import org.jfree.report.DataSourceException;
@@ -44,6 +46,7 @@ import org.jfree.report.ReportProcessingException;
 import org.jfree.report.flow.ReportJob;
 import org.jfree.report.flow.ReportStructureRoot;
 import org.jfree.report.flow.ReportTargetUtil;
+
 import org.pentaho.reporting.libraries.base.util.IOUtils;
 import org.pentaho.reporting.libraries.resourceloader.ResourceKey;
 import org.pentaho.reporting.libraries.resourceloader.ResourceManager;
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/output/spreadsheet/SpreadsheetRawReportProcessor.java b/reportbuilder/java/com/sun/star/report/pentaho/output/spreadsheet/SpreadsheetRawReportProcessor.java
index 61cd7f56c270..6876ea5be028 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/output/spreadsheet/SpreadsheetRawReportProcessor.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/output/spreadsheet/SpreadsheetRawReportProcessor.java
@@ -27,19 +27,21 @@
 package com.sun.star.report.pentaho.output.spreadsheet;
 
 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.pentaho.PentahoFormulaContext;
+
 import org.jfree.report.DataSourceException;
 import org.jfree.report.ReportDataFactoryException;
 import org.jfree.report.ReportProcessingException;
+import org.jfree.report.data.ReportContextImpl;
 import org.jfree.report.flow.AbstractReportProcessor;
+import org.jfree.report.flow.ReportContext;
 import org.jfree.report.flow.ReportJob;
 import org.jfree.report.flow.ReportStructureRoot;
 import org.jfree.report.flow.ReportTarget;
-import com.sun.star.report.OutputRepository;
-import com.sun.star.report.InputRepository;
-import com.sun.star.report.ImageService;
-import com.sun.star.report.pentaho.PentahoFormulaContext;
-import org.jfree.report.data.ReportContextImpl;
-import org.jfree.report.flow.ReportContext;
+
 import org.pentaho.reporting.libraries.resourceloader.ResourceManager;
 
 /**
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/output/spreadsheet/SpreadsheetRawReportTarget.java b/reportbuilder/java/com/sun/star/report/pentaho/output/spreadsheet/SpreadsheetRawReportTarget.java
index 90101412d0ad..11351b656ea1 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/output/spreadsheet/SpreadsheetRawReportTarget.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/output/spreadsheet/SpreadsheetRawReportTarget.java
@@ -27,49 +27,52 @@
 package com.sun.star.report.pentaho.output.spreadsheet;
 
 import com.sun.star.report.DataSourceFactory;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-
+import com.sun.star.report.ImageService;
 import com.sun.star.report.InputRepository;
+import com.sun.star.report.OfficeToken;
 import com.sun.star.report.OutputRepository;
-import com.sun.star.report.ImageService;
 import com.sun.star.report.pentaho.OfficeNamespaces;
-import com.sun.star.report.OfficeToken;
 import com.sun.star.report.pentaho.PentahoReportEngineMetaData;
+import com.sun.star.report.pentaho.model.OfficeMasterPage;
+import com.sun.star.report.pentaho.model.OfficeMasterStyles;
 import com.sun.star.report.pentaho.model.OfficeStyle;
 import com.sun.star.report.pentaho.model.OfficeStyles;
 import com.sun.star.report.pentaho.model.OfficeStylesCollection;
-import com.sun.star.report.pentaho.model.OfficeMasterPage;
-import com.sun.star.report.pentaho.model.OfficeMasterStyles;
 import com.sun.star.report.pentaho.model.PageSection;
 import com.sun.star.report.pentaho.output.OfficeDocumentReportTarget;
 import com.sun.star.report.pentaho.output.StyleUtilities;
 import com.sun.star.report.pentaho.output.text.MasterPageFactory;
 import com.sun.star.report.pentaho.styles.LengthCalculator;
+
+import java.io.IOException;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
-import org.jfree.layouting.util.AttributeMap;
-import org.jfree.layouting.input.style.values.CSSNumericValue;
+
 import org.jfree.layouting.input.style.values.CSSNumericType;
+import org.jfree.layouting.input.style.values.CSSNumericValue;
+import org.jfree.layouting.util.AttributeMap;
 import org.jfree.report.DataFlags;
 import org.jfree.report.DataSourceException;
-import org.jfree.report.ReportProcessingException;
 import org.jfree.report.JFreeReportInfo;
+import org.jfree.report.ReportProcessingException;
 import org.jfree.report.flow.ReportJob;
 import org.jfree.report.flow.ReportStructureRoot;
 import org.jfree.report.flow.ReportTargetUtil;
 import org.jfree.report.structure.Element;
 import org.jfree.report.structure.Section;
 import org.jfree.report.util.IntegerCache;
-import org.jfree.report.util.TextUtilities;
+
 import org.pentaho.reporting.libraries.resourceloader.ResourceKey;
 import org.pentaho.reporting.libraries.resourceloader.ResourceManager;
 import org.pentaho.reporting.libraries.xmlns.common.AttributeList;
 import org.pentaho.reporting.libraries.xmlns.writer.XmlWriter;
 import org.pentaho.reporting.libraries.xmlns.writer.XmlWriterSupport;
 
+
 /**
  * Creation-Date: 03.11.2007
  *
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/output/text/MasterPageFactory.java b/reportbuilder/java/com/sun/star/report/pentaho/output/text/MasterPageFactory.java
index 6abc2096c624..ff680e14657a 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/output/text/MasterPageFactory.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/output/text/MasterPageFactory.java
@@ -26,20 +26,22 @@
  ************************************************************************/
 package com.sun.star.report.pentaho.output.text;
 
-import java.util.HashMap;
-
 import com.sun.star.report.pentaho.OfficeNamespaces;
 import com.sun.star.report.pentaho.model.OfficeMasterPage;
 import com.sun.star.report.pentaho.model.OfficeMasterStyles;
-import com.sun.star.report.pentaho.model.RawText;
 import com.sun.star.report.pentaho.model.OfficeStyles;
 import com.sun.star.report.pentaho.model.PageLayout;
+import com.sun.star.report.pentaho.model.RawText;
+
+import java.util.HashMap;
 import java.util.Map;
+
 import org.jfree.layouting.input.style.values.CSSNumericValue;
-import org.jfree.report.structure.Section;
+import org.jfree.report.ReportProcessingException;
 import org.jfree.report.structure.Element;
+import org.jfree.report.structure.Section;
 import org.jfree.report.util.AttributeNameGenerator;
-import org.jfree.report.ReportProcessingException;
+
 
 /**
  * Todo: Document me!
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/output/text/PageContext.java b/reportbuilder/java/com/sun/star/report/pentaho/output/text/PageContext.java
index 8ac38e4e43ea..8aa0bb09a1f1 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/output/text/PageContext.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/output/text/PageContext.java
@@ -26,9 +26,10 @@
  ************************************************************************/
 package com.sun.star.report.pentaho.output.text;
 
-import org.jfree.layouting.input.style.values.CSSNumericValue;
 import com.sun.star.report.pentaho.styles.LengthCalculator;
 
+import org.jfree.layouting.input.style.values.CSSNumericValue;
+
 /**
  * Todo: Document me!
  *
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/output/text/TextRawReportProcessor.java b/reportbuilder/java/com/sun/star/report/pentaho/output/text/TextRawReportProcessor.java
index 01ab1a72dbd5..00d4aff11de9 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/output/text/TextRawReportProcessor.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/output/text/TextRawReportProcessor.java
@@ -27,10 +27,11 @@
 package com.sun.star.report.pentaho.output.text;
 
 import com.sun.star.report.DataSourceFactory;
-import com.sun.star.report.OutputRepository;
-import com.sun.star.report.InputRepository;
 import com.sun.star.report.ImageService;
+import com.sun.star.report.InputRepository;
+import com.sun.star.report.OutputRepository;
 import com.sun.star.report.pentaho.PentahoFormulaContext;
+
 import org.jfree.report.ReportProcessingException;
 import org.jfree.report.data.ReportContextImpl;
 import org.jfree.report.flow.ReportContext;
@@ -38,6 +39,7 @@ import org.jfree.report.flow.ReportJob;
 import org.jfree.report.flow.ReportStructureRoot;
 import org.jfree.report.flow.ReportTarget;
 import org.jfree.report.flow.SinglePassReportProcessor;
+
 import org.pentaho.reporting.libraries.resourceloader.ResourceManager;
 
 /**
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/output/text/TextRawReportTarget.java b/reportbuilder/java/com/sun/star/report/pentaho/output/text/TextRawReportTarget.java
index a5fc3a0ad4db..7c90bf1fd0ec 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/output/text/TextRawReportTarget.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/output/text/TextRawReportTarget.java
@@ -27,18 +27,11 @@
 package com.sun.star.report.pentaho.output.text;
 
 import com.sun.star.report.DataSourceFactory;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.InputStream;
-import java.io.OutputStreamWriter;
-import java.util.Iterator;
-import java.util.Map;
-
 import com.sun.star.report.ImageService;
 import com.sun.star.report.InputRepository;
+import com.sun.star.report.OfficeToken;
 import com.sun.star.report.OutputRepository;
 import com.sun.star.report.pentaho.OfficeNamespaces;
-import com.sun.star.report.OfficeToken;
 import com.sun.star.report.pentaho.PentahoReportEngineMetaData;
 import com.sun.star.report.pentaho.layoutprocessor.FormatValueUtility;
 import com.sun.star.report.pentaho.model.OfficeMasterPage;
@@ -50,7 +43,16 @@ import com.sun.star.report.pentaho.model.PageSection;
 import com.sun.star.report.pentaho.output.OfficeDocumentReportTarget;
 import com.sun.star.report.pentaho.output.StyleUtilities;
 import com.sun.star.report.pentaho.styles.LengthCalculator;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+
 import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.Map;
+
 import org.jfree.layouting.input.style.values.CSSNumericValue;
 import org.jfree.layouting.util.AttributeMap;
 import org.jfree.report.DataSourceException;
@@ -63,6 +65,7 @@ import org.jfree.report.structure.Element;
 import org.jfree.report.structure.Section;
 import org.jfree.report.util.AttributeNameGenerator;
 import org.jfree.report.util.IntegerCache;
+
 import org.pentaho.reporting.libraries.base.util.FastStack;
 import org.pentaho.reporting.libraries.base.util.IOUtils;
 import org.pentaho.reporting.libraries.base.util.ObjectUtilities;
@@ -72,6 +75,7 @@ import org.pentaho.reporting.libraries.xmlns.common.AttributeList;
 import org.pentaho.reporting.libraries.xmlns.writer.XmlWriter;
 import org.pentaho.reporting.libraries.xmlns.writer.XmlWriterSupport;
 
+
 /**
  * Creation-Date: 03.07.2006, 16:28:00
  *
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/output/text/VariablesDeclarations.java b/reportbuilder/java/com/sun/star/report/pentaho/output/text/VariablesDeclarations.java
index 6e7534df735e..b79d18b56a0b 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/output/text/VariablesDeclarations.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/output/text/VariablesDeclarations.java
@@ -27,11 +27,12 @@
 package com.sun.star.report.pentaho.output.text;
 
 import java.util.HashMap;
-import java.util.Map;
 import java.util.Iterator;
+import java.util.Map;
 
 import org.jfree.report.util.AttributeNameGenerator;
 
+
 /**
  * A collection that holds all used variables. A variable is primarily keyed by
  * its original name. If a variable contains more than one type, it is also
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/ElementReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/ElementReadHandler.java
index 81efe8fbd073..c90f6425d971 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/ElementReadHandler.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/ElementReadHandler.java
@@ -27,7 +27,9 @@
 package com.sun.star.report.pentaho.parser;
 
 import org.jfree.report.structure.Element;
+
 import org.pentaho.reporting.libraries.xmlns.parser.AbstractXmlReadHandler;
+
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
 
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/OfficeDocumentXmlResourceFactory.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/OfficeDocumentXmlResourceFactory.java
index 2bcf3a824737..4177a75f81be 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/OfficeDocumentXmlResourceFactory.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/OfficeDocumentXmlResourceFactory.java
@@ -27,6 +27,7 @@
 package com.sun.star.report.pentaho.parser;
 
 import com.sun.star.report.pentaho.model.OfficeDocument;
+
 import org.jfree.report.modules.factories.report.base.JFreeReportXmlResourceFactory;
 
 /**
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/OfficeParserUtil.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/OfficeParserUtil.java
index ce34affe7d80..5272a987957f 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/OfficeParserUtil.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/OfficeParserUtil.java
@@ -26,21 +26,24 @@
  ************************************************************************/
 package com.sun.star.report.pentaho.parser;
 
+import java.util.HashMap;
 import java.util.Iterator;
-import java.util.Properties;
 import java.util.Map;
-import java.util.HashMap;
+import java.util.Properties;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.jfree.report.JFreeReportBoot;
+
 import org.jfree.layouting.namespace.NamespaceDefinition;
 import org.jfree.layouting.namespace.Namespaces;
+import org.jfree.report.JFreeReportBoot;
+
 import org.pentaho.reporting.libraries.base.config.DefaultConfiguration;
 import org.pentaho.reporting.libraries.resourceloader.Resource;
 import org.pentaho.reporting.libraries.resourceloader.ResourceException;
 import org.pentaho.reporting.libraries.resourceloader.ResourceManager;
 
+
 public class OfficeParserUtil
 {
 
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/OfficeStylesXmlResourceFactory.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/OfficeStylesXmlResourceFactory.java
index 33108e0dc438..28d646eb8a23 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/OfficeStylesXmlResourceFactory.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/OfficeStylesXmlResourceFactory.java
@@ -27,7 +27,9 @@
 package com.sun.star.report.pentaho.parser;
 
 import com.sun.star.report.pentaho.model.OfficeStylesCollection;
+
 import org.jfree.report.JFreeReportBoot;
+
 import org.pentaho.reporting.libraries.base.config.Configuration;
 import org.pentaho.reporting.libraries.xmlns.parser.AbstractXmlResourceFactory;
 
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/StarStyleXmlFactoryModule.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/StarStyleXmlFactoryModule.java
index 1e57df98ee51..baa6531fbd08 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/StarStyleXmlFactoryModule.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/StarStyleXmlFactoryModule.java
@@ -28,6 +28,7 @@ package com.sun.star.report.pentaho.parser;
 
 import com.sun.star.report.pentaho.OfficeNamespaces;
 import com.sun.star.report.pentaho.parser.office.DocumentStylesReadHandler;
+
 import org.pentaho.reporting.libraries.xmlns.parser.XmlDocumentInfo;
 import org.pentaho.reporting.libraries.xmlns.parser.XmlFactoryModule;
 import org.pentaho.reporting.libraries.xmlns.parser.XmlReadHandler;
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/StarXmlFactoryModule.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/StarXmlFactoryModule.java
index 695bf52428cf..ce16d222eaba 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/StarXmlFactoryModule.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/StarXmlFactoryModule.java
@@ -26,8 +26,9 @@
  ************************************************************************/
 package com.sun.star.report.pentaho.parser;
 
-import com.sun.star.report.pentaho.parser.office.DocumentContentReadHandler;
 import com.sun.star.report.pentaho.OfficeNamespaces;
+import com.sun.star.report.pentaho.parser.office.DocumentContentReadHandler;
+
 import org.pentaho.reporting.libraries.xmlns.parser.XmlDocumentInfo;
 import org.pentaho.reporting.libraries.xmlns.parser.XmlFactoryModule;
 import org.pentaho.reporting.libraries.xmlns.parser.XmlReadHandler;
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/chart/ChartReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/chart/ChartReadHandler.java
index 9ec31aa498cc..9f899389b27b 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/chart/ChartReadHandler.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/chart/ChartReadHandler.java
@@ -27,20 +27,25 @@
 package com.sun.star.report.pentaho.parser.chart;
 
 import com.sun.star.report.pentaho.OfficeNamespaces;
-import java.lang.Object;
-import java.util.ArrayList;
-
 import com.sun.star.report.pentaho.parser.ElementReadHandler;
 import com.sun.star.report.pentaho.parser.rpt.DetailRootTableReadHandler;
 import com.sun.star.report.pentaho.parser.rpt.ReportReadHandler;
 import com.sun.star.report.pentaho.parser.text.TextContentReadHandler;
+
+import java.lang.Object;
+
+import java.util.ArrayList;
 import java.util.List;
+
 import org.jfree.report.structure.Element;
 import org.jfree.report.structure.Section;
+
 import org.pentaho.reporting.libraries.xmlns.parser.XmlReadHandler;
+
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
 
+
 /**
  *
  * @author Ocke Janssen
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/data/DataStyleReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/data/DataStyleReadHandler.java
index 61069584c3bb..e2effde8dfc3 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/data/DataStyleReadHandler.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/data/DataStyleReadHandler.java
@@ -26,18 +26,22 @@
  ************************************************************************/
 package com.sun.star.report.pentaho.parser.data;
 
-import java.util.ArrayList;
-
 import com.sun.star.report.pentaho.OfficeNamespaces;
 import com.sun.star.report.pentaho.model.DataStyle;
 import com.sun.star.report.pentaho.parser.ElementReadHandler;
+
+import java.util.ArrayList;
 import java.util.List;
+
 import org.jfree.report.structure.Element;
 import org.jfree.report.structure.StaticText;
+
 import org.pentaho.reporting.libraries.xmlns.parser.XmlReadHandler;
+
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
 
+
 public class DataStyleReadHandler extends ElementReadHandler
 {
 
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/draw/ObjectOleReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/draw/ObjectOleReadHandler.java
index 6774c4374507..e5d38f2d364a 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/draw/ObjectOleReadHandler.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/draw/ObjectOleReadHandler.java
@@ -29,7 +29,9 @@ package com.sun.star.report.pentaho.parser.draw;
 import com.sun.star.report.pentaho.OfficeNamespaces;
 import com.sun.star.report.pentaho.model.ObjectOleElement;
 import com.sun.star.report.pentaho.parser.ElementReadHandler;
+
 import org.jfree.report.structure.Element;
+
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
 
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/office/BodyReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/office/BodyReadHandler.java
index 1f08dd533220..b77c0e80e321 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/office/BodyReadHandler.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/office/BodyReadHandler.java
@@ -29,9 +29,12 @@ package com.sun.star.report.pentaho.parser.office;
 import com.sun.star.report.pentaho.OfficeNamespaces;
 import com.sun.star.report.pentaho.parser.ElementReadHandler;
 import com.sun.star.report.pentaho.parser.rpt.ReportReadHandler;
+
 import org.jfree.report.structure.Element;
 import org.jfree.report.structure.Section;
+
 import org.pentaho.reporting.libraries.xmlns.parser.XmlReadHandler;
+
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
 
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/office/DocumentContentReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/office/DocumentContentReadHandler.java
index 61208e765052..1f57c7c61205 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/office/DocumentContentReadHandler.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/office/DocumentContentReadHandler.java
@@ -30,9 +30,12 @@ import com.sun.star.report.pentaho.OfficeNamespaces;
 import com.sun.star.report.pentaho.model.OfficeDocument;
 import com.sun.star.report.pentaho.model.OfficeStylesCollection;
 import com.sun.star.report.pentaho.parser.style.OfficeStylesReadHandler;
+
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+
 import org.jfree.report.JFreeReport;
+
 import org.pentaho.reporting.libraries.resourceloader.Resource;
 import org.pentaho.reporting.libraries.resourceloader.ResourceException;
 import org.pentaho.reporting.libraries.resourceloader.ResourceKey;
@@ -40,6 +43,7 @@ import org.pentaho.reporting.libraries.resourceloader.ResourceKeyCreationExcepti
 import org.pentaho.reporting.libraries.resourceloader.ResourceManager;
 import org.pentaho.reporting.libraries.xmlns.parser.AbstractXmlReadHandler;
 import org.pentaho.reporting.libraries.xmlns.parser.XmlReadHandler;
+
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
 
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/office/DocumentStylesReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/office/DocumentStylesReadHandler.java
index f3665f967c11..c8bf1268ab3c 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/office/DocumentStylesReadHandler.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/office/DocumentStylesReadHandler.java
@@ -30,8 +30,11 @@ import com.sun.star.report.pentaho.OfficeNamespaces;
 import com.sun.star.report.pentaho.model.OfficeStylesCollection;
 import com.sun.star.report.pentaho.parser.ElementReadHandler;
 import com.sun.star.report.pentaho.parser.style.OfficeStylesReadHandler;
+
 import org.jfree.report.structure.Element;
+
 import org.pentaho.reporting.libraries.xmlns.parser.XmlReadHandler;
+
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
 
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/office/FontFaceDeclsReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/office/FontFaceDeclsReadHandler.java
index 058aca7bec32..bfd0e99e170d 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/office/FontFaceDeclsReadHandler.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/office/FontFaceDeclsReadHandler.java
@@ -26,19 +26,23 @@
  ************************************************************************/
 package com.sun.star.report.pentaho.parser.office;
 
-import java.util.ArrayList;
-
 import com.sun.star.report.pentaho.OfficeNamespaces;
 import com.sun.star.report.pentaho.model.FontFaceDeclsSection;
 import com.sun.star.report.pentaho.model.FontFaceElement;
 import com.sun.star.report.pentaho.parser.ElementReadHandler;
 import com.sun.star.report.pentaho.parser.style.FontFaceReadHandler;
+
+import java.util.ArrayList;
 import java.util.List;
+
 import org.jfree.report.structure.Element;
+
 import org.pentaho.reporting.libraries.xmlns.parser.XmlReadHandler;
+
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
 
+
 /**
  * Reads the font-face declarations section. This one can only contain
  * font-face elements.
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/office/MasterStylesReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/office/MasterStylesReadHandler.java
index 52854a57af40..61263a216dca 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/office/MasterStylesReadHandler.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/office/MasterStylesReadHandler.java
@@ -26,19 +26,23 @@
  ************************************************************************/
 package com.sun.star.report.pentaho.parser.office;
 
-import java.util.ArrayList;
-
+import com.sun.star.report.pentaho.OfficeNamespaces;
+import com.sun.star.report.pentaho.model.OfficeMasterStyles;
 import com.sun.star.report.pentaho.parser.ElementReadHandler;
-import com.sun.star.report.pentaho.parser.style.StyleDefinitionReadHandler;
 import com.sun.star.report.pentaho.parser.style.MasterPageReadHandler;
-import com.sun.star.report.pentaho.model.OfficeMasterStyles;
-import com.sun.star.report.pentaho.OfficeNamespaces;
+import com.sun.star.report.pentaho.parser.style.StyleDefinitionReadHandler;
+
+import java.util.ArrayList;
 import java.util.List;
+
 import org.jfree.report.structure.Element;
+
 import org.pentaho.reporting.libraries.xmlns.parser.XmlReadHandler;
+
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
 
+
 /**
  * Todo: Document me!
  *
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/ConditionalPrintExpressionReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/ConditionalPrintExpressionReadHandler.java
index 77ac9622a44e..02d23aec10bd 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/ConditionalPrintExpressionReadHandler.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/ConditionalPrintExpressionReadHandler.java
@@ -27,9 +27,12 @@
 package com.sun.star.report.pentaho.parser.rpt;
 
 import com.sun.star.report.pentaho.OfficeNamespaces;
+
 import org.jfree.report.expressions.FormulaFunction;
 import org.jfree.report.structure.Element;
+
 import org.pentaho.reporting.libraries.xmlns.parser.AbstractXmlReadHandler;
+
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
 
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/FixedContentReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/FixedContentReadHandler.java
index f414fc680bc1..e414a1bbe16c 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/FixedContentReadHandler.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/FixedContentReadHandler.java
@@ -26,14 +26,17 @@
  ************************************************************************/
 package com.sun.star.report.pentaho.parser.rpt;
 
+import com.sun.star.report.OfficeToken;
+import com.sun.star.report.pentaho.OfficeNamespaces;
 import com.sun.star.report.pentaho.model.FixedTextElement;
 import com.sun.star.report.pentaho.parser.ElementReadHandler;
 import com.sun.star.report.pentaho.parser.text.TextContentReadHandler;
-import com.sun.star.report.pentaho.OfficeNamespaces;
-import com.sun.star.report.OfficeToken;
+
 import org.jfree.report.structure.Element;
+
 import org.pentaho.reporting.libraries.xmlns.parser.IgnoreAnyChildReadHandler;
 import org.pentaho.reporting.libraries.xmlns.parser.XmlReadHandler;
+
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
 
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/FormatConditionReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/FormatConditionReadHandler.java
index 2409c9aca053..581dd79f418e 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/FormatConditionReadHandler.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/FormatConditionReadHandler.java
@@ -26,13 +26,16 @@
  ************************************************************************/
 package com.sun.star.report.pentaho.parser.rpt;
 
+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.ReportElement;
-import com.sun.star.report.pentaho.OfficeNamespaces;
-import com.sun.star.report.OfficeToken;
+
 import org.jfree.report.expressions.FormulaExpression;
+
 import org.pentaho.reporting.libraries.xmlns.parser.AbstractXmlReadHandler;
 import org.pentaho.reporting.libraries.xmlns.parser.ParseException;
+
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
 
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/FormattedTextReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/FormattedTextReadHandler.java
index 8b312aa80ba7..4c94cb910d79 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/FormattedTextReadHandler.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/FormattedTextReadHandler.java
@@ -26,13 +26,16 @@
  ************************************************************************/
 package com.sun.star.report.pentaho.parser.rpt;
 
+import com.sun.star.report.pentaho.OfficeNamespaces;
 import com.sun.star.report.pentaho.model.FormattedTextElement;
 import com.sun.star.report.pentaho.parser.ElementReadHandler;
-import com.sun.star.report.pentaho.OfficeNamespaces;
+
 import org.jfree.report.expressions.FormulaExpression;
 import org.jfree.report.structure.Element;
-import org.pentaho.reporting.libraries.xmlns.parser.XmlReadHandler;
+
 import org.pentaho.reporting.libraries.xmlns.parser.IgnoreAnyChildReadHandler;
+import org.pentaho.reporting.libraries.xmlns.parser.XmlReadHandler;
+
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
 
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/FunctionReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/FunctionReadHandler.java
index 67c8bb133920..233e0692dd07 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/FunctionReadHandler.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/FunctionReadHandler.java
@@ -26,15 +26,18 @@
  ************************************************************************/
 package com.sun.star.report.pentaho.parser.rpt;
 
-import org.pentaho.reporting.libraries.xmlns.parser.AbstractXmlReadHandler;
-import org.pentaho.reporting.libraries.xmlns.parser.ParseException;
+import com.sun.star.report.OfficeToken;
+import com.sun.star.report.pentaho.OfficeNamespaces;
+
 import org.jfree.report.expressions.Expression;
-import org.jfree.report.expressions.FormulaFunction;
 import org.jfree.report.expressions.FormulaExpression;
-import org.xml.sax.SAXException;
+import org.jfree.report.expressions.FormulaFunction;
+
+import org.pentaho.reporting.libraries.xmlns.parser.AbstractXmlReadHandler;
+import org.pentaho.reporting.libraries.xmlns.parser.ParseException;
+
 import org.xml.sax.Attributes;
-import com.sun.star.report.pentaho.OfficeNamespaces;
-import com.sun.star.report.OfficeToken;
+import org.xml.sax.SAXException;
 
 /**
  * Parses a named expression. These expressions are encountered on reports and
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/GroupReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/GroupReadHandler.java
index 108157fcfc64..3516f6e047ad 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/GroupReadHandler.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/GroupReadHandler.java
@@ -27,21 +27,25 @@
 package com.sun.star.report.pentaho.parser.rpt;
 
 import com.sun.star.report.OfficeToken;
-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.OfficeGroupInstanceSection;
 import com.sun.star.report.pentaho.parser.ElementReadHandler;
+
+import java.util.ArrayList;
 import java.util.List;
+
 import org.jfree.report.JFreeReportInfo;
 import org.jfree.report.expressions.FormulaExpression;
 import org.jfree.report.structure.Element;
 import org.jfree.report.structure.Section;
+
 import org.pentaho.reporting.libraries.xmlns.parser.XmlReadHandler;
+
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
 
+
 public class GroupReadHandler extends ElementReadHandler
 {
 
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/ImageReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/ImageReadHandler.java
index 50d52818159d..1695eac68fe0 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/ImageReadHandler.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/ImageReadHandler.java
@@ -26,15 +26,18 @@
  ************************************************************************/
 package com.sun.star.report.pentaho.parser.rpt;
 
-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 com.sun.star.report.pentaho.parser.ElementReadHandler;
 import com.sun.star.report.pentaho.parser.xlink.XLinkReadHandler;
+
 import org.jfree.report.expressions.FormulaExpression;
 import org.jfree.report.structure.Element;
+
 import org.pentaho.reporting.libraries.xmlns.parser.IgnoreAnyChildReadHandler;
 import org.pentaho.reporting.libraries.xmlns.parser.XmlReadHandler;
+
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
 
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/MasterDetailReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/MasterDetailReadHandler.java
index b1093f0957e0..59671bfbbe60 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/MasterDetailReadHandler.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/MasterDetailReadHandler.java
@@ -26,11 +26,14 @@
  ************************************************************************/
 package com.sun.star.report.pentaho.parser.rpt;
 
+import com.sun.star.report.pentaho.OfficeNamespaces;
 import com.sun.star.report.pentaho.model.ObjectOleElement;
 import com.sun.star.report.pentaho.parser.ElementReadHandler;
-import com.sun.star.report.pentaho.OfficeNamespaces;
+
 import org.jfree.report.structure.Element;
+
 import org.pentaho.reporting.libraries.xmlns.parser.XmlReadHandler;
+
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
 
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/ReportElementReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/ReportElementReadHandler.java
index e683fba93116..4359581da3a6 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/ReportElementReadHandler.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/ReportElementReadHandler.java
@@ -26,13 +26,16 @@
  ************************************************************************/
 package com.sun.star.report.pentaho.parser.rpt;
 
+import com.sun.star.report.OfficeToken;
+import com.sun.star.report.pentaho.OfficeNamespaces;
 import com.sun.star.report.pentaho.model.ReportElement;
 import com.sun.star.report.pentaho.parser.ElementReadHandler;
-import com.sun.star.report.pentaho.OfficeNamespaces;
-import com.sun.star.report.OfficeToken;
+
 import org.jfree.report.structure.Element;
-import org.pentaho.reporting.libraries.xmlns.parser.XmlReadHandler;
+
 import org.pentaho.reporting.libraries.xmlns.parser.IgnoreAnyChildReadHandler;
+import org.pentaho.reporting.libraries.xmlns.parser.XmlReadHandler;
+
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
 
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/ReportReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/ReportReadHandler.java
index 53e0bd247144..f6db6905da13 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/ReportReadHandler.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/ReportReadHandler.java
@@ -26,20 +26,24 @@
  ************************************************************************/
 package com.sun.star.report.pentaho.parser.rpt;
 
-import java.util.ArrayList;
-
 import com.sun.star.report.pentaho.OfficeNamespaces;
 import com.sun.star.report.pentaho.model.OfficeReport;
 import com.sun.star.report.pentaho.parser.ElementReadHandler;
 import com.sun.star.report.pentaho.parser.chart.ChartReadHandler;
+
+import java.util.ArrayList;
 import java.util.List;
+
 import org.jfree.report.JFreeReportInfo;
 import org.jfree.report.structure.Element;
 import org.jfree.report.structure.Section;
+
 import org.pentaho.reporting.libraries.xmlns.parser.XmlReadHandler;
+
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
 
+
 public class ReportReadHandler extends ElementReadHandler
 {
 
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/RootTableReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/RootTableReadHandler.java
index f6ca4e955ec2..70075f96b017 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/RootTableReadHandler.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/RootTableReadHandler.java
@@ -29,9 +29,12 @@ package com.sun.star.report.pentaho.parser.rpt;
 import com.sun.star.report.pentaho.OfficeNamespaces;
 import com.sun.star.report.pentaho.parser.ElementReadHandler;
 import com.sun.star.report.pentaho.parser.table.TableReadHandler;
+
 import org.jfree.report.structure.Element;
 import org.jfree.report.structure.Section;
+
 import org.pentaho.reporting.libraries.xmlns.parser.XmlReadHandler;
+
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
 
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/SubDocumentReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/SubDocumentReadHandler.java
index 945ed1a35cc0..081e8bf2020e 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/SubDocumentReadHandler.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/SubDocumentReadHandler.java
@@ -26,14 +26,17 @@
  ************************************************************************/
 package com.sun.star.report.pentaho.parser.rpt;
 
-import com.sun.star.report.pentaho.model.ObjectOleElement;
-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.ObjectOleElement;
 import com.sun.star.report.pentaho.parser.draw.ObjectOleReadHandler;
 import com.sun.star.report.pentaho.parser.text.NoCDATATextContentReadHandler;
+
 import org.jfree.report.structure.Section;
-import org.pentaho.reporting.libraries.xmlns.parser.XmlReadHandler;
+
 import org.pentaho.reporting.libraries.xmlns.parser.IgnoreAnyChildReadHandler;
+import org.pentaho.reporting.libraries.xmlns.parser.XmlReadHandler;
+
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
 
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/selectors.properties b/reportbuilder/java/com/sun/star/report/pentaho/parser/selectors.properties
index a8f0ad275941..19ba06839e62 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/selectors.properties
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/selectors.properties
@@ -24,6 +24,7 @@
 # for a copy of the LGPLv3 License.
 #
 #*************************************************************************
+# x-no-translate
 
 #    <style:style style:name="S1" style:family="graphics">
 #      <style:section-properties fo:background-color="#ffffff"/>
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/style/FontFaceReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/style/FontFaceReadHandler.java
index 035c4db1cdfc..fb20e3783123 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/style/FontFaceReadHandler.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/style/FontFaceReadHandler.java
@@ -26,8 +26,9 @@
  ************************************************************************/
 package com.sun.star.report.pentaho.parser.style;
 
-import com.sun.star.report.pentaho.parser.ElementReadHandler;
 import com.sun.star.report.pentaho.model.FontFaceElement;
+import com.sun.star.report.pentaho.parser.ElementReadHandler;
+
 import org.jfree.report.structure.Element;
 
 /**
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/style/MasterPageReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/style/MasterPageReadHandler.java
index 481042588854..d662e8028ab6 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/style/MasterPageReadHandler.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/style/MasterPageReadHandler.java
@@ -26,16 +26,20 @@
  ************************************************************************/
 package com.sun.star.report.pentaho.parser.style;
 
-import java.util.ArrayList;
-
 import com.sun.star.report.pentaho.model.OfficeMasterPage;
 import com.sun.star.report.pentaho.parser.ElementReadHandler;
+
+import java.util.ArrayList;
 import java.util.List;
+
 import org.jfree.report.structure.Element;
+
 import org.pentaho.reporting.libraries.xmlns.parser.XmlReadHandler;
+
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
 
+
 /**
  * Todo: Document me!
  *
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/style/OfficeStyleReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/style/OfficeStyleReadHandler.java
index a25155b28310..2433a7dfa2c1 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/style/OfficeStyleReadHandler.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/style/OfficeStyleReadHandler.java
@@ -26,16 +26,20 @@
  ************************************************************************/
 package com.sun.star.report.pentaho.parser.style;
 
-import java.util.ArrayList;
-
-import com.sun.star.report.pentaho.parser.ElementReadHandler;
 import com.sun.star.report.pentaho.model.OfficeStyle;
+import com.sun.star.report.pentaho.parser.ElementReadHandler;
+
+import java.util.ArrayList;
 import java.util.List;
+
 import org.jfree.report.structure.Element;
+
 import org.pentaho.reporting.libraries.xmlns.parser.XmlReadHandler;
+
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
 
+
 /**
  * This class reads a single style rule. The resulting 'office-style' element
  * is added to an 'office-styles' set.
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/style/OfficeStylesReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/style/OfficeStylesReadHandler.java
index cf68aa1f0e00..d679c1c0f412 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/style/OfficeStylesReadHandler.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/style/OfficeStylesReadHandler.java
@@ -26,17 +26,21 @@
  ************************************************************************/
 package com.sun.star.report.pentaho.parser.style;
 
+import com.sun.star.report.pentaho.OfficeNamespaces;
+import com.sun.star.report.pentaho.model.OfficeStyles;
+import com.sun.star.report.pentaho.parser.ElementReadHandler;
+import com.sun.star.report.pentaho.parser.data.DataStyleReadHandler;
+
 import java.util.ArrayList;
+import java.util.List;
+
 import org.jfree.report.modules.factories.report.flow.SectionReadHandler;
 import org.jfree.report.structure.Element;
+
 import org.pentaho.reporting.libraries.xmlns.parser.XmlReadHandler;
+
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
-import com.sun.star.report.pentaho.OfficeNamespaces;
-import com.sun.star.report.pentaho.model.OfficeStyles;
-import com.sun.star.report.pentaho.parser.ElementReadHandler;
-import com.sun.star.report.pentaho.parser.data.DataStyleReadHandler;
-import java.util.List;
 
 public class OfficeStylesReadHandler extends ElementReadHandler
 {
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/style/PageLayoutReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/style/PageLayoutReadHandler.java
index 162b58884f27..d781a05305f7 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/style/PageLayoutReadHandler.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/style/PageLayoutReadHandler.java
@@ -26,16 +26,20 @@
  ************************************************************************/
 package com.sun.star.report.pentaho.parser.style;
 
-import java.util.ArrayList;
-
 import com.sun.star.report.pentaho.model.PageLayout;
 import com.sun.star.report.pentaho.parser.ElementReadHandler;
+
+import java.util.ArrayList;
 import java.util.List;
+
 import org.jfree.report.structure.Element;
+
 import org.pentaho.reporting.libraries.xmlns.parser.XmlReadHandler;
+
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
 
+
 /**
  * Reads a page-layout element.
  *
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/style/StyleDefinitionReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/style/StyleDefinitionReadHandler.java
index bf63a72c64c7..5dcd52d04782 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/style/StyleDefinitionReadHandler.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/style/StyleDefinitionReadHandler.java
@@ -26,16 +26,20 @@
  ************************************************************************/
 package com.sun.star.report.pentaho.parser.style;
 
-import java.util.ArrayList;
-
 import com.sun.star.report.pentaho.parser.ElementReadHandler;
+
+import java.util.ArrayList;
 import java.util.List;
+
 import org.jfree.report.structure.Element;
 import org.jfree.report.structure.Section;
+
 import org.pentaho.reporting.libraries.xmlns.parser.XmlReadHandler;
+
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
 
+
 /**
  * Reads all childs of a style-definition. This simply copies everything that
  * is contained in the source-file into a generic structure that can be
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/OneOfConstantsMapper.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/OneOfConstantsMapper.java
index 3cdecbcba2fb..2832007d5ec0 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/OneOfConstantsMapper.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/OneOfConstantsMapper.java
@@ -26,14 +26,16 @@
  ************************************************************************/
 package com.sun.star.report.pentaho.parser.stylemapper;
 
-import java.util.HashMap;
-
 import com.sun.star.report.pentaho.parser.StyleMapper;
+
+import java.util.HashMap;
 import java.util.Map;
+
 import org.jfree.layouting.input.style.CSSDeclarationRule;
 import org.jfree.layouting.input.style.StyleKey;
 import org.jfree.layouting.input.style.values.CSSValue;
 
+
 public abstract class OneOfConstantsMapper implements StyleMapper
 {
 
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/draw/TextAreaVerticalAlignMapper.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/draw/TextAreaVerticalAlignMapper.java
index 4a42e58b1ad5..eb3217022f97 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/draw/TextAreaVerticalAlignMapper.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/draw/TextAreaVerticalAlignMapper.java
@@ -27,6 +27,7 @@
 package com.sun.star.report.pentaho.parser.stylemapper.draw;
 
 import com.sun.star.report.pentaho.parser.stylemapper.OneOfConstantsMapper;
+
 import org.jfree.layouting.input.style.keys.box.BoxStyleKeys;
 import org.jfree.layouting.input.style.values.CSSConstant;
 
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/BackgroundColorMapper.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/BackgroundColorMapper.java
index e81d0d126f20..f5f680ce295e 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/BackgroundColorMapper.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/BackgroundColorMapper.java
@@ -27,6 +27,7 @@
 package com.sun.star.report.pentaho.parser.stylemapper.fo;
 
 import com.sun.star.report.pentaho.parser.StyleMapper;
+
 import org.jfree.layouting.input.style.CSSDeclarationRule;
 import org.jfree.layouting.input.style.keys.border.BorderStyleKeys;
 import org.jfree.layouting.input.style.values.CSSColorValue;
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/BorderRightMapper.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/BorderRightMapper.java
index 7dd84ebf21f8..c4769b9f2708 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/BorderRightMapper.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/BorderRightMapper.java
@@ -35,6 +35,7 @@
 package com.sun.star.report.pentaho.parser.stylemapper.fo;
 
 import com.sun.star.report.pentaho.parser.StyleMapper;
+
 import org.jfree.layouting.input.style.CSSDeclarationRule;
 
 /**
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/ColorMapper.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/ColorMapper.java
index e4d595bcf719..6ab7454dbc59 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/ColorMapper.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/ColorMapper.java
@@ -27,6 +27,7 @@
 package com.sun.star.report.pentaho.parser.stylemapper.fo;
 
 import com.sun.star.report.pentaho.parser.StyleMapper;
+
 import org.jfree.layouting.input.style.CSSDeclarationRule;
 import org.jfree.layouting.input.style.keys.color.ColorStyleKeys;
 import org.jfree.layouting.input.style.values.CSSColorValue;
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/FontSizeMapper.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/FontSizeMapper.java
index ecc5e084b459..a28c293feef3 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/FontSizeMapper.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/FontSizeMapper.java
@@ -27,6 +27,7 @@
 package com.sun.star.report.pentaho.parser.stylemapper.fo;
 
 import com.sun.star.report.pentaho.parser.StyleMapper;
+
 import org.jfree.layouting.input.style.CSSDeclarationRule;
 import org.jfree.layouting.input.style.keys.font.FontStyleKeys;
 
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/FontStyleMapper.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/FontStyleMapper.java
index 0003be5618fd..e33a3c437c46 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/FontStyleMapper.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/FontStyleMapper.java
@@ -27,6 +27,7 @@
 package com.sun.star.report.pentaho.parser.stylemapper.fo;
 
 import com.sun.star.report.pentaho.parser.StyleMapper;
+
 import org.jfree.layouting.input.style.CSSDeclarationRule;
 import org.jfree.layouting.input.style.keys.font.FontStyleKeys;
 
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/FontWeightMapper.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/FontWeightMapper.java
index 2a3f4109903d..c611b09cc444 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/FontWeightMapper.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/FontWeightMapper.java
@@ -27,6 +27,7 @@
 package com.sun.star.report.pentaho.parser.stylemapper.fo;
 
 import com.sun.star.report.pentaho.parser.StyleMapper;
+
 import org.jfree.layouting.input.style.CSSDeclarationRule;
 import org.jfree.layouting.input.style.keys.font.FontStyleKeys;
 
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/TextAlignMapper.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/TextAlignMapper.java
index 817dfb956380..2820dc3d83f7 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/TextAlignMapper.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/TextAlignMapper.java
@@ -27,6 +27,7 @@
 package com.sun.star.report.pentaho.parser.stylemapper.fo;
 
 import com.sun.star.report.pentaho.parser.stylemapper.OneOfConstantsMapper;
+
 import org.jfree.layouting.input.style.keys.text.TextAlign;
 import org.jfree.layouting.input.style.keys.text.TextStyleKeys;
 
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/FontFamilyGenericMapper.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/FontFamilyGenericMapper.java
index 4d61bc9ff871..c3159f54e1a3 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/FontFamilyGenericMapper.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/FontFamilyGenericMapper.java
@@ -27,10 +27,11 @@
 package com.sun.star.report.pentaho.parser.stylemapper.style;
 
 import com.sun.star.report.pentaho.parser.StyleMapper;
+
 import org.jfree.layouting.input.style.CSSDeclarationRule;
 import org.jfree.layouting.input.style.keys.font.FontStyleKeys;
-import org.jfree.layouting.input.style.values.CSSStringValue;
 import org.jfree.layouting.input.style.values.CSSStringType;
+import org.jfree.layouting.input.style.values.CSSStringValue;
 import org.jfree.layouting.input.style.values.CSSValue;
 import org.jfree.layouting.input.style.values.CSSValueList;
 
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/FontFamilyMapper.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/FontFamilyMapper.java
index bde78e2ed0bf..808c57523361 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/FontFamilyMapper.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/FontFamilyMapper.java
@@ -27,12 +27,13 @@
 package com.sun.star.report.pentaho.parser.stylemapper.style;
 
 import com.sun.star.report.pentaho.parser.StyleMapper;
+
 import org.jfree.layouting.input.style.CSSDeclarationRule;
-import org.jfree.layouting.input.style.values.CSSStringValue;
+import org.jfree.layouting.input.style.keys.font.FontStyleKeys;
 import org.jfree.layouting.input.style.values.CSSStringType;
+import org.jfree.layouting.input.style.values.CSSStringValue;
 import org.jfree.layouting.input.style.values.CSSValue;
 import org.jfree.layouting.input.style.values.CSSValueList;
-import org.jfree.layouting.input.style.keys.font.FontStyleKeys;
 
 public class FontFamilyMapper implements StyleMapper
 {
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/FontNameMapper.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/FontNameMapper.java
index 2e8ed93c7f3b..8cc6721cffc3 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/FontNameMapper.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/FontNameMapper.java
@@ -27,10 +27,11 @@
 package com.sun.star.report.pentaho.parser.stylemapper.style;
 
 import com.sun.star.report.pentaho.parser.StyleMapper;
+
 import org.jfree.layouting.input.style.CSSDeclarationRule;
-import org.jfree.layouting.input.style.values.CSSStringValue;
-import org.jfree.layouting.input.style.values.CSSStringType;
 import org.jfree.layouting.input.style.keys.font.FontStyleKeys;
+import org.jfree.layouting.input.style.values.CSSStringType;
+import org.jfree.layouting.input.style.values.CSSStringValue;
 
 public class FontNameMapper implements StyleMapper
 {
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/FontPitchMapper.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/FontPitchMapper.java
index 93de4f494104..c7f10d61cb00 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/FontPitchMapper.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/FontPitchMapper.java
@@ -27,6 +27,7 @@
 package com.sun.star.report.pentaho.parser.stylemapper.style;
 
 import com.sun.star.report.pentaho.parser.stylemapper.OneOfConstantsMapper;
+
 import org.jfree.layouting.input.style.keys.font.FontStyleKeys;
 import org.jfree.layouting.input.style.values.CSSConstant;
 
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/FontReliefMapper.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/FontReliefMapper.java
index 8d5070ab59e9..6d4f90c3beda 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/FontReliefMapper.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/FontReliefMapper.java
@@ -27,6 +27,7 @@
 package com.sun.star.report.pentaho.parser.stylemapper.style;
 
 import com.sun.star.report.pentaho.parser.StyleMapper;
+
 import org.jfree.layouting.input.style.CSSDeclarationRule;
 import org.jfree.layouting.input.style.keys.font.FontStyleKeys;
 
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/TextEmphasizeMapper.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/TextEmphasizeMapper.java
index 83f2e576bcea..1ba4c480d58d 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/TextEmphasizeMapper.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/TextEmphasizeMapper.java
@@ -27,6 +27,7 @@
 package com.sun.star.report.pentaho.parser.stylemapper.style;
 
 import com.sun.star.report.pentaho.parser.StyleMapper;
+
 import org.jfree.layouting.input.style.CSSDeclarationRule;
 
 public class TextEmphasizeMapper implements StyleMapper
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/TextUnderlineColorMapper.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/TextUnderlineColorMapper.java
index 091ae5f57286..f247f2c171fc 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/TextUnderlineColorMapper.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/TextUnderlineColorMapper.java
@@ -27,6 +27,7 @@
 package com.sun.star.report.pentaho.parser.stylemapper.style;
 
 import com.sun.star.report.pentaho.parser.StyleMapper;
+
 import org.jfree.layouting.input.style.CSSDeclarationRule;
 import org.jfree.layouting.input.style.keys.text.TextStyleKeys;
 import org.jfree.layouting.input.style.values.CSSColorValue;
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/TextUnderlineStyleMapper.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/TextUnderlineStyleMapper.java
index 16f31d192e92..bfb1f64a8035 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/TextUnderlineStyleMapper.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/TextUnderlineStyleMapper.java
@@ -27,8 +27,9 @@
 package com.sun.star.report.pentaho.parser.stylemapper.style;
 
 import com.sun.star.report.pentaho.parser.stylemapper.OneOfConstantsMapper;
-import org.jfree.layouting.input.style.keys.text.TextStyleKeys;
+
 import org.jfree.layouting.input.style.keys.text.TextDecorationStyle;
+import org.jfree.layouting.input.style.keys.text.TextStyleKeys;
 
 public class TextUnderlineStyleMapper extends OneOfConstantsMapper
 {
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/TextUnderlineWidthMapper.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/TextUnderlineWidthMapper.java
index 92846ba947e8..63628b9ed60d 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/TextUnderlineWidthMapper.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/TextUnderlineWidthMapper.java
@@ -27,6 +27,7 @@
 package com.sun.star.report.pentaho.parser.stylemapper.style;
 
 import com.sun.star.report.pentaho.parser.stylemapper.OneOfConstantsMapper;
+
 import org.jfree.layouting.input.style.CSSDeclarationRule;
 import org.jfree.layouting.input.style.keys.border.BorderWidth;
 import org.jfree.layouting.input.style.keys.text.TextDecorationWidth;
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/TextUnderlineWordMode.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/TextUnderlineWordMode.java
index f11dc31a3c37..9cc2a62c157e 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/TextUnderlineWordMode.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/TextUnderlineWordMode.java
@@ -27,6 +27,7 @@
 package com.sun.star.report.pentaho.parser.stylemapper.style;
 
 import com.sun.star.report.pentaho.parser.stylemapper.OneOfConstantsMapper;
+
 import org.jfree.layouting.input.style.keys.text.TextDecorationMode;
 import org.jfree.layouting.input.style.keys.text.TextStyleKeys;
 
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/VerticalAlignMapper.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/VerticalAlignMapper.java
index aff90e41ee11..9994a1413b4f 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/VerticalAlignMapper.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/VerticalAlignMapper.java
@@ -27,6 +27,7 @@
 package com.sun.star.report.pentaho.parser.stylemapper.style;
 
 import com.sun.star.report.pentaho.parser.stylemapper.OneOfConstantsMapper;
+
 import org.jfree.layouting.input.style.keys.line.LineStyleKeys;
 import org.jfree.layouting.input.style.values.CSSAutoValue;
 import org.jfree.layouting.input.style.values.CSSConstant;
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/table/ColumnWidthMapper.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/table/ColumnWidthMapper.java
index 6f53d9a49733..89c5769f15a6 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/table/ColumnWidthMapper.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/table/ColumnWidthMapper.java
@@ -27,6 +27,7 @@
 package com.sun.star.report.pentaho.parser.stylemapper.table;
 
 import com.sun.star.report.pentaho.parser.StyleMapper;
+
 import org.jfree.layouting.input.style.CSSDeclarationRule;
 import org.jfree.layouting.input.style.keys.box.BoxStyleKeys;
 
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/table/RowHeightMapper.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/table/RowHeightMapper.java
index c1aeb5f9494e..5d94f4101059 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/table/RowHeightMapper.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/table/RowHeightMapper.java
@@ -27,6 +27,7 @@
 package com.sun.star.report.pentaho.parser.stylemapper.table;
 
 import com.sun.star.report.pentaho.parser.StyleMapper;
+
 import org.jfree.layouting.input.style.CSSDeclarationRule;
 import org.jfree.layouting.input.style.keys.box.BoxStyleKeys;
 
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/table/CoveredCellReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/table/CoveredCellReadHandler.java
index 8a9ca1077485..34158230c3c1 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/table/CoveredCellReadHandler.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/table/CoveredCellReadHandler.java
@@ -27,6 +27,7 @@
 package com.sun.star.report.pentaho.parser.table;
 
 import com.sun.star.report.pentaho.parser.ElementReadHandler;
+
 import org.jfree.report.structure.Element;
 import org.jfree.report.structure.Section;
 
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/table/TableColumnReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/table/TableColumnReadHandler.java
index 491ea24697cd..4b8bc8498d91 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/table/TableColumnReadHandler.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/table/TableColumnReadHandler.java
@@ -26,10 +26,11 @@
  ************************************************************************/
 package com.sun.star.report.pentaho.parser.table;
 
-import org.jfree.report.structure.Section;
-import org.jfree.report.structure.Element;
 import com.sun.star.report.pentaho.parser.ElementReadHandler;
 
+import org.jfree.report.structure.Element;
+import org.jfree.report.structure.Section;
+
 /**
  * Creation-Date: 03.07.2006, 14:26:55
  *
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/table/TableColumnsReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/table/TableColumnsReadHandler.java
index 7de47122e4ef..d1c23bb63957 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/table/TableColumnsReadHandler.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/table/TableColumnsReadHandler.java
@@ -26,17 +26,21 @@
  ************************************************************************/
 package com.sun.star.report.pentaho.parser.table;
 
+import com.sun.star.report.OfficeToken;
+import com.sun.star.report.pentaho.OfficeNamespaces;
+import com.sun.star.report.pentaho.parser.ElementReadHandler;
+
 import java.util.ArrayList;
+import java.util.List;
 
-import org.jfree.report.structure.Section;
 import org.jfree.report.structure.Element;
+import org.jfree.report.structure.Section;
+
 import org.pentaho.reporting.libraries.xmlns.parser.XmlReadHandler;
+
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
-import com.sun.star.report.pentaho.parser.ElementReadHandler;
-import com.sun.star.report.pentaho.OfficeNamespaces;
-import com.sun.star.report.OfficeToken;
-import java.util.List;
+
 
 /**
  * Creation-Date: 03.07.2006, 13:50:41
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/table/TableReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/table/TableReadHandler.java
index 00b858755338..2eb20bdc96ac 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/table/TableReadHandler.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/table/TableReadHandler.java
@@ -26,20 +26,24 @@
  ************************************************************************/
 package com.sun.star.report.pentaho.parser.table;
 
-import java.util.ArrayList;
-
-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.OfficeTableSection;
 import com.sun.star.report.pentaho.parser.ElementReadHandler;
 import com.sun.star.report.pentaho.parser.rpt.ConditionalPrintExpressionReadHandler;
+
+import java.util.ArrayList;
 import java.util.List;
+
 import org.jfree.report.structure.Element;
 import org.jfree.report.structure.Section;
+
 import org.pentaho.reporting.libraries.xmlns.parser.XmlReadHandler;
+
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
 
+
 /**
  * Creation-Date: 03.07.2006, 13:47:47
  *
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/table/TableRowReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/table/TableRowReadHandler.java
index c62511958de5..d86410140103 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/table/TableRowReadHandler.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/table/TableRowReadHandler.java
@@ -26,17 +26,21 @@
  ************************************************************************/
 package com.sun.star.report.pentaho.parser.table;
 
+import com.sun.star.report.OfficeToken;
+import com.sun.star.report.pentaho.OfficeNamespaces;
+import com.sun.star.report.pentaho.parser.ElementReadHandler;
+
 import java.util.ArrayList;
+import java.util.List;
 
-import org.jfree.report.structure.Section;
 import org.jfree.report.structure.Element;
+import org.jfree.report.structure.Section;
+
 import org.pentaho.reporting.libraries.xmlns.parser.XmlReadHandler;
+
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
-import com.sun.star.report.pentaho.parser.ElementReadHandler;
-import com.sun.star.report.pentaho.OfficeNamespaces;
-import com.sun.star.report.OfficeToken;
-import java.util.List;
+
 
 /**
  * Creation-Date: 03.07.2006, 13:51:47
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/table/TableRowsReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/table/TableRowsReadHandler.java
index 1e5750a2a0da..00a61ffb8573 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/table/TableRowsReadHandler.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/table/TableRowsReadHandler.java
@@ -26,17 +26,21 @@
  ************************************************************************/
 package com.sun.star.report.pentaho.parser.table;
 
+import com.sun.star.report.OfficeToken;
+import com.sun.star.report.pentaho.OfficeNamespaces;
+import com.sun.star.report.pentaho.parser.ElementReadHandler;
+
 import java.util.ArrayList;
+import java.util.List;
 
-import org.jfree.report.structure.Section;
 import org.jfree.report.structure.Element;
+import org.jfree.report.structure.Section;
+
 import org.pentaho.reporting.libraries.xmlns.parser.XmlReadHandler;
+
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
-import com.sun.star.report.pentaho.parser.ElementReadHandler;
-import com.sun.star.report.pentaho.OfficeNamespaces;
-import com.sun.star.report.OfficeToken;
-import java.util.List;
+
 
 /**
  *
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/text/NoCDATATextContentReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/text/NoCDATATextContentReadHandler.java
index dc2eee157b7d..95ba86623639 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/text/NoCDATATextContentReadHandler.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/text/NoCDATATextContentReadHandler.java
@@ -3,23 +3,27 @@
  */
 package com.sun.star.report.pentaho.parser.text;
 
-import java.util.ArrayList;
-
+import com.sun.star.report.OfficeToken;
+import com.sun.star.report.pentaho.OfficeNamespaces;
 import com.sun.star.report.pentaho.parser.ElementReadHandler;
 import com.sun.star.report.pentaho.parser.rpt.FixedContentReadHandler;
 import com.sun.star.report.pentaho.parser.rpt.FormattedTextReadHandler;
 import com.sun.star.report.pentaho.parser.rpt.ImageReadHandler;
-import com.sun.star.report.pentaho.OfficeNamespaces;
-import com.sun.star.report.OfficeToken;
 import com.sun.star.report.pentaho.parser.rpt.SubDocumentReadHandler;
+
+import java.util.ArrayList;
 import java.util.List;
-import org.jfree.report.structure.Section;
+
 import org.jfree.report.structure.Element;
+import org.jfree.report.structure.Section;
 import org.jfree.report.structure.StaticText;
+
 import org.pentaho.reporting.libraries.xmlns.parser.XmlReadHandler;
+
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
 
+
 /**
  * This is a generic implementation that accepts all input and adds special
  * handlers for the report-elements.
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/text/TextContentReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/text/TextContentReadHandler.java
index 98303dffe6db..ae0c29f13d3c 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/text/TextContentReadHandler.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/text/TextContentReadHandler.java
@@ -28,6 +28,7 @@ package com.sun.star.report.pentaho.parser.text;
 
 import org.jfree.report.structure.Section;
 import org.jfree.report.structure.StaticText;
+
 import org.xml.sax.SAXException;
 
 /**
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/xlink/XLinkReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/xlink/XLinkReadHandler.java
index a11d0c30e812..54a6cae8eaaa 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/xlink/XLinkReadHandler.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/xlink/XLinkReadHandler.java
@@ -27,7 +27,9 @@
 package com.sun.star.report.pentaho.parser.xlink;
 
 import com.sun.star.report.pentaho.OfficeNamespaces;
+
 import org.pentaho.reporting.libraries.xmlns.parser.AbstractXmlReadHandler;
+
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
 
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMapper.java b/reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMapper.java
index eaf2b24043ee..cee02bae0430 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMapper.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMapper.java
@@ -27,12 +27,13 @@
 package com.sun.star.report.pentaho.styles;
 
 import java.util.HashMap;
-
 import java.util.Map;
+
 import org.pentaho.reporting.libraries.resourceloader.Resource;
 import org.pentaho.reporting.libraries.resourceloader.ResourceException;
 import org.pentaho.reporting.libraries.resourceloader.ResourceManager;
 
+
 /**
  * The style-mapper holds all information about the OpenOffice style mapping
  * mechanism. OpenOffice references styles by their name and context, a style
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMapperXmlResourceFactory.java b/reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMapperXmlResourceFactory.java
index 48baade4ebc0..3fecbbfc882e 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMapperXmlResourceFactory.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMapperXmlResourceFactory.java
@@ -26,9 +26,10 @@
  ************************************************************************/
 package com.sun.star.report.pentaho.styles;
 
-import org.pentaho.reporting.libraries.xmlns.parser.AbstractXmlResourceFactory;
 import org.jfree.report.JFreeReportBoot;
+
 import org.pentaho.reporting.libraries.base.config.Configuration;
+import org.pentaho.reporting.libraries.xmlns.parser.AbstractXmlResourceFactory;
 
 /**
  * Todo: Document me!
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMappingDocumentReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMappingDocumentReadHandler.java
index 07491b3fa4e3..b0acf047df7f 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMappingDocumentReadHandler.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMappingDocumentReadHandler.java
@@ -27,12 +27,14 @@
 package com.sun.star.report.pentaho.styles;
 
 import java.util.ArrayList;
-
 import java.util.List;
+
 import org.pentaho.reporting.libraries.xmlns.parser.AbstractXmlReadHandler;
 import org.pentaho.reporting.libraries.xmlns.parser.XmlReadHandler;
-import org.xml.sax.SAXException;
+
 import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+
 
 /**
  * Todo: Document me!
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMappingReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMappingReadHandler.java
index a6acb33e14e4..1ec2dc111cb0 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMappingReadHandler.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMappingReadHandler.java
@@ -28,6 +28,7 @@ package com.sun.star.report.pentaho.styles;
 
 import org.pentaho.reporting.libraries.xmlns.parser.AbstractXmlReadHandler;
 import org.pentaho.reporting.libraries.xmlns.parser.ParseException;
+
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
 
diff --git a/reportbuilder/java/com/sun/star/report/util/DefaultJobProperties.java b/reportbuilder/java/com/sun/star/report/util/DefaultJobProperties.java
index cbebe708ee65..050ad47615cd 100644
--- a/reportbuilder/java/com/sun/star/report/util/DefaultJobProperties.java
+++ b/reportbuilder/java/com/sun/star/report/util/DefaultJobProperties.java
@@ -26,13 +26,14 @@
  ************************************************************************/
 package com.sun.star.report.util;
 
-import java.util.HashMap;
-
+import com.sun.star.report.JobDefinitionException;
 import com.sun.star.report.JobProperties;
 import com.sun.star.report.ReportEngineMetaData;
-import com.sun.star.report.JobDefinitionException;
+
+import java.util.HashMap;
 import java.util.Map;
 
+
 public class DefaultJobProperties implements JobProperties
 {
 
diff --git a/reportbuilder/java/com/sun/star/report/util/DefaultParameterMap.java b/reportbuilder/java/com/sun/star/report/util/DefaultParameterMap.java
index 917e022d53af..0fdda8f21d61 100644
--- a/reportbuilder/java/com/sun/star/report/util/DefaultParameterMap.java
+++ b/reportbuilder/java/com/sun/star/report/util/DefaultParameterMap.java
@@ -26,11 +26,12 @@
  ************************************************************************/
 package com.sun.star.report.util;
 
-import java.util.HashMap;
-
 import com.sun.star.report.ParameterMap;
+
+import java.util.HashMap;
 import java.util.Map;
 
+
 public class DefaultParameterMap implements ParameterMap
 {
 
diff --git a/reportbuilder/java/com/sun/star/report/util/ManifestWriter.java b/reportbuilder/java/com/sun/star/report/util/ManifestWriter.java
index b69ceb001409..f1b6f7a56ab3 100644
--- a/reportbuilder/java/com/sun/star/report/util/ManifestWriter.java
+++ b/reportbuilder/java/com/sun/star/report/util/ManifestWriter.java
@@ -26,19 +26,23 @@
  ************************************************************************/
 package com.sun.star.report.util;
 
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Iterator;
-import java.io.OutputStreamWriter;
+import com.sun.star.report.OutputRepository;
+
 import java.io.IOException;
 import java.io.OutputStream;
+import java.io.OutputStreamWriter;
 
-import org.pentaho.reporting.libraries.xmlns.writer.XmlWriterSupport;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+import org.jfree.report.JFreeReportBoot;
+
+import org.pentaho.reporting.libraries.xmlns.common.AttributeList;
 import org.pentaho.reporting.libraries.xmlns.writer.DefaultTagDescription;
 import org.pentaho.reporting.libraries.xmlns.writer.XmlWriter;
-import org.pentaho.reporting.libraries.xmlns.common.AttributeList;
-import org.jfree.report.JFreeReportBoot;
-import com.sun.star.report.OutputRepository;
+import org.pentaho.reporting.libraries.xmlns.writer.XmlWriterSupport;
+
 
 /**
  * Creation-Date: 24.07.2007, 18:16:52
diff --git a/reportbuilder/java/jfreereport.properties b/reportbuilder/java/jfreereport.properties
index 2548cb110089..d06a2dc28885 100644
--- a/reportbuilder/java/jfreereport.properties
+++ b/reportbuilder/java/jfreereport.properties
@@ -24,6 +24,7 @@
 # for a copy of the LGPLv3 License.
 #
 #*************************************************************************
+# x-no-translate
 
 org.jfree.report.modules.sun.report.Module=com.sun.star.report.pentaho.StarReportModule
 
diff --git a/reportbuilder/java/libformula.properties b/reportbuilder/java/libformula.properties
index c9a7d35d1afe..894a95b10b2a 100644
--- a/reportbuilder/java/libformula.properties
+++ b/reportbuilder/java/libformula.properties
@@ -24,6 +24,7 @@
 # for a copy of the LGPLv3 License.
 #
 #*************************************************************************
+# x-no-translate
 
 ##
 # Any configuration will happen here.
diff --git a/reportbuilder/java/loader.properties b/reportbuilder/java/loader.properties
index fc5926371eaf..d51a30de1a2c 100644
--- a/reportbuilder/java/loader.properties
+++ b/reportbuilder/java/loader.properties
@@ -24,6 +24,7 @@
 # for a copy of the LGPLv3 License.
 #
 #*************************************************************************
+# x-no-translate
 
 org.pentaho.reporting.libraries.resourceloader.factory.type.com.sun.star.report.pentaho.model.OfficeDocument=com.sun.star.report.pentaho.parser.OfficeDocumentXmlResourceFactory
 org.pentaho.reporting.libraries.resourceloader.factory.type.com.sun.star.report.pentaho.model.OfficeStylesCollection=com.sun.star.report.pentaho.parser.OfficeStylesXmlResourceFactory
diff --git a/reportbuilder/license/readme_en-US.html b/reportbuilder/license/readme_en-US.html
index c9fa84bf663b..ec35388c3250 100644
--- a/reportbuilder/license/readme_en-US.html
+++ b/reportbuilder/license/readme_en-US.html
@@ -1,147 +1,30 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-<HEAD>
-	<META HTTP-EQUIV="CONTENT-TYPE" CONTENT="text/html; charset=iso-8859-1">
-	<TITLE>Sun&trade; Report Builder</TITLE>
-	<META NAME="GENERATOR" CONTENT="StarOffice 8  (Solaris Sparc)">
-	<META NAME="CREATED" CONTENT="20070207;14293857">
-	<META NAME="CHANGEDBY" CONTENT="ufi">
-	<META NAME="CHANGED" CONTENT="20070814;14045700">
-	<META NAME="CHANGEDBY" CONTENT="ufi">
-	<META NAME="CHANGEDBY" CONTENT="ufi">
-	<META NAME="CHANGEDBY" CONTENT="UFI">
-	<STYLE TYPE="text/css">
-	<!--
-		H4 { margin-bottom: 0.07in; font-family: "Bitstream Vera Sans", "Arial", "Helvetica", "Lucida", "Geneva", "Helmet", sans-serif, "Andale Sans UI", "Arial Unicode MS", "Lucida Sans Unicode", "Tahoma"; font-size: 10pt }
-	-->
-	</STYLE>
-</HEAD>
-<BODY LANG="en-US" DIR="LTR">
-<H1>Sun&trade; Report Builder</H1>
-<P>This file contains important information about the installation.</P>
-<P>This software offered by Sun Microsystems, Inc. will enhance
-StarOffice(TM) 8, StarSuite(TM) 8, and OpenOffice.org 2.3 software.
-The following features will be added:</P>
-<UL>
-	<LI><P>In a Base database document, in the Reports window, you now
-	have an additional choice to &quot;Create Report in Design View&quot;.</P>
-	<LI><P>An interactive window allows you to create a database report
-	by drag-and-drop, with visual feedback.</P>
-	<LI><P>All reports created by Report Builder can also be edited in
-	the Report Builder window. 
-	</P>
-</UL>
-<P>You find more information about installation and usage of the
-plugin in the following paragraphs of this readme file. 
-</P>
-<H2>Notes on Installation</H2>
-<H3>System Requirements</H3>
-<UL TYPE=CIRCLE>
-	<LI><P STYLE="margin-bottom: 0in">Microsoft Windows 98, ME, 2000
-	(Service Pack 2 or higher), XP, Vista</P>
-	<LI><P STYLE="margin-bottom: 0in">A recent version of Java(TM)
-	Runtime Environment</P>
-	<LI><P STYLE="margin-bottom: 0in">A recent version of StarOffice(TM)
-	8, StarSuite(TM) 8, or OpenOffice.org 2.3</P>
-	<LI><P STYLE="margin-bottom: 0in">256 MB RAM (512 MB RAM
-	recommended) 
-	</P>
-	<LI><P STYLE="margin-bottom: 0in">5 MB available hard disk space 
-	</P>
-</UL>
-<H3>Installing</H3>
-<P>Installing Sun&trade; Report Builder adds additional functionality
-to an installed version of StarOffice, StarSuite, or OpenOffice.org.</P>
-<UL>
-	<LI><P>You need administrator rights to install a shared extension
-	for all users on your network. You do not need administrator rights
-	to install a user extension for your own use only.</P>
-</UL>
-<H3>To install a user extension</H3>
-<UL>
-	<LI><P>Double-click the <FONT FACE="Bitstream Vera Sans Mono, Cumberland, Courier New, Courier, Lucida Sans Typewriter, Lucida Typewriter, Monaco, Monospaced">sun-report-builder.oxt</FONT>
-	file in your system's file browser</P>
-	<P>or</P>
-	<LI><P>Choose <B>Tools - Extension Manager</B>, select <B>My
-	Extensions</B> and click <B>Add</B>.</P>
-</UL>
-<H3>To install a shared extension with UI</H3>
-<P>There are two ways of installing a shared extension with a
-graphical user interface:</P>
-<H4>From the Command Line</H4>
-<OL>
-	<LI><P>Open a terminal or command shell.</P>
-	<LI><P STYLE="margin-top: 0.02in; margin-bottom: 0in">Change to the
-	StarOffice/program directory. (Replace StarOffice by StarSuite or
-	OpenOffice.org as applicable)</P>
-	<LI><P>Terminate <B>any running instances</B> of StarOffice and the
-	Quickstarter, if this happens to be running.</P>
-	<LI><P>Enter the following command:</P>
-	<P STYLE="margin-top: 0.01in; margin-bottom: 0.01in"><FONT FACE="Bitstream Vera Sans Mono, Cumberland, Courier New, Courier, Lucida Sans Typewriter, Lucida Typewriter, Monaco, Monospaced">unopkg
-	gui</FONT> 
-	</P>
-	<P>The Extension Manager starts with a graphical user interface. 
-	</P>
-	<LI><P>Click the <B>StarOffice Extensions</B> entry and click Add.</P>
-</OL>
-<H4>From Within StarOffice</H4>
-<UL>
-	<LI><P>Choose <B>Tools - Extension Manager</B>, select <B>StarOffice
-	Extensions</B> and click <B>Add</B>.</P>
-</UL>
-<H3>To install a shared extension in text mode</H3>
-<OL>
-	<LI><P>Open a terminal or command shell.</P>
-	<LI><P STYLE="margin-top: 0.02in; margin-bottom: 0in">Change to the
-	StarOffice/program directory.</P>
-	<LI><P>Enter the following command, using the path and file name of
-	your extension:</P>
-	<P STYLE="margin-top: 0.01in; margin-bottom: 0.01in"><FONT FACE="Bitstream Vera Sans Mono, Cumberland, Courier New, Courier, Lucida Sans Typewriter, Lucida Typewriter, Monaco, Monospaced">unopkg
-	add --shared (path/)sun-report-builder.oxt</FONT> 
-	</P>
-</OL>
-<P STYLE="margin-top: 0.01in; margin-bottom: 0.01in">You need write
-access to the StarOffice installation directory to be able to install
-a <B>shared</B> extension. The extension manager will disable shared
-extension installation if you have no write access to the directory.</P>
-<P STYLE="margin-top: 0.01in; margin-bottom: 0.01in">All running
-instances of StarOffice need to be terminated for a successful
-installation of a <B>shared</B> extension.</P>
-<H3>Uninstalling</H3>
-<P>Open Extension Manager, click the Sun&trade; Report Builder entry,
-then click Remove.</P>
-<H2>Using the Plugin</H2>
-<UL>
-	<LI><P>You find complete instructions on using the Sun Report
-	Builder in the application help that is installed with a recent
-	version of StarOffice, StarSuite, or OpenOffice.org. Press F1 to
-	open the Help Viewer, then enter the words Report Builder in the
-	Index text box.</P>
-</UL>
-<H2>Support and Feedback</H2>
-<P>Product support for end users for the Sun&trade; Report Builder is
-available by Sun Micosystems, Inc. 
-</P>
-<P>We appreciate feedback or questions about the plugin but cannot
-guarantee a response to every email.</P>
-<P>We hope you enjoy using the new Sun&trade; Report Builder.</P>
-<H2>Legal Disclaimers</H2>
-<PRE>Copyright &copy; 2007 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, California 95054, U.S.A. All rights reserved.
-
-U.S. Government Rights - Commercial software.  Government users are subject to the Sun Microsystems, Inc. standard license agreement and applicable provisions of the FAR and its supplements.  
-
-Use is subject to license terms.  
-
-This distribution may include materials developed by third parties.
-Sun, Sun Microsystems and the Sun logo are trademarks or registered trademarks of Sun Microsystems, Inc. in the U.S. and other countries.
-
-This product is covered and controlled by U.S. Export Control laws and may be subject to the export or import laws in other countries.  Nuclear, missile, chemical biological weapons or nuclear maritime end uses or end users, whether direct or indirect, are strictly prohibited.  Export or reexport to countries subject to U.S. embargo or to entities identified on U.S. export exclusion lists, including, but not limited to, the denied persons and specially designated nationals lists is strictly prohibited.
-
-
-Copyright &copy; 2007 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, California 95054, Etats-Unis. Tous droits r&eacute;serv&eacute;s.
-L'utilisation est soumise aux termes de la Licence.
-Cette distribution peut comprendre des composants d&eacute;velopp&eacute;s par des tierces parties.
-Sun, Sun Microsystems et le logo Sun sont des marques de fabrique ou des marques d&eacute;pos&eacute;es de Sun Microsystems, Inc. aux Etats-Unis et dans d'autres pays.
-Ce produit est soumis &agrave; la l&eacute;gislation am&eacute;ricaine en mati&egrave;re de contr&ocirc;le des exportations et peut &ecirc;tre soumis &agrave; la r&egrave;glementation en vigueur dans d'autres pays dans le domaine des exportations et importations. Les utilisations, ou utilisateurs finaux, pour des armes nucl&eacute;aires,des missiles, des armes biologiques et chimiques ou du nucl&eacute;aire maritime, directement ou indirectement, sont strictement interdites. Les exportations ou r&eacute;exportations vers les pays sous embargo am&eacute;ricain, ou vers des entit&eacute;s figurant sur les listes d'exclusion d'exportation am&eacute;ricaines, y compris, mais de mani&egrave;re non exhaustive, la liste de personnes qui font objet d'un ordre de ne pas participer, d'une fa&ccedil;on directe ou indirecte, aux exportations des produits ou des services qui sont r&eacute;gis  par la l&eacute;gislation am&eacute;ricaine en mati&egrave;re de contr&ocirc;le des exportations et la liste de ressortissants sp&eacute;cifiquement d&eacute;sign&eacute;s, sont rigoureusement interdites.</PRE>
-</BODY>
-</HTML>
-\ No newline at end of file
+<html>
+	<head>
+		<title>Oracle Report Builder</title>
+	</head>
+	<body>	
+	<h1>Oracle Report Builder</h1>
+	<p>This file contains important information about the installation.</p>
+	<p>This software offered by Oracle will enhance Oracle Open Office and OpenOffice.org software. The following features will be added:</p>
+	<ul>
+		<li><p>In a Base database document, in the Reports window, you now have an additional choice to &quot;Create Report in Design View&quot;.</p></li>
+		<li><p>An interactive window allows you to create a database report	by drag-and-drop, with visual feedback.</p></li>
+		<li><p>All reports created by Report Builder can also be edited in the Report Builder window. </p></li>
+		</ul>
+		<p>You find more information about installation and usage of the extension in the following paragraphs of this readme file.</p>
+		<h2>Notes on Installation</h2>
+		<h3>System Requirements</h3>
+		<ul>
+			<li><p>A recent version of Oracle Open Office or OpenOffice.org</p></li>
+			<li><p>A recent version of the Java(TM) 	Runtime Environment</p></li>
+		</ul>
+		<h3>Installing</h3>
+			<p>You need administrator rights to install a shared extension	for all users on your network. You do not need administrator rights	to install a user extension for your own use only.</p>
+			<p>Double-click the extension file (*.oxt) in your system's file browser or choose <b>Tools &gt; Extension Manager</b>and click <B>Add</B>.</P>
+		<h3>Uninstalling</h3>
+		<p>Choose Tools &gt; Extension Manager, click the Oracle Report Builder entry, then click Remove.</P>
+		<h2>Using the Extension</h2>
+		<p>You find complete instructions on using the Oracle Report Builder in the application help that is installed with Oracle Open Office or OpenOffice.org. Press F1 to open the Help Viewer, then enter the words "Report Builder" in the	Index text box.</p>
+		<p>Copyright &copy; 2007, 2010 Oracle and/or its affiliates. All rights reserved.</p>
+</body>
+</html>
+\ No newline at end of file
diff --git a/reportbuilder/license/readme_en-US.txt b/reportbuilder/license/readme_en-US.txt
index 8c8d14397b1c..bd9eb48567af 100644
--- a/reportbuilder/license/readme_en-US.txt
+++ b/reportbuilder/license/readme_en-US.txt
@@ -1,87 +1,34 @@
-Sun(TM) Report Builder
-
+Oracle Report Builder
+=====================
 This file contains important information about the installation.
 
-This software offered by Sun Microsystems, Inc. will enhance StarOffice(TM) 8, StarSuite(TM) 8, and OpenOffice.org 2.3 software. The following features will be added:
-
-- In a Base database document, in the Reports window, you now have an additional choice to "Create Report in Design View".
-- An interactive window allows you to create a database report by drag-and-drop, with visual feedback.
-- All reports created by Report Builder can also be edited in the Report Builder window. 
-
-You find more information about installation and usage of the plugin in the following paragraphs of this readme file. 
+This software offered by Oracle will enhance Oracle Open Office and OpenOffice.org software. The following features will be added:
+* In a Base database document, in the Reports window, you now have an additional choice to "Create Report in Design View".
+* An interactive window allows you to create a database report	by drag-and-drop, with visual feedback.
+* All reports created by Report Builder can also be edited in the Report Builder window. 
+		
+You find more information about installation and usage of the extension in the following paragraphs of this readme file.
 
 Notes on Installation
-
+---------------------
+		
 System Requirements
 
-Microsoft Windows 98, ME, 2000 (Service Pack 2 or higher), XP, Vista
-- A recent version of Java(TM) Runtime Environment
-- A recent version of StarOffice(TM) 8, StarSuite(TM) 8, or OpenOffice.org 2.3
-- 256 MB RAM (512 MB RAM recommended) 
-- 5 MB available hard disk space 
-
+* A recent version of Oracle Open Office or OpenOffice.org
+* A recent version of the Java(TM) Runtime Environment
+		
 Installing
 
-Installing Sun(TM) Report Builder adds additional functionality to an installed version of StarOffice, StarSuite, or OpenOffice.org.
-You need administrator rights to install a shared extension for all users on your network. You do not need administrator rights to install a user extension for your own use only.
-
-To install a user extension
-
-Double-click the sun-report-builder.oxt file in your system's file browser
-or
-Choose Tools - Extension Manager, select My Extensions and click Add.
-
-To install a shared extension with UI
-
-There are two ways of installing a shared extension with a graphical user interface:
-From the Command Line
-1. Open a terminal or command shell.
-2. Change to the StarOffice/program directory. (Replace StarOffice by StarSuite or OpenOffice.org as applicable)
-3. Terminate any running instances of StarOffice and the Quickstarter, if this happens to be running.
-4. Enter the following command:
-unopkg gui 
-The Extension Manager starts with a graphical user interface. 
-5. Click the StarOffice Extensions entry and click Add.
-From Within StarOffice
-Choose Tools - Extension Manager, select StarOffice Extensions and click Add.
-To install a shared extension in text mode
-1. Open a terminal or command shell.
-2. Change to the StarOffice/program directory.
-3. Enter the following command, using the path and file name of your extension:
-unopkg add --shared (path/)sun-report-builder.oxt 
-You need write access to the StarOffice installation directory to be able to install a shared extension. The extension manager will disable shared extension installation if you have no write access to the directory.
-All running instances of StarOffice need to be terminated for a successful installation of a shared extension.
+You need administrator rights to install a shared extension for all users on your network. You do not need administrator rights	to install a user extension for your own use only.
+* Double-click the extension file (*.oxt) in your system's file browser or choose Tools > Extension Manager and click Add.
 
 Uninstalling
+	
+* Choose Tools > Extension Manager, click the Oracle Report Builder entry, then click Remove.
 
-Open Extension Manager, click the Sun? Report Builder entry, then click Remove.
-
-Using the Plugin
-
-You find complete instructions on using the Sun Report Builder in the application help that is installed with a recent version of StarOffice, StarSuite, or OpenOffice.org. Press F1 to open the Help Viewer, then enter the words Report Builder in the Index text box.
-
-Support and Feedback
-
-Product support for end users for the Sun? Report Builder is available by Sun Micosystems, Inc. 
-We appreciate feedback or questions about the plugin but cannot guarantee a response to every email.
-We hope you enjoy using the new Sun? Report Builder.
-
-Legal Disclaimers
-
-Copyright � 2007 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, California 95054, U.S.A. All rights reserved.
-
-U.S. Government Rights - Commercial software.  Government users are subject to the Sun Microsystems, Inc. standard license agreement and applicable provisions of the FAR and its supplements.  
-
-Use is subject to license terms.  
-
-This distribution may include materials developed by third parties.
-Sun, Sun Microsystems and the Sun logo are trademarks or registered trademarks of Sun Microsystems, Inc. in the U.S. and other countries.
-
-This product is covered and controlled by U.S. Export Control laws and may be subject to the export or import laws in other countries.  Nuclear, missile, chemical biological weapons or nuclear maritime end uses or end users, whether direct or indirect, are strictly prohibited.  Export or reexport to countries subject to U.S. embargo or to entities identified on U.S. export exclusion lists, including, but not limited to, the denied persons and specially designated nationals lists is strictly prohibited.
+Using the Extension
 
+You find complete instructions on using the Oracle Report Builder in the application help that is installed with Oracle Open Office or OpenOffice.org. Press F1 to open the Help Viewer, then enter the words "Report Builder" in the	Index text box.
 
-Copyright � 2007 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, California 95054, Etats-Unis. Tous droits r�serv�s.
-L'utilisation est soumise aux termes de la Licence.
-Cette distribution peut comprendre des composants d�velopp�s par des tierces parties.
-Sun, Sun Microsystems et le logo Sun sont des marques de fabrique ou des marques d�pos�es de Sun Microsystems, Inc. aux Etats-Unis et dans d'autres pays.
-Ce produit est soumis � la l�gislation am�ricaine en mati�re de contr�le des exportations et peut �tre soumis � la r�glementation en vigueur dans d'autres pays dans le domaine des exportations et importations. Les utilisations, ou utilisateurs finaux, pour des armes nucl�aires,des missiles, des armes biologiques et chimiques ou du nucl�aire maritime, directement ou indirectement, sont strictement interdites. Les exportations ou r�exportations vers les pays sous embargo am�ricain, ou vers des entit�s figurant sur les listes d'exclusion d'exportation am�ricaines, y compris, mais de mani�re non exhaustive, la liste de personnes qui font objet d'un ordre de ne pas participer, d'une fa�on directe ou indirecte, aux exportations des produits ou des services qui sont r�gis  par la l�gislation am�ricaine en mati�re de contr�le des exportations et la liste de ressortissants sp�cifiquement d�sign�s, sont rigoureusement interdites.
-\ No newline at end of file
+------------------------------------------------------------------------------
+Copyright (c) 2007, 2010 Oracle and/or its affiliates. All rights reserved.
+\ No newline at end of file
diff --git a/reportbuilder/registry/data/org/openoffice/Setup.xcu b/reportbuilder/registry/data/org/openoffice/Setup.xcu
index 86913d0eb5b8..decb19e514ce 100644
--- a/reportbuilder/registry/data/org/openoffice/Setup.xcu
+++ b/reportbuilder/registry/data/org/openoffice/Setup.xcu
@@ -45,7 +45,7 @@
                     <value >GenericCategories</value>
                 </prop>
         <prop oor:name="ooSetupFactoryUIName">
-            <value xml:lang="en-US">Base: Sun Report Builder</value>
+            <value>Base: Sun Report Builder</value>
         </prop>
             </node>
     </node>
author	Mathias Bauer <mba@openoffice.org>	2010-07-13 14:38:37 +0200
committer	Mathias Bauer <mba@openoffice.org>	2010-07-13 14:38:37 +0200
commit	9a619eddb5832f7afe94955b3bc051a82de10fa2 (patch)
tree	2e9581ce5629ae4c9c577d44927d51084d717478 /reportbuilder
parent	68c7f8fae5659753748eead42d12ed64db84702e (diff)
parent	9a1826777ad9e79663a5e942f3bee1d85619b79e (diff)