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@gmx.de> Tested-by: David Ostrovsky <David.Ostrovsky@gmx.de>
author: David Ostrovsky <david@ostrovsky.org> 2013-03-07 08:17:56 +0100
committer: David Ostrovsky <David.Ostrovsky@gmx.de> 2013-03-11 08:56:40 +0000
commit: 6f28efc2a8a559cc8c37aa883f4de0b59d4fc79c (patch)
tree: c99e9f01d5f52daad04aa1f51e3bc53e78c073fb /reportbuilder
parent: ab8f432b3382967f87967495b0b0e4c17f082da5 (diff)
229 files changed, 1029 insertions, 1029 deletions
diff --git a/reportbuilder/Configuration_reportbuilder.mk b/reportbuilder/Configuration_reportbuilder.mk
index 4690cfcb61d6..14239aa46b4a 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 f42134f92996..342522ef1ea0 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 4ac4987df52e..1fa82b6fbe67 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/pentaho/configuration.properties b/reportbuilder/java/com/sun/star/report/pentaho/configuration.properties
deleted file mode 100644
index 5f75869d4d3d..000000000000
--- a/reportbuilder/java/com/sun/star/report/pentaho/configuration.properties
+++ /dev/null
@@ -1,147 +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 .
-#
-# x-no-translate
-
-
-##
-# Do not modify the following lines. They connect this module to the central
-# parser registry.
-org.pentaho.reporting.libraries.resourceloader.factory.modules.com.sun.star.report.pentaho.model.OfficeDocument.star=com.sun.star.report.pentaho.parser.StarXmlFactoryModule
-org.pentaho.reporting.libraries.resourceloader.factory.modules.com.sun.star.report.pentaho.model.OfficeStylesCollection.star=com.sun.star.report.pentaho.parser.StarStyleXmlFactoryModule
-org.pentaho.reporting.libraries.resourceloader.factory.modules.com.sun.star.report.pentaho.styles.StyleMapper.star=com.sun.star.report.pentaho.styles.StyleMapperXmlFactoryModule
-
-##
-# The known namespaces.
-#
-org.jfree.report.namespaces.star-rpt.Uri=http://openoffice.org/2005/report
-org.jfree.report.namespaces.star-rpt.Default-Style=res://com/sun/star/report/pentaho/star-rpt.css
-org.jfree.report.namespaces.star-rpt.Prefix=rpt
-org.jfree.report.namespaces.star-rpt.ClassAttr=style-name
-
-org.jfree.report.namespaces.star-office.Uri=http://openoffice.org/2004/office
-org.jfree.report.namespaces.star-office.Default-Style=res://com/sun/star/report/pentaho/star-office.css
-org.jfree.report.namespaces.star-office.Prefix=office
-org.jfree.report.namespaces.star-office.ClassAttr=style-name
-
-org.jfree.report.namespaces.oasis-style.Uri=urn:oasis:names:tc:opendocument:xmlns:style:1.0
-org.jfree.report.namespaces.oasis-style.Default-Style=res://com/sun/star/report/pentaho/oasis-style.css
-org.jfree.report.namespaces.oasis-style.Prefix=style
-
-org.jfree.report.namespaces.oasis-table.Uri=urn:oasis:names:tc:opendocument:xmlns:table:1.0
-org.jfree.report.namespaces.oasis-table.Default-Style=res://com/sun/star/report/pentaho/oasis-table.css
-org.jfree.report.namespaces.oasis-table.Prefix=table
-org.jfree.report.namespaces.oasis-table.ClassAttr=style-name
-
-org.jfree.report.namespaces.oasis-draw.Uri=urn:oasis:names:tc:opendocument:xmlns:drawing:1.0
-org.jfree.report.namespaces.oasis-draw.Default-Style=res://com/sun/star/report/pentaho/oasis-draw.css
-org.jfree.report.namespaces.oasis-draw.Prefix=draw
-org.jfree.report.namespaces.oasis-draw.ClassAttr=style-name
-
-org.jfree.report.namespaces.oasis-chart.Uri=urn:oasis:names:tc:opendocument:xmlns:chart:1.0
-org.jfree.report.namespaces.oasis-chart.Default-Style=res://com/sun/star/report/pentaho/oasis-chart.css
-org.jfree.report.namespaces.oasis-chart.Prefix=chart
-org.jfree.report.namespaces.oasis-chart.ClassAttr=style-name
-
-org.jfree.report.namespaces.oasis-text.Uri=urn:oasis:names:tc:opendocument:xmlns:text:1.0
-org.jfree.report.namespaces.oasis-text.Default-Style=res://com/sun/star/report/pentaho/oasis-text.css
-org.jfree.report.namespaces.oasis-text.Prefix=text
-org.jfree.report.namespaces.oasis-text.ClassAttr=style-name
-
-org.jfree.report.namespaces.oasis-number.Uri=urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0
-org.jfree.report.namespaces.oasis-number.Default-Style=res://com/sun/star/report/pentaho/oasis-number.css
-org.jfree.report.namespaces.oasis-number.Prefix=number
-org.jfree.report.namespaces.oasis-number.ClassAttr=style-name
-
-org.jfree.report.namespaces.oasis-form.Uri=urn:oasis:names:tc:opendocument:xmlns:form:1.0
-org.jfree.report.namespaces.oasis-form.Default-Style=res://com/sun/star/report/pentaho/oasis-form.css
-org.jfree.report.namespaces.oasis-form.Prefix=form
-
-#
-# This defines a subset of the real XSL-FO standard.
-org.jfree.report.namespaces.oasis-compat-fo.Uri=urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0
-org.jfree.report.namespaces.oasis-compat-fo.Default-Style=res://com/sun/star/report/pentaho/xsl-fo.css
-org.jfree.report.namespaces.oasis-compat-fo.Prefix=fo
-
-#
-# This defines a subset of the real XSL-FO standard.
-org.jfree.report.namespaces.oasis-compat-svg.Uri=urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0
-org.jfree.report.namespaces.oasis-compat-svg.Default-Style=res://com/sun/star/report/pentaho/svg.css
-org.jfree.report.namespaces.oasis-compat-svg.Prefix=svg
-
-#
-# This defines a subset of the real XSL-FO standard.
-org.jfree.report.namespaces.oasis-compat-smil.Uri=urn:oasis:names:tc:opendocument:xmlns:smil-compatible:1.0
-org.jfree.report.namespaces.oasis-compat-smil.Default-Style=res://com/sun/star/report/pentaho/smil.css
-org.jfree.report.namespaces.oasis-compat-smil.Prefix=svg
-
-org.jfree.report.namespaces.xsl-fo.Uri=http://www.w3.org/1999/XSL/Format
-org.jfree.report.namespaces.xsl-fo.Default-Style=res://com/sun/star/report/pentaho/xsl-fo.css
-org.jfree.report.namespaces.xsl-fo.Prefix=fo
-
-org.jfree.report.namespaces.svg.Uri=http://www.w3.org/2000/svg
-org.jfree.report.namespaces.svg.Default-Style=res://com/sun/star/report/pentaho/svg.css
-org.jfree.report.namespaces.svg.Prefix=svg
-org.jfree.report.namespaces.svg.ClassAttr=class
-org.jfree.report.namespaces.svg.StyleAttr=style
-
-org.jfree.report.namespaces.xml-xlink.Uri=http://www.w3.org/1999/xlink
-#org.jfree.report.namespaces.xml-xlink.Default-Style=res://com/sun/star/report/pentaho/xml-xlink.css
-org.jfree.report.namespaces.xml-xlink.Prefix=xlink
-
-#
-# Tag-definition for the XML-writer.
-# Prefix is 'com.sun.star.report.pentaho.output.'
-#
-# Declare the namespaces (this is independent of the ones defined above ..)
-# <prefix>"namespace."<ns-prefix>=<ns-uri>
-com.sun.star.report.pentaho.output.namespace.oasis-text=urn:oasis:names:tc:opendocument:xmlns:text:1.0
-com.sun.star.report.pentaho.output.default.oasis-text=deny
-
-com.sun.star.report.pentaho.output.namespace.oasis-config=urn:oasis:names:tc:opendocument:xmlns:config:1.0
-com.sun.star.report.pentaho.output.default.oasis-config=allow
-
-#
-# Next define the tags for which we want to customize the indent-behaviour
-com.sun.star.report.pentaho.output.tag.oasis-text.p=deny
-com.sun.star.report.pentaho.output.tag.oasis-text.section=allow
-com.sun.star.report.pentaho.output.tag.oasis-text.variable-decls=allow
-com.sun.star.report.pentaho.output.tag.oasis-text.variable-decl=allow
-
-com.sun.star.report.pentaho.output.tag.oasis-config.config-item=deny
-
-com.sun.star.report.pentaho.output.namespace.oasis-data=urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0
-com.sun.star.report.pentaho.output.default.oasis-data=allow
-com.sun.star.report.pentaho.output.tag.oasis-data.text=deny
-com.sun.star.report.pentaho.output.tag.oasis-data.currency-symbol=deny
-com.sun.star.report.pentaho.output.tag.oasis-data.embedded-text=deny
-
-com.sun.star.report.pentaho.output.namespace.oasis-draw=urn:oasis:names:tc:opendocument:xmlns:drawing:1.0
-com.sun.star.report.pentaho.output.default.oasis-draw=deny
-
-org.jfree.report.flow.structure.com.sun.star.report.pentaho.model.FixedTextElement=com.sun.star.report.pentaho.layoutprocessor.FixedTextLayoutController
-org.jfree.report.flow.structure.com.sun.star.report.pentaho.model.FormattedTextElement=com.sun.star.report.pentaho.layoutprocessor.FormattedTextLayoutController
-org.jfree.report.flow.structure.com.sun.star.report.pentaho.model.ObjectOleElement=com.sun.star.report.pentaho.layoutprocessor.ObjectOleLayoutController
-org.jfree.report.flow.structure.com.sun.star.report.pentaho.model.ImageElement=com.sun.star.report.pentaho.layoutprocessor.ImageElementLayoutController
-org.jfree.report.flow.structure.com.sun.star.report.pentaho.model.TableCellElement=com.sun.star.report.pentaho.layoutprocessor.TableCellLayoutController
-org.jfree.report.flow.structure.com.sun.star.report.pentaho.model.OfficeReport=com.sun.star.report.pentaho.layoutprocessor.OfficeReportLayoutController
-org.jfree.report.flow.structure.com.sun.star.report.pentaho.model.OfficeGroup=com.sun.star.report.pentaho.layoutprocessor.OfficeGroupLayoutController
-org.jfree.report.flow.structure.com.sun.star.report.pentaho.model.OfficeGroupSection=com.sun.star.report.pentaho.layoutprocessor.OfficeGroupSectionLayoutController
-org.jfree.report.flow.structure.com.sun.star.report.pentaho.model.VariablesDeclarationSection=com.sun.star.report.pentaho.layoutprocessor.VariablesDeclarationLayoutController
-org.jfree.report.flow.structure.com.sun.star.report.pentaho.model.OfficeDetailSection=com.sun.star.report.pentaho.layoutprocessor.OfficeDetailLayoutController
-org.jfree.report.flow.structure.com.sun.star.report.pentaho.model.OfficeTableSection=com.sun.star.report.pentaho.layoutprocessor.OfficeTableLayoutController
-org.jfree.report.flow.structure.com.sun.star.report.pentaho.model.OfficeGroupInstanceSection=com.sun.star.report.pentaho.layoutprocessor.OfficeGroupInstanceSectionLayoutController
diff --git a/reportbuilder/java/jfreereport.properties b/reportbuilder/java/jfreereport.properties
index 06ee4a7bb4cb..b646efecc78d 100644
--- a/reportbuilder/java/jfreereport.properties
+++ b/reportbuilder/java/jfreereport.properties
@@ -17,5 +17,5 @@
 #
 # x-no-translate
 
-org.jfree.report.modules.sun.report.Module=com.sun.star.report.pentaho.StarReportModule
+org.jfree.report.modules.sun.report.Module=org.libreoffice.report.pentaho.StarReportModule
 
diff --git a/reportbuilder/java/libformula.properties b/reportbuilder/java/libformula.properties
index 78d0e75f2cc1..f903736de043 100644
--- a/reportbuilder/java/libformula.properties
+++ b/reportbuilder/java/libformula.properties
@@ -28,7 +28,7 @@ org.pentaho.reporting.libraries.formula.datesystem.ExcelHack=false
 
 ##
 # Meta data functions
-org.pentaho.reporting.libraries.formula.functions.metadata.Author.class=com.sun.star.report.function.metadata.AuthorFunction
-org.pentaho.reporting.libraries.formula.functions.metadata.Author.description=com.sun.star.report.function.metadata.AuthorFunctionDescription
-org.pentaho.reporting.libraries.formula.functions.metadata.Title.class=com.sun.star.report.function.metadata.TitleFunction
-org.pentaho.reporting.libraries.formula.functions.metadata.Title.description=com.sun.star.report.function.metadata.TitleFunctionDescription
+org.pentaho.reporting.libraries.formula.functions.metadata.Author.class=org.libreoffice.report.function.metadata.AuthorFunction
+org.pentaho.reporting.libraries.formula.functions.metadata.Author.description=org.libreoffice.report.function.metadata.AuthorFunctionDescription
+org.pentaho.reporting.libraries.formula.functions.metadata.Title.class=org.libreoffice.report.function.metadata.TitleFunction
+org.pentaho.reporting.libraries.formula.functions.metadata.Title.description=org.libreoffice.report.function.metadata.TitleFunctionDescription
diff --git a/reportbuilder/java/loader.properties b/reportbuilder/java/loader.properties
index e6fabf0db3bd..87120b50bc90 100644
--- a/reportbuilder/java/loader.properties
+++ b/reportbuilder/java/loader.properties
@@ -17,6 +17,6 @@
 #
 # x-no-translate
 
-org.pentaho.reporting.libraries.resourceloader.factory.type.com.sun.star.report.pentaho.model.OfficeDocument=com.sun.star.report.pentaho.parser.OfficeDocumentXmlResourceFactory
-org.pentaho.reporting.libraries.resourceloader.factory.type.com.sun.star.report.pentaho.model.OfficeStylesCollection=com.sun.star.report.pentaho.parser.OfficeStylesXmlResourceFactory
-org.pentaho.reporting.libraries.resourceloader.factory.type.com.sun.star.report.pentaho.styles.StyleMapper=com.sun.star.report.pentaho.styles.StyleMapperXmlResourceFactory
+org.pentaho.reporting.libraries.resourceloader.factory.type.org.libreoffice.report.pentaho.model.OfficeDocument=org.libreoffice.report.pentaho.parser.OfficeDocumentXmlResourceFactory
+org.pentaho.reporting.libraries.resourceloader.factory.type.org.libreoffice.report.pentaho.model.OfficeStylesCollection=org.libreoffice.report.pentaho.parser.OfficeStylesXmlResourceFactory
+org.pentaho.reporting.libraries.resourceloader.factory.type.org.libreoffice.report.pentaho.styles.StyleMapper=org.libreoffice.report.pentaho.styles.StyleMapperXmlResourceFactory
diff --git a/reportbuilder/java/com/sun/star/report/DataRow.java b/reportbuilder/java/org/libreoffice/report/DataRow.java
index 0361a9198092..5c0566199483 100644
--- a/reportbuilder/java/com/sun/star/report/DataRow.java
+++ b/reportbuilder/java/org/libreoffice/report/DataRow.java
@@ -15,7 +15,7 @@
  *   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;
