[Libreoffice-commits] core.git: connectivity/source dbaccess/source reportbuilder/Configuration_reportbuilder.mk reportbuilder/Extension_reportbuilder.mk reportbuilder/Jar_reportbuilder.mk reportbuilder/java reportbuilder/registry reportbuilder/util reportdesign/source Repository.mk wizards/com

Mon Mar 11 01:57:03 PDT 2013

Repository.mk                                                                                                     |    2 
 connectivity/source/commontools/dbtools2.cxx                                                                      |    4 
 dbaccess/source/core/dataaccess/documentdefinition.cxx                                                            |    2 
 dbaccess/source/ui/app/AppController.cxx                                                                          |    2 
 reportbuilder/Configuration_reportbuilder.mk                                                                      |   10 
 reportbuilder/Extension_reportbuilder.mk                                                                          |    2 
 reportbuilder/Jar_reportbuilder.mk                                                                                |  456 +-
 reportbuilder/java/com/sun/star/report/DataRow.java                                                               |   36 
 reportbuilder/java/com/sun/star/report/DataSource.java                                                            |   38 
 reportbuilder/java/com/sun/star/report/DataSourceException.java                                                   |   84 
 reportbuilder/java/com/sun/star/report/DataSourceFactory.java                                                     |   33 
 reportbuilder/java/com/sun/star/report/ImageService.java                                                          |   57 
 reportbuilder/java/com/sun/star/report/InputRepository.java                                                       |   78 
 reportbuilder/java/com/sun/star/report/JobDefinitionException.java                                                |   54 
 reportbuilder/java/com/sun/star/report/JobProgressIndicator.java                                                  |   69 
 reportbuilder/java/com/sun/star/report/JobProperties.java                                                         |   36 
 reportbuilder/java/com/sun/star/report/OfficeToken.java                                                           |   52 
 reportbuilder/java/com/sun/star/report/OutputRepository.java                                                      |   61 
 reportbuilder/java/com/sun/star/report/ParameterMap.java                                                          |   59 
 reportbuilder/java/com/sun/star/report/ReportAddIn.java                                                           |   36 
 reportbuilder/java/com/sun/star/report/ReportEngineMetaData.java                                                  |   50 
 reportbuilder/java/com/sun/star/report/ReportEngineParameterNames.java                                            |   46 
 reportbuilder/java/com/sun/star/report/ReportExecutionException.java                                              |   77 
 reportbuilder/java/com/sun/star/report/ReportExpression.java                                                      |   42 
 reportbuilder/java/com/sun/star/report/ReportExpressionMetaData.java                                              |   38 
 reportbuilder/java/com/sun/star/report/ReportFunction.java                                                        |   35 
 reportbuilder/java/com/sun/star/report/ReportJob.java                                                             |   81 
 reportbuilder/java/com/sun/star/report/ReportJobDefinition.java                                                   |   47 
 reportbuilder/java/com/sun/star/report/ReportJobFactory.java                                                      |   28 
 reportbuilder/java/com/sun/star/report/SDBCReportData.java                                                        |  367 --
 reportbuilder/java/com/sun/star/report/SDBCReportDataFactory.java                                                 |  581 ---
 reportbuilder/java/com/sun/star/report/SOImageService.java                                                        |  177 -
 reportbuilder/java/com/sun/star/report/StorageRepository.java                                                     |  343 -
 reportbuilder/java/com/sun/star/report/function/metadata/Author-Function.properties                               |   21 
 reportbuilder/java/com/sun/star/report/function/metadata/Author-Function_en_US.properties                         |   21 
 reportbuilder/java/com/sun/star/report/function/metadata/AuthorFunction.java                                      |   48 
 reportbuilder/java/com/sun/star/report/function/metadata/AuthorFunctionDescription.java                           |   57 
 reportbuilder/java/com/sun/star/report/function/metadata/MetaDataFunctionCategory.java                            |   33 
 reportbuilder/java/com/sun/star/report/function/metadata/Title-Function.properties                                |   21 
 reportbuilder/java/com/sun/star/report/function/metadata/Title-Function_en_US.properties                          |   21 
 reportbuilder/java/com/sun/star/report/function/metadata/TitleFunction.java                                       |   52 
 reportbuilder/java/com/sun/star/report/function/metadata/TitleFunctionDescription.java                            |   57 
 reportbuilder/java/com/sun/star/report/function/metadata/category.properties                                      |   21 
 reportbuilder/java/com/sun/star/report/function/metadata/category_en_US.properties                                |   21 
 reportbuilder/java/com/sun/star/report/pentaho/DefaultNameGenerator.java                                          |  147 
 reportbuilder/java/com/sun/star/report/pentaho/Manifest.mf                                                        |    7 
 reportbuilder/java/com/sun/star/report/pentaho/OfficeNamespaces.java                                              |   62 
 reportbuilder/java/com/sun/star/report/pentaho/PentahoFormulaContext.java                                         |   84 
 reportbuilder/java/com/sun/star/report/pentaho/PentahoReportAddIn.java                                            |   51 
 reportbuilder/java/com/sun/star/report/pentaho/PentahoReportEngine.java                                           |   61 
 reportbuilder/java/com/sun/star/report/pentaho/PentahoReportEngineMetaData.java                                   |  138 
 reportbuilder/java/com/sun/star/report/pentaho/PentahoReportJob.java                                              |  410 --
 reportbuilder/java/com/sun/star/report/pentaho/SOFormulaOpCodeMapper.java                                         |  144 
 reportbuilder/java/com/sun/star/report/pentaho/SOFormulaParser.java                                               |  434 --
 reportbuilder/java/com/sun/star/report/pentaho/SOFunctionManager.java                                             |  158 
 reportbuilder/java/com/sun/star/report/pentaho/SOReportJobFactory.java                                            |  420 --
 reportbuilder/java/com/sun/star/report/pentaho/StarFunctionCategory.java                                          |  166 
 reportbuilder/java/com/sun/star/report/pentaho/StarFunctionDescription.java                                       |  199 -
 reportbuilder/java/com/sun/star/report/pentaho/StarReportData.java                                                |  159 
 reportbuilder/java/com/sun/star/report/pentaho/StarReportDataFactory.java                                         |  116 
 reportbuilder/java/com/sun/star/report/pentaho/StarReportModule.java                                              |   47 
 reportbuilder/java/com/sun/star/report/pentaho/configuration.properties                                           |  147 
 reportbuilder/java/com/sun/star/report/pentaho/expressions/SumExpression.java                                     |   47 
 reportbuilder/java/com/sun/star/report/pentaho/expressions/SumExpressionMetaData.java                             |   69 
 reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/AbstractReportElementLayoutController.java         |  150 
 reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FixedTextLayoutController.java                     |   76 
 reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FormatValueUtility.java                            |  363 --
 reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FormattedTextLayoutController.java                 |  219 -
 reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/ImageElementContext.java                           |   81 
 reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/ImageElementLayoutController.java                  |  311 -
 reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/ObjectOleLayoutController.java                     |  112 
 reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeDetailLayoutController.java                  |  150 
 reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeGroupInstanceSectionLayoutController.java    |  170 
 reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeGroupLayoutController.java                   |  195 -
 reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeGroupSectionLayoutController.java            |   99 
 reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficePageSectionLayoutController.java             |   47 
 reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeRepeatingStructureLayoutController.java      |   34 
 reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeReportLayoutController.java                  |  260 -
 reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeTableLayoutController.java                   |   69 
 reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeTableTemplateLayoutController.java           |  179 -
 reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/TableCellLayoutController.java                     |  228 -
 reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/VariablesCollection.java                           |   87 
 reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/VariablesDeclarationLayoutController.java          |  181 -
 reportbuilder/java/com/sun/star/report/pentaho/loader/InputRepositoryLoader.java                                  |  180 -
 reportbuilder/java/com/sun/star/report/pentaho/loader/InputRepositoryResourceData.java                            |   76 
 reportbuilder/java/com/sun/star/report/pentaho/loader/InputResourceKey.java                                       |   53 
 reportbuilder/java/com/sun/star/report/pentaho/model/DataStyle.java                                               |   45 
 reportbuilder/java/com/sun/star/report/pentaho/model/FixedTextElement.java                                        |   42 
 reportbuilder/java/com/sun/star/report/pentaho/model/FontFaceDeclsSection.java                                    |   64 
 reportbuilder/java/com/sun/star/report/pentaho/model/FontFaceElement.java                                         |   45 
 reportbuilder/java/com/sun/star/report/pentaho/model/FormatCondition.java                                         |   57 
 reportbuilder/java/com/sun/star/report/pentaho/model/FormattedTextElement.java                                    |   48 
 reportbuilder/java/com/sun/star/report/pentaho/model/ImageElement.java                                            |   77 
 reportbuilder/java/com/sun/star/report/pentaho/model/ObjectOleElement.java                                        |   75 
 reportbuilder/java/com/sun/star/report/pentaho/model/OfficeDetailSection.java                                     |   33 
 reportbuilder/java/com/sun/star/report/pentaho/model/OfficeDocument.java                                          |   63 
 reportbuilder/java/com/sun/star/report/pentaho/model/OfficeGroup.java                                             |   84 
 reportbuilder/java/com/sun/star/report/pentaho/model/OfficeGroupInstanceSection.java                              |   33 
 reportbuilder/java/com/sun/star/report/pentaho/model/OfficeGroupSection.java                                      |   44 
 reportbuilder/java/com/sun/star/report/pentaho/model/OfficeMasterPage.java                                        |   56 
 reportbuilder/java/com/sun/star/report/pentaho/model/OfficeMasterStyles.java                                      |   73 
 reportbuilder/java/com/sun/star/report/pentaho/model/OfficeReport.java                                            |  138 
 reportbuilder/java/com/sun/star/report/pentaho/model/OfficeStyle.java                                             |  120 
 reportbuilder/java/com/sun/star/report/pentaho/model/OfficeStyles.java                                            |  188 -
 reportbuilder/java/com/sun/star/report/pentaho/model/OfficeStylesCollection.java                                  |  113 
 reportbuilder/java/com/sun/star/report/pentaho/model/OfficeTableSection.java                                      |   32 
 reportbuilder/java/com/sun/star/report/pentaho/model/PageLayout.java                                              |   58 
 reportbuilder/java/com/sun/star/report/pentaho/model/PageSection.java                                             |   50 
 reportbuilder/java/com/sun/star/report/pentaho/model/RawText.java                                                 |   36 
 reportbuilder/java/com/sun/star/report/pentaho/model/ReportElement.java                                           |  100 
 reportbuilder/java/com/sun/star/report/pentaho/model/TableCellElement.java                                        |   33 
 reportbuilder/java/com/sun/star/report/pentaho/model/VariablesDeclarationSection.java                             |   42 
 reportbuilder/java/com/sun/star/report/pentaho/module.properties                                                  |   36 
 reportbuilder/java/com/sun/star/report/pentaho/oasis-datastyle.css                                                |   23 
 reportbuilder/java/com/sun/star/report/pentaho/oasis-draw.css                                                     |    5 
 reportbuilder/java/com/sun/star/report/pentaho/oasis-form.css                                                     |    5 
 reportbuilder/java/com/sun/star/report/pentaho/oasis-style.css                                                    |   28 
 reportbuilder/java/com/sun/star/report/pentaho/oasis-table.css                                                    |   55 
 reportbuilder/java/com/sun/star/report/pentaho/oasis-text.css                                                     |   27 
 reportbuilder/java/com/sun/star/report/pentaho/output/ImageProducer.java                                          |  488 --
 reportbuilder/java/com/sun/star/report/pentaho/output/OfficeDocumentReportTarget.java                             | 1722 ----------
 reportbuilder/java/com/sun/star/report/pentaho/output/OleProducer.java                                            |  126 
 reportbuilder/java/com/sun/star/report/pentaho/output/StyleUtilities.java                                         |  605 ---
 reportbuilder/java/com/sun/star/report/pentaho/output/StylesWriter.java                                           |  380 --
 reportbuilder/java/com/sun/star/report/pentaho/output/chart/ChartRawReportProcessor.java                          |   96 
 reportbuilder/java/com/sun/star/report/pentaho/output/chart/ChartRawReportTarget.java                             |  247 -
 reportbuilder/java/com/sun/star/report/pentaho/output/spreadsheet/SpreadsheetRawReportProcessor.java              |  109 
 reportbuilder/java/com/sun/star/report/pentaho/output/spreadsheet/SpreadsheetRawReportTarget.java                 |  959 -----
 reportbuilder/java/com/sun/star/report/pentaho/output/text/MasterPageFactory.java                                 |  407 --
 reportbuilder/java/com/sun/star/report/pentaho/output/text/PageBreakDefinition.java                               |   39 
 reportbuilder/java/com/sun/star/report/pentaho/output/text/PageContext.java                                       |  218 -
 reportbuilder/java/com/sun/star/report/pentaho/output/text/TextRawReportProcessor.java                            |  106 
 reportbuilder/java/com/sun/star/report/pentaho/output/text/TextRawReportTarget.java                               | 1444 --------
 reportbuilder/java/com/sun/star/report/pentaho/output/text/VariablesDeclarations.java                             |   98 
 reportbuilder/java/com/sun/star/report/pentaho/parser/AttributeSpecification.java                                 |   48 
 reportbuilder/java/com/sun/star/report/pentaho/parser/ElementReadHandler.java                                     |   81 
 reportbuilder/java/com/sun/star/report/pentaho/parser/OfficeDocumentXmlResourceFactory.java                       |   41 
 reportbuilder/java/com/sun/star/report/pentaho/parser/OfficeParserUtil.java                                       |  182 -
 reportbuilder/java/com/sun/star/report/pentaho/parser/OfficeStylesXmlResourceFactory.java                         |   49 
 reportbuilder/java/com/sun/star/report/pentaho/parser/StarStyleXmlFactoryModule.java                              |   53 
 reportbuilder/java/com/sun/star/report/pentaho/parser/StarXmlFactoryModule.java                                   |   53 
 reportbuilder/java/com/sun/star/report/pentaho/parser/StyleMapper.java                                            |   29 
 reportbuilder/java/com/sun/star/report/pentaho/parser/chart/ChartReadHandler.java                                 |   99 
 reportbuilder/java/com/sun/star/report/pentaho/parser/data/DataStyleReadHandler.java                              |  121 
 reportbuilder/java/com/sun/star/report/pentaho/parser/draw/ObjectOleReadHandler.java                              |   75 
 reportbuilder/java/com/sun/star/report/pentaho/parser/office/BodyReadHandler.java                                 |   82 
 reportbuilder/java/com/sun/star/report/pentaho/parser/office/DocumentContentReadHandler.java                      |  227 -
 reportbuilder/java/com/sun/star/report/pentaho/parser/office/DocumentStylesReadHandler.java                       |   96 
 reportbuilder/java/com/sun/star/report/pentaho/parser/office/FontFaceDeclsReadHandler.java                        |  107 
 reportbuilder/java/com/sun/star/report/pentaho/parser/office/MasterStylesReadHandler.java                         |  113 
 reportbuilder/java/com/sun/star/report/pentaho/parser/rpt-schema-v1.0-os.xsd                                      |  405 --
 reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/ConditionalPrintExpressionReadHandler.java              |   71 
 reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/DetailRootTableReadHandler.java                         |   29 
 reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/FixedContentReadHandler.java                            |   88 
 reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/FormatConditionReadHandler.java                         |   90 
 reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/FormattedTextReadHandler.java                           |  108 
 reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/FunctionReadHandler.java                                |  106 
 reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/GroupReadHandler.java                                   |  172 
 reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/GroupSectionReadHandler.java                            |   29 
 reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/ImageReadHandler.java                                   |  131 
 reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/MasterDetailReadHandler.java                            |   96 
 reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/ReportElementReadHandler.java                           |  100 
 reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/ReportReadHandler.java                                  |  232 -
 reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/RootTableReadHandler.java                               |   96 
 reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/SubDocumentReadHandler.java                             |  124 
 reportbuilder/java/com/sun/star/report/pentaho/parser/selectors.properties                                        |  104 
 reportbuilder/java/com/sun/star/report/pentaho/parser/style-mapping.txt                                           |    8 
 reportbuilder/java/com/sun/star/report/pentaho/parser/style/FontFaceReadHandler.java                              |   46 
 reportbuilder/java/com/sun/star/report/pentaho/parser/style/MasterPageReadHandler.java                            |   95 
 reportbuilder/java/com/sun/star/report/pentaho/parser/style/OfficeStyleReadHandler.java                           |   96 
 reportbuilder/java/com/sun/star/report/pentaho/parser/style/OfficeStylesReadHandler.java                          |  130 
 reportbuilder/java/com/sun/star/report/pentaho/parser/style/PageLayoutReadHandler.java                            |   94 
 reportbuilder/java/com/sun/star/report/pentaho/parser/style/StyleDefinitionReadHandler.java                       |   90 
 reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/OneOfConstantsMapper.java                       |   68 
 reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/draw/TextAreaVerticalAlignMapper.java           |   36 
 reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/BackgroundColorMapper.java                   |   41 
 reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/BorderRightMapper.java                       |   34 
 reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/ColorMapper.java                             |   43 
 reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/FontSizeMapper.java                          |   37 
 reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/FontStyleMapper.java                         |   37 
 reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/FontWeightMapper.java                        |   37 
 reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/TextAlignMapper.java                         |   38 
 reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/FontFamilyGenericMapper.java              |   56 
 reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/FontFamilyMapper.java                     |   56 
 reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/FontNameMapper.java                       |   40 
 reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/FontPitchMapper.java                      |   34 
 reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/FontReliefMapper.java                     |   37 
 reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/TextEmphasizeMapper.java                  |   36 
 reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/TextUnderlineColorMapper.java             |   45 
 reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/TextUnderlineStyleMapper.java             |   40 
 reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/TextUnderlineWidthMapper.java             |   67 
 reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/TextUnderlineWordMode.java                |   34 
 reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/VerticalAlignMapper.java                  |   38 
 reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/table/ColumnWidthMapper.java                    |   43 
 reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/table/RowHeightMapper.java                      |   43 
 reportbuilder/java/com/sun/star/report/pentaho/parser/table/CoveredCellReadHandler.java                           |   44 
 reportbuilder/java/com/sun/star/report/pentaho/parser/table/TableCellReadHandler.java                             |   36 
 reportbuilder/java/com/sun/star/report/pentaho/parser/table/TableColumnReadHandler.java                           |   43 
 reportbuilder/java/com/sun/star/report/pentaho/parser/table/TableColumnsReadHandler.java                          |   93 
 reportbuilder/java/com/sun/star/report/pentaho/parser/table/TableReadHandler.java                                 |  135 
 reportbuilder/java/com/sun/star/report/pentaho/parser/table/TableRowReadHandler.java                              |  116 
 reportbuilder/java/com/sun/star/report/pentaho/parser/table/TableRowsReadHandler.java                             |   89 
 reportbuilder/java/com/sun/star/report/pentaho/parser/text/NoCDATATextContentReadHandler.java                     |  182 -
 reportbuilder/java/com/sun/star/report/pentaho/parser/text/TextContentReadHandler.java                            |   60 
 reportbuilder/java/com/sun/star/report/pentaho/parser/xlink/XLinkReadHandler.java                                 |   87 
 reportbuilder/java/com/sun/star/report/pentaho/smil.css                                                           |    5 
 reportbuilder/java/com/sun/star/report/pentaho/star-office.css                                                    |    5 
 reportbuilder/java/com/sun/star/report/pentaho/star-report.css                                                    |   91 
 reportbuilder/java/com/sun/star/report/pentaho/star-rpt.css                                                       |    5 
 reportbuilder/java/com/sun/star/report/pentaho/styles/LengthCalculator.java                                       |  100 
 reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMapper.java                                            |   86 
 reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMapperKey.java                                         |  108 
 reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMapperXmlFactoryModule.java                            |   60 
 reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMapperXmlResourceFactory.java                          |   46 
 reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMappingDocumentReadHandler.java                        |   96 
 reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMappingReadHandler.java                                |   91 
 reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMappingRule.java                                       |   54 
 reportbuilder/java/com/sun/star/report/pentaho/styles/stylemapper.xml                                             |  763 ----
 reportbuilder/java/com/sun/star/report/pentaho/styles/stylemapper.xsd                                             |   81 
 reportbuilder/java/com/sun/star/report/pentaho/svg.css                                                            |    5 
 reportbuilder/java/com/sun/star/report/pentaho/xsl-fo.css                                                         |    5 
 reportbuilder/java/com/sun/star/report/util/DefaultJobProperties.java                                             |   71 
 reportbuilder/java/com/sun/star/report/util/DefaultParameterMap.java                                              |  114 
 reportbuilder/java/com/sun/star/report/util/DefaultReportJobDefinition.java                                       |  107 
 reportbuilder/java/com/sun/star/report/util/ManifestWriter.java                                                   |  113 
 reportbuilder/java/jfreereport.properties                                                                         |    2 
 reportbuilder/java/libformula.properties                                                                          |    8 
 reportbuilder/java/loader.properties                                                                              |    6 
 reportbuilder/java/org/libreoffice/report/DataRow.java                                                            |   36 
 reportbuilder/java/org/libreoffice/report/DataSource.java                                                         |   38 
 reportbuilder/java/org/libreoffice/report/DataSourceException.java                                                |   84 
 reportbuilder/java/org/libreoffice/report/DataSourceFactory.java                                                  |   33 
 reportbuilder/java/org/libreoffice/report/ImageService.java                                                       |   57 
 reportbuilder/java/org/libreoffice/report/InputRepository.java                                                    |   78 
 reportbuilder/java/org/libreoffice/report/JobDefinitionException.java                                             |   54 
 reportbuilder/java/org/libreoffice/report/JobProgressIndicator.java                                               |   69 
 reportbuilder/java/org/libreoffice/report/JobProperties.java                                                      |   36 
 reportbuilder/java/org/libreoffice/report/OfficeToken.java                                                        |   52 
 reportbuilder/java/org/libreoffice/report/OutputRepository.java                                                   |   61 
 reportbuilder/java/org/libreoffice/report/ParameterMap.java                                                       |   59 
 reportbuilder/java/org/libreoffice/report/ReportAddIn.java                                                        |   36 
 reportbuilder/java/org/libreoffice/report/ReportEngineMetaData.java                                               |   50 
 reportbuilder/java/org/libreoffice/report/ReportEngineParameterNames.java                                         |   46 
 reportbuilder/java/org/libreoffice/report/ReportExecutionException.java                                           |   77 
 reportbuilder/java/org/libreoffice/report/ReportExpression.java                                                   |   42 
 reportbuilder/java/org/libreoffice/report/ReportExpressionMetaData.java                                           |   38 
 reportbuilder/java/org/libreoffice/report/ReportFunction.java                                                     |   35 
 reportbuilder/java/org/libreoffice/report/ReportJob.java                                                          |   81 
 reportbuilder/java/org/libreoffice/report/ReportJobDefinition.java                                                |   47 
 reportbuilder/java/org/libreoffice/report/ReportJobFactory.java                                                   |   28 
 reportbuilder/java/org/libreoffice/report/SDBCReportData.java                                                     |  367 ++
 reportbuilder/java/org/libreoffice/report/SDBCReportDataFactory.java                                              |  581 +++
 reportbuilder/java/org/libreoffice/report/SOImageService.java                                                     |  177 +
 reportbuilder/java/org/libreoffice/report/StorageRepository.java                                                  |  343 +
 reportbuilder/java/org/libreoffice/report/function/metadata/Author-Function.properties                            |   21 
 reportbuilder/java/org/libreoffice/report/function/metadata/Author-Function_en_US.properties                      |   21 
 reportbuilder/java/org/libreoffice/report/function/metadata/AuthorFunction.java                                   |   48 
 reportbuilder/java/org/libreoffice/report/function/metadata/AuthorFunctionDescription.java                        |   57 
 reportbuilder/java/org/libreoffice/report/function/metadata/MetaDataFunctionCategory.java                         |   33 
 reportbuilder/java/org/libreoffice/report/function/metadata/Title-Function.properties                             |   21 
 reportbuilder/java/org/libreoffice/report/function/metadata/Title-Function_en_US.properties                       |   21 
 reportbuilder/java/org/libreoffice/report/function/metadata/TitleFunction.java                                    |   52 
 reportbuilder/java/org/libreoffice/report/function/metadata/TitleFunctionDescription.java                         |   57 
 reportbuilder/java/org/libreoffice/report/function/metadata/category.properties                                   |   21 
 reportbuilder/java/org/libreoffice/report/function/metadata/category_en_US.properties                             |   21 
 reportbuilder/java/org/libreoffice/report/pentaho/DefaultNameGenerator.java                                       |  147 
 reportbuilder/java/org/libreoffice/report/pentaho/Manifest.mf                                                     |    7 
 reportbuilder/java/org/libreoffice/report/pentaho/OfficeNamespaces.java                                           |   62 
 reportbuilder/java/org/libreoffice/report/pentaho/PentahoFormulaContext.java                                      |   84 
 reportbuilder/java/org/libreoffice/report/pentaho/PentahoReportAddIn.java                                         |   51 
 reportbuilder/java/org/libreoffice/report/pentaho/PentahoReportEngine.java                                        |   61 
 reportbuilder/java/org/libreoffice/report/pentaho/PentahoReportEngineMetaData.java                                |  138 
 reportbuilder/java/org/libreoffice/report/pentaho/PentahoReportJob.java                                           |  410 ++
 reportbuilder/java/org/libreoffice/report/pentaho/SOFormulaOpCodeMapper.java                                      |  144 
 reportbuilder/java/org/libreoffice/report/pentaho/SOFormulaParser.java                                            |  434 ++
 reportbuilder/java/org/libreoffice/report/pentaho/SOFunctionManager.java                                          |  158 
 reportbuilder/java/org/libreoffice/report/pentaho/SOReportJobFactory.java                                         |  420 ++
 reportbuilder/java/org/libreoffice/report/pentaho/StarFunctionCategory.java                                       |  166 
 reportbuilder/java/org/libreoffice/report/pentaho/StarFunctionDescription.java                                    |  199 +
 reportbuilder/java/org/libreoffice/report/pentaho/StarReportData.java                                             |  159 
 reportbuilder/java/org/libreoffice/report/pentaho/StarReportDataFactory.java                                      |  116 
 reportbuilder/java/org/libreoffice/report/pentaho/StarReportModule.java                                           |   47 
 reportbuilder/java/org/libreoffice/report/pentaho/configuration.properties                                        |  147 
 reportbuilder/java/org/libreoffice/report/pentaho/expressions/SumExpression.java                                  |   47 
 reportbuilder/java/org/libreoffice/report/pentaho/expressions/SumExpressionMetaData.java                          |   69 
 reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/AbstractReportElementLayoutController.java      |  150 
 reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FixedTextLayoutController.java                  |   76 
 reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormatValueUtility.java                         |  363 ++
 reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormattedTextLayoutController.java              |  219 +
 reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/ImageElementContext.java                        |   81 
 reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/ImageElementLayoutController.java               |  311 +
 reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/ObjectOleLayoutController.java                  |  112 
 reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeDetailLayoutController.java               |  150 
 reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeGroupInstanceSectionLayoutController.java |  170 
 reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeGroupLayoutController.java                |  195 +
 reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeGroupSectionLayoutController.java         |   99 
 reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficePageSectionLayoutController.java          |   47 
 reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeRepeatingStructureLayoutController.java   |   34 
 reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeReportLayoutController.java               |  260 +
 reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeTableLayoutController.java                |   69 
 reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeTableTemplateLayoutController.java        |  179 +
 reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/TableCellLayoutController.java                  |  228 +
 reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/VariablesCollection.java                        |   87 
 reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/VariablesDeclarationLayoutController.java       |  181 +
 reportbuilder/java/org/libreoffice/report/pentaho/loader/InputRepositoryLoader.java                               |  180 +
 reportbuilder/java/org/libreoffice/report/pentaho/loader/InputRepositoryResourceData.java                         |   76 
 reportbuilder/java/org/libreoffice/report/pentaho/loader/InputResourceKey.java                                    |   53 
 reportbuilder/java/org/libreoffice/report/pentaho/model/DataStyle.java                                            |   45 
 reportbuilder/java/org/libreoffice/report/pentaho/model/FixedTextElement.java                                     |   42 
 reportbuilder/java/org/libreoffice/report/pentaho/model/FontFaceDeclsSection.java                                 |   64 
 reportbuilder/java/org/libreoffice/report/pentaho/model/FontFaceElement.java                                      |   45 
 reportbuilder/java/org/libreoffice/report/pentaho/model/FormatCondition.java                                      |   57 
 reportbuilder/java/org/libreoffice/report/pentaho/model/FormattedTextElement.java                                 |   48 
 reportbuilder/java/org/libreoffice/report/pentaho/model/ImageElement.java                                         |   77 
 reportbuilder/java/org/libreoffice/report/pentaho/model/ObjectOleElement.java                                     |   75 
 reportbuilder/java/org/libreoffice/report/pentaho/model/OfficeDetailSection.java                                  |   33 
 reportbuilder/java/org/libreoffice/report/pentaho/model/OfficeDocument.java                                       |   63 
 reportbuilder/java/org/libreoffice/report/pentaho/model/OfficeGroup.java                                          |   84 
 reportbuilder/java/org/libreoffice/report/pentaho/model/OfficeGroupInstanceSection.java                           |   33 
 reportbuilder/java/org/libreoffice/report/pentaho/model/OfficeGroupSection.java                                   |   44 
 reportbuilder/java/org/libreoffice/report/pentaho/model/OfficeMasterPage.java                                     |   56 
 reportbuilder/java/org/libreoffice/report/pentaho/model/OfficeMasterStyles.java                                   |   73 
 reportbuilder/java/org/libreoffice/report/pentaho/model/OfficeReport.java                                         |  138 
 reportbuilder/java/org/libreoffice/report/pentaho/model/OfficeStyle.java                                          |  120 
 reportbuilder/java/org/libreoffice/report/pentaho/model/OfficeStyles.java                                         |  188 +
 reportbuilder/java/org/libreoffice/report/pentaho/model/OfficeStylesCollection.java                               |  113 
 reportbuilder/java/org/libreoffice/report/pentaho/model/OfficeTableSection.java                                   |   32 
 reportbuilder/java/org/libreoffice/report/pentaho/model/PageLayout.java                                           |   58 
 reportbuilder/java/org/libreoffice/report/pentaho/model/PageSection.java                                          |   50 
 reportbuilder/java/org/libreoffice/report/pentaho/model/RawText.java                                              |   36 
 reportbuilder/java/org/libreoffice/report/pentaho/model/ReportElement.java                                        |  100 
 reportbuilder/java/org/libreoffice/report/pentaho/model/TableCellElement.java                                     |   33 
 reportbuilder/java/org/libreoffice/report/pentaho/model/VariablesDeclarationSection.java                          |   42 
 reportbuilder/java/org/libreoffice/report/pentaho/module.properties                                               |   36 
 reportbuilder/java/org/libreoffice/report/pentaho/oasis-datastyle.css                                             |   23 
 reportbuilder/java/org/libreoffice/report/pentaho/oasis-draw.css                                                  |    5 
 reportbuilder/java/org/libreoffice/report/pentaho/oasis-form.css                                                  |    5 
 reportbuilder/java/org/libreoffice/report/pentaho/oasis-style.css                                                 |   28 
 reportbuilder/java/org/libreoffice/report/pentaho/oasis-table.css                                                 |   55 
 reportbuilder/java/org/libreoffice/report/pentaho/oasis-text.css                                                  |   27 
 reportbuilder/java/org/libreoffice/report/pentaho/output/ImageProducer.java                                       |  488 ++
 reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java                          | 1722 ++++++++++
 reportbuilder/java/org/libreoffice/report/pentaho/output/OleProducer.java                                         |  126 
 reportbuilder/java/org/libreoffice/report/pentaho/output/StyleUtilities.java                                      |  605 +++
 reportbuilder/java/org/libreoffice/report/pentaho/output/StylesWriter.java                                        |  380 ++
 reportbuilder/java/org/libreoffice/report/pentaho/output/chart/ChartRawReportProcessor.java                       |   96 
 reportbuilder/java/org/libreoffice/report/pentaho/output/chart/ChartRawReportTarget.java                          |  247 +
 reportbuilder/java/org/libreoffice/report/pentaho/output/spreadsheet/SpreadsheetRawReportProcessor.java           |  109 
 reportbuilder/java/org/libreoffice/report/pentaho/output/spreadsheet/SpreadsheetRawReportTarget.java              |  959 +++++
 reportbuilder/java/org/libreoffice/report/pentaho/output/text/MasterPageFactory.java                              |  407 ++
 reportbuilder/java/org/libreoffice/report/pentaho/output/text/PageBreakDefinition.java                            |   39 
 reportbuilder/java/org/libreoffice/report/pentaho/output/text/PageContext.java                                    |  218 +
 reportbuilder/java/org/libreoffice/report/pentaho/output/text/TextRawReportProcessor.java                         |  106 
 reportbuilder/java/org/libreoffice/report/pentaho/output/text/TextRawReportTarget.java                            | 1444 ++++++++
 reportbuilder/java/org/libreoffice/report/pentaho/output/text/VariablesDeclarations.java                          |   98 
 reportbuilder/java/org/libreoffice/report/pentaho/parser/AttributeSpecification.java                              |   48 
 reportbuilder/java/org/libreoffice/report/pentaho/parser/ElementReadHandler.java                                  |   81 
 reportbuilder/java/org/libreoffice/report/pentaho/parser/OfficeDocumentXmlResourceFactory.java                    |   41 
 reportbuilder/java/org/libreoffice/report/pentaho/parser/OfficeParserUtil.java                                    |  182 +
 reportbuilder/java/org/libreoffice/report/pentaho/parser/OfficeStylesXmlResourceFactory.java                      |   49 
 reportbuilder/java/org/libreoffice/report/pentaho/parser/StarStyleXmlFactoryModule.java                           |   53 
 reportbuilder/java/org/libreoffice/report/pentaho/parser/StarXmlFactoryModule.java                                |   53 
 reportbuilder/java/org/libreoffice/report/pentaho/parser/StyleMapper.java                                         |   29 
 reportbuilder/java/org/libreoffice/report/pentaho/parser/chart/ChartReadHandler.java                              |   99 
 reportbuilder/java/org/libreoffice/report/pentaho/parser/data/DataStyleReadHandler.java                           |  121 
 reportbuilder/java/org/libreoffice/report/pentaho/parser/draw/ObjectOleReadHandler.java                           |   75 
 reportbuilder/java/org/libreoffice/report/pentaho/parser/office/BodyReadHandler.java                              |   82 
 reportbuilder/java/org/libreoffice/report/pentaho/parser/office/DocumentContentReadHandler.java                   |  227 +
 reportbuilder/java/org/libreoffice/report/pentaho/parser/office/DocumentStylesReadHandler.java                    |   96 
 reportbuilder/java/org/libreoffice/report/pentaho/parser/office/FontFaceDeclsReadHandler.java                     |  107 
 reportbuilder/java/org/libreoffice/report/pentaho/parser/office/MasterStylesReadHandler.java                      |  113 
 reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt-schema-v1.0-os.xsd                                   |  405 ++
 reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/ConditionalPrintExpressionReadHandler.java           |   71 
 reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/DetailRootTableReadHandler.java                      |   29 
 reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/FixedContentReadHandler.java                         |   88 
 reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/FormatConditionReadHandler.java                      |   90 
 reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/FormattedTextReadHandler.java                        |  108 
 reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/FunctionReadHandler.java                             |  106 
 reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/GroupReadHandler.java                                |  172 
 reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/GroupSectionReadHandler.java                         |   29 
 reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/ImageReadHandler.java                                |  131 
 reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/MasterDetailReadHandler.java                         |   96 
 reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/ReportElementReadHandler.java                        |  100 
 reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/ReportReadHandler.java                               |  232 +
 reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/RootTableReadHandler.java                            |   96 
 reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/SubDocumentReadHandler.java                          |  124 
 reportbuilder/java/org/libreoffice/report/pentaho/parser/selectors.properties                                     |  104 
 reportbuilder/java/org/libreoffice/report/pentaho/parser/style-mapping.txt                                        |    8 
 reportbuilder/java/org/libreoffice/report/pentaho/parser/style/FontFaceReadHandler.java                           |   46 
 reportbuilder/java/org/libreoffice/report/pentaho/parser/style/MasterPageReadHandler.java                         |   95 
 reportbuilder/java/org/libreoffice/report/pentaho/parser/style/OfficeStyleReadHandler.java                        |   96 
 reportbuilder/java/org/libreoffice/report/pentaho/parser/style/OfficeStylesReadHandler.java                       |  130 
 reportbuilder/java/org/libreoffice/report/pentaho/parser/style/PageLayoutReadHandler.java                         |   94 
 reportbuilder/java/org/libreoffice/report/pentaho/parser/style/StyleDefinitionReadHandler.java                    |   90 
 reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/OneOfConstantsMapper.java                    |   68 
 reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/draw/TextAreaVerticalAlignMapper.java        |   36 
 reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/fo/BackgroundColorMapper.java                |   41 
 reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/fo/BorderRightMapper.java                    |   34 
 reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/fo/ColorMapper.java                          |   43 
 reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/fo/FontSizeMapper.java                       |   37 
 reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/fo/FontStyleMapper.java                      |   37 
 reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/fo/FontWeightMapper.java                     |   37 
 reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/fo/TextAlignMapper.java                      |   38 
 reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/style/FontFamilyGenericMapper.java           |   56 
 reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/style/FontFamilyMapper.java                  |   56 
 reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/style/FontNameMapper.java                    |   40 
 reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/style/FontPitchMapper.java                   |   34 
 reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/style/FontReliefMapper.java                  |   37 
 reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/style/TextEmphasizeMapper.java               |   36 
 reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/style/TextUnderlineColorMapper.java          |   45 
 reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/style/TextUnderlineStyleMapper.java          |   40 
 reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/style/TextUnderlineWidthMapper.java          |   67 
 reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/style/TextUnderlineWordMode.java             |   34 
 reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/style/VerticalAlignMapper.java               |   38 
 reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/table/ColumnWidthMapper.java                 |   43 
 reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/table/RowHeightMapper.java                   |   43 
 reportbuilder/java/org/libreoffice/report/pentaho/parser/table/CoveredCellReadHandler.java                        |   44 
 reportbuilder/java/org/libreoffice/report/pentaho/parser/table/TableCellReadHandler.java                          |   36 
 reportbuilder/java/org/libreoffice/report/pentaho/parser/table/TableColumnReadHandler.java                        |   43 
 reportbuilder/java/org/libreoffice/report/pentaho/parser/table/TableColumnsReadHandler.java                       |   93 
 reportbuilder/java/org/libreoffice/report/pentaho/parser/table/TableReadHandler.java                              |  135 
 reportbuilder/java/org/libreoffice/report/pentaho/parser/table/TableRowReadHandler.java                           |  116 
 reportbuilder/java/org/libreoffice/report/pentaho/parser/table/TableRowsReadHandler.java                          |   89 
 reportbuilder/java/org/libreoffice/report/pentaho/parser/text/NoCDATATextContentReadHandler.java                  |  182 +
 reportbuilder/java/org/libreoffice/report/pentaho/parser/text/TextContentReadHandler.java                         |   60 
 reportbuilder/java/org/libreoffice/report/pentaho/parser/xlink/XLinkReadHandler.java                              |   87 
 reportbuilder/java/org/libreoffice/report/pentaho/smil.css                                                        |    5 
 reportbuilder/java/org/libreoffice/report/pentaho/star-office.css                                                 |    5 
 reportbuilder/java/org/libreoffice/report/pentaho/star-report.css                                                 |   91 
 reportbuilder/java/org/libreoffice/report/pentaho/star-rpt.css                                                    |    5 
 reportbuilder/java/org/libreoffice/report/pentaho/styles/LengthCalculator.java                                    |  100 
 reportbuilder/java/org/libreoffice/report/pentaho/styles/StyleMapper.java                                         |   86 
 reportbuilder/java/org/libreoffice/report/pentaho/styles/StyleMapperKey.java                                      |  108 
 reportbuilder/java/org/libreoffice/report/pentaho/styles/StyleMapperXmlFactoryModule.java                         |   60 
 reportbuilder/java/org/libreoffice/report/pentaho/styles/StyleMapperXmlResourceFactory.java                       |   46 
 reportbuilder/java/org/libreoffice/report/pentaho/styles/StyleMappingDocumentReadHandler.java                     |   96 
 reportbuilder/java/org/libreoffice/report/pentaho/styles/StyleMappingReadHandler.java                             |   91 
 reportbuilder/java/org/libreoffice/report/pentaho/styles/StyleMappingRule.java                                    |   54 
 reportbuilder/java/org/libreoffice/report/pentaho/styles/stylemapper.xml                                          |  763 ++++
 reportbuilder/java/org/libreoffice/report/pentaho/styles/stylemapper.xsd                                          |   81 
 reportbuilder/java/org/libreoffice/report/pentaho/svg.css                                                         |    5 
 reportbuilder/java/org/libreoffice/report/pentaho/xsl-fo.css                                                      |    5 
 reportbuilder/java/org/libreoffice/report/util/DefaultJobProperties.java                                          |   71 
 reportbuilder/java/org/libreoffice/report/util/DefaultParameterMap.java                                           |  114 
 reportbuilder/java/org/libreoffice/report/util/DefaultReportJobDefinition.java                                    |  107 
 reportbuilder/java/org/libreoffice/report/util/ManifestWriter.java                                                |  113 
 reportbuilder/registry/data/org/openoffice/Office/DataAccess.xcu                                                  |    2 
 reportbuilder/util/components.rdb                                                                                 |   10 
 reportbuilder/util/description.xml                                                                                |    2 
 reportbuilder/util/manifest.mf                                                                                    |    2 
 reportdesign/source/ui/dlg/Formula.cxx                                                                            |    2 
 reportdesign/source/ui/misc/UITools.cxx                                                                           |    2 
 wizards/com/sun/star/wizards/report/ReportWizard.java                                                             |    2 
 453 files changed, 26421 insertions(+), 26421 deletions(-)

New commits:
commit 6f28efc2a8a559cc8c37aa883f4de0b59d4fc79c
Author: David Ostrovsky <david at ostrovsky.org>
Date:   Thu Mar 7 08:17:56 2013 +0100

    fdo#61726: rename report-builder package to org.libreoffice.report
    
    To prevent future clashes with uno name space rename the
    com.sun.star.report package to org.libreoffice.report.
    
    Bump the version to 1.2.4.
    
    Change-Id: Ia06cb7ad8c1528c1d5b5eeb70f1e4b2aa854b70f
    Reviewed-on: https://gerrit.libreoffice.org/2578
    Reviewed-by: David Ostrovsky <David.Ostrovsky at gmx.de>
    Tested-by: David Ostrovsky <David.Ostrovsky at gmx.de>

diff --git a/Repository.mk b/Repository.mk
index 95a69db..d0be109 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -786,7 +786,7 @@ $(eval $(call gb_Helper_register_jars,OXT, \
 	mediawiki \
 	nlpsolver \
 	passive_java \
-	sun-report-builder \
+	report-builder \
 ))
 
 # External executables
diff --git a/connectivity/source/commontools/dbtools2.cxx b/connectivity/source/commontools/dbtools2.cxx
index bcd6a8e..db7b02b 100644
--- a/connectivity/source/commontools/dbtools2.cxx
+++ b/connectivity/source/commontools/dbtools2.cxx
@@ -1007,10 +1007,10 @@ sal_Int32 DBTypeConversion::convertUnicodeStringToLength( const ::rtl::OUString&
             }
         }
         else