+package org.libreoffice.report;
 
 /**
  * This feeds data into the reporting engine, in case the data has been provided
diff --git a/reportbuilder/java/com/sun/star/report/DataSource.java b/reportbuilder/java/org/libreoffice/report/DataSource.java
index 420b8d3261f7..ebdc314eeb82 100644
--- a/reportbuilder/java/com/sun/star/report/DataSource.java
+++ b/reportbuilder/java/org/libreoffice/report/DataSource.java
@@ -15,7 +15,7 @@
  *   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;
+package org.libreoffice.report;
 
 /**
  * This feeds data into the reporting engine, in case the data has been provided
diff --git a/reportbuilder/java/com/sun/star/report/DataSourceException.java b/reportbuilder/java/org/libreoffice/report/DataSourceException.java
index 3fe7c7985aac..abcef53349aa 100644
--- a/reportbuilder/java/com/sun/star/report/DataSourceException.java
+++ b/reportbuilder/java/org/libreoffice/report/DataSourceException.java
@@ -15,7 +15,7 @@
  *   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;
+package org.libreoffice.report;
 
 /**
  * A general exception to indicate that there was an error while accessing the
diff --git a/reportbuilder/java/com/sun/star/report/DataSourceFactory.java b/reportbuilder/java/org/libreoffice/report/DataSourceFactory.java
index f0311fae48db..9987a6a963e2 100644
--- a/reportbuilder/java/com/sun/star/report/DataSourceFactory.java
+++ b/reportbuilder/java/org/libreoffice/report/DataSourceFactory.java
@@ -15,7 +15,7 @@
  *   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;
+package org.libreoffice.report;
 
 import java.util.Map;
 
diff --git a/reportbuilder/java/com/sun/star/report/ImageService.java b/reportbuilder/java/org/libreoffice/report/ImageService.java
index da5e2477a757..4089a0c42b65 100644
--- a/reportbuilder/java/com/sun/star/report/ImageService.java
+++ b/reportbuilder/java/org/libreoffice/report/ImageService.java
@@ -15,7 +15,7 @@
  *   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;
+package org.libreoffice.report;
 
 import com.sun.star.awt.Size;
 
diff --git a/reportbuilder/java/com/sun/star/report/InputRepository.java b/reportbuilder/java/org/libreoffice/report/InputRepository.java
index 18717e3f5ea2..bbaec3eaafe2 100644
--- a/reportbuilder/java/com/sun/star/report/InputRepository.java
+++ b/reportbuilder/java/org/libreoffice/report/InputRepository.java
@@ -15,7 +15,7 @@
  *   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;
+package org.libreoffice.report;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/reportbuilder/java/com/sun/star/report/JobDefinitionException.java b/reportbuilder/java/org/libreoffice/report/JobDefinitionException.java
index bc3bdb6a53f6..06e7ac0018cb 100644
--- a/reportbuilder/java/com/sun/star/report/JobDefinitionException.java
+++ b/reportbuilder/java/org/libreoffice/report/JobDefinitionException.java
@@ -15,7 +15,7 @@
  *   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;
+package org.libreoffice.report;
 
 /**
  * Creation-Date: 05.02.2006, 17:36:33
diff --git a/reportbuilder/java/com/sun/star/report/JobProgressIndicator.java b/reportbuilder/java/org/libreoffice/report/JobProgressIndicator.java
index 6d0a87a2f00d..2f51de5fae7a 100644
--- a/reportbuilder/java/com/sun/star/report/JobProgressIndicator.java
+++ b/reportbuilder/java/org/libreoffice/report/JobProgressIndicator.java
@@ -15,7 +15,7 @@
  *   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;
+package org.libreoffice.report;
 
 /**
  * Based on
diff --git a/reportbuilder/java/com/sun/star/report/JobProperties.java b/reportbuilder/java/org/libreoffice/report/JobProperties.java
index c4fe1ee69666..42813428d2c4 100644
--- a/reportbuilder/java/com/sun/star/report/JobProperties.java
+++ b/reportbuilder/java/org/libreoffice/report/JobProperties.java
@@ -15,7 +15,7 @@
  *   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;
+package org.libreoffice.report;
 
 public interface JobProperties
 {
diff --git a/reportbuilder/java/com/sun/star/report/OfficeToken.java b/reportbuilder/java/org/libreoffice/report/OfficeToken.java
index e64d536ed662..76bc897d09be 100644
--- a/reportbuilder/java/com/sun/star/report/OfficeToken.java
+++ b/reportbuilder/java/org/libreoffice/report/OfficeToken.java
@@ -15,7 +15,7 @@
  *   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;
+package org.libreoffice.report;
 
 public class OfficeToken
 {
diff --git a/reportbuilder/java/com/sun/star/report/OutputRepository.java b/reportbuilder/java/org/libreoffice/report/OutputRepository.java
index 7c818e67d775..ae1653225401 100644
--- a/reportbuilder/java/com/sun/star/report/OutputRepository.java
+++ b/reportbuilder/java/org/libreoffice/report/OutputRepository.java
@@ -15,7 +15,7 @@
  *   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;
+package org.libreoffice.report;
 
 import java.io.IOException;
 import java.io.OutputStream;
diff --git a/reportbuilder/java/com/sun/star/report/ParameterMap.java b/reportbuilder/java/org/libreoffice/report/ParameterMap.java
index 05d140da3083..c1d8fae9a931 100644
--- a/reportbuilder/java/com/sun/star/report/ParameterMap.java
+++ b/reportbuilder/java/org/libreoffice/report/ParameterMap.java
@@ -15,7 +15,7 @@
  *   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;
+package org.libreoffice.report;
 
 public interface ParameterMap
 {
diff --git a/reportbuilder/java/com/sun/star/report/ReportAddIn.java b/reportbuilder/java/org/libreoffice/report/ReportAddIn.java
index 8cb44b0a05b8..60c15b80d5a1 100644
--- a/reportbuilder/java/com/sun/star/report/ReportAddIn.java
+++ b/reportbuilder/java/org/libreoffice/report/ReportAddIn.java
@@ -15,7 +15,7 @@
  *   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;
+package org.libreoffice.report;
 
 /**
  * A report add-in defines a set of expressions, which can
diff --git a/reportbuilder/java/com/sun/star/report/ReportEngineMetaData.java b/reportbuilder/java/org/libreoffice/report/ReportEngineMetaData.java
index ab98ceedfe35..00331779e0d1 100644
--- a/reportbuilder/java/com/sun/star/report/ReportEngineMetaData.java
+++ b/reportbuilder/java/org/libreoffice/report/ReportEngineMetaData.java
@@ -15,7 +15,7 @@
  *   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;
+package org.libreoffice.report;
 
 public interface ReportEngineMetaData
 {
diff --git a/reportbuilder/java/com/sun/star/report/ReportEngineParameterNames.java b/reportbuilder/java/org/libreoffice/report/ReportEngineParameterNames.java
index 8c5352fb4493..8e6593ead7c7 100644
--- a/reportbuilder/java/com/sun/star/report/ReportEngineParameterNames.java
+++ b/reportbuilder/java/org/libreoffice/report/ReportEngineParameterNames.java
@@ -15,7 +15,7 @@
  *   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;
+package org.libreoffice.report;
 
 /**
  * Making this enumeration typesafe and fully defined here would
diff --git a/reportbuilder/java/com/sun/star/report/ReportExecutionException.java b/reportbuilder/java/org/libreoffice/report/ReportExecutionException.java
index 2d67342c40d4..3d7334d683f7 100644
--- a/reportbuilder/java/com/sun/star/report/ReportExecutionException.java
+++ b/reportbuilder/java/org/libreoffice/report/ReportExecutionException.java
@@ -15,7 +15,7 @@
  *   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;
+package org.libreoffice.report;
 
 public class ReportExecutionException extends Exception
 {
diff --git a/reportbuilder/java/com/sun/star/report/ReportExpression.java b/reportbuilder/java/org/libreoffice/report/ReportExpression.java
index 4b4e549c68ad..d9fdeb2d4b64 100644
--- a/reportbuilder/java/com/sun/star/report/ReportExpression.java
+++ b/reportbuilder/java/org/libreoffice/report/ReportExpression.java
@@ -15,7 +15,7 @@
  *   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;
+package org.libreoffice.report;
 
 /**
  * Expressions are simple computation components.
diff --git a/reportbuilder/java/com/sun/star/report/ReportExpressionMetaData.java b/reportbuilder/java/org/libreoffice/report/ReportExpressionMetaData.java
index bf630c5e0179..b4c359e5502c 100644
--- a/reportbuilder/java/com/sun/star/report/ReportExpressionMetaData.java
+++ b/reportbuilder/java/org/libreoffice/report/ReportExpressionMetaData.java
@@ -15,7 +15,7 @@
  *   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;
+package org.libreoffice.report;
 
 import java.util.Locale;
 
diff --git a/reportbuilder/java/com/sun/star/report/ReportFunction.java b/reportbuilder/java/org/libreoffice/report/ReportFunction.java
index ee20e0185e58..668f11c241e6 100644
--- a/reportbuilder/java/com/sun/star/report/ReportFunction.java
+++ b/reportbuilder/java/org/libreoffice/report/ReportFunction.java
@@ -15,7 +15,7 @@
  *   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;
+package org.libreoffice.report;
 
 /**
  * Functions are statefull computation components.
diff --git a/reportbuilder/java/com/sun/star/report/ReportJob.java b/reportbuilder/java/org/libreoffice/report/ReportJob.java
index 16dbc32c90a6..1bbcdec436ee 100644
--- a/reportbuilder/java/com/sun/star/report/ReportJob.java
+++ b/reportbuilder/java/org/libreoffice/report/ReportJob.java
@@ -15,7 +15,7 @@
  *   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;
+package org.libreoffice.report;
 
 import java.io.IOException;
 
diff --git a/reportbuilder/java/com/sun/star/report/ReportJobDefinition.java b/reportbuilder/java/org/libreoffice/report/ReportJobDefinition.java
index 8ba30f2da465..896d4026496f 100644
--- a/reportbuilder/java/com/sun/star/report/ReportJobDefinition.java
+++ b/reportbuilder/java/org/libreoffice/report/ReportJobDefinition.java
@@ -15,7 +15,7 @@
  *   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;
+package org.libreoffice.report;
 
 /**
  * The report job is created by the report job factory and holds all properties
diff --git a/reportbuilder/java/com/sun/star/report/ReportJobFactory.java b/reportbuilder/java/org/libreoffice/report/ReportJobFactory.java
index 4345e009c5b2..eeb16f6560dc 100644
--- a/reportbuilder/java/com/sun/star/report/ReportJobFactory.java
+++ b/reportbuilder/java/org/libreoffice/report/ReportJobFactory.java
@@ -15,7 +15,7 @@
  *   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;
+package org.libreoffice.report;
 
 import com.sun.star.beans.NamedValue;
 import com.sun.star.lang.IllegalArgumentException;
diff --git a/reportbuilder/java/com/sun/star/report/SDBCReportData.java b/reportbuilder/java/org/libreoffice/report/SDBCReportData.java
index 7f8fae13a16f..6019d94c8cb6 100644
--- a/reportbuilder/java/com/sun/star/report/SDBCReportData.java
+++ b/reportbuilder/java/org/libreoffice/report/SDBCReportData.java
@@ -15,7 +15,7 @@
  *   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;
+package org.libreoffice.report;
 
 import com.sun.star.beans.UnknownPropertyException;
 import com.sun.star.beans.XPropertySet;
diff --git a/reportbuilder/java/com/sun/star/report/SDBCReportDataFactory.java b/reportbuilder/java/org/libreoffice/report/SDBCReportDataFactory.java
index d0168a645db1..a22be04503cc 100644
--- a/reportbuilder/java/com/sun/star/report/SDBCReportDataFactory.java
+++ b/reportbuilder/java/org/libreoffice/report/SDBCReportDataFactory.java
@@ -15,7 +15,7 @@
  *   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;
+package org.libreoffice.report;
 
 import com.sun.star.beans.PropertyVetoException;
 import com.sun.star.beans.UnknownPropertyException;
diff --git a/reportbuilder/java/com/sun/star/report/SOImageService.java b/reportbuilder/java/org/libreoffice/report/SOImageService.java
index 41522324d63f..7cc987145a6c 100644
--- a/reportbuilder/java/com/sun/star/report/SOImageService.java
+++ b/reportbuilder/java/org/libreoffice/report/SOImageService.java
@@ -15,7 +15,7 @@
  *   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;
+package org.libreoffice.report;
 
 import com.sun.star.awt.Size;
 import com.sun.star.beans.PropertyValue;
diff --git a/reportbuilder/java/com/sun/star/report/StorageRepository.java b/reportbuilder/java/org/libreoffice/report/StorageRepository.java
index 0b23997bfcb9..2feb9972b118 100644
--- a/reportbuilder/java/com/sun/star/report/StorageRepository.java
+++ b/reportbuilder/java/org/libreoffice/report/StorageRepository.java
@@ -15,7 +15,7 @@
  *   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;
+package org.libreoffice.report;
 
 import com.sun.star.beans.PropertyVetoException;
 import com.sun.star.beans.UnknownPropertyException;
diff --git a/reportbuilder/java/com/sun/star/report/function/metadata/Author-Function.properties b/reportbuilder/java/org/libreoffice/report/function/metadata/Author-Function.properties
index a05ce8dad886..a05ce8dad886 100644
--- a/reportbuilder/java/com/sun/star/report/function/metadata/Author-Function.properties
+++ b/reportbuilder/java/org/libreoffice/report/function/metadata/Author-Function.properties
diff --git a/reportbuilder/java/com/sun/star/report/function/metadata/Author-Function_en_US.properties b/reportbuilder/java/org/libreoffice/report/function/metadata/Author-Function_en_US.properties
index a05ce8dad886..a05ce8dad886 100644
--- a/reportbuilder/java/com/sun/star/report/function/metadata/Author-Function_en_US.properties
+++ b/reportbuilder/java/org/libreoffice/report/function/metadata/Author-Function_en_US.properties
diff --git a/reportbuilder/java/com/sun/star/report/function/metadata/AuthorFunction.java b/reportbuilder/java/org/libreoffice/report/function/metadata/AuthorFunction.java
index 641eddf0c840..dcd30e5f056b 100644
--- a/reportbuilder/java/com/sun/star/report/function/metadata/AuthorFunction.java
+++ b/reportbuilder/java/org/libreoffice/report/function/metadata/AuthorFunction.java
@@ -15,9 +15,9 @@
  *   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.function.metadata;
+package org.libreoffice.report.function.metadata;
 
-import com.sun.star.report.ReportEngineParameterNames;
+import org.libreoffice.report.ReportEngineParameterNames;
 
 import org.pentaho.reporting.libraries.formula.EvaluationException;
 import org.pentaho.reporting.libraries.formula.FormulaContext;
diff --git a/reportbuilder/java/com/sun/star/report/function/metadata/AuthorFunctionDescription.java b/reportbuilder/java/org/libreoffice/report/function/metadata/AuthorFunctionDescription.java
index af4cd6c96fc0..b4cf6e22fce7 100644
--- a/reportbuilder/java/com/sun/star/report/function/metadata/AuthorFunctionDescription.java
+++ b/reportbuilder/java/org/libreoffice/report/function/metadata/AuthorFunctionDescription.java
@@ -15,7 +15,7 @@
  *   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.function.metadata;
+package org.libreoffice.report.function.metadata;
 
 import org.pentaho.reporting.libraries.formula.function.AbstractFunctionDescription;
 import org.pentaho.reporting.libraries.formula.function.FunctionCategory;
@@ -27,7 +27,7 @@ public class AuthorFunctionDescription extends AbstractFunctionDescription
 
     public AuthorFunctionDescription()
     {
-        super("AUTHOR", "com.sun.star.report.function.metadata.Author-Function");
+        super("AUTHOR", "org.libreoffice.report.function.metadata.Author-Function");
     }
 
     public FunctionCategory getCategory()
diff --git a/reportbuilder/java/com/sun/star/report/function/metadata/MetaDataFunctionCategory.java b/reportbuilder/java/org/libreoffice/report/function/metadata/MetaDataFunctionCategory.java
index 42b6b770e26d..3b6ac8a29413 100644
--- a/reportbuilder/java/com/sun/star/report/function/metadata/MetaDataFunctionCategory.java
+++ b/reportbuilder/java/org/libreoffice/report/function/metadata/MetaDataFunctionCategory.java
@@ -15,7 +15,7 @@
  *   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.function.metadata;
+package org.libreoffice.report.function.metadata;
 
 import org.pentaho.reporting.libraries.formula.function.AbstractFunctionCategory;
 import org.pentaho.reporting.libraries.formula.function.FunctionCategory;
@@ -27,7 +27,7 @@ public class MetaDataFunctionCategory extends AbstractFunctionCategory
 
     private MetaDataFunctionCategory()
     {
-        super("com.sun.star.report.function.metadata.category");
+        super("org.libreoffice.report.function.metadata.category");
     }
 }
 
diff --git a/reportbuilder/java/com/sun/star/report/function/metadata/Title-Function.properties b/reportbuilder/java/org/libreoffice/report/function/metadata/Title-Function.properties
index 3c0039f6c105..3c0039f6c105 100644
--- a/reportbuilder/java/com/sun/star/report/function/metadata/Title-Function.properties
+++ b/reportbuilder/java/org/libreoffice/report/function/metadata/Title-Function.properties
diff --git a/reportbuilder/java/com/sun/star/report/function/metadata/Title-Function_en_US.properties b/reportbuilder/java/org/libreoffice/report/function/metadata/Title-Function_en_US.properties
index 3c0039f6c105..3c0039f6c105 100644
--- a/reportbuilder/java/com/sun/star/report/function/metadata/Title-Function_en_US.properties
+++ b/reportbuilder/java/org/libreoffice/report/function/metadata/Title-Function_en_US.properties
diff --git a/reportbuilder/java/com/sun/star/report/function/metadata/TitleFunction.java b/reportbuilder/java/org/libreoffice/report/function/metadata/TitleFunction.java
index a6572b44ace2..fdc7ed0ebc30 100644
--- a/reportbuilder/java/com/sun/star/report/function/metadata/TitleFunction.java
+++ b/reportbuilder/java/org/libreoffice/report/function/metadata/TitleFunction.java
@@ -15,9 +15,9 @@
  *   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.function.metadata;
+package org.libreoffice.report.function.metadata;
 
-import com.sun.star.report.ReportEngineParameterNames;
+import org.libreoffice.report.ReportEngineParameterNames;
 
 import org.pentaho.reporting.libraries.formula.EvaluationException;
 import org.pentaho.reporting.libraries.formula.FormulaContext;
diff --git a/reportbuilder/java/com/sun/star/report/function/metadata/TitleFunctionDescription.java b/reportbuilder/java/org/libreoffice/report/function/metadata/TitleFunctionDescription.java
index 0c0c80acf284..30d3d337b510 100644
--- a/reportbuilder/java/com/sun/star/report/function/metadata/TitleFunctionDescription.java
+++ b/reportbuilder/java/org/libreoffice/report/function/metadata/TitleFunctionDescription.java
@@ -15,7 +15,7 @@
  *   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.function.metadata;
+package org.libreoffice.report.function.metadata;
 
 import org.pentaho.reporting.libraries.formula.function.AbstractFunctionDescription;
 import org.pentaho.reporting.libraries.formula.function.FunctionCategory;
@@ -27,7 +27,7 @@ public class TitleFunctionDescription extends AbstractFunctionDescription
 
     public TitleFunctionDescription()
     {
-        super("TITLE", "com.sun.star.report.function.metadata.Title-Function");
+        super("TITLE", "org.libreoffice.report.function.metadata.Title-Function");
     }
 
     public FunctionCategory getCategory()
diff --git a/reportbuilder/java/com/sun/star/report/function/metadata/category.properties b/reportbuilder/java/org/libreoffice/report/function/metadata/category.properties
index 39f24f271d1e..39f24f271d1e 100644
--- a/reportbuilder/java/com/sun/star/report/function/metadata/category.properties
+++ b/reportbuilder/java/org/libreoffice/report/function/metadata/category.properties
diff --git a/reportbuilder/java/com/sun/star/report/function/metadata/category_en_US.properties b/reportbuilder/java/org/libreoffice/report/function/metadata/category_en_US.properties
index 76ea0bb4d77f..76ea0bb4d77f 100644
--- a/reportbuilder/java/com/sun/star/report/function/metadata/category_en_US.properties
+++ b/reportbuilder/java/org/libreoffice/report/function/metadata/category_en_US.properties
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/DefaultNameGenerator.java b/reportbuilder/java/org/libreoffice/report/pentaho/DefaultNameGenerator.java
index f8397a7d31b4..ca69be4b63a6 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/DefaultNameGenerator.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/DefaultNameGenerator.java
@@ -15,9 +15,9 @@
  *   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.pentaho;
+package org.libreoffice.report.pentaho;
 
-import com.sun.star.report.OutputRepository;
+import org.libreoffice.report.OutputRepository;
 
 import java.io.IOException;
 
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/Manifest.mf b/reportbuilder/java/org/libreoffice/report/pentaho/Manifest.mf
index 5d27005f2d65..f98127d5b403 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/Manifest.mf
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/Manifest.mf
@@ -1,4 +1,4 @@
-RegistrationClassName: com.sun.star.report.pentaho.SOReportJobFactory
+RegistrationClassName: org.libreoffice.report.pentaho.SOReportJobFactory
 Class-Path: reportbuilderwizard.jar
   flute-1.1.6.jar libserializer-1.1.6.jar libbase-1.1.6.jar
   libfonts-1.1.6.jar libformula-1.1.7.jar liblayout-0.2.10.jar
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/OfficeNamespaces.java b/reportbuilder/java/org/libreoffice/report/pentaho/OfficeNamespaces.java
index c9efb511cf12..1a45f1f4347a 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/OfficeNamespaces.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/OfficeNamespaces.java
@@ -15,7 +15,7 @@
  *   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.pentaho;
+package org.libreoffice.report.pentaho;
 
 /**
  * Creation-Date: Feb 22, 2007, 1:53:29 PM
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/PentahoFormulaContext.java b/reportbuilder/java/org/libreoffice/report/pentaho/PentahoFormulaContext.java
index 8544004ca168..ced17741c9d1 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/PentahoFormulaContext.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/PentahoFormulaContext.java
@@ -15,7 +15,7 @@
  *   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.pentaho;
+package org.libreoffice.report.pentaho;
 
 import org.pentaho.reporting.libraries.base.config.Configuration;
 import org.pentaho.reporting.libraries.formula.ContextEvaluationException;
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/PentahoReportAddIn.java b/reportbuilder/java/org/libreoffice/report/pentaho/PentahoReportAddIn.java
index f5bd86c464c1..bbd915c87222 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/PentahoReportAddIn.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/PentahoReportAddIn.java
@@ -15,12 +15,12 @@
  *   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.pentaho;
+package org.libreoffice.report.pentaho;
 
-import com.sun.star.report.ReportAddIn;
-import com.sun.star.report.ReportExpression;
-import com.sun.star.report.ReportExpressionMetaData;
-import com.sun.star.report.pentaho.expressions.SumExpression;
+import org.libreoffice.report.ReportAddIn;
+import org.libreoffice.report.ReportExpression;
+import org.libreoffice.report.ReportExpressionMetaData;
+import org.libreoffice.report.pentaho.expressions.SumExpression;
 
 /**
  * This class is a dummy implementation. Ignore it for now, we may extend this
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/PentahoReportEngine.java b/reportbuilder/java/org/libreoffice/report/pentaho/PentahoReportEngine.java
index a4ddc774c105..8e30adc77fdf 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/PentahoReportEngine.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/PentahoReportEngine.java
@@ -15,13 +15,13 @@
  *   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.pentaho;
+package org.libreoffice.report.pentaho;
 
-import com.sun.star.report.JobDefinitionException;
-import com.sun.star.report.ReportEngineMetaData;
-import com.sun.star.report.ReportJob;
-import com.sun.star.report.ReportJobDefinition;
-import com.sun.star.report.util.DefaultReportJobDefinition;
+import org.libreoffice.report.JobDefinitionException;
+import org.libreoffice.report.ReportEngineMetaData;
+import org.libreoffice.report.ReportJob;
+import org.libreoffice.report.ReportJobDefinition;
+import org.libreoffice.report.util.DefaultReportJobDefinition;
 import org.jfree.report.JFreeReportBoot;
 
 public class PentahoReportEngine
@@ -50,7 +50,7 @@ public class PentahoReportEngine
      *
      * @return the report job definition for the job description.
      *
-     * @throws com.sun.star.report.JobDefinitionException
+     * @throws org.libreoffice.report.JobDefinitionException
      *
      */
     public ReportJob createJob(final ReportJobDefinition definition)
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/PentahoReportEngineMetaData.java b/reportbuilder/java/org/libreoffice/report/pentaho/PentahoReportEngineMetaData.java
index 623de3ae996d..337eaa68d114 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/PentahoReportEngineMetaData.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/PentahoReportEngineMetaData.java
@@ -15,15 +15,15 @@
  *   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.pentaho;
-
-import com.sun.star.report.DataSourceFactory;
-import com.sun.star.report.ImageService;
-import com.sun.star.report.InputRepository;
-import com.sun.star.report.OutputRepository;
-import com.sun.star.report.ReportEngineMetaData;
-import com.sun.star.report.ReportEngineParameterNames;
-import com.sun.star.report.ReportJobFactory;
+package org.libreoffice.report.pentaho;
+
+import org.libreoffice.report.DataSourceFactory;
+import org.libreoffice.report.ImageService;
+import org.libreoffice.report.InputRepository;
+import org.libreoffice.report.OutputRepository;
+import org.libreoffice.report.ReportEngineMetaData;
+import org.libreoffice.report.ReportEngineParameterNames;
+import org.libreoffice.report.ReportJobFactory;
 
 import java.util.HashMap;
 import java.util.HashSet;
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/PentahoReportJob.java b/reportbuilder/java/org/libreoffice/report/pentaho/PentahoReportJob.java
index 273e26c07bcf..e1cf4f3900e9 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/PentahoReportJob.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/PentahoReportJob.java
@@ -15,29 +15,29 @@
  *   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.pentaho;
-
-import com.sun.star.report.DataSourceFactory;
-import com.sun.star.report.ImageService;
-import com.sun.star.report.InputRepository;
-import com.sun.star.report.JobDefinitionException;
-import com.sun.star.report.JobProgressIndicator;
-import com.sun.star.report.JobProperties;
-import com.sun.star.report.OutputRepository;
-import com.sun.star.report.ParameterMap;
-import com.sun.star.report.ReportEngineParameterNames;
-import com.sun.star.report.ReportExecutionException;
-import com.sun.star.report.ReportJob;
-import com.sun.star.report.ReportJobDefinition;
-import com.sun.star.report.SDBCReportDataFactory;
-import com.sun.star.report.pentaho.loader.InputRepositoryLoader;
-import com.sun.star.report.pentaho.model.OfficeDetailSection;
-import com.sun.star.report.pentaho.model.OfficeDocument;
-import com.sun.star.report.pentaho.model.OfficeGroup;
-import com.sun.star.report.pentaho.model.OfficeReport;
-import com.sun.star.report.pentaho.output.chart.ChartRawReportProcessor;
-import com.sun.star.report.pentaho.output.spreadsheet.SpreadsheetRawReportProcessor;
-import com.sun.star.report.pentaho.output.text.TextRawReportProcessor;
+package org.libreoffice.report.pentaho;
+
+import org.libreoffice.report.DataSourceFactory;
+import org.libreoffice.report.ImageService;
+import org.libreoffice.report.InputRepository;
+import org.libreoffice.report.JobDefinitionException;
+import org.libreoffice.report.JobProgressIndicator;
+import org.libreoffice.report.JobProperties;
+import org.libreoffice.report.OutputRepository;
+import org.libreoffice.report.ParameterMap;
+import org.libreoffice.report.ReportEngineParameterNames;
+import org.libreoffice.report.ReportExecutionException;
+import org.libreoffice.report.ReportJob;
+import org.libreoffice.report.ReportJobDefinition;
+import org.libreoffice.report.SDBCReportDataFactory;
+import org.libreoffice.report.pentaho.loader.InputRepositoryLoader;
+import org.libreoffice.report.pentaho.model.OfficeDetailSection;
+import org.libreoffice.report.pentaho.model.OfficeDocument;
+import org.libreoffice.report.pentaho.model.OfficeGroup;
+import org.libreoffice.report.pentaho.model.OfficeReport;
+import org.libreoffice.report.pentaho.output.chart.ChartRawReportProcessor;
+import org.libreoffice.report.pentaho.output.spreadsheet.SpreadsheetRawReportProcessor;
+import org.libreoffice.report.pentaho.output.text.TextRawReportProcessor;
 
 import java.io.IOException;
 
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/SOFormulaOpCodeMapper.java b/reportbuilder/java/org/libreoffice/report/pentaho/SOFormulaOpCodeMapper.java
index ae962b273f7b..5c9f59819995 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/SOFormulaOpCodeMapper.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/SOFormulaOpCodeMapper.java
@@ -15,7 +15,7 @@
  *   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.pentaho;
+package org.libreoffice.report.pentaho;
 
 import com.sun.star.lang.XServiceInfo;
 import com.sun.star.lib.uno.helper.WeakBase;