-            return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.report.pentaho.SOReportJobFactory"));
+            return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.libreoffice.report.pentaho.SOReportJobFactory"));
     }
     else
-        return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.report.pentaho.SOReportJobFactory"));
+        return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.libreoffice.report.pentaho.SOReportJobFactory"));
     return ::rtl::OUString();
 }
 // -----------------------------------------------------------------------------
diff --git a/dbaccess/source/core/dataaccess/documentdefinition.cxx b/dbaccess/source/core/dataaccess/documentdefinition.cxx
index e6cff05..ae46767 100644
--- a/dbaccess/source/core/dataaccess/documentdefinition.cxx
+++ b/dbaccess/source/core/dataaccess/documentdefinition.cxx
@@ -1627,7 +1627,7 @@ void ODocumentDefinition::loadEmbeddedObject( const Reference< XConnection >& i_
             {
                 sDocumentService = GetDocumentServiceFromMediaType( getContentType(), m_aContext, aClassID );
                 // check if we are not a form and
-                // the com.sun.star.report.pentaho.SOReportJobFactory is not present.
+                // the org.libreoffice.report.pentaho.SOReportJobFactory is not present.
                 if ( !m_bForm && !(sDocumentService == "com.sun.star.text.TextDocument"))
                 {
                     // we seem to be a "new style" report, check if report extension is present.
diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx
index 0880194..b447726 100644
--- a/dbaccess/source/ui/app/AppController.cxx
+++ b/dbaccess/source/ui/app/AppController.cxx
@@ -746,7 +746,7 @@ FeatureState OApplicationController::GetState(sal_uInt16 _nId) const
                         aReturn.bEnabled = xEnumAccess.is();
                         if ( aReturn.bEnabled )
                         {
-                            static OUString s_sReportDesign("com.sun.star.report.pentaho.SOReportJobFactory");
+                            static OUString s_sReportDesign("org.libreoffice.report.pentaho.SOReportJobFactory");
                             Reference< XEnumeration > xEnumDrivers = xEnumAccess->createContentEnumeration(s_sReportDesign);
                             aReturn.bEnabled = xEnumDrivers.is() && xEnumDrivers->hasMoreElements();
                         }
diff --git a/reportbuilder/Configuration_reportbuilder.mk b/reportbuilder/Configuration_reportbuilder.mk
index 4690cfc..14239aa 100644
--- a/reportbuilder/Configuration_reportbuilder.mk
+++ b/reportbuilder/Configuration_reportbuilder.mk
@@ -25,23 +25,23 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
-$(eval $(call gb_Configuration_Configuration,sun-report-builder,nodeliver))
+$(eval $(call gb_Configuration_Configuration,report-builder,nodeliver))
 
-$(eval $(call gb_Configuration_use_configuration,sun-report-builder,registry))
+$(eval $(call gb_Configuration_use_configuration,report-builder,registry))
 
-$(eval $(call gb_Configuration_add_schemas,sun-report-builder,reportbuilder/registry/schema,\
+$(eval $(call gb_Configuration_add_schemas,report-builder,reportbuilder/registry/schema,\
 	org/openoffice/Office/ReportDesign.xcs \
 	org/openoffice/Office/UI/DbReportWindowState.xcs \
 	org/openoffice/Office/UI/ReportCommands.xcs \
 ))
 
-$(eval $(call gb_Configuration_add_datas,sun-report-builder,reportbuilder/registry/data,\
+$(eval $(call gb_Configuration_add_datas,report-builder,reportbuilder/registry/data,\
 	org/openoffice/Office/Paths.xcu \
 	org/openoffice/Office/ReportDesign.xcu \
 	org/openoffice/Office/UI/Controller.xcu \
 ))
 
-$(eval $(call gb_Configuration_add_localized_datas,sun-report-builder,reportbuilder/registry/data,\
+$(eval $(call gb_Configuration_add_localized_datas,report-builder,reportbuilder/registry/data,\
 	org/openoffice/Office/Accelerators.xcu \
 	org/openoffice/Office/DataAccess.xcu \
 	org/openoffice/Office/Embedding.xcu \
diff --git a/reportbuilder/Extension_reportbuilder.mk b/reportbuilder/Extension_reportbuilder.mk
index f42134f..342522e 100644
--- a/reportbuilder/Extension_reportbuilder.mk
+++ b/reportbuilder/Extension_reportbuilder.mk
@@ -32,7 +32,7 @@ $(eval $(call gb_Extension_use_default_license,report-builder))
 
 $(eval $(call gb_Extension_add_files,report-builder,,\
 	$(call gb_Jar_get_outdir_target,reportbuilderwizard) \
-	$(call gb_Jar_get_outdir_target,sun-report-builder) \
+	$(call gb_Jar_get_outdir_target,report-builder) \
 	$(SRCDIR)/reportbuilder/license/readme_en-US.html \
 	$(SRCDIR)/reportbuilder/license/readme_en-US.txt \
 	$(SRCDIR)/reportbuilder/util/components.rdb \
diff --git a/reportbuilder/Jar_reportbuilder.mk b/reportbuilder/Jar_reportbuilder.mk
index 4ac4987..1fa82b6 100644
--- a/reportbuilder/Jar_reportbuilder.mk
+++ b/reportbuilder/Jar_reportbuilder.mk
@@ -25,9 +25,9 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
-$(eval $(call gb_Jar_Jar,sun-report-builder))
+$(eval $(call gb_Jar_Jar,report-builder))
 
-$(eval $(call gb_Jar_use_jars,sun-report-builder,\
+$(eval $(call gb_Jar_use_jars,report-builder,\
 	java_uno \
 	juh \
 	jurt \
@@ -35,7 +35,7 @@ $(eval $(call gb_Jar_use_jars,sun-report-builder,\
 	unoil \
 ))
 
-$(eval $(call gb_Jar_use_externals,sun-report-builder,\
+$(eval $(call gb_Jar_use_externals,report-builder,\
 	commons-logging \
 	flow-engine \
 	flute \
@@ -50,246 +50,246 @@ $(eval $(call gb_Jar_use_externals,sun-report-builder,\
 	sac \
 ))
 
-$(eval $(call gb_Jar_set_manifest,sun-report-builder,$(SRCDIR)/reportbuilder/util/manifest.mf))
+$(eval $(call gb_Jar_set_manifest,report-builder,$(SRCDIR)/reportbuilder/util/manifest.mf))
 
-$(eval $(call gb_Jar_set_packageroot,sun-report-builder,com))
+$(eval $(call gb_Jar_set_packageroot,report-builder,org))
 
-$(eval $(call gb_Jar_add_sourcefiles,sun-report-builder,\
-    reportbuilder/java/com/sun/star/report/DataRow \
-    reportbuilder/java/com/sun/star/report/DataSource \
-    reportbuilder/java/com/sun/star/report/DataSourceException \
-    reportbuilder/java/com/sun/star/report/DataSourceFactory \
-    reportbuilder/java/com/sun/star/report/ImageService \
-    reportbuilder/java/com/sun/star/report/InputRepository \
-    reportbuilder/java/com/sun/star/report/JobDefinitionException \
-    reportbuilder/java/com/sun/star/report/JobProgressIndicator \
-    reportbuilder/java/com/sun/star/report/JobProperties \
-    reportbuilder/java/com/sun/star/report/OfficeToken \
-    reportbuilder/java/com/sun/star/report/OutputRepository \
-    reportbuilder/java/com/sun/star/report/ParameterMap \
-    reportbuilder/java/com/sun/star/report/ReportAddIn \
-    reportbuilder/java/com/sun/star/report/ReportEngineMetaData \
-    reportbuilder/java/com/sun/star/report/ReportEngineParameterNames \
-    reportbuilder/java/com/sun/star/report/ReportExecutionException \
-    reportbuilder/java/com/sun/star/report/ReportExpression \
-    reportbuilder/java/com/sun/star/report/ReportExpressionMetaData \
-    reportbuilder/java/com/sun/star/report/ReportFunction \
-    reportbuilder/java/com/sun/star/report/ReportJob \
-    reportbuilder/java/com/sun/star/report/ReportJobDefinition \
-    reportbuilder/java/com/sun/star/report/ReportJobFactory \
-    reportbuilder/java/com/sun/star/report/SDBCReportData \
-    reportbuilder/java/com/sun/star/report/SDBCReportDataFactory \
-    reportbuilder/java/com/sun/star/report/SOImageService \
-    reportbuilder/java/com/sun/star/report/StorageRepository \
-    reportbuilder/java/com/sun/star/report/function/metadata/AuthorFunction \
-    reportbuilder/java/com/sun/star/report/function/metadata/AuthorFunctionDescription \
-    reportbuilder/java/com/sun/star/report/function/metadata/MetaDataFunctionCategory \
-    reportbuilder/java/com/sun/star/report/function/metadata/TitleFunction \
-    reportbuilder/java/com/sun/star/report/function/metadata/TitleFunctionDescription \
-    reportbuilder/java/com/sun/star/report/pentaho/DefaultNameGenerator \
-    reportbuilder/java/com/sun/star/report/pentaho/OfficeNamespaces \
-    reportbuilder/java/com/sun/star/report/pentaho/PentahoFormulaContext \
-    reportbuilder/java/com/sun/star/report/pentaho/PentahoReportAddIn \
-    reportbuilder/java/com/sun/star/report/pentaho/PentahoReportEngine \
-    reportbuilder/java/com/sun/star/report/pentaho/PentahoReportEngineMetaData \
-    reportbuilder/java/com/sun/star/report/pentaho/PentahoReportJob \
-    reportbuilder/java/com/sun/star/report/pentaho/SOFormulaOpCodeMapper \
-    reportbuilder/java/com/sun/star/report/pentaho/SOFormulaParser \
-    reportbuilder/java/com/sun/star/report/pentaho/SOFunctionManager \
-    reportbuilder/java/com/sun/star/report/pentaho/SOReportJobFactory \
-    reportbuilder/java/com/sun/star/report/pentaho/StarFunctionCategory \
-    reportbuilder/java/com/sun/star/report/pentaho/StarFunctionDescription \
-    reportbuilder/java/com/sun/star/report/pentaho/StarReportData \
-    reportbuilder/java/com/sun/star/report/pentaho/StarReportDataFactory \
-    reportbuilder/java/com/sun/star/report/pentaho/StarReportModule \
-    reportbuilder/java/com/sun/star/report/pentaho/expressions/SumExpression \
-    reportbuilder/java/com/sun/star/report/pentaho/expressions/SumExpressionMetaData \
-    reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/AbstractReportElementLayoutController \
-    reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FixedTextLayoutController \
-    reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FormatValueUtility \
-    reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FormattedTextLayoutController \
-    reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/ImageElementContext \
-    reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/ImageElementLayoutController \
-    reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/ObjectOleLayoutController \
-    reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeDetailLayoutController \
-    reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeGroupInstanceSectionLayoutController \
-    reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeGroupLayoutController \
-    reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeGroupSectionLayoutController \
-    reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficePageSectionLayoutController \
-    reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeRepeatingStructureLayoutController \
-    reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeReportLayoutController \
-    reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeTableLayoutController \
-    reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeTableTemplateLayoutController \
-    reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/TableCellLayoutController \
-    reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/VariablesCollection \
-    reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/VariablesDeclarationLayoutController \
-    reportbuilder/java/com/sun/star/report/pentaho/loader/InputRepositoryLoader \
-    reportbuilder/java/com/sun/star/report/pentaho/loader/InputRepositoryResourceData \
-    reportbuilder/java/com/sun/star/report/pentaho/loader/InputResourceKey \
-    reportbuilder/java/com/sun/star/report/pentaho/model/DataStyle \
-    reportbuilder/java/com/sun/star/report/pentaho/model/FixedTextElement \
-    reportbuilder/java/com/sun/star/report/pentaho/model/FontFaceDeclsSection \
-    reportbuilder/java/com/sun/star/report/pentaho/model/FontFaceElement \
-    reportbuilder/java/com/sun/star/report/pentaho/model/FormatCondition \
-    reportbuilder/java/com/sun/star/report/pentaho/model/FormattedTextElement \
-    reportbuilder/java/com/sun/star/report/pentaho/model/ImageElement \
-    reportbuilder/java/com/sun/star/report/pentaho/model/ObjectOleElement \
-    reportbuilder/java/com/sun/star/report/pentaho/model/OfficeDetailSection \
-    reportbuilder/java/com/sun/star/report/pentaho/model/OfficeDocument \
-    reportbuilder/java/com/sun/star/report/pentaho/model/OfficeGroup \
-    reportbuilder/java/com/sun/star/report/pentaho/model/OfficeGroupInstanceSection \
-    reportbuilder/java/com/sun/star/report/pentaho/model/OfficeGroupSection \
-    reportbuilder/java/com/sun/star/report/pentaho/model/OfficeMasterPage \
-    reportbuilder/java/com/sun/star/report/pentaho/model/OfficeMasterStyles \
-    reportbuilder/java/com/sun/star/report/pentaho/model/OfficeReport \
-    reportbuilder/java/com/sun/star/report/pentaho/model/OfficeStyle \
-    reportbuilder/java/com/sun/star/report/pentaho/model/OfficeStyles \
-    reportbuilder/java/com/sun/star/report/pentaho/model/OfficeStylesCollection \
-    reportbuilder/java/com/sun/star/report/pentaho/model/OfficeTableSection \
-    reportbuilder/java/com/sun/star/report/pentaho/model/PageLayout \
-    reportbuilder/java/com/sun/star/report/pentaho/model/PageSection \
-    reportbuilder/java/com/sun/star/report/pentaho/model/RawText \
-    reportbuilder/java/com/sun/star/report/pentaho/model/ReportElement \
-    reportbuilder/java/com/sun/star/report/pentaho/model/TableCellElement \
-    reportbuilder/java/com/sun/star/report/pentaho/model/VariablesDeclarationSection \
-    reportbuilder/java/com/sun/star/report/pentaho/output/ImageProducer \
-    reportbuilder/java/com/sun/star/report/pentaho/output/OfficeDocumentReportTarget \
-    reportbuilder/java/com/sun/star/report/pentaho/output/OleProducer \
-    reportbuilder/java/com/sun/star/report/pentaho/output/StyleUtilities \
-    reportbuilder/java/com/sun/star/report/pentaho/output/StylesWriter \
-    reportbuilder/java/com/sun/star/report/pentaho/output/chart/ChartRawReportProcessor \
-    reportbuilder/java/com/sun/star/report/pentaho/output/chart/ChartRawReportTarget \
-    reportbuilder/java/com/sun/star/report/pentaho/output/spreadsheet/SpreadsheetRawReportProcessor \
-    reportbuilder/java/com/sun/star/report/pentaho/output/spreadsheet/SpreadsheetRawReportTarget \
-    reportbuilder/java/com/sun/star/report/pentaho/output/text/MasterPageFactory \
-    reportbuilder/java/com/sun/star/report/pentaho/output/text/PageBreakDefinition \
-    reportbuilder/java/com/sun/star/report/pentaho/output/text/PageContext \
-    reportbuilder/java/com/sun/star/report/pentaho/output/text/TextRawReportProcessor \
-    reportbuilder/java/com/sun/star/report/pentaho/output/text/TextRawReportTarget \
-    reportbuilder/java/com/sun/star/report/pentaho/output/text/VariablesDeclarations \
-    reportbuilder/java/com/sun/star/report/pentaho/parser/AttributeSpecification \
-    reportbuilder/java/com/sun/star/report/pentaho/parser/ElementReadHandler \
-    reportbuilder/java/com/sun/star/report/pentaho/parser/OfficeDocumentXmlResourceFactory \
-    reportbuilder/java/com/sun/star/report/pentaho/parser/OfficeParserUtil \
-    reportbuilder/java/com/sun/star/report/pentaho/parser/OfficeStylesXmlResourceFactory \
-    reportbuilder/java/com/sun/star/report/pentaho/parser/StarStyleXmlFactoryModule \
-    reportbuilder/java/com/sun/star/report/pentaho/parser/StarXmlFactoryModule \
-    reportbuilder/java/com/sun/star/report/pentaho/parser/StyleMapper \
-    reportbuilder/java/com/sun/star/report/pentaho/parser/chart/ChartReadHandler \
-    reportbuilder/java/com/sun/star/report/pentaho/parser/data/DataStyleReadHandler \
-    reportbuilder/java/com/sun/star/report/pentaho/parser/draw/ObjectOleReadHandler \
-    reportbuilder/java/com/sun/star/report/pentaho/parser/office/BodyReadHandler \
-    reportbuilder/java/com/sun/star/report/pentaho/parser/office/DocumentContentReadHandler \
-    reportbuilder/java/com/sun/star/report/pentaho/parser/office/DocumentStylesReadHandler \
-    reportbuilder/java/com/sun/star/report/pentaho/parser/office/FontFaceDeclsReadHandler \
-    reportbuilder/java/com/sun/star/report/pentaho/parser/office/MasterStylesReadHandler \
-    reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/ConditionalPrintExpressionReadHandler \
-    reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/DetailRootTableReadHandler \
-    reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/FixedContentReadHandler \
-    reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/FormatConditionReadHandler \
-    reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/FormattedTextReadHandler \
-    reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/FunctionReadHandler \
-    reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/GroupReadHandler \
-    reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/GroupSectionReadHandler \
-    reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/ImageReadHandler \
-    reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/MasterDetailReadHandler \
-    reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/ReportElementReadHandler \
-    reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/ReportReadHandler \
-    reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/RootTableReadHandler \
-    reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/SubDocumentReadHandler \
-    reportbuilder/java/com/sun/star/report/pentaho/parser/style/FontFaceReadHandler \
-    reportbuilder/java/com/sun/star/report/pentaho/parser/style/MasterPageReadHandler \
-    reportbuilder/java/com/sun/star/report/pentaho/parser/style/OfficeStyleReadHandler \
-    reportbuilder/java/com/sun/star/report/pentaho/parser/style/OfficeStylesReadHandler \
-    reportbuilder/java/com/sun/star/report/pentaho/parser/style/PageLayoutReadHandler \
-    reportbuilder/java/com/sun/star/report/pentaho/parser/style/StyleDefinitionReadHandler \
-    reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/OneOfConstantsMapper \
-    reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/draw/TextAreaVerticalAlignMapper \
-    reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/BackgroundColorMapper \
-    reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/BorderRightMapper \
-    reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/ColorMapper \
-    reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/FontSizeMapper \
-    reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/FontStyleMapper \
-    reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/FontWeightMapper \
-    reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/TextAlignMapper \
-    reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/FontFamilyGenericMapper \
-    reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/FontFamilyMapper \
-    reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/FontNameMapper \
-    reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/FontPitchMapper \
-    reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/FontReliefMapper \
-    reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/TextEmphasizeMapper \
-    reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/TextUnderlineColorMapper \
-    reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/TextUnderlineStyleMapper \
-    reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/TextUnderlineWidthMapper \
-    reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/TextUnderlineWordMode \
-    reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/VerticalAlignMapper \
-    reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/table/ColumnWidthMapper \
-    reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/table/RowHeightMapper \
-    reportbuilder/java/com/sun/star/report/pentaho/parser/table/CoveredCellReadHandler \
-    reportbuilder/java/com/sun/star/report/pentaho/parser/table/TableCellReadHandler \
-    reportbuilder/java/com/sun/star/report/pentaho/parser/table/TableColumnReadHandler \
-    reportbuilder/java/com/sun/star/report/pentaho/parser/table/TableColumnsReadHandler \
-    reportbuilder/java/com/sun/star/report/pentaho/parser/table/TableReadHandler \
-    reportbuilder/java/com/sun/star/report/pentaho/parser/table/TableRowReadHandler \
-    reportbuilder/java/com/sun/star/report/pentaho/parser/table/TableRowsReadHandler \
-    reportbuilder/java/com/sun/star/report/pentaho/parser/text/NoCDATATextContentReadHandler \
-    reportbuilder/java/com/sun/star/report/pentaho/parser/text/TextContentReadHandler \
-    reportbuilder/java/com/sun/star/report/pentaho/parser/xlink/XLinkReadHandler \
-    reportbuilder/java/com/sun/star/report/pentaho/styles/LengthCalculator \
-    reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMapper \
-    reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMapperKey \
-    reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMapperXmlFactoryModule \
-    reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMapperXmlResourceFactory \
-    reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMappingDocumentReadHandler \
-    reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMappingReadHandler \
-    reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMappingRule \
-    reportbuilder/java/com/sun/star/report/util/DefaultJobProperties \
-    reportbuilder/java/com/sun/star/report/util/DefaultParameterMap \
-    reportbuilder/java/com/sun/star/report/util/DefaultReportJobDefinition \
-    reportbuilder/java/com/sun/star/report/util/ManifestWriter \
+$(eval $(call gb_Jar_add_sourcefiles,report-builder,\
+    reportbuilder/java/org/libreoffice/report/DataRow \
+    reportbuilder/java/org/libreoffice/report/DataSource \
+    reportbuilder/java/org/libreoffice/report/DataSourceException \
+    reportbuilder/java/org/libreoffice/report/DataSourceFactory \
+    reportbuilder/java/org/libreoffice/report/ImageService \
+    reportbuilder/java/org/libreoffice/report/InputRepository \
+    reportbuilder/java/org/libreoffice/report/JobDefinitionException \
+    reportbuilder/java/org/libreoffice/report/JobProgressIndicator \
+    reportbuilder/java/org/libreoffice/report/JobProperties \
+    reportbuilder/java/org/libreoffice/report/OfficeToken \
+    reportbuilder/java/org/libreoffice/report/OutputRepository \
+    reportbuilder/java/org/libreoffice/report/ParameterMap \
+    reportbuilder/java/org/libreoffice/report/ReportAddIn \
+    reportbuilder/java/org/libreoffice/report/ReportEngineMetaData \
+    reportbuilder/java/org/libreoffice/report/ReportEngineParameterNames \
+    reportbuilder/java/org/libreoffice/report/ReportExecutionException \
+    reportbuilder/java/org/libreoffice/report/ReportExpression \
+    reportbuilder/java/org/libreoffice/report/ReportExpressionMetaData \
+    reportbuilder/java/org/libreoffice/report/ReportFunction \
+    reportbuilder/java/org/libreoffice/report/ReportJob \
+    reportbuilder/java/org/libreoffice/report/ReportJobDefinition \
+    reportbuilder/java/org/libreoffice/report/ReportJobFactory \
+    reportbuilder/java/org/libreoffice/report/SDBCReportData \
+    reportbuilder/java/org/libreoffice/report/SDBCReportDataFactory \
+    reportbuilder/java/org/libreoffice/report/SOImageService \
+    reportbuilder/java/org/libreoffice/report/StorageRepository \
+    reportbuilder/java/org/libreoffice/report/function/metadata/AuthorFunction \
+    reportbuilder/java/org/libreoffice/report/function/metadata/AuthorFunctionDescription \
+    reportbuilder/java/org/libreoffice/report/function/metadata/MetaDataFunctionCategory \
+    reportbuilder/java/org/libreoffice/report/function/metadata/TitleFunction \
+    reportbuilder/java/org/libreoffice/report/function/metadata/TitleFunctionDescription \
+    reportbuilder/java/org/libreoffice/report/pentaho/DefaultNameGenerator \
+    reportbuilder/java/org/libreoffice/report/pentaho/OfficeNamespaces \
+    reportbuilder/java/org/libreoffice/report/pentaho/PentahoFormulaContext \
+    reportbuilder/java/org/libreoffice/report/pentaho/PentahoReportAddIn \
+    reportbuilder/java/org/libreoffice/report/pentaho/PentahoReportEngine \
+    reportbuilder/java/org/libreoffice/report/pentaho/PentahoReportEngineMetaData \
+    reportbuilder/java/org/libreoffice/report/pentaho/PentahoReportJob \
+    reportbuilder/java/org/libreoffice/report/pentaho/SOFormulaOpCodeMapper \
+    reportbuilder/java/org/libreoffice/report/pentaho/SOFormulaParser \
+    reportbuilder/java/org/libreoffice/report/pentaho/SOFunctionManager \
+    reportbuilder/java/org/libreoffice/report/pentaho/SOReportJobFactory \
+    reportbuilder/java/org/libreoffice/report/pentaho/StarFunctionCategory \
+    reportbuilder/java/org/libreoffice/report/pentaho/StarFunctionDescription \
+    reportbuilder/java/org/libreoffice/report/pentaho/StarReportData \
+    reportbuilder/java/org/libreoffice/report/pentaho/StarReportDataFactory \
+    reportbuilder/java/org/libreoffice/report/pentaho/StarReportModule \
+    reportbuilder/java/org/libreoffice/report/pentaho/expressions/SumExpression \
+    reportbuilder/java/org/libreoffice/report/pentaho/expressions/SumExpressionMetaData \
+    reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/AbstractReportElementLayoutController \
+    reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FixedTextLayoutController \
+    reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormatValueUtility \
+    reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormattedTextLayoutController \
+    reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/ImageElementContext \
+    reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/ImageElementLayoutController \
+    reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/ObjectOleLayoutController \
+    reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeDetailLayoutController \
+    reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeGroupInstanceSectionLayoutController \
+    reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeGroupLayoutController \
+    reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeGroupSectionLayoutController \
+    reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficePageSectionLayoutController \
+    reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeRepeatingStructureLayoutController \
+    reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeReportLayoutController \
+    reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeTableLayoutController \
+    reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeTableTemplateLayoutController \
+    reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/TableCellLayoutController \
+    reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/VariablesCollection \
+    reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/VariablesDeclarationLayoutController \
+    reportbuilder/java/org/libreoffice/report/pentaho/loader/InputRepositoryLoader \
+    reportbuilder/java/org/libreoffice/report/pentaho/loader/InputRepositoryResourceData \
+    reportbuilder/java/org/libreoffice/report/pentaho/loader/InputResourceKey \
+    reportbuilder/java/org/libreoffice/report/pentaho/model/DataStyle \
+    reportbuilder/java/org/libreoffice/report/pentaho/model/FixedTextElement \
+    reportbuilder/java/org/libreoffice/report/pentaho/model/FontFaceDeclsSection \
+    reportbuilder/java/org/libreoffice/report/pentaho/model/FontFaceElement \
+    reportbuilder/java/org/libreoffice/report/pentaho/model/FormatCondition \
+    reportbuilder/java/org/libreoffice/report/pentaho/model/FormattedTextElement \
+    reportbuilder/java/org/libreoffice/report/pentaho/model/ImageElement \
+    reportbuilder/java/org/libreoffice/report/pentaho/model/ObjectOleElement \
+    reportbuilder/java/org/libreoffice/report/pentaho/model/OfficeDetailSection \
+    reportbuilder/java/org/libreoffice/report/pentaho/model/OfficeDocument \
+    reportbuilder/java/org/libreoffice/report/pentaho/model/OfficeGroup \
+    reportbuilder/java/org/libreoffice/report/pentaho/model/OfficeGroupInstanceSection \
+    reportbuilder/java/org/libreoffice/report/pentaho/model/OfficeGroupSection \
+    reportbuilder/java/org/libreoffice/report/pentaho/model/OfficeMasterPage \
+    reportbuilder/java/org/libreoffice/report/pentaho/model/OfficeMasterStyles \
+    reportbuilder/java/org/libreoffice/report/pentaho/model/OfficeReport \
+    reportbuilder/java/org/libreoffice/report/pentaho/model/OfficeStyle \
+    reportbuilder/java/org/libreoffice/report/pentaho/model/OfficeStyles \
+    reportbuilder/java/org/libreoffice/report/pentaho/model/OfficeStylesCollection \
+    reportbuilder/java/org/libreoffice/report/pentaho/model/OfficeTableSection \
+    reportbuilder/java/org/libreoffice/report/pentaho/model/PageLayout \
+    reportbuilder/java/org/libreoffice/report/pentaho/model/PageSection \
+    reportbuilder/java/org/libreoffice/report/pentaho/model/RawText \
+    reportbuilder/java/org/libreoffice/report/pentaho/model/ReportElement \
+    reportbuilder/java/org/libreoffice/report/pentaho/model/TableCellElement \
+    reportbuilder/java/org/libreoffice/report/pentaho/model/VariablesDeclarationSection \
+    reportbuilder/java/org/libreoffice/report/pentaho/output/ImageProducer \
+    reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget \
+    reportbuilder/java/org/libreoffice/report/pentaho/output/OleProducer \
+    reportbuilder/java/org/libreoffice/report/pentaho/output/StyleUtilities \
+    reportbuilder/java/org/libreoffice/report/pentaho/output/StylesWriter \
+    reportbuilder/java/org/libreoffice/report/pentaho/output/chart/ChartRawReportProcessor \
+    reportbuilder/java/org/libreoffice/report/pentaho/output/chart/ChartRawReportTarget \
+    reportbuilder/java/org/libreoffice/report/pentaho/output/spreadsheet/SpreadsheetRawReportProcessor \
+    reportbuilder/java/org/libreoffice/report/pentaho/output/spreadsheet/SpreadsheetRawReportTarget \
+    reportbuilder/java/org/libreoffice/report/pentaho/output/text/MasterPageFactory \
+    reportbuilder/java/org/libreoffice/report/pentaho/output/text/PageBreakDefinition \
+    reportbuilder/java/org/libreoffice/report/pentaho/output/text/PageContext \
+    reportbuilder/java/org/libreoffice/report/pentaho/output/text/TextRawReportProcessor \
+    reportbuilder/java/org/libreoffice/report/pentaho/output/text/TextRawReportTarget \
+    reportbuilder/java/org/libreoffice/report/pentaho/output/text/VariablesDeclarations \
+    reportbuilder/java/org/libreoffice/report/pentaho/parser/AttributeSpecification \
+    reportbuilder/java/org/libreoffice/report/pentaho/parser/ElementReadHandler \
+    reportbuilder/java/org/libreoffice/report/pentaho/parser/OfficeDocumentXmlResourceFactory \
+    reportbuilder/java/org/libreoffice/report/pentaho/parser/OfficeParserUtil \
+    reportbuilder/java/org/libreoffice/report/pentaho/parser/OfficeStylesXmlResourceFactory \
+    reportbuilder/java/org/libreoffice/report/pentaho/parser/StarStyleXmlFactoryModule \
+    reportbuilder/java/org/libreoffice/report/pentaho/parser/StarXmlFactoryModule \
+    reportbuilder/java/org/libreoffice/report/pentaho/parser/StyleMapper \
+    reportbuilder/java/org/libreoffice/report/pentaho/parser/chart/ChartReadHandler \
+    reportbuilder/java/org/libreoffice/report/pentaho/parser/data/DataStyleReadHandler \
+    reportbuilder/java/org/libreoffice/report/pentaho/parser/draw/ObjectOleReadHandler \
+    reportbuilder/java/org/libreoffice/report/pentaho/parser/office/BodyReadHandler \
+    reportbuilder/java/org/libreoffice/report/pentaho/parser/office/DocumentContentReadHandler \
+    reportbuilder/java/org/libreoffice/report/pentaho/parser/office/DocumentStylesReadHandler \
+    reportbuilder/java/org/libreoffice/report/pentaho/parser/office/FontFaceDeclsReadHandler \
+    reportbuilder/java/org/libreoffice/report/pentaho/parser/office/MasterStylesReadHandler \
+    reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/ConditionalPrintExpressionReadHandler \
+    reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/DetailRootTableReadHandler \
+    reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/FixedContentReadHandler \
+    reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/FormatConditionReadHandler \
+    reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/FormattedTextReadHandler \
+    reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/FunctionReadHandler \
+    reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/GroupReadHandler \
+    reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/GroupSectionReadHandler \
+    reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/ImageReadHandler \
+    reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/MasterDetailReadHandler \
+    reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/ReportElementReadHandler \
+    reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/ReportReadHandler \
+    reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/RootTableReadHandler \
+    reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/SubDocumentReadHandler \
+    reportbuilder/java/org/libreoffice/report/pentaho/parser/style/FontFaceReadHandler \
+    reportbuilder/java/org/libreoffice/report/pentaho/parser/style/MasterPageReadHandler \
+    reportbuilder/java/org/libreoffice/report/pentaho/parser/style/OfficeStyleReadHandler \
+    reportbuilder/java/org/libreoffice/report/pentaho/parser/style/OfficeStylesReadHandler \
+    reportbuilder/java/org/libreoffice/report/pentaho/parser/style/PageLayoutReadHandler \
+    reportbuilder/java/org/libreoffice/report/pentaho/parser/style/StyleDefinitionReadHandler \
+    reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/OneOfConstantsMapper \
+    reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/draw/TextAreaVerticalAlignMapper \
+    reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/fo/BackgroundColorMapper \
+    reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/fo/BorderRightMapper \
+    reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/fo/ColorMapper \
+    reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/fo/FontSizeMapper \
+    reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/fo/FontStyleMapper \
+    reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/fo/FontWeightMapper \
+    reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/fo/TextAlignMapper \
+    reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/style/FontFamilyGenericMapper \
+    reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/style/FontFamilyMapper \
+    reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/style/FontNameMapper \
+    reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/style/FontPitchMapper \
+    reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/style/FontReliefMapper \
+    reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/style/TextEmphasizeMapper \
+    reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/style/TextUnderlineColorMapper \
+    reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/style/TextUnderlineStyleMapper \
+    reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/style/TextUnderlineWidthMapper \
+    reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/style/TextUnderlineWordMode \
+    reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/style/VerticalAlignMapper \
+    reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/table/ColumnWidthMapper \
+    reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/table/RowHeightMapper \
+    reportbuilder/java/org/libreoffice/report/pentaho/parser/table/CoveredCellReadHandler \
+    reportbuilder/java/org/libreoffice/report/pentaho/parser/table/TableCellReadHandler \
+    reportbuilder/java/org/libreoffice/report/pentaho/parser/table/TableColumnReadHandler \
+    reportbuilder/java/org/libreoffice/report/pentaho/parser/table/TableColumnsReadHandler \
+    reportbuilder/java/org/libreoffice/report/pentaho/parser/table/TableReadHandler \
+    reportbuilder/java/org/libreoffice/report/pentaho/parser/table/TableRowReadHandler \
+    reportbuilder/java/org/libreoffice/report/pentaho/parser/table/TableRowsReadHandler \
+    reportbuilder/java/org/libreoffice/report/pentaho/parser/text/NoCDATATextContentReadHandler \
+    reportbuilder/java/org/libreoffice/report/pentaho/parser/text/TextContentReadHandler \
+    reportbuilder/java/org/libreoffice/report/pentaho/parser/xlink/XLinkReadHandler \
+    reportbuilder/java/org/libreoffice/report/pentaho/styles/LengthCalculator \
+    reportbuilder/java/org/libreoffice/report/pentaho/styles/StyleMapper \
+    reportbuilder/java/org/libreoffice/report/pentaho/styles/StyleMapperKey \
+    reportbuilder/java/org/libreoffice/report/pentaho/styles/StyleMapperXmlFactoryModule \
+    reportbuilder/java/org/libreoffice/report/pentaho/styles/StyleMapperXmlResourceFactory \
+    reportbuilder/java/org/libreoffice/report/pentaho/styles/StyleMappingDocumentReadHandler \
+    reportbuilder/java/org/libreoffice/report/pentaho/styles/StyleMappingReadHandler \
+    reportbuilder/java/org/libreoffice/report/pentaho/styles/StyleMappingRule \
+    reportbuilder/java/org/libreoffice/report/util/DefaultJobProperties \
+    reportbuilder/java/org/libreoffice/report/util/DefaultParameterMap \
+    reportbuilder/java/org/libreoffice/report/util/DefaultReportJobDefinition \
+    reportbuilder/java/org/libreoffice/report/util/ManifestWriter \
 ))
 
-$(eval $(call gb_Jar_add_packagefiles,sun-report-builder,,\
+$(eval $(call gb_Jar_add_packagefiles,report-builder,,\
 	$(SRCDIR)/reportbuilder/java/jfreereport.properties \
 	$(SRCDIR)/reportbuilder/java/libformula.properties \
 	$(SRCDIR)/reportbuilder/java/loader.properties \
 ))
 
-$(eval $(call gb_Jar_add_packagefiles,sun-report-builder,com/sun/star/report/function/metadata,\
-	$(SRCDIR)/reportbuilder/java/com/sun/star/report/function/metadata/Author-Function.properties \
-	$(SRCDIR)/reportbuilder/java/com/sun/star/report/function/metadata/Author-Function_en_US.properties \
-	$(SRCDIR)/reportbuilder/java/com/sun/star/report/function/metadata/Title-Function.properties \
-	$(SRCDIR)/reportbuilder/java/com/sun/star/report/function/metadata/Title-Function_en_US.properties \
-	$(SRCDIR)/reportbuilder/java/com/sun/star/report/function/metadata/category.properties \
-	$(SRCDIR)/reportbuilder/java/com/sun/star/report/function/metadata/category_en_US.properties \
+$(eval $(call gb_Jar_add_packagefiles,report-builder,org/libreoffice/report/function/metadata,\
+	$(SRCDIR)/reportbuilder/java/org/libreoffice/report/function/metadata/Author-Function.properties \
+	$(SRCDIR)/reportbuilder/java/org/libreoffice/report/function/metadata/Author-Function_en_US.properties \
+	$(SRCDIR)/reportbuilder/java/org/libreoffice/report/function/metadata/Title-Function.properties \
+	$(SRCDIR)/reportbuilder/java/org/libreoffice/report/function/metadata/Title-Function_en_US.properties \
+	$(SRCDIR)/reportbuilder/java/org/libreoffice/report/function/metadata/category.properties \
+	$(SRCDIR)/reportbuilder/java/org/libreoffice/report/function/metadata/category_en_US.properties \
 ))
 
-$(eval $(call gb_Jar_add_packagefiles,sun-report-builder,com/sun/star/report/pentaho,\
-	$(SRCDIR)/reportbuilder/java/com/sun/star/report/pentaho/configuration.properties \
-	$(SRCDIR)/reportbuilder/java/com/sun/star/report/pentaho/module.properties \
-	$(SRCDIR)/reportbuilder/java/com/sun/star/report/pentaho/oasis-datastyle.css \
-	$(SRCDIR)/reportbuilder/java/com/sun/star/report/pentaho/oasis-draw.css \
-	$(SRCDIR)/reportbuilder/java/com/sun/star/report/pentaho/oasis-form.css \
-	$(SRCDIR)/reportbuilder/java/com/sun/star/report/pentaho/oasis-style.css \
-	$(SRCDIR)/reportbuilder/java/com/sun/star/report/pentaho/oasis-table.css \
-	$(SRCDIR)/reportbuilder/java/com/sun/star/report/pentaho/oasis-text.css \
-	$(SRCDIR)/reportbuilder/java/com/sun/star/report/pentaho/smil.css \
-	$(SRCDIR)/reportbuilder/java/com/sun/star/report/pentaho/star-office.css \
-	$(SRCDIR)/reportbuilder/java/com/sun/star/report/pentaho/star-report.css \
-	$(SRCDIR)/reportbuilder/java/com/sun/star/report/pentaho/star-rpt.css \
-	$(SRCDIR)/reportbuilder/java/com/sun/star/report/pentaho/svg.css \
-	$(SRCDIR)/reportbuilder/java/com/sun/star/report/pentaho/xsl-fo.css \
+$(eval $(call gb_Jar_add_packagefiles,report-builder,org/libreoffice/report/pentaho,\
+	$(SRCDIR)/reportbuilder/java/org/libreoffice/report/pentaho/configuration.properties \
+	$(SRCDIR)/reportbuilder/java/org/libreoffice/report/pentaho/module.properties \
+	$(SRCDIR)/reportbuilder/java/org/libreoffice/report/pentaho/oasis-datastyle.css \
+	$(SRCDIR)/reportbuilder/java/org/libreoffice/report/pentaho/oasis-draw.css \
+	$(SRCDIR)/reportbuilder/java/org/libreoffice/report/pentaho/oasis-form.css \
+	$(SRCDIR)/reportbuilder/java/org/libreoffice/report/pentaho/oasis-style.css \
+	$(SRCDIR)/reportbuilder/java/org/libreoffice/report/pentaho/oasis-table.css \
+	$(SRCDIR)/reportbuilder/java/org/libreoffice/report/pentaho/oasis-text.css \
+	$(SRCDIR)/reportbuilder/java/org/libreoffice/report/pentaho/smil.css \
+	$(SRCDIR)/reportbuilder/java/org/libreoffice/report/pentaho/star-office.css \
+	$(SRCDIR)/reportbuilder/java/org/libreoffice/report/pentaho/star-report.css \
+	$(SRCDIR)/reportbuilder/java/org/libreoffice/report/pentaho/star-rpt.css \
+	$(SRCDIR)/reportbuilder/java/org/libreoffice/report/pentaho/svg.css \
+	$(SRCDIR)/reportbuilder/java/org/libreoffice/report/pentaho/xsl-fo.css \
 ))
 
-$(eval $(call gb_Jar_add_packagefiles,sun-report-builder,com/sun/star/report/pentaho/parser,\
-	$(SRCDIR)/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt-schema-v1.0-os.xsd \
-	$(SRCDIR)/reportbuilder/java/com/sun/star/report/pentaho/parser/selectors.properties \
-	$(SRCDIR)/reportbuilder/java/com/sun/star/report/pentaho/parser/style-mapping.txt \
+$(eval $(call gb_Jar_add_packagefiles,report-builder,org/libreoffice/report/pentaho/parser,\
+	$(SRCDIR)/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt-schema-v1.0-os.xsd \
+	$(SRCDIR)/reportbuilder/java/org/libreoffice/report/pentaho/parser/selectors.properties \
+	$(SRCDIR)/reportbuilder/java/org/libreoffice/report/pentaho/parser/style-mapping.txt \
 ))
 
-$(eval $(call gb_Jar_add_packagefiles,sun-report-builder,com/sun/star/report/pentaho/styles,\
-	$(SRCDIR)/reportbuilder/java/com/sun/star/report/pentaho/styles/stylemapper.xml \
-	$(SRCDIR)/reportbuilder/java/com/sun/star/report/pentaho/styles/stylemapper.xsd \
+$(eval $(call gb_Jar_add_packagefiles,report-builder,org/libreoffice/report/pentaho/styles,\
+	$(SRCDIR)/reportbuilder/java/org/libreoffice/report/pentaho/styles/stylemapper.xml \
+	$(SRCDIR)/reportbuilder/java/org/libreoffice/report/pentaho/styles/stylemapper.xsd \
 ))
 
 # vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/reportbuilder/java/com/sun/star/report/DataRow.java b/reportbuilder/java/com/sun/star/report/DataRow.java
deleted file mode 100644
index 0361a91..0000000
--- a/reportbuilder/java/com/sun/star/report/DataRow.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-package com.sun.star.report;
-
-/**
- * This feeds data into the reporting engine, in case the data has been provided
- * by the caller. The methods are a mix of TableModel methods and methods borrowed
- * from the java.sql.ResultSet interface.
- *
- * The column and row index starts at 1 (as it is done in JDBC).
- *
- */
-public interface DataRow
-{
-
-    int getColumnCount() throws DataSourceException;
-
-    String getColumnName(int column) throws DataSourceException;
-
-    Object getObject(int column) throws DataSourceException;
-}
diff --git a/reportbuilder/java/com/sun/star/report/DataSource.java b/reportbuilder/java/com/sun/star/report/DataSource.java
deleted file mode 100644
index 420b8d3..0000000
--- a/reportbuilder/java/com/sun/star/report/DataSource.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-package com.sun.star.report;
-
-/**
- * This feeds data into the reporting engine, in case the data has been provided
- * by the caller. The methods are a mix of TableModel methods and methods borrowed
- * from the java.sql.ResultSet interface.
- *
- * The column and row index starts at 1 (as it is done in JDBC).
- *
- */
-public interface DataSource extends DataRow
-{
-
-    int getRowCount() throws DataSourceException;
-
-    boolean absolute(int row) throws DataSourceException;
-
-    boolean next() throws DataSourceException;
-
-    void close() throws DataSourceException;
-}
diff --git a/reportbuilder/java/com/sun/star/report/DataSourceException.java b/reportbuilder/java/com/sun/star/report/DataSourceException.java
deleted file mode 100644
index 3fe7c79..0000000
--- a/reportbuilder/java/com/sun/star/report/DataSourceException.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-package com.sun.star.report;
-
-/**
- * A general exception to indicate that there was an error while accessing the
- * datasource.
- *
- */
-public class DataSourceException extends Exception
-{
-
-    /**
-     * Constructs a new exception with <code>null</code> as its detail message.
-     * The cause is not initialized, and may subsequently be initialized by a call
-     * to {@link #initCause}.
-     */
-    public DataSourceException()
-    {
-        super();
-    }
-
-    /**
-     * Constructs a new exception with the specified detail message.  The cause is
-     * not initialized, and may subsequently be initialized by a call to {@link
-     * #initCause}.
-     *
-     * @param message the detail message. The detail message is saved for later
-     *                retrieval by the {@link #getMessage()} method.
-     */
-    public DataSourceException(String message)
-    {
-        super(message);
-    }
-
-    /**
-     * Constructs a new exception with the specified detail message and cause.
-     * <p>Note that the detail message associated with <code>cause</code> is
-     * <i>not</i> automatically incorporated in this exception's detail message.
-     *
-     * @param message the detail message (which is saved for later retrieval by
-     *                the {@link #getMessage()} method).
-     * @param cause   the cause (which is saved for later retrieval by the {@link
-     *                #getCause()} method).  (A <tt>null</tt> value is permitted,
-     *                and indicates that the cause is nonexistent or unknown.)
-     * @since 1.4
-     */
-    public DataSourceException(String message, Throwable cause)
-    {
-        super(message, cause);
-    }
-
-    /**
-     * Constructs a new exception with the specified cause and a detail message of
-     * <tt>(cause==null ? null : cause.toString())</tt> (which typically contains
-     * the class and detail message of <tt>cause</tt>). This constructor is useful
-     * for exceptions that are little more than wrappers for other throwables (for
-     * example, {@link PrivilegedActionException}).
-     *
-     * @param cause the cause (which is saved for later retrieval by the {@link
-     *              #getCause()} method).  (A <tt>null</tt> value is permitted,
-     *              and indicates that the cause is nonexistent or unknown.)
-     * @since 1.4
-     */
-    public DataSourceException(Throwable cause)
-    {
-        super(cause);
-    }
-}
diff --git a/reportbuilder/java/com/sun/star/report/DataSourceFactory.java b/reportbuilder/java/com/sun/star/report/DataSourceFactory.java
deleted file mode 100644
index f0311fa..0000000
--- a/reportbuilder/java/com/sun/star/report/DataSourceFactory.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-package com.sun.star.report;
-
-import java.util.Map;
-
-/**
- * Allows to query the data repository and returns a datasource for the
- * specified name and parameters. The parameters-map can be null, if there
- * are no parameters required.
- *
- */
-public interface DataSourceFactory
-{
-
-    public DataSource queryData(String name, Map<String,Object> parameters)
-            throws DataSourceException;
-}
diff --git a/reportbuilder/java/com/sun/star/report/ImageService.java b/reportbuilder/java/com/sun/star/report/ImageService.java
deleted file mode 100644
index da5e247..0000000
--- a/reportbuilder/java/com/sun/star/report/ImageService.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-package com.sun.star.report;
-
-import com.sun.star.awt.Size;
-
-import java.io.InputStream;
-
-public interface ImageService
-{
-
-    /**
-     * @param image
-     * @return the mime-type of the image as string.
-     * @throws ReportExecutionException
-     */
-    String getMimeType(final InputStream image) throws ReportExecutionException;
-
-    /**
-     * @param image
-     * @return the mime-type of the image as string.
-     * @throws ReportExecutionException
-     */
-    String getMimeType(final byte[] image) throws ReportExecutionException;
-
-    /**
-     * @param image
-     * @returns the dimension in 100th mm.
-     *
-     * @throws ReportExecutionException
-     * @return*/
-    Size getImageSize(final InputStream image) throws ReportExecutionException;
-
-    /**
-     * @param image
-     * @returns the dimension in 100th mm.
-     *
-     * @throws ReportExecutionException
-     * @return*/
-    Size getImageSize(final byte[] image) throws ReportExecutionException;
-}
-
diff --git a/reportbuilder/java/com/sun/star/report/InputRepository.java b/reportbuilder/java/com/sun/star/report/InputRepository.java
deleted file mode 100644
index 18717e3..0000000
--- a/reportbuilder/java/com/sun/star/report/InputRepository.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-package com.sun.star.report;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-/**
- * This allows the job processor to load data from a repository. It is assumed,
- * that all resource names are given as strings and furthermore, that the names
- * identify a resource uniquely within the input repository.
- *
- * An input repository connects the report processing to the xml definitions.
- * Unless defined otherwise, it is assumed, that the input-name is 'content.xml';
- * possible other files are 'settings.xml' and 'styles.xml' (see the Oasis standard
- * for details on these files and their contents).
- *
- */
-public interface InputRepository
-{
-
-    /**
-     * Returns a unique identifier for this repository. Two repositories accessing
-     * the same location should return the same id. The identifier must never
-     * be null.
-     *
-     * @return the repository id
-     */
-    Object getId();
-
-    InputStream createInputStream(final String name) throws IOException;
-
-    /** allows to acces sub repositories inside this repository
-     *
-     * @param name describes the path to the sub repository
-     * @return the sub repository
-     * @throws java.io.IOException when the sub repository doesn't exist.
-     */
-    InputRepository openInputRepository(final String name) throws IOException;
-
-    /**
-     * This returns an version number for the given resource. Return zero, if
-     * the resource is not versionable, else return a unique number for each version.
-     * As rule of thumb: Increase the version number by at least one for each change
-     * made to the resource.
-     *
-     * @param name the name of the resource
-     * @return the version number
-     */
-    long getVersion(final String name);
-
-    boolean exists(final String name);
-
-    boolean isReadable(final String name);
-
-    void closeInputRepository();
-
-    /** returns the URL of the database document
-     *
-     * @return the URL of the database document
-     */
-    String getRootURL();
-}
diff --git a/reportbuilder/java/com/sun/star/report/JobDefinitionException.java b/reportbuilder/java/com/sun/star/report/JobDefinitionException.java
deleted file mode 100644
index bc3bdb6..0000000
--- a/reportbuilder/java/com/sun/star/report/JobDefinitionException.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-package com.sun.star.report;
-
-/**
- * Creation-Date: 05.02.2006, 17:36:33
- *
- */
-public class JobDefinitionException extends RuntimeException
-{
-
-    /**
-     * Creates a StackableRuntimeException with no message and no parent.
-     */
-    public JobDefinitionException()
-    {
-    }
-
-    /**
-     * Creates an exception.
-     *
-     * @param message the exception message.
-     */
-    public JobDefinitionException(final String message)
-    {
-        super(message);
-    }
-
-    /**
-     * Creates an exception.
-     *
-     * @param message the exception message.
-     * @param ex      the parent exception.
-     */
-    public JobDefinitionException(final String message, final Exception ex)
-    {
-        super(message, ex);
-    }
-}
diff --git a/reportbuilder/java/com/sun/star/report/JobProgressIndicator.java b/reportbuilder/java/com/sun/star/report/JobProgressIndicator.java
deleted file mode 100644
index 6d0a87a..0000000
--- a/reportbuilder/java/com/sun/star/report/JobProgressIndicator.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-package com.sun.star.report;
-
-/**
- * Based on
- * http://api.libreoffice.org/docs/common/ref/com/sun/star/task/XStatusIndicator.html
- *
- */
-public interface JobProgressIndicator
-{
-
-    /**
-     * Updates the progress description.
-     *
-     * @param string the new description
-     */
-    void setText(String string);
-
-    /**
-     * Initializes the progress indicator and sets the progress description to
-     * the text given in the parameter <code>text</code>. The progress values
-     * passed to this indicator will not exceed the given <code>maxValue</code>.
-     * The value range of this indicator is set to 0 to <code>maxValue</code>
-     * Stopped indicators must ignore that call.
-     *
-     * @param string the progress description
-     * @param text
-     * @param maxValue the maximum value
-     * @see JobProgressIndicator#setText(String)
-     */
-    void start(String text, int maxValue);
-
-    /**
-     * Updates the value to the specified value. Invalid values must be ignored.
-     * Stopped indicators must ignore that call.
-     *
-     * @param value the new value that should be shown now. This must fit the
-     * range [0..maxValue] as defined in {@link JobProgressIndicator#start(String, int)}.
-     */
-    void setValue(int value);
-
-    /**
-     * Stop the progress. A progress indicator cannot be destructed before end()
-     * has been called.
-     */
-    void end();
-
-    /**
-     * Clear progress value and description. Calling of setValue(0) and
-     * setText("") should do the same. Stopped indicators must ignore this call.
-     */
-    void reset();
-}
diff --git a/reportbuilder/java/com/sun/star/report/JobProperties.java b/reportbuilder/java/com/sun/star/report/JobProperties.java
deleted file mode 100644
index c4fe1ee..0000000
--- a/reportbuilder/java/com/sun/star/report/JobProperties.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-package com.sun.star.report;
-
-public interface JobProperties
-{
-
-    void setProperty(String key, Object value)
-            throws JobDefinitionException;
-
-    Object getProperty(String key);
-
-    /**
-     * A type safe clone operation. We derive a copy of all properties,
-     * so that changes to the original job properties collection does not
-     * affect the copy.
-     *
-     * @return a copy.
-     */
-    JobProperties copy();
-}
diff --git a/reportbuilder/java/com/sun/star/report/OfficeToken.java b/reportbuilder/java/com/sun/star/report/OfficeToken.java
deleted file mode 100644
index e64d536..0000000
--- a/reportbuilder/java/com/sun/star/report/OfficeToken.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-package com.sun.star.report;
-
-public class OfficeToken
-{
-
-    public static final String GRAPHIC = "graphic";
-    public static final String GRAPHICS = "Graphics";
-    public static final String GRAPHIC_PROPERTIES = "graphic-properties";
-    public static final String PARAGRAPH = "paragraph";
-    public static final String TRUE = "true";
-    public static final String FALSE = "false";
-    public static final String FRAME = "frame";
-    public static final String STYLE_NAME = "style-name";
-    public static final String BACKGROUND_COLOR = "background-color";
-    public static final String COVERED_TABLE_CELL = "covered-table-cell";
-    public static final String TABLE = "table";
-    public static final String TABLE_COLUMN = "table-column";
-    public static final String TABLE_COLUMNS = "table-columns";
-    public static final String TABLE_HEADER_COLUMNS = "table-header-columns";
-    public static final String TABLE_HEADER_ROWS = "table-header-rows";
-    public static final String TABLE_ROWS = "table-rows";
-    public static final String TABLE_ROW = "table-row";
-    public static final String TABLE_CELL = "table-cell";
-    public static final String P = "p";
-    public static final String OBJECT_OLE = "object-ole";
-    public static final String IMAGE = "image";
-    public static final String IMAGE_DATA = "image-data";
-    public static final String PRESERVE_IRI = "preserve-IRI";
-    public static final String SCALE = "scale";
-    public static final String NAME = "name";
-    public static final String SHAPES = "shapes";
-    public static final String ISOTROPIC = "isotropic";
-    public static final String ANISOTROPIC = "anisotropic";
-    public static final String NONE = "none";
-}
diff --git a/reportbuilder/java/com/sun/star/report/OutputRepository.java b/reportbuilder/java/com/sun/star/report/OutputRepository.java
deleted file mode 100644
index 7c818e6..0000000
--- a/reportbuilder/java/com/sun/star/report/OutputRepository.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-package com.sun.star.report;
-
-import java.io.IOException;
-import java.io.OutputStream;
-
-/**
- * A repository for writing. Providing a repository always assumes,
- * that more than one stream can be written.
- *
- */
-public interface OutputRepository
-{
-
-    /**
-     * Creates an output stream for writing the data. If there is an entry with
-     * that name already contained in the repository, try to overwrite it.
-     *
-     * @param name
-     *    the name of the output stream
-     * @param mimeType
-     *    the mime type of the to-be-created output stream. Repository implementations which do not support
-     *    associating a mime time with a stream might ignore this parameter.
-     * @return the outputstream
-     * @throws IOException if opening the stream fails
-     */
-    OutputStream createOutputStream(final String name, final String mimeType) throws IOException;
-
-    /** allows to acces sub repositories inside this repository
-     *
-     * @param name describes the path to the sub repository
-     * @param mimeType
-     * @return the sub repository
-     * @throws java.io.IOException when the sub repository doesn't exist.
-     */
-    OutputRepository openOutputRepository(final String name, final String mimeType) throws IOException;
-
-    boolean exists(final String name);
-
-    boolean existsStorage(final String name);
-
-    boolean isWritable(final String name);
-
-    void closeOutputRepository();
-}
diff --git a/reportbuilder/java/com/sun/star/report/ParameterMap.java b/reportbuilder/java/com/sun/star/report/ParameterMap.java
deleted file mode 100644
index 05d140d..0000000
--- a/reportbuilder/java/com/sun/star/report/ParameterMap.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-package com.sun.star.report;
-
-public interface ParameterMap
-{
-
-    /**
-     * Adds a property to this properties collection. If a property with the given name
-     * exist, the property will be replaced with the new value. If the value is null, the
-     * property will be removed.
-     *
-     * @param key   the property key.
-     * @param value the property value.
-     */
-    public void put(final String key, final Object value);
-
-    /**
-     * Retrieves the value stored for a key in this properties collection.
-     *
-     * @param key the property key.
-     * @return The stored value, or <code>null</code> if the key does not exist in this
-     *         collection.
-     */
-    Object get(final String key);
-
-    /**
-     * Retrieves the value stored for a key in this properties collection, and returning the
-     * default value if the key was not stored in this properties collection.
-     *
-     * @param key          the property key.
-     * @param defaultValue the default value to be returned when the key is not stored in
-     *                     this properties collection.
-     * @return The stored value, or the default value if the key does not exist in this
-     *         collection.
-     */
-    Object get(final String key, final Object defaultValue);
-
-    String[] keys();
-
-    void clear();
-
-    int size();
-}
diff --git a/reportbuilder/java/com/sun/star/report/ReportAddIn.java b/reportbuilder/java/com/sun/star/report/ReportAddIn.java
deleted file mode 100644
index 8cb44b0..0000000
--- a/reportbuilder/java/com/sun/star/report/ReportAddIn.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-package com.sun.star.report;
-
-/**
- * A report add-in defines a set of expressions, which can
- * be used in the reporting.
- *
- * Each expression must provide meta-data to support GUI implementors.
- * Expressions are assumed to be statefull, if they are not, they are
- * free to be implemented as stateless expression.
- */
-public interface ReportAddIn
-{
-
-    int getExpressionCount();
-
-    ReportExpression createExpression(int expression);
-
-    ReportExpressionMetaData getMetaData(int expression);
-}
diff --git a/reportbuilder/java/com/sun/star/report/ReportEngineMetaData.java b/reportbuilder/java/com/sun/star/report/ReportEngineMetaData.java
deleted file mode 100644
index ab98cee..0000000
--- a/reportbuilder/java/com/sun/star/report/ReportEngineMetaData.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-package com.sun.star.report;
-
-public interface ReportEngineMetaData
-{
-
-    /**
-     * Checks, whether a certain output type is available.
-     * Feed the mime-type of the output type in and you'll get
-     * a true or false back.
-     *
-     * @param mimeType
-     * @return true, if the output type is supported; false otherwise.
-     */
-    boolean isOutputSupported(String mimeType);
-
-    /**
-     * Lists all supported output parameters for the given mime-type.
-     * This listing can be used to build a generic user interface for
-     * configuring a certain output.
-     *
-     * @param mimeType
-     * @return
-     */
-    String[] getOutputParameters(String mimeType);
-
-    Class getParameterType(String parameter);
-
-    boolean isMandatory(String parameter);
-
-    boolean isEnumeration(String parameter);
-
-    Object[] getEnumerationValues(String parameter);
-}
diff --git a/reportbuilder/java/com/sun/star/report/ReportEngineParameterNames.java b/reportbuilder/java/com/sun/star/report/ReportEngineParameterNames.java
deleted file mode 100644
index 8c5352f..0000000
--- a/reportbuilder/java/com/sun/star/report/ReportEngineParameterNames.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-package com.sun.star.report;
-
-/**
- * Making this enumeration typesafe and fully defined here would
- * be nice, wouldn't it?
- */
-public class ReportEngineParameterNames
-{
-
-    public static final String CONTENT_TYPE = "content-type";
-    public static final String INPUT_NAME = "input.name";
-    public static final String INPUT_REPOSITORY = "input.repository";
-    public static final String OUTPUT_NAME = "output.name";
-    public static final String OUTPUT_REPOSITORY = "output.repository";
-    public static final String INPUT_DATASOURCE_FACTORY = "input.datasource-factory";
-    public static final String IMAGE_SERVICE = "ImageService";
-    public static final String INPUT_REPORTJOB_FACTORY = "input.reportjob-factory";
-    public static final String INPUT_MASTER_COLUMNS = "input.master-columns";
-    public static final String INPUT_MASTER_VALUES = "input.master-values";
-    public static final String INPUT_DETAIL_COLUMNS = "input.detail-columns";
-    public static final String MIMETYPE = "output.mimetype";
-    public static final String AUTHOR = "Author";
-    public static final String TITLE = "Title";
-    public static final String MAXROWS = "MaxRows";
-
-    private ReportEngineParameterNames()
-    {
-    }
-}
diff --git a/reportbuilder/java/com/sun/star/report/ReportExecutionException.java b/reportbuilder/java/com/sun/star/report/ReportExecutionException.java
deleted file mode 100644
index 2d67342..0000000
--- a/reportbuilder/java/com/sun/star/report/ReportExecutionException.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-package com.sun.star.report;
-
-public class ReportExecutionException extends Exception
-{
-
-    /**
-     * Constructs a new exception with <code>null</code> as its detail message. The cause is
-     * not initialized, and may subsequently be initialized by a call to {@link
-     * #initCause}.
-     */
-    public ReportExecutionException()
-    {
-    }
-
-    /**
-     * Constructs a new exception with the specified cause and a detail message of
-     * <tt>(cause==null ? null : cause.toString())</tt> (which typically contains the class
-     * and detail message of <tt>cause</tt>). This constructor is useful for exceptions that
-     * are little more than wrappers for other throwables (for example, {@link
-     * java.security.PrivilegedActionException}).
-     *
-     * @param cause the cause (which is saved for later retrieval by the {@link #getCause()}
-     *              method).  (A <tt>null</tt> value is permitted, and indicates that the
-     *              cause is nonexistent or unknown.)
-     * @since 1.4
-     */
-    public ReportExecutionException(Throwable cause)
-    {
-        super(cause);
-    }
-
-    /**
-     * Constructs a new exception with the specified detail message.  The cause is not
-     * initialized, and may subsequently be initialized by a call to {@link #initCause}.
-     *
-     * @param message the detail message. The detail message is saved for later retrieval by
-     *                the {@link #getMessage()} method.
-     */
-    public ReportExecutionException(String message)
-    {
-        super(message);
-    }
-
-    /**
-     * Constructs a new exception with the specified detail message and cause.  <p>Note that
-     * the detail message associated with <code>cause</code> is <i>not</i> automatically
-     * incorporated in this exception's detail message.
-     *
-     * @param message the detail message (which is saved for later retrieval by the {@link
-     *                #getMessage()} method).
-     * @param cause   the cause (which is saved for later retrieval by the {@link
-     *                #getCause()} method).  (A <tt>null</tt> value is permitted, and
-     *                indicates that the cause is nonexistent or unknown.)
-     * @since 1.4
-     */
-    public ReportExecutionException(String message, Throwable cause)
-    {
-        super(message, cause);
-    }
-}
diff --git a/reportbuilder/java/com/sun/star/report/ReportExpression.java b/reportbuilder/java/com/sun/star/report/ReportExpression.java
deleted file mode 100644
index 4b4e549..0000000
--- a/reportbuilder/java/com/sun/star/report/ReportExpression.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-package com.sun.star.report;
-
-/**
- * Expressions are simple computation components.
- *
- * Expressions are always assumed to be immutable. They are not allowed to
- * change their state and it is not guaranteed, in which order they get called.
- * If the expression has been called before, the last computed value will be
- * available from the datarow.
- *
- * This construct allows us to write expressions in the form
- * "Sum := Sum + Column".
- *
- * Multiple calls to getValue on the same expression instance must return the
- * same value (assuming that the datarow passed in is the same).
- */
-public interface ReportExpression
-{
-
-    void setParameters(Object[] parameters);
-
-    Object getParameters();
-
-    Object getValue(DataRow row);
-}
diff --git a/reportbuilder/java/com/sun/star/report/ReportExpressionMetaData.java b/reportbuilder/java/com/sun/star/report/ReportExpressionMetaData.java
deleted file mode 100644
index bf630c5..0000000
--- a/reportbuilder/java/com/sun/star/report/ReportExpressionMetaData.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-package com.sun.star.report;
-
-import java.util.Locale;
-
-public interface ReportExpressionMetaData
-{
-
-    int getParameterCount();
-
-    String getParameterName(int param);
-
-    String getParameterDisplayName(int param, Locale locale);
-
-    String getParameterDescription(int param, Locale locale);
-
-    String getName();
-
-    String getDisplayName(Locale l);
-
-    String getDescription(Locale l);
-}
diff --git a/reportbuilder/java/com/sun/star/report/ReportFunction.java b/reportbuilder/java/com/sun/star/report/ReportFunction.java
deleted file mode 100644
index ee20e01..0000000
--- a/reportbuilder/java/com/sun/star/report/ReportFunction.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-package com.sun.star.report;
-
-/**
- * Functions are statefull computation components.
- *
- * Functions are allowed to have a state, but are considered
- * immutable (the same is true for expressions). Functions are
- * allowed to update their state on every call to 'advance', which
- * signals, that the cursor has been moved.
- *
- * Functions have no way to 'reset' their state, if a reset is needed,
- * the report engine is urged to query a new instance from the ReportAddin.
- */
-public interface ReportFunction extends ReportExpression
-{
-
-    public ReportFunction advance(DataRow row);
-}
diff --git a/reportbuilder/java/com/sun/star/report/ReportJob.java b/reportbuilder/java/com/sun/star/report/ReportJob.java
deleted file mode 100644
index 16dbc32..0000000
--- a/reportbuilder/java/com/sun/star/report/ReportJob.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-package com.sun.star.report;
-
-import java.io.IOException;
-
-/**
- * This allows some simple job control. A job can be interrupted (or if it has
- * not yet been started, canceled), and the job status can be queried (scheduled,
- * running, finished).
- *
- * <table border="1">
- * <tr>
- * <th>JobStatus</th><th>running</th><th>finished</th>
- * </tr>
- * <tr>
- * <td>Scheduled</td><td>false</td><td>false</td>
- * </tr>
- * <tr>
- * <td>Running</td><td>true</td><td>false</td>
- * </tr>
- * <tr>
- * <td>Finished</td><td>false</td><td>true</td>
- * </tr>
- * </table>
- *
- */
-public interface ReportJob
-{
-
-    /**
-     * Although we might want to run the job as soon as it has been
-     * created, sometimes it is wiser to let the user add some listeners
-     * first. If we execute at once, the user either has to deal with
-     * threading code or wont receive any progress information in single
-     * threaded environments.
-     * @throws java.io.IOException
-     * @throws ReportExecutionException
-     */
-    void execute()
-            throws ReportExecutionException, IOException;
-
-    /**
-     * Interrupt the job.
-     */
-    void interrupt();
-
-    /**
-     * Queries the jobs execution status.
-     *
-     * @return true, if the job is currently running, false otherwise.
-     */
-    boolean isRunning();
-
-    /**
-     * Queries the jobs result status.
-     *
-     * @return true, if the job is finished (or has been interrupted), false
-     * if the job waits for activation.
-     */
-    boolean isFinished();
-
-    void addProgressIndicator(JobProgressIndicator indicator);
-
-    void removeProgressIndicator(JobProgressIndicator indicator);
-}
diff --git a/reportbuilder/java/com/sun/star/report/ReportJobDefinition.java b/reportbuilder/java/com/sun/star/report/ReportJobDefinition.java
deleted file mode 100644
index 8ba30f2..0000000
--- a/reportbuilder/java/com/sun/star/report/ReportJobDefinition.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-package com.sun.star.report;
-
-/**
- * The report job is created by the report job factory and holds all properties
- * required to complete the reporting task.
- *
- */
-public interface ReportJobDefinition
-{
-
-    /**
-     * The parameters of the root report definition. The report parameters are using
-     * by the query factory to parametrize the query statement.
-     *
-     * The query parameters for the subreports are defined using mappings, it would not
-     * make sense to define them here.
-     *
-     * @return a map containing the report parameters
-     */
-    ParameterMap getQueryParameters();
-
-    /**
-     * The report processing parameters control the behaviour of the report. There are
-     * several mandatory parameters, some optional and possibly some not-yet-understood
-     * parameters. Use the engine meta data to find out, which parameters are supported.
-     *
-     * @return the processing parameters
-     */
-    JobProperties getProcessingParameters();
-}
diff --git a/reportbuilder/java/com/sun/star/report/ReportJobFactory.java b/reportbuilder/java/com/sun/star/report/ReportJobFactory.java
deleted file mode 100644
index 4345e00..0000000
--- a/reportbuilder/java/com/sun/star/report/ReportJobFactory.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-package com.sun.star.report;
-
-import com.sun.star.beans.NamedValue;
-import com.sun.star.lang.IllegalArgumentException;
-import com.sun.star.uno.Exception;
-
-public interface ReportJobFactory
-{
-
-    ReportJob createReportJob(final NamedValue[] namedValue) throws IllegalArgumentException, ReportExecutionException, Exception;
-}
diff --git a/reportbuilder/java/com/sun/star/report/SDBCReportData.java b/reportbuilder/java/com/sun/star/report/SDBCReportData.java
deleted file mode 100644
index 7f8fae1..0000000
--- a/reportbuilder/java/com/sun/star/report/SDBCReportData.java
+++ /dev/null
@@ -1,367 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-package com.sun.star.report;
-
-import com.sun.star.beans.UnknownPropertyException;
-import com.sun.star.beans.XPropertySet;
-import com.sun.star.container.XIndexAccess;
-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 com.sun.star.sdbc.DataType;
-import com.sun.star.sdbc.SQLException;
-import com.sun.star.sdbc.XResultSetMetaData;
-import com.sun.star.sdbc.XResultSetMetaDataSupplier;
-import com.sun.star.sdbc.XRow;
-import com.sun.star.sdbc.XRowSet;
-import com.sun.star.sdbcx.XColumnsSupplier;
-import com.sun.star.uno.Any;
-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
-{
-
-    private final XRowSet rowSet;
-    private final XRow row;
-    private int rowCount;
-    private XIndexAccess parameters;
-    private int firstParameterIndex = -1;
-    private int columnCount;
-    private final String[] columnNames;
-    private final int[] columnTypes;
-
-    public SDBCReportData(final XRowSet rowSet) throws SQLException
-    {
-        row = (XRow) UnoRuntime.queryInterface(XRow.class, rowSet);
-        this.rowSet = rowSet;
-
-        if (rowSet == null)
-        {
-            rowCount = 0;
-            columnCount = 0;
-            columnTypes = new int[1];
-            columnNames = new String[1];
-        }
-        else
-        {
-            final XParametersSupplier xSuppParams = (XParametersSupplier) UnoRuntime.queryInterface(
-                    XParametersSupplier.class, rowSet);
-            if (xSuppParams != null)
-            {
-                parameters = xSuppParams.getParameters();
-            }
-
-            final XColumnsSupplier columnsSup = (XColumnsSupplier) UnoRuntime.queryInterface(XColumnsSupplier.class, rowSet);
-            final XNameAccess columns = columnsSup.getColumns();
-            final String[] columnNamesList = columns.getElementNames();
-            final XResultSetMetaDataSupplier sup = (XResultSetMetaDataSupplier) UnoRuntime.queryInterface(XResultSetMetaDataSupplier.class, rowSet);
-            final XResultSetMetaData resultSetMetaData = sup.getMetaData();
-
-            columnCount = resultSetMetaData.getColumnCount();
-            firstParameterIndex = columnCount + 1;
-            if (parameters != null)
-            {
-                columnCount += parameters.getCount();
-            }
-
-            columnTypes = new int[columnCount];
-            columnNames = new String[columnCount];
-
-            for (int i = 1; i <= columnCount; ++i)
-            {
-                if (i < firstParameterIndex)
-                {
-                    columnNames[i - 1] = columnNamesList[i - 1];// resultSetMetaData.getColumnName(i);
-                    columnTypes[i - 1] = resultSetMetaData.getColumnType(i);
-                }
-                else
-                {
-                    try
-                    {
-                        final XPropertySet paramColumn = (XPropertySet) UnoRuntime.queryInterface(
-                                XPropertySet.class, parameters.getByIndex(i - firstParameterIndex));
-                        columnNames[i - 1] = (String) paramColumn.getPropertyValue("Name");
-                        columnTypes[i - 1] = (Integer) paramColumn.getPropertyValue("Type");
-                    }
-                    catch (Exception e)
-                    {
-                        columnNames[i - 1] = "Error";
-                        columnTypes[i - 1] = DataType.CHAR;
-                    }
-                }
-            }
-
-            if (rowSet.last())
-            {
-                rowCount = rowSet.getRow();
-                rowSet.beforeFirst();
-            }
-            else
-            {
-                rowCount = 0;
-            }
-        }
-    }
-
-    public int getColumnCount() throws DataSourceException
-    {
-        return columnCount;
-    }
-
-    public int getRowCount()
-    {
-        return rowCount;
-    }
-
-    public String getColumnName(final int column) throws DataSourceException
-    {
-        return columnNames[column - 1];
-    }
-
-    public boolean absolute(final int row) throws DataSourceException
-    {
-        if (rowSet == null)
-        {
-            return false;
-        }
-        try
-        {
-            if (row == 0)
-            {
-                rowSet.beforeFirst();
-                return true;
-            }

... etc. - the rest is truncated