@@ -31,7 +31,7 @@ public final class SOFormulaOpCodeMapper extends WeakBase
         implements com.sun.star.sheet.XFormulaOpCodeMapper, XServiceInfo
 {
 
-    private static final String __serviceName = "com.sun.star.report.pentaho.SOFormulaOpCodeMapper";
+    private static final String __serviceName = "org.libreoffice.report.pentaho.SOFormulaOpCodeMapper";
     private final SOFormulaParser parser;
     // attributes
     final private int m_OpCodeExternal = 0;
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/SOFormulaParser.java b/reportbuilder/java/org/libreoffice/report/pentaho/SOFormulaParser.java
index 3e1b623044ed..f604210ffb67 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/SOFormulaParser.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/SOFormulaParser.java
@@ -15,7 +15,7 @@
  *   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.pentaho;
+package org.libreoffice.report.pentaho;
 
 
 import com.sun.star.lang.XServiceInfo;
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/SOFunctionManager.java b/reportbuilder/java/org/libreoffice/report/pentaho/SOFunctionManager.java
index 5ffcc022dfff..3e96ca003fee 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/SOFunctionManager.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/SOFunctionManager.java
@@ -15,7 +15,7 @@
  *   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.pentaho;
+package org.libreoffice.report.pentaho;
 
 import com.sun.star.container.NoSuchElementException;
 import com.sun.star.lang.XServiceInfo;
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/SOReportJobFactory.java b/reportbuilder/java/org/libreoffice/report/pentaho/SOReportJobFactory.java
index 5e891396f63d..8d99ddf8b652 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/SOReportJobFactory.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/SOReportJobFactory.java
@@ -15,7 +15,7 @@
  *   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.pentaho;
+package org.libreoffice.report.pentaho;
 
 import com.sun.star.beans.NamedValue;
 import com.sun.star.beans.PropertyVetoException;
@@ -38,16 +38,16 @@ import com.sun.star.registry.InvalidRegistryException;
 import com.sun.star.registry.InvalidValueException;
 import com.sun.star.registry.XRegistryKey;
 import com.sun.star.registry.XSimpleRegistry;
-import com.sun.star.report.DataSourceFactory;
-import com.sun.star.report.JobProperties;
-import com.sun.star.report.ReportEngineParameterNames;
-import com.sun.star.report.ReportExecutionException;
-import com.sun.star.report.ReportJob;
-import com.sun.star.report.ReportJobDefinition;
-import com.sun.star.report.ReportJobFactory;
-import com.sun.star.report.SDBCReportDataFactory;
-import com.sun.star.report.SOImageService;
-import com.sun.star.report.StorageRepository;
+import org.libreoffice.report.DataSourceFactory;
+import org.libreoffice.report.JobProperties;
+import org.libreoffice.report.ReportEngineParameterNames;
+import org.libreoffice.report.ReportExecutionException;
+import org.libreoffice.report.ReportJob;
+import org.libreoffice.report.ReportJobDefinition;
+import org.libreoffice.report.ReportJobFactory;
+import org.libreoffice.report.SDBCReportDataFactory;
+import org.libreoffice.report.SOImageService;
+import org.libreoffice.report.StorageRepository;
 import com.sun.star.report.XReportDefinition;
 import com.sun.star.sdb.XDocumentDataSource;
 import com.sun.star.sdbc.XConnection;
@@ -84,7 +84,7 @@ public class SOReportJobFactory
          * The service name, that must be used to get an instance of this service.
          */
         private static final String __serviceName =
-                "com.sun.star.report.pentaho.SOReportJobFactory";
+                "org.libreoffice.report.pentaho.SOReportJobFactory";
         private final PropertySetMixin m_prophlp;
         /**
          * The initial component contextr, that gives access to the service manager, supported singletons, ... It's
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/StarFunctionCategory.java b/reportbuilder/java/org/libreoffice/report/pentaho/StarFunctionCategory.java
index 26c4f02caea4..83f26a0ea168 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/StarFunctionCategory.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/StarFunctionCategory.java
@@ -15,7 +15,7 @@
  *   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.pentaho;
+package org.libreoffice.report.pentaho;
 
 import com.sun.star.lib.uno.helper.PropertySetMixin;
 import com.sun.star.lib.uno.helper.WeakBase;
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/StarFunctionDescription.java b/reportbuilder/java/org/libreoffice/report/pentaho/StarFunctionDescription.java
index 04b2f256b42a..832137e2a4f4 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/StarFunctionDescription.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/StarFunctionDescription.java
@@ -15,7 +15,7 @@
  *   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.pentaho;
+package org.libreoffice.report.pentaho;
 
 import com.sun.star.lib.uno.helper.PropertySetMixin;
 import com.sun.star.lib.uno.helper.WeakBase;
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/StarReportData.java b/reportbuilder/java/org/libreoffice/report/pentaho/StarReportData.java
index 2f0627a4518d..77d65112c736 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/StarReportData.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/StarReportData.java
@@ -15,9 +15,9 @@
  *   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.pentaho;
+package org.libreoffice.report.pentaho;
 
-import com.sun.star.report.DataSource;
+import org.libreoffice.report.DataSource;
 
 import org.jfree.report.DataSourceException;
 import org.jfree.report.ReportData;
@@ -30,7 +30,7 @@ public class StarReportData implements ReportData
     private final int rowCount;
 
     public StarReportData(final DataSource dataSource)
-            throws com.sun.star.report.DataSourceException
+            throws org.libreoffice.report.DataSourceException
     {
         if (dataSource == null)
         {
@@ -52,7 +52,7 @@ public class StarReportData implements ReportData
             }
             return ret;
         }
-        catch (com.sun.star.report.DataSourceException e)
+        catch (org.libreoffice.report.DataSourceException e)
         {
             throw new DataSourceException("Failed to move cursor", e);
         }
@@ -65,7 +65,7 @@ public class StarReportData implements ReportData
         {
             dataSource.close();
         }
-        catch (com.sun.star.report.DataSourceException e)
+        catch (org.libreoffice.report.DataSourceException e)
         {
             throw new DataSourceException("Failed to close datasource", e);
         }
@@ -102,7 +102,7 @@ public class StarReportData implements ReportData
             }
             return false;
         }
-        catch (com.sun.star.report.DataSourceException e)
+        catch (org.libreoffice.report.DataSourceException e)
         {
             throw new DataSourceException("Failed to move cursor", e);
         }
@@ -120,7 +120,7 @@ public class StarReportData implements ReportData
         {
             return dataSource.getObject(column + 1);
         }
-        catch (com.sun.star.report.DataSourceException e)
+        catch (org.libreoffice.report.DataSourceException e)
         {
             throw new DataSourceException("Failed to query column.", e);
         }
@@ -133,7 +133,7 @@ public class StarReportData implements ReportData
         {
             return dataSource.getColumnCount();
         }
-        catch (com.sun.star.report.DataSourceException e)
+        catch (org.libreoffice.report.DataSourceException e)
         {
             throw new DataSourceException("Failed to query column count.", e);
         }
@@ -146,7 +146,7 @@ public class StarReportData implements ReportData
         {
             return dataSource.getColumnName(column + 1);
         }
-        catch (com.sun.star.report.DataSourceException e)
+        catch (org.libreoffice.report.DataSourceException e)
         {
             throw new DataSourceException("Failed to query column name.", e);
         }
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/StarReportDataFactory.java b/reportbuilder/java/org/libreoffice/report/pentaho/StarReportDataFactory.java
index e1046334f613..fd7114aa4bdb 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/StarReportDataFactory.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/StarReportDataFactory.java
@@ -15,10 +15,10 @@
  *   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.pentaho;
+package org.libreoffice.report.pentaho;
 
-import com.sun.star.report.DataSourceException;
-import com.sun.star.report.DataSourceFactory;
+import org.libreoffice.report.DataSourceException;
+import org.libreoffice.report.DataSourceFactory;
 
 import java.util.HashMap;
 
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/StarReportModule.java b/reportbuilder/java/org/libreoffice/report/pentaho/StarReportModule.java
index c0d014a0e1e8..0e6b1e124641 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/StarReportModule.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/StarReportModule.java
@@ -15,7 +15,7 @@
  *   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.pentaho;
+package org.libreoffice.report.pentaho;
 
 import org.pentaho.reporting.libraries.base.boot.AbstractModule;
 import org.pentaho.reporting.libraries.base.boot.ModuleInitializeException;
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/configuration.properties b/reportbuilder/java/org/libreoffice/report/pentaho/configuration.properties
new file mode 100644
index 000000000000..2453cf44e410
--- /dev/null
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/configuration.properties
@@ -0,0 +1,147 @@
+#
+# 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 .
+#
+# x-no-translate
+
+
+##
+# Do not modify the following lines. They connect this module to the central
+# parser registry.
+org.pentaho.reporting.libraries.resourceloader.factory.modules.org.libreoffice.report.pentaho.model.OfficeDocument.star=org.libreoffice.report.pentaho.parser.StarXmlFactoryModule
+org.pentaho.reporting.libraries.resourceloader.factory.modules.org.libreoffice.report.pentaho.model.OfficeStylesCollection.star=org.libreoffice.report.pentaho.parser.StarStyleXmlFactoryModule
+org.pentaho.reporting.libraries.resourceloader.factory.modules.org.libreoffice.report.pentaho.styles.StyleMapper.star=org.libreoffice.report.pentaho.styles.StyleMapperXmlFactoryModule
+
+##
+# The known namespaces.
+#
+org.jfree.report.namespaces.star-rpt.Uri=http://openoffice.org/2005/report
+org.jfree.report.namespaces.star-rpt.Default-Style=res://org/libreoffice/report/pentaho/star-rpt.css
+org.jfree.report.namespaces.star-rpt.Prefix=rpt
+org.jfree.report.namespaces.star-rpt.ClassAttr=style-name
+
+org.jfree.report.namespaces.star-office.Uri=http://openoffice.org/2004/office
+org.jfree.report.namespaces.star-office.Default-Style=res://org/libreoffice/report/pentaho/star-office.css
+org.jfree.report.namespaces.star-office.Prefix=office
+org.jfree.report.namespaces.star-office.ClassAttr=style-name
+
+org.jfree.report.namespaces.oasis-style.Uri=urn:oasis:names:tc:opendocument:xmlns:style:1.0
+org.jfree.report.namespaces.oasis-style.Default-Style=res://org/libreoffice/report/pentaho/oasis-style.css
+org.jfree.report.namespaces.oasis-style.Prefix=style
+
+org.jfree.report.namespaces.oasis-table.Uri=urn:oasis:names:tc:opendocument:xmlns:table:1.0
+org.jfree.report.namespaces.oasis-table.Default-Style=res://org/libreoffice/report/pentaho/oasis-table.css
+org.jfree.report.namespaces.oasis-table.Prefix=table
+org.jfree.report.namespaces.oasis-table.ClassAttr=style-name
+
+org.jfree.report.namespaces.oasis-draw.Uri=urn:oasis:names:tc:opendocument:xmlns:drawing:1.0
+org.jfree.report.namespaces.oasis-draw.Default-Style=res://org/libreoffice/report/pentaho/oasis-draw.css
+org.jfree.report.namespaces.oasis-draw.Prefix=draw
+org.jfree.report.namespaces.oasis-draw.ClassAttr=style-name
+
+org.jfree.report.namespaces.oasis-chart.Uri=urn:oasis:names:tc:opendocument:xmlns:chart:1.0
+org.jfree.report.namespaces.oasis-chart.Default-Style=res://org/libreoffice/report/pentaho/oasis-chart.css
+org.jfree.report.namespaces.oasis-chart.Prefix=chart
+org.jfree.report.namespaces.oasis-chart.ClassAttr=style-name
+
+org.jfree.report.namespaces.oasis-text.Uri=urn:oasis:names:tc:opendocument:xmlns:text:1.0
+org.jfree.report.namespaces.oasis-text.Default-Style=res://org/libreoffice/report/pentaho/oasis-text.css
+org.jfree.report.namespaces.oasis-text.Prefix=text
+org.jfree.report.namespaces.oasis-text.ClassAttr=style-name
+
+org.jfree.report.namespaces.oasis-number.Uri=urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0
+org.jfree.report.namespaces.oasis-number.Default-Style=res://org/libreoffice/report/pentaho/oasis-number.css
+org.jfree.report.namespaces.oasis-number.Prefix=number
+org.jfree.report.namespaces.oasis-number.ClassAttr=style-name
+
+org.jfree.report.namespaces.oasis-form.Uri=urn:oasis:names:tc:opendocument:xmlns:form:1.0
+org.jfree.report.namespaces.oasis-form.Default-Style=res://org/libreoffice/report/pentaho/oasis-form.css
+org.jfree.report.namespaces.oasis-form.Prefix=form
+
+#
+# This defines a subset of the real XSL-FO standard.
+org.jfree.report.namespaces.oasis-compat-fo.Uri=urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0
+org.jfree.report.namespaces.oasis-compat-fo.Default-Style=res://org/libreoffice/report/pentaho/xsl-fo.css
+org.jfree.report.namespaces.oasis-compat-fo.Prefix=fo
+
+#
+# This defines a subset of the real XSL-FO standard.
+org.jfree.report.namespaces.oasis-compat-svg.Uri=urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0
+org.jfree.report.namespaces.oasis-compat-svg.Default-Style=res://org/libreoffice/report/pentaho/svg.css
+org.jfree.report.namespaces.oasis-compat-svg.Prefix=svg
+
+#
+# This defines a subset of the real XSL-FO standard.
+org.jfree.report.namespaces.oasis-compat-smil.Uri=urn:oasis:names:tc:opendocument:xmlns:smil-compatible:1.0
+org.jfree.report.namespaces.oasis-compat-smil.Default-Style=res://org/libreoffice/report/pentaho/smil.css
+org.jfree.report.namespaces.oasis-compat-smil.Prefix=svg
+
+org.jfree.report.namespaces.xsl-fo.Uri=http://www.w3.org/1999/XSL/Format
+org.jfree.report.namespaces.xsl-fo.Default-Style=res://org/libreoffice/report/pentaho/xsl-fo.css
+org.jfree.report.namespaces.xsl-fo.Prefix=fo
+
+org.jfree.report.namespaces.svg.Uri=http://www.w3.org/2000/svg
+org.jfree.report.namespaces.svg.Default-Style=res://org/libreoffice/report/pentaho/svg.css
+org.jfree.report.namespaces.svg.Prefix=svg
+org.jfree.report.namespaces.svg.ClassAttr=class
+org.jfree.report.namespaces.svg.StyleAttr=style
+
+org.jfree.report.namespaces.xml-xlink.Uri=http://www.w3.org/1999/xlink
+#org.jfree.report.namespaces.xml-xlink.Default-Style=res://org/libreoffice/report/pentaho/xml-xlink.css
+org.jfree.report.namespaces.xml-xlink.Prefix=xlink
+
+#
+# Tag-definition for the XML-writer.
+# Prefix is 'org.libreoffice.report.pentaho.output.'
+#
+# Declare the namespaces (this is independent of the ones defined above ..)
+# <prefix>"namespace."<ns-prefix>=<ns-uri>
+org.libreoffice.report.pentaho.output.namespace.oasis-text=urn:oasis:names:tc:opendocument:xmlns:text:1.0
+org.libreoffice.report.pentaho.output.default.oasis-text=deny
+
+org.libreoffice.report.pentaho.output.namespace.oasis-config=urn:oasis:names:tc:opendocument:xmlns:config:1.0
+org.libreoffice.report.pentaho.output.default.oasis-config=allow
+
+#
+# Next define the tags for which we want to customize the indent-behaviour
+org.libreoffice.report.pentaho.output.tag.oasis-text.p=deny
+org.libreoffice.report.pentaho.output.tag.oasis-text.section=allow
+org.libreoffice.report.pentaho.output.tag.oasis-text.variable-decls=allow
+org.libreoffice.report.pentaho.output.tag.oasis-text.variable-decl=allow
+
+org.libreoffice.report.pentaho.output.tag.oasis-config.config-item=deny
+
+org.libreoffice.report.pentaho.output.namespace.oasis-data=urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0
+org.libreoffice.report.pentaho.output.default.oasis-data=allow
+org.libreoffice.report.pentaho.output.tag.oasis-data.text=deny
+org.libreoffice.report.pentaho.output.tag.oasis-data.currency-symbol=deny
+org.libreoffice.report.pentaho.output.tag.oasis-data.embedded-text=deny
+
+org.libreoffice.report.pentaho.output.namespace.oasis-draw=urn:oasis:names:tc:opendocument:xmlns:drawing:1.0
+org.libreoffice.report.pentaho.output.default.oasis-draw=deny
+
+org.jfree.report.flow.structure.org.libreoffice.report.pentaho.model.FixedTextElement=org.libreoffice.report.pentaho.layoutprocessor.FixedTextLayoutController
+org.jfree.report.flow.structure.org.libreoffice.report.pentaho.model.FormattedTextElement=org.libreoffice.report.pentaho.layoutprocessor.FormattedTextLayoutController
+org.jfree.report.flow.structure.org.libreoffice.report.pentaho.model.ObjectOleElement=org.libreoffice.report.pentaho.layoutprocessor.ObjectOleLayoutController
+org.jfree.report.flow.structure.org.libreoffice.report.pentaho.model.ImageElement=org.libreoffice.report.pentaho.layoutprocessor.ImageElementLayoutController
+org.jfree.report.flow.structure.org.libreoffice.report.pentaho.model.TableCellElement=org.libreoffice.report.pentaho.layoutprocessor.TableCellLayoutController
+org.jfree.report.flow.structure.org.libreoffice.report.pentaho.model.OfficeReport=org.libreoffice.report.pentaho.layoutprocessor.OfficeReportLayoutController
+org.jfree.report.flow.structure.org.libreoffice.report.pentaho.model.OfficeGroup=org.libreoffice.report.pentaho.layoutprocessor.OfficeGroupLayoutController
+org.jfree.report.flow.structure.org.libreoffice.report.pentaho.model.OfficeGroupSection=org.libreoffice.report.pentaho.layoutprocessor.OfficeGroupSectionLayoutController
+org.jfree.report.flow.structure.org.libreoffice.report.pentaho.model.VariablesDeclarationSection=org.libreoffice.report.pentaho.layoutprocessor.VariablesDeclarationLayoutController
+org.jfree.report.flow.structure.org.libreoffice.report.pentaho.model.OfficeDetailSection=org.libreoffice.report.pentaho.layoutprocessor.OfficeDetailLayoutController
+org.jfree.report.flow.structure.org.libreoffice.report.pentaho.model.OfficeTableSection=org.libreoffice.report.pentaho.layoutprocessor.OfficeTableLayoutController
+org.jfree.report.flow.structure.org.libreoffice.report.pentaho.model.OfficeGroupInstanceSection=org.libreoffice.report.pentaho.layoutprocessor.OfficeGroupInstanceSectionLayoutController
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/expressions/SumExpression.java b/reportbuilder/java/org/libreoffice/report/pentaho/expressions/SumExpression.java
index d41167a9b91b..d724010ef17a 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/expressions/SumExpression.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/expressions/SumExpression.java
@@ -15,10 +15,10 @@
  *   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.pentaho.expressions;
+package org.libreoffice.report.pentaho.expressions;
 
-import com.sun.star.report.DataRow;
-import com.sun.star.report.ReportExpression;
+import org.libreoffice.report.DataRow;
+import org.libreoffice.report.ReportExpression;
 
 public class SumExpression implements ReportExpression
 {
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/expressions/SumExpressionMetaData.java b/reportbuilder/java/org/libreoffice/report/pentaho/expressions/SumExpressionMetaData.java
index 17297e472976..fbfa73c0d168 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/expressions/SumExpressionMetaData.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/expressions/SumExpressionMetaData.java
@@ -15,9 +15,9 @@
  *   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.pentaho.expressions;
+package org.libreoffice.report.pentaho.expressions;
 
-import com.sun.star.report.ReportExpressionMetaData;
+import org.libreoffice.report.ReportExpressionMetaData;
 
 import java.util.Locale;
 
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/AbstractReportElementLayoutController.java b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/AbstractReportElementLayoutController.java
index 7a7465f99345..a690062bf83f 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/AbstractReportElementLayoutController.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/AbstractReportElementLayoutController.java
@@ -16,10 +16,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-package com.sun.star.report.pentaho.layoutprocessor;
+package org.libreoffice.report.pentaho.layoutprocessor;
 
-import com.sun.star.report.pentaho.model.OfficeGroupSection;
-import com.sun.star.report.pentaho.model.ReportElement;
+import org.libreoffice.report.pentaho.model.OfficeGroupSection;
+import org.libreoffice.report.pentaho.model.ReportElement;
 
 import org.jfree.report.DataFlags;
 import org.jfree.report.DataRow;
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FixedTextLayoutController.java b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FixedTextLayoutController.java
index 2dd554e0543e..1dd0a26174b7 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FixedTextLayoutController.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FixedTextLayoutController.java
@@ -16,9 +16,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-package com.sun.star.report.pentaho.layoutprocessor;
+package org.libreoffice.report.pentaho.layoutprocessor;
 
-import com.sun.star.report.pentaho.model.FixedTextElement;
+import org.libreoffice.report.pentaho.model.FixedTextElement;
 
 import org.jfree.report.DataSourceException;
 import org.jfree.report.ReportDataFactoryException;
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FormatValueUtility.java b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormatValueUtility.java
index 99ff3e5fcf27..f5f65db53d52 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FormatValueUtility.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormatValueUtility.java
@@ -16,13 +16,13 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-package com.sun.star.report.pentaho.layoutprocessor;
+package org.libreoffice.report.pentaho.layoutprocessor;
 
-import com.sun.star.report.OfficeToken;
-import com.sun.star.report.pentaho.OfficeNamespaces;
-import com.sun.star.report.pentaho.model.FormattedTextElement;
-import com.sun.star.report.pentaho.model.OfficeGroupSection;
-import com.sun.star.report.pentaho.model.ReportElement;
+import org.libreoffice.report.OfficeToken;
+import org.libreoffice.report.pentaho.OfficeNamespaces;
+import org.libreoffice.report.pentaho.model.FormattedTextElement;
+import org.libreoffice.report.pentaho.model.OfficeGroupSection;
+import org.libreoffice.report.pentaho.model.ReportElement;
 import java.math.BigDecimal;
 
 import java.sql.Time;
@@ -248,7 +248,7 @@ public class FormatValueUtility
         else if (ref instanceof TableCellLayoutController)
             isValueChanged=((TableCellLayoutController)ref).isValueChanged();
         else
-            throw new AssertionError("com.sun.star.report.pentaho.layoutprocessor.FormatValueUtility.shouldPrint expects an implementor of isValueChanged as first argument");
+            throw new AssertionError("org.libreoffice.report.pentaho.layoutprocessor.FormatValueUtility.shouldPrint expects an implementor of isValueChanged as first argument");
 
         // Tests we have to perform:
         // 1. If repeated values are supposed to be printed, then print.
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FormattedTextLayoutController.java b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormattedTextLayoutController.java
index ea3d22bc169c..dcc153c71962 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FormattedTextLayoutController.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormattedTextLayoutController.java
@@ -16,13 +16,13 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-package com.sun.star.report.pentaho.layoutprocessor;
+package org.libreoffice.report.pentaho.layoutprocessor;
 
-import com.sun.star.report.OfficeToken;
-import com.sun.star.report.pentaho.OfficeNamespaces;
-import com.sun.star.report.pentaho.model.FormattedTextElement;
-import com.sun.star.report.pentaho.model.OfficeDocument;
-import com.sun.star.report.pentaho.model.OfficeStyle;
+import org.libreoffice.report.OfficeToken;
+import org.libreoffice.report.pentaho.OfficeNamespaces;
+import org.libreoffice.report.pentaho.model.FormattedTextElement;
+import org.libreoffice.report.pentaho.model.OfficeDocument;
+import org.libreoffice.report.pentaho.model.OfficeStyle;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/ImageElementContext.java b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/ImageElementContext.java
index 03c062487471..91cf767eab2d 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/ImageElementContext.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/ImageElementContext.java
@@ -16,7 +16,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-package com.sun.star.report.pentaho.layoutprocessor;
+package org.libreoffice.report.pentaho.layoutprocessor;
 
 /**
  * Todo: Document me!
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/ImageElementLayoutController.java b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/ImageElementLayoutController.java
index a32073e13224..bd5d529553d5 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/ImageElementLayoutController.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/ImageElementLayoutController.java
@@ -16,11 +16,11 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-package com.sun.star.report.pentaho.layoutprocessor;
+package org.libreoffice.report.pentaho.layoutprocessor;
 
-import com.sun.star.report.OfficeToken;
-import com.sun.star.report.pentaho.OfficeNamespaces;
-import com.sun.star.report.pentaho.model.ImageElement;
+import org.libreoffice.report.OfficeToken;
+import org.libreoffice.report.pentaho.OfficeNamespaces;
+import org.libreoffice.report.pentaho.model.ImageElement;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/ObjectOleLayoutController.java b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/ObjectOleLayoutController.java
index 4dbac0fae730..3a5c31dd1435 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/ObjectOleLayoutController.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/ObjectOleLayoutController.java
@@ -16,11 +16,11 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-package com.sun.star.report.pentaho.layoutprocessor;
+package org.libreoffice.report.pentaho.layoutprocessor;
 
-import com.sun.star.report.OfficeToken;
-import com.sun.star.report.SDBCReportDataFactory;
-import com.sun.star.report.pentaho.model.ObjectOleElement;
+import org.libreoffice.report.OfficeToken;
+import org.libreoffice.report.SDBCReportDataFactory;
+import org.libreoffice.report.pentaho.model.ObjectOleElement;
 
 import java.util.ArrayList;
 import java.util.Iterator;
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeDetailLayoutController.java b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeDetailLayoutController.java
index ad314e5ae31d..40dd5c0488f6 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeDetailLayoutController.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeDetailLayoutController.java
@@ -16,9 +16,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-package com.sun.star.report.pentaho.layoutprocessor;
+package org.libreoffice.report.pentaho.layoutprocessor;
 
-import com.sun.star.report.pentaho.model.VariablesDeclarationSection;
+import org.libreoffice.report.pentaho.model.VariablesDeclarationSection;
 
 import org.jfree.report.DataSourceException;
 import org.jfree.report.ReportData;
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeGroupInstanceSectionLayoutController.java b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeGroupInstanceSectionLayoutController.java
index dc443aba23d4..ad402e03a994 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeGroupInstanceSectionLayoutController.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeGroupInstanceSectionLayoutController.java
@@ -16,10 +16,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-package com.sun.star.report.pentaho.layoutprocessor;
+package org.libreoffice.report.pentaho.layoutprocessor;
 
-import com.sun.star.report.pentaho.model.OfficeGroupSection;
-import com.sun.star.report.pentaho.model.VariablesDeclarationSection;
+import org.libreoffice.report.pentaho.model.OfficeGroupSection;
+import org.libreoffice.report.pentaho.model.VariablesDeclarationSection;
 
 import org.jfree.layouting.util.AttributeMap;
 import org.jfree.report.DataSourceException;
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeGroupLayoutController.java b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeGroupLayoutController.java
index 91bea4b1179a..293a6dbdd001 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeGroupLayoutController.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeGroupLayoutController.java
@@ -16,10 +16,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-package com.sun.star.report.pentaho.layoutprocessor;
+package org.libreoffice.report.pentaho.layoutprocessor;
 
-import com.sun.star.report.pentaho.model.OfficeGroup;
-import com.sun.star.report.pentaho.model.OfficeGroupSection;
+import org.libreoffice.report.pentaho.model.OfficeGroup;
+import org.libreoffice.report.pentaho.model.OfficeGroupSection;
 
 import org.jfree.layouting.util.AttributeMap;
 import org.jfree.report.DataSourceException;
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeGroupSectionLayoutController.java b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeGroupSectionLayoutController.java
index 531c1b48cbd7..a709bdce9ec4 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeGroupSectionLayoutController.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeGroupSectionLayoutController.java
@@ -15,10 +15,10 @@
  *   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.pentaho.layoutprocessor;
+package org.libreoffice.report.pentaho.layoutprocessor;
 
-import com.sun.star.report.OfficeToken;
-import com.sun.star.report.pentaho.model.OfficeGroupSection;
+import org.libreoffice.report.OfficeToken;
+import org.libreoffice.report.pentaho.model.OfficeGroupSection;
 
 import org.jfree.layouting.util.AttributeMap;
 import org.jfree.report.DataSourceException;
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficePageSectionLayoutController.java b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficePageSectionLayoutController.java
index fb31245c9a21..069ec7dfa298 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficePageSectionLayoutController.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficePageSectionLayoutController.java
@@ -16,7 +16,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-package com.sun.star.report.pentaho.layoutprocessor;
+package org.libreoffice.report.pentaho.layoutprocessor;
 
 import org.jfree.layouting.util.AttributeMap;
 import org.jfree.report.DataSourceException;
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeRepeatingStructureLayoutController.java b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeRepeatingStructureLayoutController.java
index e50b1dc9bf7b..a07aaf9a2b5c 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeRepeatingStructureLayoutController.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeRepeatingStructureLayoutController.java
@@ -16,7 +16,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-package com.sun.star.report.pentaho.layoutprocessor;
+package org.libreoffice.report.pentaho.layoutprocessor;
 
 import org.jfree.report.flow.layoutprocessor.LayoutController;
 
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeReportLayoutController.java b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeReportLayoutController.java
index 48b8614d179d..a9cc10fc8de5 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeReportLayoutController.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeReportLayoutController.java
@@ -15,10 +15,10 @@
  *   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.pentaho.layoutprocessor;
+package org.libreoffice.report.pentaho.layoutprocessor;
 
-import com.sun.star.report.pentaho.model.OfficeReport;
-import com.sun.star.report.pentaho.model.VariablesDeclarationSection;
+import org.libreoffice.report.pentaho.model.OfficeReport;
+import org.libreoffice.report.pentaho.model.VariablesDeclarationSection;
 
 import org.jfree.report.DataSourceException;
 import org.jfree.report.ReportDataFactoryException;
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeTableLayoutController.java b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeTableLayoutController.java
index cec85a8d681d..ed5d63887051 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeTableLayoutController.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeTableLayoutController.java
@@ -15,10 +15,10 @@
  *   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.pentaho.layoutprocessor;
+package org.libreoffice.report.pentaho.layoutprocessor;
 
-import com.sun.star.report.OfficeToken;
-import com.sun.star.report.pentaho.OfficeNamespaces;
+import org.libreoffice.report.OfficeToken;
+import org.libreoffice.report.pentaho.OfficeNamespaces;
 
 import org.jfree.layouting.util.AttributeMap;
 import org.jfree.report.DataSourceException;
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeTableTemplateLayoutController.java b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeTableTemplateLayoutController.java
index d67ec836818d..e610fc421cb7 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeTableTemplateLayoutController.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeTableTemplateLayoutController.java
@@ -15,11 +15,11 @@
  *   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.pentaho.layoutprocessor;
+package org.libreoffice.report.pentaho.layoutprocessor;
 
-import com.sun.star.report.pentaho.OfficeNamespaces;
-import com.sun.star.report.pentaho.model.OfficeGroup;
-import com.sun.star.report.pentaho.model.OfficeReport;
+import org.libreoffice.report.pentaho.OfficeNamespaces;
+import org.libreoffice.report.pentaho.model.OfficeGroup;
+import org.libreoffice.report.pentaho.model.OfficeReport;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/TableCellLayoutController.java b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/TableCellLayoutController.java
index 5e8872dc6483..dd07f8b2133d 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/TableCellLayoutController.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/TableCellLayoutController.java
@@ -15,13 +15,13 @@
  *   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.pentaho.layoutprocessor;
+package org.libreoffice.report.pentaho.layoutprocessor;
 
-import com.sun.star.report.OfficeToken;
-import com.sun.star.report.pentaho.OfficeNamespaces;
-import com.sun.star.report.pentaho.model.FormatCondition;
-import com.sun.star.report.pentaho.model.FormattedTextElement;
-import com.sun.star.report.pentaho.model.ReportElement;
+import org.libreoffice.report.OfficeToken;
+import org.libreoffice.report.pentaho.OfficeNamespaces;
+import org.libreoffice.report.pentaho.model.FormatCondition;
+import org.libreoffice.report.pentaho.model.FormattedTextElement;
+import org.libreoffice.report.pentaho.model.ReportElement;
 
 import org.jfree.layouting.util.AttributeMap;
 import org.jfree.report.DataFlags;
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/VariablesCollection.java b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/VariablesCollection.java
index bff20a8416d3..6cd025206eb9 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/VariablesCollection.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/VariablesCollection.java
@@ -15,9 +15,9 @@
  *   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.pentaho.layoutprocessor;
+package org.libreoffice.report.pentaho.layoutprocessor;
 
-import com.sun.star.report.pentaho.model.FormattedTextElement;
+import org.libreoffice.report.pentaho.model.FormattedTextElement;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/VariablesDeclarationLayoutController.java b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/VariablesDeclarationLayoutController.java
index f1a55cb15bc7..7edacec14e9e 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/VariablesDeclarationLayoutController.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/VariablesDeclarationLayoutController.java
@@ -15,10 +15,10 @@
  *   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.pentaho.layoutprocessor;
+package org.libreoffice.report.pentaho.layoutprocessor;
 
-import com.sun.star.report.pentaho.OfficeNamespaces;
-import com.sun.star.report.pentaho.model.FormattedTextElement;
+import org.libreoffice.report.pentaho.OfficeNamespaces;
+import org.libreoffice.report.pentaho.model.FormattedTextElement;
 
 import java.text.SimpleDateFormat;
 
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/loader/InputRepositoryLoader.java b/reportbuilder/java/org/libreoffice/report/pentaho/loader/InputRepositoryLoader.java
index 06d32385db1d..fdb52154ffd5 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/loader/InputRepositoryLoader.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/loader/InputRepositoryLoader.java
@@ -15,9 +15,9 @@
  *   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.pentaho.loader;
+package org.libreoffice.report.pentaho.loader;
 
-import com.sun.star.report.InputRepository;
+import org.libreoffice.report.InputRepository;
 
 import java.net.URL;
 
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/loader/InputRepositoryResourceData.java b/reportbuilder/java/org/libreoffice/report/pentaho/loader/InputRepositoryResourceData.java
index 525539f368f3..e3dde734416c 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/loader/InputRepositoryResourceData.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/loader/InputRepositoryResourceData.java
@@ -15,9 +15,9 @@
  *   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.pentaho.loader;
+package org.libreoffice.report.pentaho.loader;
 
-import com.sun.star.report.InputRepository;
+import org.libreoffice.report.InputRepository;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/loader/InputResourceKey.java b/reportbuilder/java/org/libreoffice/report/pentaho/loader/InputResourceKey.java
index ae2e34e73296..917b43cc223a 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/loader/InputResourceKey.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/loader/InputResourceKey.java
@@ -15,7 +15,7 @@
  *   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.pentaho.loader;
+package org.libreoffice.report.pentaho.loader;
 
 import java.io.Serializable;
 
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/model/DataStyle.java b/reportbuilder/java/org/libreoffice/report/pentaho/model/DataStyle.java
index fedbb71f1ada..2a2155b4102f 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/model/DataStyle.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/model/DataStyle.java
@@ -15,9 +15,9 @@
  *   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.pentaho.model;
+package org.libreoffice.report.pentaho.model;
 
-import com.sun.star.report.pentaho.OfficeNamespaces;
+import org.libreoffice.report.pentaho.OfficeNamespaces;
 
 import org.jfree.report.structure.Section;
 
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/model/FixedTextElement.java b/reportbuilder/java/org/libreoffice/report/pentaho/model/FixedTextElement.java
index e411ad05ef8e..45145b7cfbda 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/model/FixedTextElement.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/model/FixedTextElement.java
@@ -15,7 +15,7 @@
  *   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.pentaho.model;
+package org.libreoffice.report.pentaho.model;
 
 import org.jfree.report.structure.Section;
 
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/model/FontFaceDeclsSection.java b/reportbuilder/java/org/libreoffice/report/pentaho/model/FontFaceDeclsSection.java
index e3b98b4c549e..b4e4bd1d5254 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/model/FontFaceDeclsSection.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/model/FontFaceDeclsSection.java
@@ -15,9 +15,9 @@
  *   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.pentaho.model;
+package org.libreoffice.report.pentaho.model;
 
-import com.sun.star.report.pentaho.OfficeNamespaces;
+import org.libreoffice.report.pentaho.OfficeNamespaces;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/model/FontFaceElement.java b/reportbuilder/java/org/libreoffice/report/pentaho/model/FontFaceElement.java
index 0bebe6efbdf1..6ea79a35ebe2 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/model/FontFaceElement.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/model/FontFaceElement.java
@@ -15,9 +15,9 @@
  *   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.pentaho.model;
+package org.libreoffice.report.pentaho.model;
 
-import com.sun.star.report.pentaho.OfficeNamespaces;
+import org.libreoffice.report.pentaho.OfficeNamespaces;
 
 import org.jfree.report.structure.Section;
 
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/model/FormatCondition.java b/reportbuilder/java/org/libreoffice/report/pentaho/model/FormatCondition.java
index 6543aa59e14b..32ca96eefb55 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/model/FormatCondition.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/model/FormatCondition.java
@@ -15,7 +15,7 @@
  *   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.pentaho.model;
+package org.libreoffice.report.pentaho.model;
 
 import org.jfree.report.expressions.FormulaExpression;
 
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/model/FormattedTextElement.java b/reportbuilder/java/org/libreoffice/report/pentaho/model/FormattedTextElement.java
index 3570fca99d8d..dd1b273516f0 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/model/FormattedTextElement.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/model/FormattedTextElement.java
@@ -15,7 +15,7 @@
  *   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.pentaho.model;
+package org.libreoffice.report.pentaho.model;
 
 import org.jfree.report.expressions.FormulaExpression;
 
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/model/ImageElement.java b/reportbuilder/java/org/libreoffice/report/pentaho/model/ImageElement.java
index 6cf2c4406db0..e15f66da1b33 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/model/ImageElement.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/model/ImageElement.java
@@ -15,10 +15,10 @@
  *   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.pentaho.model;
+package org.libreoffice.report.pentaho.model;
 
-import com.sun.star.report.OfficeToken;
-import com.sun.star.report.pentaho.OfficeNamespaces;
+import org.libreoffice.report.OfficeToken;
+import org.libreoffice.report.pentaho.OfficeNamespaces;
 
 import org.jfree.report.expressions.FormulaExpression;
 
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/model/ObjectOleElement.java b/reportbuilder/java/org/libreoffice/report/pentaho/model/ObjectOleElement.java
index 9737f23c557e..ddd74bd8bcc6 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/model/ObjectOleElement.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/model/ObjectOleElement.java
@@ -15,7 +15,7 @@
  *   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.pentaho.model;
+package org.libreoffice.report.pentaho.model;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeDetailSection.java b/reportbuilder/java/org/libreoffice/report/pentaho/model/OfficeDetailSection.java
index 659c129b6941..2307d1dc7775 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeDetailSection.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/model/OfficeDetailSection.java
@@ -15,7 +15,7 @@
  *   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.pentaho.model;
+package org.libreoffice.report.pentaho.model;
 
 import org.jfree.report.structure.DetailSection;
 
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeDocument.java b/reportbuilder/java/org/libreoffice/report/pentaho/model/OfficeDocument.java
index dc5117a887e6..8e8e475e49ed 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeDocument.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/model/OfficeDocument.java
@@ -15,9 +15,9 @@
  *   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.pentaho.model;
+package org.libreoffice.report.pentaho.model;
 
-import com.sun.star.report.JobProperties;
+import org.libreoffice.report.JobProperties;
 
 import org.jfree.report.JFreeReport;
 
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeGroup.java b/reportbuilder/java/org/libreoffice/report/pentaho/model/OfficeGroup.java
index 6497d5ad06fc..b10aab188d0c 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeGroup.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/model/OfficeGroup.java
@@ -15,10 +15,10 @@
  *   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.pentaho.model;
+package org.libreoffice.report.pentaho.model;
 
-import com.sun.star.report.OfficeToken;
-import com.sun.star.report.pentaho.OfficeNamespaces;
+import org.libreoffice.report.OfficeToken;
+import org.libreoffice.report.pentaho.OfficeNamespaces;
 
 import org.jfree.report.JFreeReportInfo;
 import org.jfree.report.expressions.Expression;
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeGroupInstanceSection.java b/reportbuilder/java/org/libreoffice/report/pentaho/model/OfficeGroupInstanceSection.java
index 501aa450fb95..a9adad301c41 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeGroupInstanceSection.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/model/OfficeGroupInstanceSection.java
@@ -16,7 +16,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-package com.sun.star.report.pentaho.model;
+package org.libreoffice.report.pentaho.model;
 
 import org.jfree.report.structure.Group;
 
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeGroupSection.java b/reportbuilder/java/org/libreoffice/report/pentaho/model/OfficeGroupSection.java
index ad9f59ba6478..d4e7818b3d8e 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeGroupSection.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/model/OfficeGroupSection.java
@@ -15,10 +15,10 @@
  *   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.pentaho.model;
+package org.libreoffice.report.pentaho.model;
 
-import com.sun.star.report.OfficeToken;
-import com.sun.star.report.pentaho.OfficeNamespaces;
+import org.libreoffice.report.OfficeToken;
+import org.libreoffice.report.pentaho.OfficeNamespaces;
 
 import org.jfree.report.structure.Section;
 
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeMasterPage.java b/reportbuilder/java/org/libreoffice/report/pentaho/model/OfficeMasterPage.java
index 4b5edbb838dd..8cdb50880213 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeMasterPage.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/model/OfficeMasterPage.java
@@ -15,9 +15,9 @@
  *   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.pentaho.model;
+package org.libreoffice.report.pentaho.model;
 
-import com.sun.star.report.pentaho.OfficeNamespaces;
+import org.libreoffice.report.pentaho.OfficeNamespaces;
 
 import org.jfree.report.structure.Section;
 
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeMasterStyles.java b/reportbuilder/java/org/libreoffice/report/pentaho/model/OfficeMasterStyles.java
index 8fc66950ccb9..be42e98620e4 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeMasterStyles.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/model/OfficeMasterStyles.java
@@ -15,7 +15,7 @@
  *   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.pentaho.model;
+package org.libreoffice.report.pentaho.model;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeReport.java b/reportbuilder/java/org/libreoffice/report/pentaho/model/OfficeReport.java
index 6a46021ec05b..589d7488d01d 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeReport.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/model/OfficeReport.java
@@ -15,7 +15,7 @@
  *   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.pentaho.model;
+package org.libreoffice.report.pentaho.model;
 
 import org.jfree.report.structure.Element;
 import org.jfree.report.structure.Node;
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeStyle.java b/reportbuilder/java/org/libreoffice/report/pentaho/model/OfficeStyle.java
index 65e31c0af92e..c70b9ee30878 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeStyle.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/model/OfficeStyle.java
@@ -15,10 +15,10 @@
  *   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.pentaho.model;
+package org.libreoffice.report.pentaho.model;
 
-import com.sun.star.report.OfficeToken;
-import com.sun.star.report.pentaho.OfficeNamespaces;
+import org.libreoffice.report.OfficeToken;
+import org.libreoffice.report.pentaho.OfficeNamespaces;
 
 import org.jfree.report.structure.Element;
 import org.jfree.report.structure.Section;
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeStyles.java b/reportbuilder/java/org/libreoffice/report/pentaho/model/OfficeStyles.java
index 9a60bd7703e2..5a87a989ad3c 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeStyles.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/model/OfficeStyles.java
@@ -15,7 +15,7 @@
  *   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.pentaho.model;
+package org.libreoffice.report.pentaho.model;
 
 import java.io.Serializable;
 
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeStylesCollection.java b/reportbuilder/java/org/libreoffice/report/pentaho/model/OfficeStylesCollection.java
index bde44116d8ec..f760bcf776ab 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeStylesCollection.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/model/OfficeStylesCollection.java
@@ -15,9 +15,9 @@
  *   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.pentaho.model;
+package org.libreoffice.report.pentaho.model;
 
-import com.sun.star.report.pentaho.OfficeNamespaces;
+import org.libreoffice.report.pentaho.OfficeNamespaces;
 
 import org.jfree.report.structure.Element;
 
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeTableSection.java b/reportbuilder/java/org/libreoffice/report/pentaho/model/OfficeTableSection.java
index 5a6dfad1bd24..5ebc13882c3e 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeTableSection.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/model/OfficeTableSection.java
@@ -15,7 +15,7 @@
  *   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.pentaho.model;
+package org.libreoffice.report.pentaho.model;
 
 import org.jfree.report.structure.Section;
 
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/model/PageLayout.java b/reportbuilder/java/org/libreoffice/report/pentaho/model/PageLayout.java
index 1b58d2b3f864..8ef007c7ed35 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/model/PageLayout.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/model/PageLayout.java
@@ -15,9 +15,9 @@
  *   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.pentaho.model;
+package org.libreoffice.report.pentaho.model;
 
-import com.sun.star.report.pentaho.OfficeNamespaces;
+import org.libreoffice.report.pentaho.OfficeNamespaces;
 
 import org.jfree.report.structure.Section;
 
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/model/PageSection.java b/reportbuilder/java/org/libreoffice/report/pentaho/model/PageSection.java
index 599fc0a9af94..f9997e266181 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/model/PageSection.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/model/PageSection.java
@@ -15,9 +15,9 @@
  *   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.pentaho.model;
+package org.libreoffice.report.pentaho.model;
 
-import com.sun.star.report.pentaho.OfficeNamespaces;
+import org.libreoffice.report.pentaho.OfficeNamespaces;
 
 import org.jfree.layouting.util.AttributeMap;
 import org.jfree.report.structure.Section;
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/model/RawText.java b/reportbuilder/java/org/libreoffice/report/pentaho/model/RawText.java
index 588a8f0c5648..bebbb8637df8 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/model/RawText.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/model/RawText.java
@@ -15,7 +15,7 @@
  *   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.pentaho.model;
+package org.libreoffice.report.pentaho.model;
 
 import org.jfree.report.structure.StaticText;
 
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/model/ReportElement.java b/reportbuilder/java/org/libreoffice/report/pentaho/model/ReportElement.java
index 37e11ffc0637..d2f2d3cd8de1 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/model/ReportElement.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/model/ReportElement.java
@@ -15,10 +15,10 @@
  *   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.pentaho.model;
+package org.libreoffice.report.pentaho.model;
 
-import com.sun.star.report.OfficeToken;
-import com.sun.star.report.pentaho.OfficeNamespaces;
+import org.libreoffice.report.OfficeToken;
+import org.libreoffice.report.pentaho.OfficeNamespaces;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/model/TableCellElement.java b/reportbuilder/java/org/libreoffice/report/pentaho/model/TableCellElement.java
index 0cae16a45d12..7d9bc193a287 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/model/TableCellElement.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/model/TableCellElement.java
@@ -15,7 +15,7 @@
  *   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.pentaho.model;
+package org.libreoffice.report.pentaho.model;
 
 import org.jfree.report.structure.Section;
 
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/model/VariablesDeclarationSection.java b/reportbuilder/java/org/libreoffice/report/pentaho/model/VariablesDeclarationSection.java
index 3b025812f57b..c429176535eb 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/model/VariablesDeclarationSection.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/model/VariablesDeclarationSection.java
@@ -15,7 +15,7 @@
  *   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.pentaho.model;
+package org.libreoffice.report.pentaho.model;
 
 import org.jfree.report.JFreeReportInfo;
 import org.jfree.report.structure.Section;
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/module.properties b/reportbuilder/java/org/libreoffice/report/pentaho/module.properties
index ad74ab7b52b3..ad74ab7b52b3 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/module.properties
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/module.properties
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/oasis-datastyle.css b/reportbuilder/java/org/libreoffice/report/pentaho/oasis-datastyle.css
index 6c94b1e059fe..6c94b1e059fe 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/oasis-datastyle.css
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/oasis-datastyle.css
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/oasis-draw.css b/reportbuilder/java/org/libreoffice/report/pentaho/oasis-draw.css
index 341f44ec550e..341f44ec550e 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/oasis-draw.css
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/oasis-draw.css
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/oasis-form.css b/reportbuilder/java/org/libreoffice/report/pentaho/oasis-form.css
index 7c8c43008435..7c8c43008435 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/oasis-form.css
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/oasis-form.css
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/oasis-style.css b/reportbuilder/java/org/libreoffice/report/pentaho/oasis-style.css
index bca51bd6ba8b..bca51bd6ba8b 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/oasis-style.css
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/oasis-style.css
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/oasis-table.css b/reportbuilder/java/org/libreoffice/report/pentaho/oasis-table.css
index 80145880af0f..80145880af0f 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/oasis-table.css
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/oasis-table.css
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/oasis-text.css b/reportbuilder/java/org/libreoffice/report/pentaho/oasis-text.css
index fb85c3d1f938..fb85c3d1f938 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/oasis-text.css
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/oasis-text.css
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/output/ImageProducer.java b/reportbuilder/java/org/libreoffice/report/pentaho/output/ImageProducer.java
index e34c585e00a3..c4d545c49d85 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/output/ImageProducer.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/output/ImageProducer.java
@@ -15,14 +15,14 @@
  *   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.pentaho.output;
+package org.libreoffice.report.pentaho.output;
 
 import com.sun.star.awt.Size;
-import com.sun.star.report.ImageService;
-import com.sun.star.report.InputRepository;
-import com.sun.star.report.OutputRepository;
-import com.sun.star.report.ReportExecutionException;
-import com.sun.star.report.pentaho.DefaultNameGenerator;
+import org.libreoffice.report.ImageService;
+import org.libreoffice.report.InputRepository;
+import org.libreoffice.report.OutputRepository;
+import org.libreoffice.report.ReportExecutionException;
+import org.libreoffice.report.pentaho.DefaultNameGenerator;
 
 import java.awt.Image;
 
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/output/OfficeDocumentReportTarget.java b/reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java
index e9b91ada8df8..8d34a5d6cfb2 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/output/OfficeDocumentReportTarget.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java
@@ -15,23 +15,23 @@
  *   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.pentaho.output;
-
-import com.sun.star.report.DataSourceFactory;
-import com.sun.star.report.ImageService;
-import com.sun.star.report.InputRepository;
-import com.sun.star.report.OfficeToken;
-import com.sun.star.report.OutputRepository;
-import com.sun.star.report.ReportEngineParameterNames;
-import com.sun.star.report.SDBCReportDataFactory;
-import com.sun.star.report.pentaho.OfficeNamespaces;
-import com.sun.star.report.pentaho.layoutprocessor.ImageElementContext;
-import com.sun.star.report.pentaho.model.OfficeDocument;
-import com.sun.star.report.pentaho.model.OfficeStyle;
-import com.sun.star.report.pentaho.model.OfficeStyles;
-import com.sun.star.report.pentaho.model.OfficeStylesCollection;
-import com.sun.star.report.pentaho.styles.LengthCalculator;
-import com.sun.star.report.pentaho.styles.StyleMapper;
+package org.libreoffice.report.pentaho.output;
+
+import org.libreoffice.report.DataSourceFactory;
+import org.libreoffice.report.ImageService;
+import org.libreoffice.report.InputRepository;
+import org.libreoffice.report.OfficeToken;
+import org.libreoffice.report.OutputRepository;
+import org.libreoffice.report.ReportEngineParameterNames;
+import org.libreoffice.report.SDBCReportDataFactory;
+import org.libreoffice.report.pentaho.OfficeNamespaces;
+import org.libreoffice.report.pentaho.layoutprocessor.ImageElementContext;
+import org.libreoffice.report.pentaho.model.OfficeDocument;
+import org.libreoffice.report.pentaho.model.OfficeStyle;
+import org.libreoffice.report.pentaho.model.OfficeStyles;
+import org.libreoffice.report.pentaho.model.OfficeStylesCollection;
+import org.libreoffice.report.pentaho.styles.LengthCalculator;
+import org.libreoffice.report.pentaho.styles.StyleMapper;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import javax.xml.transform.OutputKeys;
@@ -115,7 +115,7 @@ public abstract class OfficeDocumentReportTarget extends AbstractReportTarget
 
     protected static final Log LOGGER = LogFactory.getLog(OfficeDocumentReportTarget.class);
     public static final String HORIZONTAL_POS = "horizontal-pos";
-    public static final String TAG_DEF_PREFIX = "com.sun.star.report.pentaho.output.";
+    public static final String TAG_DEF_PREFIX = "org.libreoffice.report.pentaho.output.";
     public static final int ROLE_NONE = 0;
     public static final int ROLE_REPORT_HEADER = 1;
     public static final int ROLE_REPORT_FOOTER = 2;
@@ -275,7 +275,7 @@ public abstract class OfficeDocumentReportTarget extends AbstractReportTarget
     private final OleProducer oleProducer;
     private GroupContext groupContext;
     private static final boolean DEBUG_ELEMENTS =
-            JFreeReportBoot.getInstance().getExtendedConfig().getBoolProperty("com.sun.star.report.pentaho.output.DebugElements");
+            JFreeReportBoot.getInstance().getExtendedConfig().getBoolProperty("org.libreoffice.report.pentaho.output.DebugElements");
 
     protected OfficeDocumentReportTarget(final ReportJob reportJob,
             final ResourceManager resourceManager,
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/output/OleProducer.java b/reportbuilder/java/org/libreoffice/report/pentaho/output/OleProducer.java
index c3bc3291a780..2010a189be1d 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/output/OleProducer.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/output/OleProducer.java
@@ -15,19 +15,19 @@
  *   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.pentaho.output;
+package org.libreoffice.report.pentaho.output;
 
-import com.sun.star.report.DataSourceFactory;
-import com.sun.star.report.ImageService;
-import com.sun.star.report.InputRepository;
-import com.sun.star.report.JobProperties;
-import com.sun.star.report.OutputRepository;
-import com.sun.star.report.ReportEngineParameterNames;
-import com.sun.star.report.ReportExecutionException;
-import com.sun.star.report.ReportJobDefinition;
-import com.sun.star.report.pentaho.DefaultNameGenerator;
-import com.sun.star.report.pentaho.PentahoReportEngine;
-import com.sun.star.report.pentaho.PentahoReportEngineMetaData;
+import org.libreoffice.report.DataSourceFactory;
+import org.libreoffice.report.ImageService;
+import org.libreoffice.report.InputRepository;
+import org.libreoffice.report.JobProperties;
+import org.libreoffice.report.OutputRepository;
+import org.libreoffice.report.ReportEngineParameterNames;
+import org.libreoffice.report.ReportExecutionException;
+import org.libreoffice.report.ReportJobDefinition;
+import org.libreoffice.report.pentaho.DefaultNameGenerator;
+import org.libreoffice.report.pentaho.PentahoReportEngine;
+import org.libreoffice.report.pentaho.PentahoReportEngineMetaData;
 
 import java.io.IOException;
 
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/output/StyleUtilities.java b/reportbuilder/java/org/libreoffice/report/pentaho/output/StyleUtilities.java
index 2357635551fd..da568078afb5 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/output/StyleUtilities.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/output/StyleUtilities.java
@@ -15,15 +15,15 @@
  *   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.pentaho.output;
-
-import com.sun.star.report.pentaho.OfficeNamespaces;
-import com.sun.star.report.pentaho.model.DataStyle;
-import com.sun.star.report.pentaho.model.FontFaceDeclsSection;
-import com.sun.star.report.pentaho.model.FontFaceElement;
-import com.sun.star.report.pentaho.model.OfficeStyle;
-import com.sun.star.report.pentaho.model.OfficeStyles;
-import com.sun.star.report.pentaho.model.OfficeStylesCollection;
+package org.libreoffice.report.pentaho.output;
+
+import org.libreoffice.report.pentaho.OfficeNamespaces;
+import org.libreoffice.report.pentaho.model.DataStyle;
+import org.libreoffice.report.pentaho.model.FontFaceDeclsSection;
+import org.libreoffice.report.pentaho.model.FontFaceElement;
+import org.libreoffice.report.pentaho.model.OfficeStyle;
+import org.libreoffice.report.pentaho.model.OfficeStyles;
+import org.libreoffice.report.pentaho.model.OfficeStylesCollection;
 
 import java.util.ArrayList;
 import java.util.HashSet;
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/output/StylesWriter.java b/reportbuilder/java/org/libreoffice/report/pentaho/output/StylesWriter.java
index 0b568cf86f12..64257d50d160 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/output/StylesWriter.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/output/StylesWriter.java
@@ -15,19 +15,19 @@
  *   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.pentaho.output;
-
-import com.sun.star.report.pentaho.OfficeNamespaces;
-import com.sun.star.report.pentaho.model.DataStyle;
-import com.sun.star.report.pentaho.model.FontFaceDeclsSection;
-import com.sun.star.report.pentaho.model.FontFaceElement;
-import com.sun.star.report.pentaho.model.OfficeMasterPage;
-import com.sun.star.report.pentaho.model.OfficeMasterStyles;
-import com.sun.star.report.pentaho.model.OfficeStyle;
-import com.sun.star.report.pentaho.model.OfficeStyles;
-import com.sun.star.report.pentaho.model.OfficeStylesCollection;
-import com.sun.star.report.pentaho.model.PageLayout;
-import com.sun.star.report.pentaho.model.RawText;
+package org.libreoffice.report.pentaho.output;
+
+import org.libreoffice.report.pentaho.OfficeNamespaces;
+import org.libreoffice.report.pentaho.model.DataStyle;
+import org.libreoffice.report.pentaho.model.FontFaceDeclsSection;
+import org.libreoffice.report.pentaho.model.FontFaceElement;
+import org.libreoffice.report.pentaho.model.OfficeMasterPage;
+import org.libreoffice.report.pentaho.model.OfficeMasterStyles;
+import org.libreoffice.report.pentaho.model.OfficeStyle;
+import org.libreoffice.report.pentaho.model.OfficeStyles;
+import org.libreoffice.report.pentaho.model.OfficeStylesCollection;
+import org.libreoffice.report.pentaho.model.PageLayout;
+import org.libreoffice.report.pentaho.model.RawText;
 
 import java.io.IOException;
 import java.io.Writer;
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/output/chart/ChartRawReportProcessor.java b/reportbuilder/java/org/libreoffice/report/pentaho/output/chart/ChartRawReportProcessor.java
index 56ebb6c807bd..f8256bc6ff57 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/output/chart/ChartRawReportProcessor.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/output/chart/ChartRawReportProcessor.java
@@ -15,12 +15,12 @@
  *   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.pentaho.output.chart;
+package org.libreoffice.report.pentaho.output.chart;
 
-import com.sun.star.report.DataSourceFactory;
-import com.sun.star.report.ImageService;
-import com.sun.star.report.InputRepository;
-import com.sun.star.report.OutputRepository;
+import org.libreoffice.report.DataSourceFactory;
+import org.libreoffice.report.ImageService;
+import org.libreoffice.report.InputRepository;
+import org.libreoffice.report.OutputRepository;
 
 import org.jfree.report.DataSourceException;
 import org.jfree.report.ReportDataFactoryException;
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/output/chart/ChartRawReportTarget.java b/reportbuilder/java/org/libreoffice/report/pentaho/output/chart/ChartRawReportTarget.java
index 3d1446522a7c..7b0a2819a22b 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/output/chart/ChartRawReportTarget.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/output/chart/ChartRawReportTarget.java
@@ -15,16 +15,16 @@
  *   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.pentaho.output.chart;
-
-import com.sun.star.report.DataSourceFactory;
-import com.sun.star.report.ImageService;
-import com.sun.star.report.InputRepository;
-import com.sun.star.report.OfficeToken;
-import com.sun.star.report.OutputRepository;
-import com.sun.star.report.pentaho.OfficeNamespaces;
-import com.sun.star.report.pentaho.PentahoReportEngineMetaData;
-import com.sun.star.report.pentaho.output.OfficeDocumentReportTarget;
+package org.libreoffice.report.pentaho.output.chart;
+
+import org.libreoffice.report.DataSourceFactory;
+import org.libreoffice.report.ImageService;
+import org.libreoffice.report.InputRepository;
+import org.libreoffice.report.OfficeToken;
+import org.libreoffice.report.OutputRepository;
+import org.libreoffice.report.pentaho.OfficeNamespaces;
+import org.libreoffice.report.pentaho.PentahoReportEngineMetaData;
+import org.libreoffice.report.pentaho.output.OfficeDocumentReportTarget;
 
 import java.io.IOException;
 import org.jfree.layouting.util.AttributeMap;
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/output/spreadsheet/SpreadsheetRawReportProcessor.java b/reportbuilder/java/org/libreoffice/report/pentaho/output/spreadsheet/SpreadsheetRawReportProcessor.java
index 52f6619f7cbd..e61194797c70 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/output/spreadsheet/SpreadsheetRawReportProcessor.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/output/spreadsheet/SpreadsheetRawReportProcessor.java
@@ -15,13 +15,13 @@
  *   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.pentaho.output.spreadsheet;
+package org.libreoffice.report.pentaho.output.spreadsheet;
 
-import com.sun.star.report.DataSourceFactory;
-import com.sun.star.report.ImageService;
-import com.sun.star.report.InputRepository;
-import com.sun.star.report.OutputRepository;
-import com.sun.star.report.pentaho.PentahoFormulaContext;
+import org.libreoffice.report.DataSourceFactory;
+import org.libreoffice.report.ImageService;
+import org.libreoffice.report.InputRepository;
+import org.libreoffice.report.OutputRepository;
+import org.libreoffice.report.pentaho.PentahoFormulaContext;
 
 import org.jfree.report.DataSourceException;
 import org.jfree.report.ReportDataFactoryException;
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/output/spreadsheet/SpreadsheetRawReportTarget.java b/reportbuilder/java/org/libreoffice/report/pentaho/output/spreadsheet/SpreadsheetRawReportTarget.java
index 7418445007a3..163818cf0aa4 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/output/spreadsheet/SpreadsheetRawReportTarget.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/output/spreadsheet/SpreadsheetRawReportTarget.java
@@ -15,25 +15,25 @@
  *   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.pentaho.output.spreadsheet;
-
-import com.sun.star.report.DataSourceFactory;
-import com.sun.star.report.ImageService;
-import com.sun.star.report.InputRepository;
-import com.sun.star.report.OfficeToken;
-import com.sun.star.report.OutputRepository;
-import com.sun.star.report.pentaho.OfficeNamespaces;
-import com.sun.star.report.pentaho.PentahoReportEngineMetaData;
-import com.sun.star.report.pentaho.model.OfficeMasterPage;
-import com.sun.star.report.pentaho.model.OfficeMasterStyles;
-import com.sun.star.report.pentaho.model.OfficeStyle;
-import com.sun.star.report.pentaho.model.OfficeStyles;
-import com.sun.star.report.pentaho.model.OfficeStylesCollection;
-import com.sun.star.report.pentaho.model.PageSection;
-import com.sun.star.report.pentaho.output.OfficeDocumentReportTarget;
-import com.sun.star.report.pentaho.output.StyleUtilities;
-import com.sun.star.report.pentaho.output.text.MasterPageFactory;
-import com.sun.star.report.pentaho.styles.LengthCalculator;
+package org.libreoffice.report.pentaho.output.spreadsheet;
+
+import org.libreoffice.report.DataSourceFactory;
+import org.libreoffice.report.ImageService;
+import org.libreoffice.report.InputRepository;
+import org.libreoffice.report.OfficeToken;
+import org.libreoffice.report.OutputRepository;
+import org.libreoffice.report.pentaho.OfficeNamespaces;
+import org.libreoffice.report.pentaho.PentahoReportEngineMetaData;
+import org.libreoffice.report.pentaho.model.OfficeMasterPage;
+import org.libreoffice.report.pentaho.model.OfficeMasterStyles;
+import org.libreoffice.report.pentaho.model.OfficeStyle;
+import org.libreoffice.report.pentaho.model.OfficeStyles;
+import org.libreoffice.report.pentaho.model.OfficeStylesCollection;
+import org.libreoffice.report.pentaho.model.PageSection;
+import org.libreoffice.report.pentaho.output.OfficeDocumentReportTarget;
+import org.libreoffice.report.pentaho.output.StyleUtilities;
+import org.libreoffice.report.pentaho.output.text.MasterPageFactory;
+import org.libreoffice.report.pentaho.styles.LengthCalculator;
 
 import java.io.IOException;
 
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/output/text/MasterPageFactory.java b/reportbuilder/java/org/libreoffice/report/pentaho/output/text/MasterPageFactory.java
index e8854ef35826..4bc0ada7038c 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/output/text/MasterPageFactory.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/output/text/MasterPageFactory.java
@@ -15,14 +15,14 @@
  *   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.pentaho.output.text;
-
-import com.sun.star.report.pentaho.OfficeNamespaces;
-import com.sun.star.report.pentaho.model.OfficeMasterPage;
-import com.sun.star.report.pentaho.model.OfficeMasterStyles;
-import com.sun.star.report.pentaho.model.OfficeStyles;
-import com.sun.star.report.pentaho.model.PageLayout;
-import com.sun.star.report.pentaho.model.RawText;
+package org.libreoffice.report.pentaho.output.text;
+
+import org.libreoffice.report.pentaho.OfficeNamespaces;
+import org.libreoffice.report.pentaho.model.OfficeMasterPage;
+import org.libreoffice.report.pentaho.model.OfficeMasterStyles;
+import org.libreoffice.report.pentaho.model.OfficeStyles;
+import org.libreoffice.report.pentaho.model.PageLayout;
+import org.libreoffice.report.pentaho.model.RawText;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/output/text/PageBreakDefinition.java b/reportbuilder/java/org/libreoffice/report/pentaho/output/text/PageBreakDefinition.java
index f968f036dcd0..e92e644eca4f 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/output/text/PageBreakDefinition.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/output/text/PageBreakDefinition.java
@@ -15,7 +15,7 @@
  *   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.pentaho.output.text;
+package org.libreoffice.report.pentaho.output.text;
 
 /**
  * Todo: Document me!
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/output/text/PageContext.java b/reportbuilder/java/org/libreoffice/report/pentaho/output/text/PageContext.java
index a170be7efead..157dec4bf017 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/output/text/PageContext.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/output/text/PageContext.java
@@ -15,9 +15,9 @@
  *   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.pentaho.output.text;
+package org.libreoffice.report.pentaho.output.text;
 
-import com.sun.star.report.pentaho.styles.LengthCalculator;
+import org.libreoffice.report.pentaho.styles.LengthCalculator;
 
 import org.jfree.layouting.input.style.values.CSSNumericValue;
 
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/output/text/TextRawReportProcessor.java b/reportbuilder/java/org/libreoffice/report/pentaho/output/text/TextRawReportProcessor.java
index 294bc83a2067..b0dd06eab9ff 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/output/text/TextRawReportProcessor.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/output/text/TextRawReportProcessor.java
@@ -15,13 +15,13 @@
  *   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.pentaho.output.text;
+package org.libreoffice.report.pentaho.output.text;
 
-import com.sun.star.report.DataSourceFactory;
-import com.sun.star.report.ImageService;
-import com.sun.star.report.InputRepository;
-import com.sun.star.report.OutputRepository;
-import com.sun.star.report.pentaho.PentahoFormulaContext;
+import org.libreoffice.report.DataSourceFactory;
+import org.libreoffice.report.ImageService;
+import org.libreoffice.report.InputRepository;
+import org.libreoffice.report.OutputRepository;
+import org.libreoffice.report.pentaho.PentahoFormulaContext;
 
 import org.jfree.report.ReportProcessingException;
 import org.jfree.report.data.ReportContextImpl;
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/output/text/TextRawReportTarget.java b/reportbuilder/java/org/libreoffice/report/pentaho/output/text/TextRawReportTarget.java
index 865ae47ac24e..9532fcc7a190 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/output/text/TextRawReportTarget.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/output/text/TextRawReportTarget.java
@@ -15,26 +15,26 @@
  *   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.pentaho.output.text;
-
-
-import com.sun.star.report.DataSourceFactory;
-import com.sun.star.report.ImageService;
-import com.sun.star.report.InputRepository;
-import com.sun.star.report.OfficeToken;
-import com.sun.star.report.OutputRepository;
-import com.sun.star.report.pentaho.OfficeNamespaces;
-import com.sun.star.report.pentaho.PentahoReportEngineMetaData;
-import com.sun.star.report.pentaho.layoutprocessor.FormatValueUtility;
-import com.sun.star.report.pentaho.model.OfficeMasterPage;
-import com.sun.star.report.pentaho.model.OfficeMasterStyles;
-import com.sun.star.report.pentaho.model.OfficeStyle;
-import com.sun.star.report.pentaho.model.OfficeStyles;
-import com.sun.star.report.pentaho.model.OfficeStylesCollection;
-import com.sun.star.report.pentaho.model.PageSection;
-import com.sun.star.report.pentaho.output.OfficeDocumentReportTarget;
-import com.sun.star.report.pentaho.output.StyleUtilities;
-import com.sun.star.report.pentaho.styles.LengthCalculator;
+package org.libreoffice.report.pentaho.output.text;
+
+
+import org.libreoffice.report.DataSourceFactory;
+import org.libreoffice.report.ImageService;
+import org.libreoffice.report.InputRepository;
+import org.libreoffice.report.OfficeToken;
+import org.libreoffice.report.OutputRepository;
+import org.libreoffice.report.pentaho.OfficeNamespaces;
+import org.libreoffice.report.pentaho.PentahoReportEngineMetaData;
+import org.libreoffice.report.pentaho.layoutprocessor.FormatValueUtility;
+import org.libreoffice.report.pentaho.model.OfficeMasterPage;
+import org.libreoffice.report.pentaho.model.OfficeMasterStyles;
+import org.libreoffice.report.pentaho.model.OfficeStyle;
+import org.libreoffice.report.pentaho.model.OfficeStyles;
+import org.libreoffice.report.pentaho.model.OfficeStylesCollection;
+import org.libreoffice.report.pentaho.model.PageSection;
+import org.libreoffice.report.pentaho.output.OfficeDocumentReportTarget;
+import org.libreoffice.report.pentaho.output.StyleUtilities;
+import org.libreoffice.report.pentaho.styles.LengthCalculator;
 
 import java.io.IOException;
 
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/output/text/VariablesDeclarations.java b/reportbuilder/java/org/libreoffice/report/pentaho/output/text/VariablesDeclarations.java
index a15877c73fc4..05fe8911b880 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/output/text/VariablesDeclarations.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/output/text/VariablesDeclarations.java
@@ -15,7 +15,7 @@
  *   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.pentaho.output.text;
+package org.libreoffice.report.pentaho.output.text;
 
 import java.util.HashMap;
 import java.util.Iterator;
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/AttributeSpecification.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/AttributeSpecification.java
index 5ced8e212225..937f7a40591c 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/AttributeSpecification.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/AttributeSpecification.java
@@ -15,7 +15,7 @@
  *   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.pentaho.parser;
+package org.libreoffice.report.pentaho.parser;
 
 public final class AttributeSpecification
 {
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/ElementReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/ElementReadHandler.java
index 2a71ddf65496..c311f45d1390 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/ElementReadHandler.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/ElementReadHandler.java
@@ -15,7 +15,7 @@
  *   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.pentaho.parser;
+package org.libreoffice.report.pentaho.parser;
 
 import org.jfree.report.structure.Element;
 
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/OfficeDocumentXmlResourceFactory.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/OfficeDocumentXmlResourceFactory.java
index 4da2eca96edf..edcb56cb9f71 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/OfficeDocumentXmlResourceFactory.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/OfficeDocumentXmlResourceFactory.java
@@ -15,9 +15,9 @@
  *   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.pentaho.parser;
+package org.libreoffice.report.pentaho.parser;
 
-import com.sun.star.report.pentaho.model.OfficeDocument;
+import org.libreoffice.report.pentaho.model.OfficeDocument;
 
 import org.jfree.report.modules.factories.report.base.JFreeReportXmlResourceFactory;
 
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/OfficeParserUtil.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/OfficeParserUtil.java
index 287eaca2dfc3..9cc91f22b6d3 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/OfficeParserUtil.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/OfficeParserUtil.java
@@ -15,7 +15,7 @@
  *   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.pentaho.parser;
+package org.libreoffice.report.pentaho.parser;
 
 import java.util.HashMap;
 import java.util.Iterator;
@@ -61,7 +61,7 @@ public class OfficeParserUtil
         resourceManager.registerDefaults();
         try
         {
-            final Resource res = resourceManager.createDirectly("res://com/sun/star/report/pentaho/parser/selectors.properties", Properties.class);
+            final Resource res = resourceManager.createDirectly("res://org/libreoffice/report/pentaho/parser/selectors.properties", Properties.class);
             final Properties resProps = (Properties) res.getResource();
             props.putAll(resProps);
         }
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/OfficeStylesXmlResourceFactory.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/OfficeStylesXmlResourceFactory.java
index ba94dd5b030c..18267f21382f 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/OfficeStylesXmlResourceFactory.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/OfficeStylesXmlResourceFactory.java
@@ -15,9 +15,9 @@
  *   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.pentaho.parser;
+package org.libreoffice.report.pentaho.parser;
 
-import com.sun.star.report.pentaho.model.OfficeStylesCollection;
+import org.libreoffice.report.pentaho.model.OfficeStylesCollection;
 
 import org.jfree.report.JFreeReportBoot;
 
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/StarStyleXmlFactoryModule.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/StarStyleXmlFactoryModule.java
index f2c856cf358c..bf793e1d8acf 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/StarStyleXmlFactoryModule.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/StarStyleXmlFactoryModule.java
@@ -15,10 +15,10 @@
  *   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.pentaho.parser;
+package org.libreoffice.report.pentaho.parser;
 
-import com.sun.star.report.pentaho.OfficeNamespaces;
-import com.sun.star.report.pentaho.parser.office.DocumentStylesReadHandler;
+import org.libreoffice.report.pentaho.OfficeNamespaces;
+import org.libreoffice.report.pentaho.parser.office.DocumentStylesReadHandler;
 
 import org.pentaho.reporting.libraries.xmlns.parser.XmlDocumentInfo;
 import org.pentaho.reporting.libraries.xmlns.parser.XmlFactoryModule;
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/StarXmlFactoryModule.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/StarXmlFactoryModule.java
index 9258a452bf12..78f0633f0956 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/StarXmlFactoryModule.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/StarXmlFactoryModule.java
@@ -15,10 +15,10 @@
  *   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.pentaho.parser;
+package org.libreoffice.report.pentaho.parser;
 
-import com.sun.star.report.pentaho.OfficeNamespaces;
-import com.sun.star.report.pentaho.parser.office.DocumentContentReadHandler;
+import org.libreoffice.report.pentaho.OfficeNamespaces;
+import org.libreoffice.report.pentaho.parser.office.DocumentContentReadHandler;
 
 import org.pentaho.reporting.libraries.xmlns.parser.XmlDocumentInfo;
 import org.pentaho.reporting.libraries.xmlns.parser.XmlFactoryModule;
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/StyleMapper.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/StyleMapper.java
index 32ae65c02040..a248ce5a4ce1 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/StyleMapper.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/StyleMapper.java
@@ -15,7 +15,7 @@
  *   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.pentaho.parser;
+package org.libreoffice.report.pentaho.parser;
 
 import org.jfree.layouting.input.style.CSSDeclarationRule;
 
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/chart/ChartReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/chart/ChartReadHandler.java
index 0afb8c107c82..a7a6e55ceb31 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/chart/ChartReadHandler.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/chart/ChartReadHandler.java
@@ -15,13 +15,13 @@
  *   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.pentaho.parser.chart;
+package org.libreoffice.report.pentaho.parser.chart;
 
-import com.sun.star.report.pentaho.OfficeNamespaces;
-import com.sun.star.report.pentaho.parser.ElementReadHandler;
-import com.sun.star.report.pentaho.parser.rpt.DetailRootTableReadHandler;
-import com.sun.star.report.pentaho.parser.rpt.ReportReadHandler;
-import com.sun.star.report.pentaho.parser.text.TextContentReadHandler;
+import org.libreoffice.report.pentaho.OfficeNamespaces;
+import org.libreoffice.report.pentaho.parser.ElementReadHandler;
+import org.libreoffice.report.pentaho.parser.rpt.DetailRootTableReadHandler;
+import org.libreoffice.report.pentaho.parser.rpt.ReportReadHandler;
+import org.libreoffice.report.pentaho.parser.text.TextContentReadHandler;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/data/DataStyleReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/data/DataStyleReadHandler.java
index 40aee6391296..693ed0173b79 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/data/DataStyleReadHandler.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/data/DataStyleReadHandler.java
@@ -15,11 +15,11 @@
  *   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.pentaho.parser.data;
+package org.libreoffice.report.pentaho.parser.data;
 
-import com.sun.star.report.pentaho.OfficeNamespaces;
-import com.sun.star.report.pentaho.model.DataStyle;
-import com.sun.star.report.pentaho.parser.ElementReadHandler;
+import org.libreoffice.report.pentaho.OfficeNamespaces;
+import org.libreoffice.report.pentaho.model.DataStyle;
+import org.libreoffice.report.pentaho.parser.ElementReadHandler;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/draw/ObjectOleReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/draw/ObjectOleReadHandler.java
index 25601dee934f..291490752619 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/draw/ObjectOleReadHandler.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/draw/ObjectOleReadHandler.java
@@ -15,11 +15,11 @@
  *   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.pentaho.parser.draw;
+package org.libreoffice.report.pentaho.parser.draw;
 
-import com.sun.star.report.pentaho.OfficeNamespaces;
-import com.sun.star.report.pentaho.model.ObjectOleElement;
-import com.sun.star.report.pentaho.parser.ElementReadHandler;
+import org.libreoffice.report.pentaho.OfficeNamespaces;
+import org.libreoffice.report.pentaho.model.ObjectOleElement;
+import org.libreoffice.report.pentaho.parser.ElementReadHandler;
 
 import org.jfree.report.structure.Element;
 
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/office/BodyReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/office/BodyReadHandler.java
index 669d1a8fdf62..0baecda6261d 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/office/BodyReadHandler.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/office/BodyReadHandler.java
@@ -15,11 +15,11 @@
  *   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.pentaho.parser.office;
+package org.libreoffice.report.pentaho.parser.office;
 
-import com.sun.star.report.pentaho.OfficeNamespaces;
-import com.sun.star.report.pentaho.parser.ElementReadHandler;
-import com.sun.star.report.pentaho.parser.rpt.ReportReadHandler;
+import org.libreoffice.report.pentaho.OfficeNamespaces;
+import org.libreoffice.report.pentaho.parser.ElementReadHandler;
+import org.libreoffice.report.pentaho.parser.rpt.ReportReadHandler;
 
 import org.jfree.report.structure.Element;
 import org.jfree.report.structure.Section;
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/office/DocumentContentReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/office/DocumentContentReadHandler.java
index 92cc38044963..6557227f8dd7 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/office/DocumentContentReadHandler.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/office/DocumentContentReadHandler.java
@@ -15,12 +15,12 @@
  *   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.pentaho.parser.office;
+package org.libreoffice.report.pentaho.parser.office;
 
-import com.sun.star.report.pentaho.OfficeNamespaces;
-import com.sun.star.report.pentaho.model.OfficeDocument;
-import com.sun.star.report.pentaho.model.OfficeStylesCollection;
-import com.sun.star.report.pentaho.parser.style.OfficeStylesReadHandler;
+import org.libreoffice.report.pentaho.OfficeNamespaces;
+import org.libreoffice.report.pentaho.model.OfficeDocument;
+import org.libreoffice.report.pentaho.model.OfficeStylesCollection;
+import org.libreoffice.report.pentaho.parser.style.OfficeStylesReadHandler;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/office/DocumentStylesReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/office/DocumentStylesReadHandler.java
index 799875991d36..958fd896d9ba 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/office/DocumentStylesReadHandler.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/office/DocumentStylesReadHandler.java
@@ -15,12 +15,12 @@
  *   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.pentaho.parser.office;
+package org.libreoffice.report.pentaho.parser.office;
 
-import com.sun.star.report.pentaho.OfficeNamespaces;
-import com.sun.star.report.pentaho.model.OfficeStylesCollection;
-import com.sun.star.report.pentaho.parser.ElementReadHandler;
-import com.sun.star.report.pentaho.parser.style.OfficeStylesReadHandler;
+import org.libreoffice.report.pentaho.OfficeNamespaces;
+import org.libreoffice.report.pentaho.model.OfficeStylesCollection;
+import org.libreoffice.report.pentaho.parser.ElementReadHandler;
+import org.libreoffice.report.pentaho.parser.style.OfficeStylesReadHandler;
 
 import org.jfree.report.structure.Element;
 
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/office/FontFaceDeclsReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/office/FontFaceDeclsReadHandler.java
index bf1025893cd2..de13cf10a53a 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/office/FontFaceDeclsReadHandler.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/office/FontFaceDeclsReadHandler.java
@@ -15,13 +15,13 @@
  *   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.pentaho.parser.office;
+package org.libreoffice.report.pentaho.parser.office;
 
-import com.sun.star.report.pentaho.OfficeNamespaces;
-import com.sun.star.report.pentaho.model.FontFaceDeclsSection;
-import com.sun.star.report.pentaho.model.FontFaceElement;
-import com.sun.star.report.pentaho.parser.ElementReadHandler;
-import com.sun.star.report.pentaho.parser.style.FontFaceReadHandler;
+import org.libreoffice.report.pentaho.OfficeNamespaces;
+import org.libreoffice.report.pentaho.model.FontFaceDeclsSection;
+import org.libreoffice.report.pentaho.model.FontFaceElement;
+import org.libreoffice.report.pentaho.parser.ElementReadHandler;
+import org.libreoffice.report.pentaho.parser.style.FontFaceReadHandler;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/office/MasterStylesReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/office/MasterStylesReadHandler.java
index 4d682ecad419..0b2b25430090 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/office/MasterStylesReadHandler.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/office/MasterStylesReadHandler.java
@@ -15,13 +15,13 @@
  *   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.pentaho.parser.office;
+package org.libreoffice.report.pentaho.parser.office;
 
-import com.sun.star.report.pentaho.OfficeNamespaces;
-import com.sun.star.report.pentaho.model.OfficeMasterStyles;
-import com.sun.star.report.pentaho.parser.ElementReadHandler;
-import com.sun.star.report.pentaho.parser.style.MasterPageReadHandler;
-import com.sun.star.report.pentaho.parser.style.StyleDefinitionReadHandler;
+import org.libreoffice.report.pentaho.OfficeNamespaces;
+import org.libreoffice.report.pentaho.model.OfficeMasterStyles;
+import org.libreoffice.report.pentaho.parser.ElementReadHandler;
+import org.libreoffice.report.pentaho.parser.style.MasterPageReadHandler;
+import org.libreoffice.report.pentaho.parser.style.StyleDefinitionReadHandler;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt-schema-v1.0-os.xsd b/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt-schema-v1.0-os.xsd
index 4c296ac7a75f..4c296ac7a75f 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt-schema-v1.0-os.xsd
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt-schema-v1.0-os.xsd
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/ConditionalPrintExpressionReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/ConditionalPrintExpressionReadHandler.java
index 6a449497d80d..a15f1610e770 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/ConditionalPrintExpressionReadHandler.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/ConditionalPrintExpressionReadHandler.java
@@ -15,9 +15,9 @@
  *   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.pentaho.parser.rpt;
+package org.libreoffice.report.pentaho.parser.rpt;
 
-import com.sun.star.report.pentaho.OfficeNamespaces;
+import org.libreoffice.report.pentaho.OfficeNamespaces;
 
 import org.jfree.report.expressions.FormulaFunction;
 import org.jfree.report.structure.Element;
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/DetailRootTableReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/DetailRootTableReadHandler.java
index 9a0975e64c7c..2a0677065ecc 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/DetailRootTableReadHandler.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/DetailRootTableReadHandler.java
@@ -15,9 +15,9 @@
  *   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.pentaho.parser.rpt;
+package org.libreoffice.report.pentaho.parser.rpt;
 
-import com.sun.star.report.pentaho.model.OfficeDetailSection;
+import org.libreoffice.report.pentaho.model.OfficeDetailSection;
 
 public class DetailRootTableReadHandler extends RootTableReadHandler
 {
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/FixedContentReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/FixedContentReadHandler.java
index 984820a59cd6..ab0fc52b1fee 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/FixedContentReadHandler.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/FixedContentReadHandler.java
@@ -15,13 +15,13 @@
  *   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.pentaho.parser.rpt;
+package org.libreoffice.report.pentaho.parser.rpt;
 
-import com.sun.star.report.OfficeToken;
-import com.sun.star.report.pentaho.OfficeNamespaces;
-import com.sun.star.report.pentaho.model.FixedTextElement;
-import com.sun.star.report.pentaho.parser.ElementReadHandler;
-import com.sun.star.report.pentaho.parser.text.TextContentReadHandler;
+import org.libreoffice.report.OfficeToken;
+import org.libreoffice.report.pentaho.OfficeNamespaces;
+import org.libreoffice.report.pentaho.model.FixedTextElement;
+import org.libreoffice.report.pentaho.parser.ElementReadHandler;
+import org.libreoffice.report.pentaho.parser.text.TextContentReadHandler;
 
 import org.jfree.report.structure.Element;
 
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/FormatConditionReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/FormatConditionReadHandler.java
index 05d49eeb5a28..cb3fa0a96039 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/FormatConditionReadHandler.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/FormatConditionReadHandler.java
@@ -15,12 +15,12 @@
  *   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.pentaho.parser.rpt;
+package org.libreoffice.report.pentaho.parser.rpt;
 
-import com.sun.star.report.OfficeToken;
-import com.sun.star.report.pentaho.OfficeNamespaces;
-import com.sun.star.report.pentaho.model.FormatCondition;
-import com.sun.star.report.pentaho.model.ReportElement;
+import org.libreoffice.report.OfficeToken;
+import org.libreoffice.report.pentaho.OfficeNamespaces;
+import org.libreoffice.report.pentaho.model.FormatCondition;
+import org.libreoffice.report.pentaho.model.ReportElement;
 
 import org.jfree.report.expressions.FormulaExpression;
 
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/FormattedTextReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/FormattedTextReadHandler.java
index 0ed48ca586d9..a1408d20dd52 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/FormattedTextReadHandler.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/FormattedTextReadHandler.java
@@ -15,11 +15,11 @@
  *   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.pentaho.parser.rpt;
+package org.libreoffice.report.pentaho.parser.rpt;
 
-import com.sun.star.report.pentaho.OfficeNamespaces;
-import com.sun.star.report.pentaho.model.FormattedTextElement;
-import com.sun.star.report.pentaho.parser.ElementReadHandler;
+import org.libreoffice.report.pentaho.OfficeNamespaces;
+import org.libreoffice.report.pentaho.model.FormattedTextElement;
+import org.libreoffice.report.pentaho.parser.ElementReadHandler;
 
 import org.jfree.report.expressions.FormulaExpression;
 import org.jfree.report.structure.Element;
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/FunctionReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/FunctionReadHandler.java
index 63c519ebce60..b1352d20c909 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/FunctionReadHandler.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/FunctionReadHandler.java
@@ -15,10 +15,10 @@
  *   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.pentaho.parser.rpt;
+package org.libreoffice.report.pentaho.parser.rpt;
 
-import com.sun.star.report.OfficeToken;
-import com.sun.star.report.pentaho.OfficeNamespaces;
+import org.libreoffice.report.OfficeToken;
+import org.libreoffice.report.pentaho.OfficeNamespaces;
 
 import org.jfree.report.expressions.Expression;
 import org.jfree.report.expressions.FormulaExpression;
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/GroupReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/GroupReadHandler.java
index 61ce6bb16649..22def36e179b 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/GroupReadHandler.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/GroupReadHandler.java
@@ -15,13 +15,13 @@
  *   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.pentaho.parser.rpt;
+package org.libreoffice.report.pentaho.parser.rpt;
 
-import com.sun.star.report.OfficeToken;
-import com.sun.star.report.pentaho.OfficeNamespaces;
-import com.sun.star.report.pentaho.model.OfficeGroup;
-import com.sun.star.report.pentaho.model.OfficeGroupInstanceSection;
-import com.sun.star.report.pentaho.parser.ElementReadHandler;
+import org.libreoffice.report.OfficeToken;
+import org.libreoffice.report.pentaho.OfficeNamespaces;
+import org.libreoffice.report.pentaho.model.OfficeGroup;
+import org.libreoffice.report.pentaho.model.OfficeGroupInstanceSection;
+import org.libreoffice.report.pentaho.parser.ElementReadHandler;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/GroupSectionReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/GroupSectionReadHandler.java
index c345fa174801..461cf67840f0 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/GroupSectionReadHandler.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/GroupSectionReadHandler.java
@@ -15,9 +15,9 @@
  *   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.pentaho.parser.rpt;
+package org.libreoffice.report.pentaho.parser.rpt;
 
-import com.sun.star.report.pentaho.model.OfficeGroupSection;
+import org.libreoffice.report.pentaho.model.OfficeGroupSection;
 
 public class GroupSectionReadHandler extends RootTableReadHandler
 {
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/ImageReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/ImageReadHandler.java
index d736f127445a..39f0d82326e6 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/ImageReadHandler.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/ImageReadHandler.java
@@ -15,13 +15,13 @@
  *   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.pentaho.parser.rpt;
+package org.libreoffice.report.pentaho.parser.rpt;
 
-import com.sun.star.report.OfficeToken;
-import com.sun.star.report.pentaho.OfficeNamespaces;
-import com.sun.star.report.pentaho.model.ImageElement;
-import com.sun.star.report.pentaho.parser.ElementReadHandler;
-import com.sun.star.report.pentaho.parser.xlink.XLinkReadHandler;
+import org.libreoffice.report.OfficeToken;
+import org.libreoffice.report.pentaho.OfficeNamespaces;
+import org.libreoffice.report.pentaho.model.ImageElement;
+import org.libreoffice.report.pentaho.parser.ElementReadHandler;
+import org.libreoffice.report.pentaho.parser.xlink.XLinkReadHandler;
 
 import org.jfree.report.expressions.FormulaExpression;
 import org.jfree.report.structure.Element;
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/MasterDetailReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/MasterDetailReadHandler.java
index 725091778fba..7fe32ecc5d70 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/MasterDetailReadHandler.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/MasterDetailReadHandler.java
@@ -15,11 +15,11 @@
  *   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.pentaho.parser.rpt;
+package org.libreoffice.report.pentaho.parser.rpt;
 
-import com.sun.star.report.pentaho.OfficeNamespaces;
-import com.sun.star.report.pentaho.model.ObjectOleElement;
-import com.sun.star.report.pentaho.parser.ElementReadHandler;
+import org.libreoffice.report.pentaho.OfficeNamespaces;
+import org.libreoffice.report.pentaho.model.ObjectOleElement;
+import org.libreoffice.report.pentaho.parser.ElementReadHandler;
 
 import org.jfree.report.structure.Element;
 
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/ReportElementReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/ReportElementReadHandler.java
index d7adf8631d9c..c29488435fa3 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/ReportElementReadHandler.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/ReportElementReadHandler.java
@@ -15,12 +15,12 @@
  *   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.pentaho.parser.rpt;
+package org.libreoffice.report.pentaho.parser.rpt;
 
-import com.sun.star.report.OfficeToken;
-import com.sun.star.report.pentaho.OfficeNamespaces;
-import com.sun.star.report.pentaho.model.ReportElement;
-import com.sun.star.report.pentaho.parser.ElementReadHandler;
+import org.libreoffice.report.OfficeToken;
+import org.libreoffice.report.pentaho.OfficeNamespaces;
+import org.libreoffice.report.pentaho.model.ReportElement;
+import org.libreoffice.report.pentaho.parser.ElementReadHandler;
 
 import org.jfree.report.structure.Element;
 
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/ReportReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/ReportReadHandler.java
index 5e7821a13a0a..ec270543b904 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/ReportReadHandler.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/ReportReadHandler.java
@@ -15,12 +15,12 @@
  *   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.pentaho.parser.rpt;
+package org.libreoffice.report.pentaho.parser.rpt;
 
-import com.sun.star.report.pentaho.OfficeNamespaces;
-import com.sun.star.report.pentaho.model.OfficeReport;
-import com.sun.star.report.pentaho.parser.ElementReadHandler;
-import com.sun.star.report.pentaho.parser.chart.ChartReadHandler;
+import org.libreoffice.report.pentaho.OfficeNamespaces;
+import org.libreoffice.report.pentaho.model.OfficeReport;
+import org.libreoffice.report.pentaho.parser.ElementReadHandler;
+import org.libreoffice.report.pentaho.parser.chart.ChartReadHandler;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/RootTableReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/RootTableReadHandler.java
index 32e0d44188d7..54b753b8f630 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/RootTableReadHandler.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/RootTableReadHandler.java
@@ -15,11 +15,11 @@
  *   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.pentaho.parser.rpt;
+package org.libreoffice.report.pentaho.parser.rpt;
 
-import com.sun.star.report.pentaho.OfficeNamespaces;
-import com.sun.star.report.pentaho.parser.ElementReadHandler;
-import com.sun.star.report.pentaho.parser.table.TableReadHandler;
+import org.libreoffice.report.pentaho.OfficeNamespaces;
+import org.libreoffice.report.pentaho.parser.ElementReadHandler;
+import org.libreoffice.report.pentaho.parser.table.TableReadHandler;
 
 import org.jfree.report.structure.Element;
 import org.jfree.report.structure.Section;
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/SubDocumentReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/SubDocumentReadHandler.java
index bb206e903a98..c815a69ba7ae 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/SubDocumentReadHandler.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/SubDocumentReadHandler.java
@@ -15,13 +15,13 @@
  *   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.pentaho.parser.rpt;
+package org.libreoffice.report.pentaho.parser.rpt;
 
-import com.sun.star.report.OfficeToken;
-import com.sun.star.report.pentaho.OfficeNamespaces;
-import com.sun.star.report.pentaho.model.ObjectOleElement;
-import com.sun.star.report.pentaho.parser.draw.ObjectOleReadHandler;
-import com.sun.star.report.pentaho.parser.text.NoCDATATextContentReadHandler;
+import org.libreoffice.report.OfficeToken;
+import org.libreoffice.report.pentaho.OfficeNamespaces;
+import org.libreoffice.report.pentaho.model.ObjectOleElement;
+import org.libreoffice.report.pentaho.parser.draw.ObjectOleReadHandler;
+import org.libreoffice.report.pentaho.parser.text.NoCDATATextContentReadHandler;
 
 import org.jfree.report.structure.Section;
 
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/selectors.properties b/reportbuilder/java/org/libreoffice/report/pentaho/parser/selectors.properties
index b0bc07516541..f9640d001fa5 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/selectors.properties
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/selectors.properties
@@ -80,25 +80,25 @@ font-family.system=monospace
 #
 # AttrName is the defined attribute name for this namespace as defined by the
 # opendocument standard.
-attr.style.graphic-properties.draw.textarea-vertical-align=com.sun.star.report.pentaho.parser.stylemapper.draw.TextAreaVerticalAlignMapper
-attr.style.section-properties.fo.background-color=com.sun.star.report.pentaho.parser.stylemapper.fo.BackgroundColorMapper
-attr.style.paragraph-properties.fo.text-align=com.sun.star.report.pentaho.parser.stylemapper.fo.TextAlignMapper
-attr.style.paragraph-properties.style.vertical-align=com.sun.star.report.pentaho.parser.stylemapper.style.VerticalAlignMapper
-attr.style.text-properties.fo.color=com.sun.star.report.pentaho.parser.stylemapper.fo.ColorMapper
-attr.style.text-properties.style.font-name=com.sun.star.report.pentaho.parser.stylemapper.style.FontNameMapper
-attr.style.text-properties.fo.font-family=com.sun.star.report.pentaho.parser.stylemapper.style.FontFamilyMapper
-attr.style.table-properties.fo.background-color=com.sun.star.report.pentaho.parser.stylemapper.fo.BackgroundColorMapper
+attr.style.graphic-properties.draw.textarea-vertical-align=org.libreoffice.report.pentaho.parser.stylemapper.draw.TextAreaVerticalAlignMapper
+attr.style.section-properties.fo.background-color=org.libreoffice.report.pentaho.parser.stylemapper.fo.BackgroundColorMapper
+attr.style.paragraph-properties.fo.text-align=org.libreoffice.report.pentaho.parser.stylemapper.fo.TextAlignMapper
+attr.style.paragraph-properties.style.vertical-align=org.libreoffice.report.pentaho.parser.stylemapper.style.VerticalAlignMapper
+attr.style.text-properties.fo.color=org.libreoffice.report.pentaho.parser.stylemapper.fo.ColorMapper
+attr.style.text-properties.style.font-name=org.libreoffice.report.pentaho.parser.stylemapper.style.FontNameMapper
+attr.style.text-properties.fo.font-family=org.libreoffice.report.pentaho.parser.stylemapper.style.FontFamilyMapper
+attr.style.table-properties.fo.background-color=org.libreoffice.report.pentaho.parser.stylemapper.fo.BackgroundColorMapper
 #attr.style.text-properties.style.font-style-name=
-attr.style.text-properties.style.font-family-generic=com.sun.star.report.pentaho.parser.stylemapper.style.FontFamilyGenericMapper
-attr.style.text-properties.style.font-pitch=com.sun.star.report.pentaho.parser.stylemapper.style.FontPitchMapper
-attr.style.text-properties.fo.font-size=com.sun.star.report.pentaho.parser.stylemapper.fo.FontSizeMapper
-attr.style.text-properties.fo.font-style=com.sun.star.report.pentaho.parser.stylemapper.fo.FontStyleMapper
-attr.style.text-properties.style.text-underline-style=com.sun.star.report.pentaho.parser.stylemapper.style.TextUnderlineStyleMapper
-attr.style.text-properties.style.text-underline-width=com.sun.star.report.pentaho.parser.stylemapper.style.TextUnderlineWidthMapper
-attr.style.text-properties.style.text-underline-color=com.sun.star.report.pentaho.parser.stylemapper.style.TextUnderlineColorMapper
-attr.style.text-properties.fo.font-weight=com.sun.star.report.pentaho.parser.stylemapper.fo.FontWeightMapper
-attr.style.text-properties.style.text-emphasize=com.sun.star.report.pentaho.parser.stylemapper.style.TextEmphasizeMapper
-attr.style.text-properties.style.font-relief=com.sun.star.report.pentaho.parser.stylemapper.style.FontReliefMapper
-attr.style.table-column-properties.table.column-width=com.sun.star.report.pentaho.parser.stylemapper.table.ColumnWidthMapper
-attr.style.table-row-properties.table.row-height=com.sun.star.report.pentaho.parser.stylemapper.table.RowHeightMapper
-attr.style.table-cell-properties.fo.border-right=com.sun.star.report.pentaho.parser.stylemapper.fo.BorderRightMapper
+attr.style.text-properties.style.font-family-generic=org.libreoffice.report.pentaho.parser.stylemapper.style.FontFamilyGenericMapper
+attr.style.text-properties.style.font-pitch=org.libreoffice.report.pentaho.parser.stylemapper.style.FontPitchMapper
+attr.style.text-properties.fo.font-size=org.libreoffice.report.pentaho.parser.stylemapper.fo.FontSizeMapper
+attr.style.text-properties.fo.font-style=org.libreoffice.report.pentaho.parser.stylemapper.fo.FontStyleMapper
+attr.style.text-properties.style.text-underline-style=org.libreoffice.report.pentaho.parser.stylemapper.style.TextUnderlineStyleMapper
+attr.style.text-properties.style.text-underline-width=org.libreoffice.report.pentaho.parser.stylemapper.style.TextUnderlineWidthMapper
+attr.style.text-properties.style.text-underline-color=org.libreoffice.report.pentaho.parser.stylemapper.style.TextUnderlineColorMapper
+attr.style.text-properties.fo.font-weight=org.libreoffice.report.pentaho.parser.stylemapper.fo.FontWeightMapper
+attr.style.text-properties.style.text-emphasize=org.libreoffice.report.pentaho.parser.stylemapper.style.TextEmphasizeMapper
+attr.style.text-properties.style.font-relief=org.libreoffice.report.pentaho.parser.stylemapper.style.FontReliefMapper
+attr.style.table-column-properties.table.column-width=org.libreoffice.report.pentaho.parser.stylemapper.table.ColumnWidthMapper
+attr.style.table-row-properties.table.row-height=org.libreoffice.report.pentaho.parser.stylemapper.table.RowHeightMapper
+attr.style.table-cell-properties.fo.border-right=org.libreoffice.report.pentaho.parser.stylemapper.fo.BorderRightMapper
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/style-mapping.txt b/reportbuilder/java/org/libreoffice/report/pentaho/parser/style-mapping.txt
index 6b1ede5d98cf..6b1ede5d98cf 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/style-mapping.txt
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/style-mapping.txt
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/style/FontFaceReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/style/FontFaceReadHandler.java
index 00b230311f84..d6f7ed04f78b 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/style/FontFaceReadHandler.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/style/FontFaceReadHandler.java
@@ -15,10 +15,10 @@
  *   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.pentaho.parser.style;
+package org.libreoffice.report.pentaho.parser.style;
 
-import com.sun.star.report.pentaho.model.FontFaceElement;
-import com.sun.star.report.pentaho.parser.ElementReadHandler;
+import org.libreoffice.report.pentaho.model.FontFaceElement;
+import org.libreoffice.report.pentaho.parser.ElementReadHandler;
 
 import org.jfree.report.structure.Element;
 
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/style/MasterPageReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/style/MasterPageReadHandler.java
index 5a6d74f3d536..993331d02933 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/style/MasterPageReadHandler.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/style/MasterPageReadHandler.java
@@ -15,10 +15,10 @@
  *   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.pentaho.parser.style;
+package org.libreoffice.report.pentaho.parser.style;
 
-import com.sun.star.report.pentaho.model.OfficeMasterPage;
-import com.sun.star.report.pentaho.parser.ElementReadHandler;
+import org.libreoffice.report.pentaho.model.OfficeMasterPage;
+import org.libreoffice.report.pentaho.parser.ElementReadHandler;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/style/OfficeStyleReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/style/OfficeStyleReadHandler.java
index cbfcc112f8ea..ed6b9ddeaa23 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/style/OfficeStyleReadHandler.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/style/OfficeStyleReadHandler.java
@@ -15,10 +15,10 @@
  *   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.pentaho.parser.style;
+package org.libreoffice.report.pentaho.parser.style;
 
-import com.sun.star.report.pentaho.model.OfficeStyle;
-import com.sun.star.report.pentaho.parser.ElementReadHandler;
+import org.libreoffice.report.pentaho.model.OfficeStyle;
+import org.libreoffice.report.pentaho.parser.ElementReadHandler;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/style/OfficeStylesReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/style/OfficeStylesReadHandler.java
index 37a3e8cccc1b..17e684838bae 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/style/OfficeStylesReadHandler.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/style/OfficeStylesReadHandler.java
@@ -15,12 +15,12 @@
  *   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.pentaho.parser.style;
+package org.libreoffice.report.pentaho.parser.style;
 
-import com.sun.star.report.pentaho.OfficeNamespaces;
-import com.sun.star.report.pentaho.model.OfficeStyles;
-import com.sun.star.report.pentaho.parser.ElementReadHandler;
-import com.sun.star.report.pentaho.parser.data.DataStyleReadHandler;
+import org.libreoffice.report.pentaho.OfficeNamespaces;
+import org.libreoffice.report.pentaho.model.OfficeStyles;
+import org.libreoffice.report.pentaho.parser.ElementReadHandler;
+import org.libreoffice.report.pentaho.parser.data.DataStyleReadHandler;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/style/PageLayoutReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/style/PageLayoutReadHandler.java
index 95109164ae3d..f0ff7c8f3572 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/style/PageLayoutReadHandler.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/style/PageLayoutReadHandler.java
@@ -15,10 +15,10 @@
  *   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.pentaho.parser.style;
+package org.libreoffice.report.pentaho.parser.style;
 
-import com.sun.star.report.pentaho.model.PageLayout;
-import com.sun.star.report.pentaho.parser.ElementReadHandler;
+import org.libreoffice.report.pentaho.model.PageLayout;
+import org.libreoffice.report.pentaho.parser.ElementReadHandler;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/style/StyleDefinitionReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/style/StyleDefinitionReadHandler.java
index 2961068908af..b50f7f9767e4 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/style/StyleDefinitionReadHandler.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/style/StyleDefinitionReadHandler.java
@@ -15,9 +15,9 @@
  *   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.pentaho.parser.style;
+package org.libreoffice.report.pentaho.parser.style;
 
-import com.sun.star.report.pentaho.parser.ElementReadHandler;
+import org.libreoffice.report.pentaho.parser.ElementReadHandler;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/OneOfConstantsMapper.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/OneOfConstantsMapper.java
index e2c292bdf38d..0f7583dc6b74 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/OneOfConstantsMapper.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/OneOfConstantsMapper.java
@@ -15,9 +15,9 @@
  *   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.pentaho.parser.stylemapper;
+package org.libreoffice.report.pentaho.parser.stylemapper;
 
-import com.sun.star.report.pentaho.parser.StyleMapper;
+import org.libreoffice.report.pentaho.parser.StyleMapper;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/draw/TextAreaVerticalAlignMapper.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/draw/TextAreaVerticalAlignMapper.java
index da80173092ba..af921da41ff8 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/draw/TextAreaVerticalAlignMapper.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/draw/TextAreaVerticalAlignMapper.java
@@ -15,9 +15,9 @@
  *   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.pentaho.parser.stylemapper.draw;
+package org.libreoffice.report.pentaho.parser.stylemapper.draw;
 
-import com.sun.star.report.pentaho.parser.stylemapper.OneOfConstantsMapper;
+import org.libreoffice.report.pentaho.parser.stylemapper.OneOfConstantsMapper;
 
 import org.jfree.layouting.input.style.keys.box.BoxStyleKeys;
 import org.jfree.layouting.input.style.values.CSSConstant;
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/BackgroundColorMapper.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/fo/BackgroundColorMapper.java
index d8c054edf52e..1ccad389f9b0 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/BackgroundColorMapper.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/fo/BackgroundColorMapper.java
@@ -15,9 +15,9 @@
  *   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.pentaho.parser.stylemapper.fo;
+package org.libreoffice.report.pentaho.parser.stylemapper.fo;
 
-import com.sun.star.report.pentaho.parser.StyleMapper;
+import org.libreoffice.report.pentaho.parser.StyleMapper;
 
 import org.jfree.layouting.input.style.CSSDeclarationRule;
 import org.jfree.layouting.input.style.keys.border.BorderStyleKeys;
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/BorderRightMapper.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/fo/BorderRightMapper.java
index af9afa4ab270..dc669bd0d7a0 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/BorderRightMapper.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/fo/BorderRightMapper.java
@@ -15,9 +15,9 @@
  *   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.pentaho.parser.stylemapper.fo;
+package org.libreoffice.report.pentaho.parser.stylemapper.fo;
 
-import com.sun.star.report.pentaho.parser.StyleMapper;
+import org.libreoffice.report.pentaho.parser.StyleMapper;
 
 import org.jfree.layouting.input.style.CSSDeclarationRule;
 
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/ColorMapper.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/fo/ColorMapper.java
index 870674198c1e..9e19b8e898b8 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/ColorMapper.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/fo/ColorMapper.java
@@ -15,9 +15,9 @@
  *   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.pentaho.parser.stylemapper.fo;
+package org.libreoffice.report.pentaho.parser.stylemapper.fo;
 
-import com.sun.star.report.pentaho.parser.StyleMapper;
+import org.libreoffice.report.pentaho.parser.StyleMapper;
 
 import org.jfree.layouting.input.style.CSSDeclarationRule;
 import org.jfree.layouting.input.style.keys.color.ColorStyleKeys;
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/FontSizeMapper.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/fo/FontSizeMapper.java
index 21c9452b8715..683a79fa2932 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/FontSizeMapper.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/fo/FontSizeMapper.java
@@ -15,9 +15,9 @@
  *   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.pentaho.parser.stylemapper.fo;
+package org.libreoffice.report.pentaho.parser.stylemapper.fo;
 
-import com.sun.star.report.pentaho.parser.StyleMapper;
+import org.libreoffice.report.pentaho.parser.StyleMapper;
 
 import org.jfree.layouting.input.style.CSSDeclarationRule;
 import org.jfree.layouting.input.style.keys.font.FontStyleKeys;
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/FontStyleMapper.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/fo/FontStyleMapper.java
index 07f9254e22d8..ebe7cb6505f1 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/FontStyleMapper.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/fo/FontStyleMapper.java
@@ -15,9 +15,9 @@
  *   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.pentaho.parser.stylemapper.fo;
+package org.libreoffice.report.pentaho.parser.stylemapper.fo;
 
-import com.sun.star.report.pentaho.parser.StyleMapper;
+import org.libreoffice.report.pentaho.parser.StyleMapper;
 
 import org.jfree.layouting.input.style.CSSDeclarationRule;
 import org.jfree.layouting.input.style.keys.font.FontStyleKeys;
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/FontWeightMapper.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/fo/FontWeightMapper.java
index 667715584e24..d9a5edcc1be4 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/FontWeightMapper.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/fo/FontWeightMapper.java
@@ -15,9 +15,9 @@
  *   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.pentaho.parser.stylemapper.fo;
+package org.libreoffice.report.pentaho.parser.stylemapper.fo;
 
-import com.sun.star.report.pentaho.parser.StyleMapper;
+import org.libreoffice.report.pentaho.parser.StyleMapper;
 
 import org.jfree.layouting.input.style.CSSDeclarationRule;
 import org.jfree.layouting.input.style.keys.font.FontStyleKeys;
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/TextAlignMapper.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/fo/TextAlignMapper.java
index 221041a02b12..f369af9bfa0a 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/TextAlignMapper.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/fo/TextAlignMapper.java
@@ -15,9 +15,9 @@
  *   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.pentaho.parser.stylemapper.fo;
+package org.libreoffice.report.pentaho.parser.stylemapper.fo;
 
-import com.sun.star.report.pentaho.parser.stylemapper.OneOfConstantsMapper;
+import org.libreoffice.report.pentaho.parser.stylemapper.OneOfConstantsMapper;
 
 import org.jfree.layouting.input.style.keys.text.TextAlign;
 import org.jfree.layouting.input.style.keys.text.TextStyleKeys;
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/FontFamilyGenericMapper.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/style/FontFamilyGenericMapper.java
index f41a786a58fa..fd9f3f7d029a 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/FontFamilyGenericMapper.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/style/FontFamilyGenericMapper.java
@@ -15,9 +15,9 @@
  *   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.pentaho.parser.stylemapper.style;
+package org.libreoffice.report.pentaho.parser.stylemapper.style;
 
-import com.sun.star.report.pentaho.parser.StyleMapper;
+import org.libreoffice.report.pentaho.parser.StyleMapper;
 
 import org.jfree.layouting.input.style.CSSDeclarationRule;
 import org.jfree.layouting.input.style.keys.font.FontStyleKeys;
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/FontFamilyMapper.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/style/FontFamilyMapper.java
index 45ca730c9afb..7268b29c697a 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/FontFamilyMapper.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/style/FontFamilyMapper.java
@@ -15,9 +15,9 @@
  *   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.pentaho.parser.stylemapper.style;
+package org.libreoffice.report.pentaho.parser.stylemapper.style;
 
-import com.sun.star.report.pentaho.parser.StyleMapper;
+import org.libreoffice.report.pentaho.parser.StyleMapper;
 
 import org.jfree.layouting.input.style.CSSDeclarationRule;
 import org.jfree.layouting.input.style.keys.font.FontStyleKeys;
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/FontNameMapper.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/style/FontNameMapper.java
index 5609ef1e10bf..fbf0aa226674 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/FontNameMapper.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/style/FontNameMapper.java
@@ -15,9 +15,9 @@
  *   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.pentaho.parser.stylemapper.style;
+package org.libreoffice.report.pentaho.parser.stylemapper.style;
 
-import com.sun.star.report.pentaho.parser.StyleMapper;
+import org.libreoffice.report.pentaho.parser.StyleMapper;
 
 import org.jfree.layouting.input.style.CSSDeclarationRule;
 import org.jfree.layouting.input.style.keys.font.FontStyleKeys;
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/FontPitchMapper.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/style/FontPitchMapper.java
index 1d462a72749b..15d87ae2ee10 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/FontPitchMapper.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/style/FontPitchMapper.java
@@ -15,9 +15,9 @@
  *   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.pentaho.parser.stylemapper.style;
+package org.libreoffice.report.pentaho.parser.stylemapper.style;
 
-import com.sun.star.report.pentaho.parser.stylemapper.OneOfConstantsMapper;
+import org.libreoffice.report.pentaho.parser.stylemapper.OneOfConstantsMapper;
 
 import org.jfree.layouting.input.style.keys.font.FontStyleKeys;
 import org.jfree.layouting.input.style.values.CSSConstant;
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/FontReliefMapper.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/style/FontReliefMapper.java
index 7f79a59813a3..c8f397eaf459 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/FontReliefMapper.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/style/FontReliefMapper.java
@@ -15,9 +15,9 @@
  *   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.pentaho.parser.stylemapper.style;
+package org.libreoffice.report.pentaho.parser.stylemapper.style;
 
-import com.sun.star.report.pentaho.parser.StyleMapper;
+import org.libreoffice.report.pentaho.parser.StyleMapper;
 
 import org.jfree.layouting.input.style.CSSDeclarationRule;
 import org.jfree.layouting.input.style.keys.font.FontStyleKeys;
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/TextEmphasizeMapper.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/style/TextEmphasizeMapper.java
index 8de923cd4e4c..f3cdb77762da 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/TextEmphasizeMapper.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/style/TextEmphasizeMapper.java
@@ -15,9 +15,9 @@
  *   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.pentaho.parser.stylemapper.style;
+package org.libreoffice.report.pentaho.parser.stylemapper.style;
 
-import com.sun.star.report.pentaho.parser.StyleMapper;
+import org.libreoffice.report.pentaho.parser.StyleMapper;
 
 import org.jfree.layouting.input.style.CSSDeclarationRule;
 
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/TextUnderlineColorMapper.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/style/TextUnderlineColorMapper.java
index 21b8118accd8..2be734d86361 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/TextUnderlineColorMapper.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/style/TextUnderlineColorMapper.java
@@ -15,9 +15,9 @@
  *   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.pentaho.parser.stylemapper.style;
+package org.libreoffice.report.pentaho.parser.stylemapper.style;
 
-import com.sun.star.report.pentaho.parser.StyleMapper;
+import org.libreoffice.report.pentaho.parser.StyleMapper;
 
 import org.jfree.layouting.input.style.CSSDeclarationRule;
 import org.jfree.layouting.input.style.keys.text.TextStyleKeys;
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/TextUnderlineStyleMapper.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/style/TextUnderlineStyleMapper.java
index c405f110f347..bb81af95417c 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/TextUnderlineStyleMapper.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/style/TextUnderlineStyleMapper.java
@@ -15,9 +15,9 @@
  *   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.pentaho.parser.stylemapper.style;
+package org.libreoffice.report.pentaho.parser.stylemapper.style;
 
-import com.sun.star.report.pentaho.parser.stylemapper.OneOfConstantsMapper;
+import org.libreoffice.report.pentaho.parser.stylemapper.OneOfConstantsMapper;
 
 import org.jfree.layouting.input.style.keys.text.TextDecorationStyle;
 import org.jfree.layouting.input.style.keys.text.TextStyleKeys;
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/TextUnderlineWidthMapper.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/style/TextUnderlineWidthMapper.java
index 71f482c8a270..1ce8fd7346e2 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/TextUnderlineWidthMapper.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/style/TextUnderlineWidthMapper.java
@@ -15,9 +15,9 @@
  *   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.pentaho.parser.stylemapper.style;
+package org.libreoffice.report.pentaho.parser.stylemapper.style;
 
-import com.sun.star.report.pentaho.parser.stylemapper.OneOfConstantsMapper;
+import org.libreoffice.report.pentaho.parser.stylemapper.OneOfConstantsMapper;
 
 import org.jfree.layouting.input.style.CSSDeclarationRule;
 import org.jfree.layouting.input.style.keys.border.BorderWidth;
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/TextUnderlineWordMode.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/style/TextUnderlineWordMode.java
index 12139d73ba99..733835c28849 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/TextUnderlineWordMode.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/style/TextUnderlineWordMode.java
@@ -15,9 +15,9 @@
  *   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.pentaho.parser.stylemapper.style;
+package org.libreoffice.report.pentaho.parser.stylemapper.style;
 
-import com.sun.star.report.pentaho.parser.stylemapper.OneOfConstantsMapper;
+import org.libreoffice.report.pentaho.parser.stylemapper.OneOfConstantsMapper;
 
 import org.jfree.layouting.input.style.keys.text.TextDecorationMode;
 import org.jfree.layouting.input.style.keys.text.TextStyleKeys;
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/VerticalAlignMapper.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/style/VerticalAlignMapper.java
index 518fc0b87e4f..12759a67329d 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/VerticalAlignMapper.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/style/VerticalAlignMapper.java
@@ -15,9 +15,9 @@
  *   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.pentaho.parser.stylemapper.style;
+package org.libreoffice.report.pentaho.parser.stylemapper.style;
 
-import com.sun.star.report.pentaho.parser.stylemapper.OneOfConstantsMapper;
+import org.libreoffice.report.pentaho.parser.stylemapper.OneOfConstantsMapper;
 
 import org.jfree.layouting.input.style.keys.line.LineStyleKeys;
 import org.jfree.layouting.input.style.values.CSSAutoValue;
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/table/ColumnWidthMapper.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/table/ColumnWidthMapper.java
index 7c262c5c503c..c12d6aa62ed5 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/table/ColumnWidthMapper.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/table/ColumnWidthMapper.java
@@ -15,9 +15,9 @@
  *   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.pentaho.parser.stylemapper.table;
+package org.libreoffice.report.pentaho.parser.stylemapper.table;
 
-import com.sun.star.report.pentaho.parser.StyleMapper;
+import org.libreoffice.report.pentaho.parser.StyleMapper;
 
 import org.jfree.layouting.input.style.CSSDeclarationRule;
 import org.jfree.layouting.input.style.keys.box.BoxStyleKeys;
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/table/RowHeightMapper.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/table/RowHeightMapper.java
index 3500e7b4fa3b..1d48b696853f 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/table/RowHeightMapper.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/stylemapper/table/RowHeightMapper.java
@@ -15,9 +15,9 @@
  *   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.pentaho.parser.stylemapper.table;
+package org.libreoffice.report.pentaho.parser.stylemapper.table;
 
-import com.sun.star.report.pentaho.parser.StyleMapper;
+import org.libreoffice.report.pentaho.parser.StyleMapper;
 
 import org.jfree.layouting.input.style.CSSDeclarationRule;
 import org.jfree.layouting.input.style.keys.box.BoxStyleKeys;
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/table/CoveredCellReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/table/CoveredCellReadHandler.java
index 2c2c5d973cbe..c2cba6187024 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/table/CoveredCellReadHandler.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/table/CoveredCellReadHandler.java
@@ -15,9 +15,9 @@
  *   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.pentaho.parser.table;
+package org.libreoffice.report.pentaho.parser.table;
 
-import com.sun.star.report.pentaho.parser.ElementReadHandler;
+import org.libreoffice.report.pentaho.parser.ElementReadHandler;
 
 import org.jfree.report.structure.Element;
 import org.jfree.report.structure.Section;
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/table/TableCellReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/table/TableCellReadHandler.java
index 07d139389e21..e987dbbe8712 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/table/TableCellReadHandler.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/table/TableCellReadHandler.java
@@ -15,10 +15,10 @@
  *   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.pentaho.parser.table;
+package org.libreoffice.report.pentaho.parser.table;
 
-import com.sun.star.report.pentaho.model.TableCellElement;
-import com.sun.star.report.pentaho.parser.text.NoCDATATextContentReadHandler;
+import org.libreoffice.report.pentaho.model.TableCellElement;
+import org.libreoffice.report.pentaho.parser.text.NoCDATATextContentReadHandler;
 
 /**
  * A read handler for table-cell contents. This is basicly a text-content
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/table/TableColumnReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/table/TableColumnReadHandler.java
index 6c95744faf38..ba83447ea4f6 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/table/TableColumnReadHandler.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/table/TableColumnReadHandler.java
@@ -15,9 +15,9 @@
  *   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.pentaho.parser.table;
+package org.libreoffice.report.pentaho.parser.table;
 
-import com.sun.star.report.pentaho.parser.ElementReadHandler;
+import org.libreoffice.report.pentaho.parser.ElementReadHandler;
 
 import org.jfree.report.structure.Element;
 import org.jfree.report.structure.Section;
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/table/TableColumnsReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/table/TableColumnsReadHandler.java
index 5357b9c14011..d8e866991053 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/table/TableColumnsReadHandler.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/table/TableColumnsReadHandler.java
@@ -15,11 +15,11 @@
  *   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.pentaho.parser.table;
+package org.libreoffice.report.pentaho.parser.table;
 
-import com.sun.star.report.OfficeToken;
-import com.sun.star.report.pentaho.OfficeNamespaces;
-import com.sun.star.report.pentaho.parser.ElementReadHandler;
+import org.libreoffice.report.OfficeToken;
+import org.libreoffice.report.pentaho.OfficeNamespaces;
+import org.libreoffice.report.pentaho.parser.ElementReadHandler;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/table/TableReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/table/TableReadHandler.java
index 86f34922d581..eec0954eeff6 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/table/TableReadHandler.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/table/TableReadHandler.java
@@ -15,13 +15,13 @@
  *   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.pentaho.parser.table;
+package org.libreoffice.report.pentaho.parser.table;
 
-import com.sun.star.report.OfficeToken;
-import com.sun.star.report.pentaho.OfficeNamespaces;
-import com.sun.star.report.pentaho.model.OfficeTableSection;
-import com.sun.star.report.pentaho.parser.ElementReadHandler;
-import com.sun.star.report.pentaho.parser.rpt.ConditionalPrintExpressionReadHandler;
+import org.libreoffice.report.OfficeToken;
+import org.libreoffice.report.pentaho.OfficeNamespaces;
+import org.libreoffice.report.pentaho.model.OfficeTableSection;
+import org.libreoffice.report.pentaho.parser.ElementReadHandler;
+import org.libreoffice.report.pentaho.parser.rpt.ConditionalPrintExpressionReadHandler;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/table/TableRowReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/table/TableRowReadHandler.java
index fd48b7fa747f..413cfaefbb68 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/table/TableRowReadHandler.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/table/TableRowReadHandler.java
@@ -15,11 +15,11 @@
  *   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.pentaho.parser.table;
+package org.libreoffice.report.pentaho.parser.table;
 
-import com.sun.star.report.OfficeToken;
-import com.sun.star.report.pentaho.OfficeNamespaces;
-import com.sun.star.report.pentaho.parser.ElementReadHandler;
+import org.libreoffice.report.OfficeToken;
+import org.libreoffice.report.pentaho.OfficeNamespaces;
+import org.libreoffice.report.pentaho.parser.ElementReadHandler;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/table/TableRowsReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/table/TableRowsReadHandler.java
index ad196dc2e29f..019fdbdc8c34 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/table/TableRowsReadHandler.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/table/TableRowsReadHandler.java
@@ -15,11 +15,11 @@
  *   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.pentaho.parser.table;
+package org.libreoffice.report.pentaho.parser.table;
 
-import com.sun.star.report.OfficeToken;
-import com.sun.star.report.pentaho.OfficeNamespaces;
-import com.sun.star.report.pentaho.parser.ElementReadHandler;
+import org.libreoffice.report.OfficeToken;
+import org.libreoffice.report.pentaho.OfficeNamespaces;
+import org.libreoffice.report.pentaho.parser.ElementReadHandler;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/text/NoCDATATextContentReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/text/NoCDATATextContentReadHandler.java
index dbbbc807e2f1..fd05be68a572 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/text/NoCDATATextContentReadHandler.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/text/NoCDATATextContentReadHandler.java
@@ -16,15 +16,15 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-package com.sun.star.report.pentaho.parser.text;
-
-import com.sun.star.report.OfficeToken;
-import com.sun.star.report.pentaho.OfficeNamespaces;
-import com.sun.star.report.pentaho.parser.ElementReadHandler;
-import com.sun.star.report.pentaho.parser.rpt.FixedContentReadHandler;
-import com.sun.star.report.pentaho.parser.rpt.FormattedTextReadHandler;
-import com.sun.star.report.pentaho.parser.rpt.ImageReadHandler;
-import com.sun.star.report.pentaho.parser.rpt.SubDocumentReadHandler;
+package org.libreoffice.report.pentaho.parser.text;
+
+import org.libreoffice.report.OfficeToken;
+import org.libreoffice.report.pentaho.OfficeNamespaces;
+import org.libreoffice.report.pentaho.parser.ElementReadHandler;
+import org.libreoffice.report.pentaho.parser.rpt.FixedContentReadHandler;
+import org.libreoffice.report.pentaho.parser.rpt.FormattedTextReadHandler;
+import org.libreoffice.report.pentaho.parser.rpt.ImageReadHandler;
+import org.libreoffice.report.pentaho.parser.rpt.SubDocumentReadHandler;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/text/TextContentReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/text/TextContentReadHandler.java
index d50d15807102..08a410a5c7bc 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/text/TextContentReadHandler.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/text/TextContentReadHandler.java
@@ -15,7 +15,7 @@
  *   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.pentaho.parser.text;
+package org.libreoffice.report.pentaho.parser.text;
 
 import org.jfree.report.structure.Section;
 import org.jfree.report.structure.StaticText;
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/xlink/XLinkReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/xlink/XLinkReadHandler.java
index 15a980f7811c..beb57b2eabb9 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/xlink/XLinkReadHandler.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/xlink/XLinkReadHandler.java
@@ -15,9 +15,9 @@
  *   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.pentaho.parser.xlink;
+package org.libreoffice.report.pentaho.parser.xlink;
 
-import com.sun.star.report.pentaho.OfficeNamespaces;
+import org.libreoffice.report.pentaho.OfficeNamespaces;
 
 import org.pentaho.reporting.libraries.xmlns.parser.AbstractXmlReadHandler;
 
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/smil.css b/reportbuilder/java/org/libreoffice/report/pentaho/smil.css
index 54d59ac828e2..54d59ac828e2 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/smil.css
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/smil.css
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/star-office.css b/reportbuilder/java/org/libreoffice/report/pentaho/star-office.css
index 22d57ca05a18..22d57ca05a18 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/star-office.css
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/star-office.css
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/star-report.css b/reportbuilder/java/org/libreoffice/report/pentaho/star-report.css
index b063d3563dbc..b063d3563dbc 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/star-report.css
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/star-report.css
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/star-rpt.css b/reportbuilder/java/org/libreoffice/report/pentaho/star-rpt.css
index 47b6aca74d00..47b6aca74d00 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/star-rpt.css
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/star-rpt.css
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/styles/LengthCalculator.java b/reportbuilder/java/org/libreoffice/report/pentaho/styles/LengthCalculator.java
index db5ee11a29bc..d8ade2708f94 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/styles/LengthCalculator.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/styles/LengthCalculator.java
@@ -15,7 +15,7 @@
  *   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.pentaho.styles;
+package org.libreoffice.report.pentaho.styles;
 
 import org.jfree.layouting.input.style.values.CSSNumericType;
 import org.jfree.layouting.input.style.values.CSSNumericValue;
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMapper.java b/reportbuilder/java/org/libreoffice/report/pentaho/styles/StyleMapper.java
index f612af8ac865..9335309c720f 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMapper.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/styles/StyleMapper.java
@@ -15,7 +15,7 @@
  *   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.pentaho.styles;
+package org.libreoffice.report.pentaho.styles;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -80,7 +80,7 @@ public class StyleMapper
     public static StyleMapper loadInstance(final ResourceManager resourceManager)
             throws ResourceException
     {
-        final Resource resource = resourceManager.createDirectly("res://com/sun/star/report/pentaho/styles/stylemapper.xml", StyleMapper.class);
+        final Resource resource = resourceManager.createDirectly("res://org/libreoffice/report/pentaho/styles/stylemapper.xml", StyleMapper.class);
         return (StyleMapper) resource.getResource();
     }
 }
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMapperKey.java b/reportbuilder/java/org/libreoffice/report/pentaho/styles/StyleMapperKey.java
index d5a0d9b90a26..605df59aa36a 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMapperKey.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/styles/StyleMapperKey.java
@@ -15,7 +15,7 @@
  *   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.pentaho.styles;
+package org.libreoffice.report.pentaho.styles;
 
 /**
  * A hash key for the stylemapper.
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMapperXmlFactoryModule.java b/reportbuilder/java/org/libreoffice/report/pentaho/styles/StyleMapperXmlFactoryModule.java
index 34195011daed..979b4c13552d 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMapperXmlFactoryModule.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/styles/StyleMapperXmlFactoryModule.java
@@ -15,7 +15,7 @@
  *   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.pentaho.styles;
+package org.libreoffice.report.pentaho.styles;
 
 import org.pentaho.reporting.libraries.xmlns.parser.XmlDocumentInfo;
 import org.pentaho.reporting.libraries.xmlns.parser.XmlFactoryModule;
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMapperXmlResourceFactory.java b/reportbuilder/java/org/libreoffice/report/pentaho/styles/StyleMapperXmlResourceFactory.java
index bafeea4523ce..5ae6d1a2dd6e 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMapperXmlResourceFactory.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/styles/StyleMapperXmlResourceFactory.java
@@ -15,7 +15,7 @@
  *   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.pentaho.styles;
+package org.libreoffice.report.pentaho.styles;
 
 import org.jfree.report.JFreeReportBoot;
 
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMappingDocumentReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/styles/StyleMappingDocumentReadHandler.java
index 57d05fb24767..e96f89d92fbb 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMappingDocumentReadHandler.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/styles/StyleMappingDocumentReadHandler.java
@@ -15,7 +15,7 @@
  *   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.pentaho.styles;
+package org.libreoffice.report.pentaho.styles;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMappingReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/styles/StyleMappingReadHandler.java
index 0b0ccbddd629..8c3fbc1ba98e 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMappingReadHandler.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/styles/StyleMappingReadHandler.java
@@ -15,7 +15,7 @@
  *   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.pentaho.styles;
+package org.libreoffice.report.pentaho.styles;
 
 import org.pentaho.reporting.libraries.xmlns.parser.AbstractXmlReadHandler;
 import org.pentaho.reporting.libraries.xmlns.parser.ParseException;
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMappingRule.java b/reportbuilder/java/org/libreoffice/report/pentaho/styles/StyleMappingRule.java
index 7a486e07786c..6e5e7512a08f 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMappingRule.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/styles/StyleMappingRule.java
@@ -15,7 +15,7 @@
  *   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.pentaho.styles;
+package org.libreoffice.report.pentaho.styles;
 
 /**
  * Todo: Document me!
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/styles/stylemapper.xml b/reportbuilder/java/org/libreoffice/report/pentaho/styles/stylemapper.xml
index 8e5e5bc49aab..8e5e5bc49aab 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/styles/stylemapper.xml
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/styles/stylemapper.xml
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/styles/stylemapper.xsd b/reportbuilder/java/org/libreoffice/report/pentaho/styles/stylemapper.xsd
index feb7234e83c0..feb7234e83c0 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/styles/stylemapper.xsd
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/styles/stylemapper.xsd
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/svg.css b/reportbuilder/java/org/libreoffice/report/pentaho/svg.css
index ebe16e30b115..ebe16e30b115 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/svg.css
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/svg.css
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/xsl-fo.css b/reportbuilder/java/org/libreoffice/report/pentaho/xsl-fo.css
index f030a3872481..f030a3872481 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/xsl-fo.css
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/xsl-fo.css
diff --git a/reportbuilder/java/com/sun/star/report/util/DefaultJobProperties.java b/reportbuilder/java/org/libreoffice/report/util/DefaultJobProperties.java
index 0775c79dd33d..ce0ea8dce131 100644
--- a/reportbuilder/java/com/sun/star/report/util/DefaultJobProperties.java
+++ b/reportbuilder/java/org/libreoffice/report/util/DefaultJobProperties.java
@@ -15,11 +15,11 @@
  *   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.util;
+package org.libreoffice.report.util;
 
-import com.sun.star.report.JobDefinitionException;
-import com.sun.star.report.JobProperties;
-import com.sun.star.report.ReportEngineMetaData;
+import org.libreoffice.report.JobDefinitionException;
+import org.libreoffice.report.JobProperties;
+import org.libreoffice.report.ReportEngineMetaData;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/reportbuilder/java/com/sun/star/report/util/DefaultParameterMap.java b/reportbuilder/java/org/libreoffice/report/util/DefaultParameterMap.java
index 61e71b33db0c..3eca2872be83 100644
--- a/reportbuilder/java/com/sun/star/report/util/DefaultParameterMap.java
+++ b/reportbuilder/java/org/libreoffice/report/util/DefaultParameterMap.java
@@ -15,9 +15,9 @@
  *   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.util;
+package org.libreoffice.report.util;
 
-import com.sun.star.report.ParameterMap;
+import org.libreoffice.report.ParameterMap;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/reportbuilder/java/com/sun/star/report/util/DefaultReportJobDefinition.java b/reportbuilder/java/org/libreoffice/report/util/DefaultReportJobDefinition.java
index 8fdef315b253..4f24dd99d474 100644
--- a/reportbuilder/java/com/sun/star/report/util/DefaultReportJobDefinition.java
+++ b/reportbuilder/java/org/libreoffice/report/util/DefaultReportJobDefinition.java
@@ -15,17 +15,17 @@
  *   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.util;
+package org.libreoffice.report.util;
 
-import com.sun.star.report.DataSourceFactory;
-import com.sun.star.report.InputRepository;
-import com.sun.star.report.JobDefinitionException;
-import com.sun.star.report.JobProperties;
-import com.sun.star.report.OutputRepository;
-import com.sun.star.report.ParameterMap;
-import com.sun.star.report.ReportEngineMetaData;
-import com.sun.star.report.ReportEngineParameterNames;
-import com.sun.star.report.ReportJobDefinition;
+import org.libreoffice.report.DataSourceFactory;
+import org.libreoffice.report.InputRepository;
+import org.libreoffice.report.JobDefinitionException;
+import org.libreoffice.report.JobProperties;
+import org.libreoffice.report.OutputRepository;
+import org.libreoffice.report.ParameterMap;
+import org.libreoffice.report.ReportEngineMetaData;
+import org.libreoffice.report.ReportEngineParameterNames;
+import org.libreoffice.report.ReportJobDefinition;
 
 public class DefaultReportJobDefinition implements ReportJobDefinition
 {
diff --git a/reportbuilder/java/com/sun/star/report/util/ManifestWriter.java b/reportbuilder/java/org/libreoffice/report/util/ManifestWriter.java
index afae91286ab6..3be716971158 100644
--- a/reportbuilder/java/com/sun/star/report/util/ManifestWriter.java
+++ b/reportbuilder/java/org/libreoffice/report/util/ManifestWriter.java
@@ -15,9 +15,9 @@
  *   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.util;
+package org.libreoffice.report.util;
 
-import com.sun.star.report.OutputRepository;
+import org.libreoffice.report.OutputRepository;
 
 import java.io.IOException;
 import java.io.OutputStream;
@@ -44,7 +44,7 @@ public class ManifestWriter
     // need this two strings other it breaks the ooo build :-(
 
     public static final String MANIFEST_NS = "urn:oasis:names:tc:opendocument:xmlns:manifest:1.0";
-    public static final String TAG_DEF_PREFIX = "com.sun.star.report.pentaho.output.";
+    public static final String TAG_DEF_PREFIX = "org.libreoffice.report.pentaho.output.";
     private final Map<String,String> entries;
 
     public ManifestWriter()
diff --git a/reportbuilder/registry/data/org/openoffice/Office/DataAccess.xcu b/reportbuilder/registry/data/org/openoffice/Office/DataAccess.xcu
index 1f1dd092e2a6..dc22b85744a6 100644
--- a/reportbuilder/registry/data/org/openoffice/Office/DataAccess.xcu
+++ b/reportbuilder/registry/data/org/openoffice/Office/DataAccess.xcu
@@ -27,7 +27,7 @@
                 <value>Pentaho Reporting Flow Engine</value>
             </prop>
             <prop oor:name="ServiceName" oor:type="xs:string">
-                <value>com.sun.star.report.pentaho.SOReportJobFactory</value>
+                <value>org.libreoffice.report.pentaho.SOReportJobFactory</value>
             </prop>
         </node>
     </node>
diff --git a/reportbuilder/util/components.rdb b/reportbuilder/util/components.rdb
index edf66caaab65..b49abce1a3ea 100644
--- a/reportbuilder/util/components.rdb
+++ b/reportbuilder/util/components.rdb
@@ -8,15 +8,15 @@
  *
 -->
 <components xmlns="http://openoffice.org/2010/uno-components">
-    <component loader="com.sun.star.loader.Java2" uri="./sun-report-builder.jar">
-        <implementation name="com.sun.star.report.pentaho.SOFormulaParser">
+    <component loader="com.sun.star.loader.Java2" uri="./report-builder.jar">
+        <implementation name="org.libreoffice.report.pentaho.SOFormulaParser">
             <service name="com.sun.star.report.meta.FormulaParser"/>
         </implementation>
-        <implementation name="com.sun.star.report.pentaho.SOFunctionManager">
+        <implementation name="org.libreoffice.report.pentaho.SOFunctionManager">
             <service name="com.sun.star.report.meta.FunctionManager"/>
         </implementation>
-        <implementation name="com.sun.star.report.pentaho.SOReportJobFactory$_SOReportJobFactory">
-            <service name="com.sun.star.report.pentaho.SOReportJobFactory"/>
+        <implementation name="org.libreoffice.report.pentaho.SOReportJobFactory$_SOReportJobFactory">
+            <service name="org.libreoffice.report.pentaho.SOReportJobFactory"/>
         </implementation>
     </component>
 </components>
diff --git a/reportbuilder/util/description.xml b/reportbuilder/util/description.xml
index c120c122abbe..3ea03d6d700e 100644
--- a/reportbuilder/util/description.xml
+++ b/reportbuilder/util/description.xml
@@ -22,7 +22,7 @@
   <display-name>
     <name lang="en-US">Report Builder</name>
   </display-name>
-  <version value="1.2.3"/>
+  <version value="1.2.4"/>
   <identifier value="com.sun.reportdesigner"/>
   <dependencies>
     <OpenOffice.org-minimal-version value="3.2" d:name="OpenOffice.org 3.2"/>
diff --git a/reportbuilder/util/manifest.mf b/reportbuilder/util/manifest.mf
index fb497ae71494..2b335b640796 100644
--- a/reportbuilder/util/manifest.mf
+++ b/reportbuilder/util/manifest.mf
@@ -1,2 +1,2 @@
-RegistrationClassName: com.sun.star.report.pentaho.SOReportJobFactory
+RegistrationClassName: org.libreoffice.report.pentaho.SOReportJobFactory
 UNO-Type-Path:
author	David Ostrovsky <david@ostrovsky.org>	2013-03-07 08:17:56 +0100
committer	David Ostrovsky <David.Ostrovsky@gmx.de>	2013-03-11 08:56:40 +0000
commit	6f28efc2a8a559cc8c37aa883f4de0b59d4fc79c (patch)
tree	c99e9f01d5f52daad04aa1f51e3bc53e78c073fb /reportbuilder
parent	ab8f432b3382967f87967495b0b0e4c17f082da5 (diff)