gnumake4: converted reportdesign [hg:e3de7a65caba]

142 files changed, 937 insertions, 960 deletions

diff --git a/dbaccess/AllLangResTarget_adabasui.mk b/dbaccess/AllLangResTarget_adabasui.mk
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/dbaccess/AllLangResTarget_adabasui.mk
diff --git a/dbaccess/AllLangResTarget_dba.mk b/dbaccess/AllLangResTarget_dba.mk
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/dbaccess/AllLangResTarget_dba.mk
diff --git a/dbaccess/AllLangResTarget_dbmm.mk b/dbaccess/AllLangResTarget_dbmm.mk
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/dbaccess/AllLangResTarget_dbmm.mk
diff --git a/dbaccess/AllLangResTarget_dbui.mk b/dbaccess/AllLangResTarget_dbui.mk
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/dbaccess/AllLangResTarget_dbui.mk
diff --git a/dbaccess/AllLangResTarget_sdbt.mk b/dbaccess/AllLangResTarget_sdbt.mk
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/dbaccess/AllLangResTarget_sdbt.mk
diff --git a/dbaccess/JunitTest_dbaccess_complex.mk b/dbaccess/JunitTest_dbaccess_complex.mk
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/dbaccess/JunitTest_dbaccess_complex.mk
diff --git a/dbaccess/JunitTest_dbaccess_unoapi.mk b/dbaccess/JunitTest_dbaccess_unoapi.mk
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/dbaccess/JunitTest_dbaccess_unoapi.mk
diff --git a/dbaccess/Library_adabasui.mk b/dbaccess/Library_adabasui.mk
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/dbaccess/Library_adabasui.mk
diff --git a/dbaccess/Library_dba.mk b/dbaccess/Library_dba.mk
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/dbaccess/Library_dba.mk
diff --git a/dbaccess/Library_dbaxml.mk b/dbaccess/Library_dbaxml.mk
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/dbaccess/Library_dbaxml.mk
diff --git a/dbaccess/Library_dbmm.mk b/dbaccess/Library_dbmm.mk
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/dbaccess/Library_dbmm.mk
diff --git a/dbaccess/Library_dbui.mk b/dbaccess/Library_dbui.mk
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/dbaccess/Library_dbui.mk
diff --git a/dbaccess/Library_sdbt.mk b/dbaccess/Library_sdbt.mk
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/dbaccess/Library_sdbt.mk
diff --git a/dbaccess/Module_dbaccess.mk b/dbaccess/Module_dbaccess.mk
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/dbaccess/Module_dbaccess.mk
diff --git a/dbaccess/Package_inc.mk b/dbaccess/Package_inc.mk
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/dbaccess/Package_inc.mk
diff --git a/reportdesign/AllLangResTarget_rpt.mk b/reportdesign/AllLangResTarget_rpt.mk
new file mode 100644
index 000000000..034e4cda9
--- /dev/null
+++ b/reportdesign/AllLangResTarget_rpt.mk
@@ -0,0 +1,47 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2011 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platdbam office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS dba A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 dba more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# dba a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+$(eval $(call gb_AllLangResTarget_AllLangResTarget,rpt))
+
+$(eval $(call gb_AllLangResTarget_set_reslocation,rpt,reportdesign))
+
+$(eval $(call gb_AllLangResTarget_add_srs,rpt,reportdesign/rpt))
+
+$(eval $(call gb_SrsTarget_SrsTarget,reportdesign/rpt))
+
+$(eval $(call gb_SrsTarget_set_include,reportdesign/rpt,\
+	$$(INCLUDE) \
+	-I$(OUTDIR)/inc \
+	-I$(SRCDIR)/reportdesign/source/core/inc \
+	-I$(SRCDIR)/reportdesign/inc \
+))
+
+$(eval $(call gb_SrsTarget_add_files,reportdesign/rpt,\
+	reportdesign/source/core/resource/strings.src \

+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/reportdesign/qa/complex/reportdesign/makefile.mk b/reportdesign/AllLangResTarget_rptui.mk
index 4174eb02c..ffc76e509 100755..100644
--- a/reportdesign/qa/complex/reportdesign/makefile.mk
+++ b/reportdesign/AllLangResTarget_rptui.mk
@@ -2,7 +2,7 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
+# Copyright 2000, 2011 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
@@ -25,38 +25,32 @@
 #
 #*************************************************************************
 
-.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
-nothing .PHONY:
-.ELSE
+$(eval $(call gb_AllLangResTarget_AllLangResTarget,rptui))
 
-PRJ = ../../..
-PRJNAME = reportdesign
-TARGET = qa_complex_reportdesign
+$(eval $(call gb_AllLangResTarget_set_reslocation,rptui,reportdesign))
 
-.IF "$(OOO_JUNIT_JAR)" != ""
-PACKAGE = complex/reportdesign
+$(eval $(call gb_AllLangResTarget_add_srs,rptui,reportdesign/rptui))
 
-# here store only Files which contain a @Test
-JAVATESTFILES = \
-    ReportDesignerTest.java
+$(eval $(call gb_SrsTarget_SrsTarget,reportdesign/rptui))
 
-# put here all other files
-JAVAFILES = $(JAVATESTFILES) \
-    TestDocument.java \
-    FileURL.java
+$(eval $(call gb_SrsTarget_set_include,reportdesign/rptui,\
+	$$(INCLUDE) \
+	-I$(OUTDIR)/inc \
+	-I$(WORKDIR)/inc/reportdesign \
+	-I$(SRCDIR)/reportdesign/source/ui/inc \
+	-I$(SRCDIR)/reportdesign/inc \
+))
 
-JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar
-EXTRAJARFILES = $(OOO_JUNIT_JAR)
 
-# Sample how to debug
-# JAVAIFLAGS=-Xdebug  -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y
+$(eval $(call gb_SrsTarget_add_files,reportdesign/rptui,\
+	reportdesign/source/ui/dlg/dlgpage.src	\
+	reportdesign/source/ui/dlg/PageNumber.src	\
+	reportdesign/source/ui/dlg/DateTime.src	\
+	reportdesign/source/ui/dlg/CondFormat.src	\
+	reportdesign/source/ui/dlg/Navigator.src	\
+	reportdesign/source/ui/dlg/GroupsSorting.src \
+	reportdesign/source/ui/inspection/inspection.src \
+	reportdesign/source/ui/report/report.src \
+))
 
-.END
-
-.INCLUDE: settings.mk
-.INCLUDE: target.mk
-.INCLUDE: installationtest.mk
-
-ALLTAR : javatest
-
-.END
+# vim: set noet sw=4 ts=4:
diff --git a/reportdesign/JunitTest_reportdesign_complex.mk b/reportdesign/JunitTest_reportdesign_complex.mk
new file mode 100644
index 000000000..a38f04f54
--- /dev/null
+++ b/reportdesign/JunitTest_reportdesign_complex.mk
@@ -0,0 +1,48 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2011 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+$(eval $(call gb_JunitTest_JunitTest,reportdesign_complex))
+
+$(eval $(call gb_JunitTest_add_sourcefiles,reportdesign_complex,\
+	reportdesign/qa/complex/reportdesign/ReportDesignerTest \
+	reportdesign/qa/complex/reportdesign/TestDocument \
+	reportdesign/qa/complex/reportdesign/FileURL \
+))
+
+$(eval $(call gb_JunitTest_add_jars,reportdesign_complex,\
+	$(OUTDIR)/bin/OOoRunner.jar \
+	$(OUTDIR)/bin/ridl.jar \
+	$(OUTDIR)/bin/test.jar \
+	$(OUTDIR)/bin/unoil.jar \
+	$(OUTDIR)/bin/jurt.jar \
+))
+
+$(eval $(call gb_JunitTest_add_classes,reportdesign_complex,\
+	complex.reportdesign.ReportDesignerTest \
+))
+
+# vim: set noet reportdesign=4 ts=4:
diff --git a/reportdesign/Library_rpt.mk b/reportdesign/Library_rpt.mk
new file mode 100644
index 000000000..1271ca631
--- /dev/null
+++ b/reportdesign/Library_rpt.mk
@@ -0,0 +1,114 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2011 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+$(eval $(call gb_Library_Library,rpt))
+$(eval $(call gb_Library_add_package_headers,rpt,reportdesign_inc))

+$(eval $(call gb_Library_add_precompiled_header,rpt,$(SRCDIR)/reportdesign/inc/pch/precompiled_reportdesign))

+
+$(eval $(call gb_Library_set_componentfile,rpt,reportdesign/util/rpt))
+
+$(eval $(call gb_Library_set_include,rpt,\
+	-I$(SRCDIR)/reportdesign/inc \
+	-I$(SRCDIR)/reportdesign/source/core/inc \
+	-I$(SRCDIR)/reportdesign/source/inc \
+	-I$(SRCDIR)/reportdesign/inc/pch \
+	$$(SOLARINC) \
+	-I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_set_defs,rpt,\
+	$$(DEFS) \
+	-DREPORTDESIGN_DLLIMPLEMENTATION \
+))
+
+$(eval $(call gb_Library_add_linked_libs,rpt,\
+	editeng \
+	sb \
+	tl \
+	svt \
+	svl \
+	cppuhelper \
+	cppu \
+	comphelper \
+	dbtools \
+	dbui \
+	utl \
+	vcl \
+	sal \
+	stl \
+	i18nisolang1 \
+	ucbhelper \
+	sfx \
+	salhelper \
+	fwe \
+	svx \
+	svxcore \
+	tk \
+    $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,rpt,\
+		reportdesign/source/core/api/FormattedField		\
+		reportdesign/source/core/api/Groups				\
+		reportdesign/source/core/api/Group				\
+		reportdesign/source/core/api/Section				\
+		reportdesign/source/core/api/services			\
+		reportdesign/source/core/api/FixedText			\
+		reportdesign/source/core/api/ImageControl		\
+		reportdesign/source/core/api/ReportDefinition	\
+		reportdesign/source/core/api/ReportComponent		\
+		reportdesign/source/core/api/ReportEngineJFree	\
+		reportdesign/source/core/api/Tools				\
+		reportdesign/source/core/api/Function			\
+		reportdesign/source/core/api/Functions			\
+		reportdesign/source/core/api/ReportControlModel	\
+		reportdesign/source/core/api/FormatCondition		\
+		reportdesign/source/core/api/ReportVisitor		\
+		reportdesign/source/core/api/Shape				\
+		reportdesign/source/core/api/FixedLine \
+		reportdesign/source/core/misc/conditionalexpression \
+        reportdesign/source/core/misc/conditionupdater \
+        reportdesign/source/core/misc/reportformula \
+		reportdesign/source/core/resource/core_resource \
+		reportdesign/source/core/sdr/RptModel			\
+		reportdesign/source/core/sdr/RptPage				\
+		reportdesign/source/core/sdr/UndoActions			\
+		reportdesign/source/core/sdr/RptObject			\
+		reportdesign/source/core/sdr/RptObjectListener	\
+		reportdesign/source/core/sdr/ModuleHelper		\
+		reportdesign/source/core/sdr/PropertyForward		\
+		reportdesign/source/core/sdr/ReportDrawPage		\
+		reportdesign/source/core/sdr/ReportUndoFactory   \
+		reportdesign/source/core/sdr/UndoEnv \
+		reportdesign/source/core/sdr/formatnormalizer \
+))
+
+$(eval $(call gb_Library_add_noexception_objects,rpt,\
+	reportdesign/source/shared/corestrings	\
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/reportdesign/Library_rptui.mk b/reportdesign/Library_rptui.mk
new file mode 100644
index 000000000..5dcf8709f
--- /dev/null
+++ b/reportdesign/Library_rptui.mk
@@ -0,0 +1,117 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2011 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+$(eval $(call gb_Library_Library,rptui))
+$(eval $(call gb_Library_add_package_headers,rptui,reportdesign_inc))

+$(eval $(call gb_Library_add_precompiled_header,rptui,$(SRCDIR)/reportdesign/inc/pch/precompiled_rptui))

+
+$(eval $(call gb_Library_set_componentfile,rptui,reportdesign/util/rptui))
+
+$(eval $(call gb_Library_set_include,rptui,\
+	-I$(SRCDIR)/reportdesign/inc \
+	-I$(SRCDIR)/reportdesign/source/ui/inc \
+	-I$(SRCDIR)/reportdesign/source/inc \
+	-I$(SRCDIR)/reportdesign/inc/pch \
+	$$(SOLARINC) \
+	-I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_add_linked_libs,rptui,\
+	editeng \
+	comphelper \
+	cppuhelper \
+	cppu \
+	dbtools \
+	i18nisolang1 \
+	fwe \
+	sal \
+	salhelper \
+	sfx \
+	svl \
+	svt \
+	stl \
+	vcl \
+	for \
+	tl \
+	utl \
+	ucbhelper \
+	svxcore \
+	svx \
+	tk \
+	sot \
+	dba \
+	vos3 \
+	forui \
+	dbui \
+	rpt \
+    $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,rptui,\
+	reportdesign/source/ui/dlg/dlgpage					\
+	reportdesign/source/ui/dlg/Condition				\
+	reportdesign/source/ui/dlg/CondFormat				\
+	reportdesign/source/ui/dlg/GroupExchange			\
+	reportdesign/source/ui/dlg/PageNumber				\
+	reportdesign/source/ui/dlg/DateTime				\
+	reportdesign/source/ui/dlg/AddField				\
+	reportdesign/source/ui/dlg/Navigator				\
+	reportdesign/source/ui/dlg/GroupsSorting           \
+	reportdesign/source/ui/dlg/Formula \
+	reportdesign/source/ui/inspection/DefaultInspection		\
+	reportdesign/source/ui/inspection/ReportComponentHandler	\
+	reportdesign/source/ui/inspection/GeometryHandler			\
+	reportdesign/source/ui/inspection/DataProviderHandler		\
+	reportdesign/source/ui/inspection/metadata \
+	reportdesign/source/ui/misc/RptUndo					\
+	reportdesign/source/ui/misc/ColorListener			\
+	reportdesign/source/ui/misc/UITools					\
+	reportdesign/source/ui/misc/rptuiservices			\
+	reportdesign/source/ui/misc/toolboxcontroller		\
+	reportdesign/source/ui/misc/statusbarcontroller		\
+	reportdesign/source/ui/misc/FunctionHelper \
+	reportdesign/source/ui/report/SectionWindow			\
+	reportdesign/source/ui/report/ReportController		\
+	reportdesign/source/ui/report/ReportControllerObserver \
+	reportdesign/source/ui/report/FormattedFieldBeautifier \
+	reportdesign/source/ui/report/FixedTextColor           \
+	reportdesign/source/ui/report/ReportSection			\
+	reportdesign/source/ui/report/SectionView				\
+	reportdesign/source/ui/report/ViewsWindow				\
+	reportdesign/source/ui/report/ScrollHelper			\
+	reportdesign/source/ui/report/StartMarker				\
+	reportdesign/source/ui/report/EndMarker				\
+	reportdesign/source/ui/report/dlgedfunc				\
+	reportdesign/source/ui/report/dlgedfac				\
+	reportdesign/source/ui/report/dlgedclip				\
+	reportdesign/source/ui/report/ReportWindow			\
+	reportdesign/source/ui/report/DesignView				\
+	reportdesign/source/ui/report/propbrw \
+	reportdesign/source/shared/uistrings \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/reportdesign/Library_rptxml.mk b/reportdesign/Library_rptxml.mk
new file mode 100644
index 000000000..dcabec70d
--- /dev/null
+++ b/reportdesign/Library_rptxml.mk
@@ -0,0 +1,99 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2011 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+$(eval $(call gb_Library_Library,rptxml))
+$(eval $(call gb_Library_add_package_headers,rptxml,reportdesign_inc))

+$(eval $(call gb_Library_add_precompiled_header,rptxml,$(SRCDIR)/reportdesign/inc/pch/precompiled_rptxml))

+
+$(eval $(call gb_Library_set_componentfile,rptxml,reportdesign/source/filter/xml/rptxml))
+
+$(eval $(call gb_Library_set_include,rptxml,\
+	-I$(SRCDIR)/reportdesign/inc \
+	-I$(SRCDIR)/reportdesign/source/filter/xml \
+	-I$(SRCDIR)/reportdesign/source/inc \
+	-I$(SRCDIR)/reportdesign/inc/pch \
+	$$(SOLARINC) \
+	-I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_add_linked_libs,rptxml,\
+	tl \
+	svl \
+	cppuhelper \
+	cppu \
+	comphelper \
+	utl \
+	vcl \
+	sal \
+	sfx \
+	dbtools \
+	xo \
+	sot \
+	tk \
+	dba \
+	stl \
+	editeng \
+	rpt \
+    $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,rptxml,\
+	reportdesign/source/filter/xml/xmlfilter				\
+	reportdesign/source/filter/xml/xmlReport				\
+	reportdesign/source/filter/xml/xmlMasterFields			\
+	reportdesign/source/filter/xml/xmlGroup				\
+	reportdesign/source/filter/xml/xmlHelper				\
+	reportdesign/source/filter/xml/xmlSection				\
+	reportdesign/source/filter/xml/xmlComponent			\
+	reportdesign/source/filter/xml/xmlControlProperty		\
+	reportdesign/source/filter/xml/xmlFormattedField		\
+	reportdesign/source/filter/xml/xmlReportElement		\
+	reportdesign/source/filter/xml/xmlReportElementBase	\
+	reportdesign/source/filter/xml/xmlCondPrtExpr			\
+	reportdesign/source/filter/xml/xmlImage				\
+	reportdesign/source/filter/xml/xmlFunction				\
+	reportdesign/source/filter/xml/xmlStyleImport			\
+	reportdesign/source/filter/xml/xmlAutoStyle			\
+	reportdesign/source/filter/xml/xmlExport				\
+	reportdesign/source/filter/xml/dbloader2				\
+	reportdesign/source/filter/xml/xmlFormatCondition		\
+	reportdesign/source/filter/xml/xmlPropertyHandler		\
+	reportdesign/source/filter/xml/xmlColumn				\
+	reportdesign/source/filter/xml/xmlCell					\
+	reportdesign/source/filter/xml/xmlTable				\
+	reportdesign/source/filter/xml/xmlFixedContent			\
+	reportdesign/source/filter/xml/xmlSubDocument			\
+	reportdesign/source/filter/xml/xmlservices				\
+	reportdesign/source/filter/xml/xmlImportDocumentHandler \
+	reportdesign/source/filter/xml/xmlExportDocumentHandler \
+))
+
+$(eval $(call gb_Library_add_noexception_objects,rptxml, \
+	reportdesign/source/shared/xmlstrings \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/reportdesign/source/core/resource/makefile.mk b/reportdesign/Makefile
index d80adb525..90947b2e5 100644
--- a/reportdesign/source/core/resource/makefile.mk
+++ b/reportdesign/Makefile
@@ -2,7 +2,7 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
+# Copyright 2000, 2011 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
@@ -25,24 +25,14 @@
 #
 #*************************************************************************
 
-PRJ=..$/..$/..
-PRJINC=$(PRJ)$/source
-PRJNAME=reportdesign
-TARGET=core_resource
-ENABLE_EXCEPTIONS=TRUE
-# --- Settings -----------------------------------------------------
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set!)
+endif
 
-.INCLUDE :  settings.mk
-.INCLUDE : $(PRJ)$/util$/dll.pmk
+gb_PARTIALBUILD := T
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
 
-# --- Files --------------------------------------------------------
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
 
-SRS1NAME=core_strings
-SRC1FILES= \
-    strings.src 	\
-
-SLOFILES=	$(SLO)$/core_resource.obj \
-
-# --- Targets ----------------------------------
-
-.INCLUDE :  target.mk
+# vim: set noet sw=4 ts=4:
diff --git a/reportdesign/source/core/misc/makefile.mk b/reportdesign/Module_reportdesign.mk
index 749eb8214..8089c23dd 100644
--- a/reportdesign/source/core/misc/makefile.mk
+++ b/reportdesign/Module_reportdesign.mk
@@ -2,7 +2,7 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
+# Copyright 2000, 2011 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
@@ -25,22 +25,19 @@
 #
 #*************************************************************************
 
-PRJ=..$/..$/..
-PRJINC=$(PRJ)$/source
-PRJNAME=reportdesign
-TARGET=core_misc
-ENABLE_EXCEPTIONS=TRUE
+$(eval $(call gb_Module_Module,reportdesign))
 
-# --- Settings -----------------------------------------------------
-.INCLUDE :  settings.mk
-.INCLUDE : $(PRJ)$/util$/dll.pmk
+$(eval $(call gb_Module_add_targets,reportdesign,\
+	AllLangResTarget_rpt\

+	AllLangResTarget_rptui\

+	Library_rpt\

+	Library_rptxml\

+	Library_rptui\

+	Package_uiconfig \
+	Package_xml \
+))
 
-# --- Files --------------------------------------------------------
-
-SLOFILES=	$(SLO)$/conditionalexpression.obj \
-            $(SLO)$/conditionupdater.obj \
-            $(SLO)$/reportformula.obj
-
-# --- Targets ----------------------------------
-
-.INCLUDE :  target.mk
+$(eval $(call gb_Module_add_subsequentcheck_targets,reportdesign,\
+	JunitTest_reportdesign_complex \
+))
+# vim: set noet ts=4 sw=4:
diff --git a/reportdesign/Package_uiconfig.mk b/reportdesign/Package_uiconfig.mk
new file mode 100644
index 000000000..0d867ee1c
--- /dev/null
+++ b/reportdesign/Package_uiconfig.mk
@@ -0,0 +1,45 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2011 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+$(eval $(call gb_Package_Package,reportdesign_uiconfig,$(SRCDIR)/reportdesign/uiconfig))
+
+$(eval $(call gb_Package_add_file,reportdesign_uiconfig,xml/uiconfig/modules/dbreport/menubar/menubar.xml,dbreport/menubar/menubar.xml))
+$(eval $(call gb_Package_add_file,reportdesign_uiconfig,xml/uiconfig/modules/dbreport/statusbar/statusbar.xml,dbreport/statusbar/statusbar.xml))
+$(eval $(call gb_Package_add_file,reportdesign_uiconfig,xml/uiconfig/modules/dbreport/toolbar/toolbar.xml,dbreport/toolbar/toolbar.xml))
+$(eval $(call gb_Package_add_file,reportdesign_uiconfig,xml/uiconfig/modules/dbreport/toolbar/Formatting.xml,dbreport/toolbar/Formatting.xml))

+$(eval $(call gb_Package_add_file,reportdesign_uiconfig,xml/uiconfig/modules/dbreport/toolbar/alignmentbar.xml,dbreport/toolbar/alignmentbar.xml))

+$(eval $(call gb_Package_add_file,reportdesign_uiconfig,xml/uiconfig/modules/dbreport/toolbar/arrowshapes.xml,dbreport/toolbar/arrowshapes.xml))

+$(eval $(call gb_Package_add_file,reportdesign_uiconfig,xml/uiconfig/modules/dbreport/toolbar/basicshapes.xml,dbreport/toolbar/basicshapes.xml))

+$(eval $(call gb_Package_add_file,reportdesign_uiconfig,xml/uiconfig/modules/dbreport/toolbar/calloutshapes.xml,dbreport/toolbar/calloutshapes.xml))

+$(eval $(call gb_Package_add_file,reportdesign_uiconfig,xml/uiconfig/modules/dbreport/toolbar/drawbar.xml,dbreport/toolbar/drawbar.xml))

+$(eval $(call gb_Package_add_file,reportdesign_uiconfig,xml/uiconfig/modules/dbreport/toolbar/flowchartshapes.xml,dbreport/toolbar/flowchartshapes.xml))

+$(eval $(call gb_Package_add_file,reportdesign_uiconfig,xml/uiconfig/modules/dbreport/toolbar/reportcontrols.xml,dbreport/toolbar/reportcontrols.xml))

+$(eval $(call gb_Package_add_file,reportdesign_uiconfig,xml/uiconfig/modules/dbreport/toolbar/resizebar.xml,dbreport/toolbar/resizebar.xml))

+$(eval $(call gb_Package_add_file,reportdesign_uiconfig,xml/uiconfig/modules/dbreport/toolbar/sectionalignmentbar.xml,dbreport/toolbar/sectionalignmentbar.xml))

+$(eval $(call gb_Package_add_file,reportdesign_uiconfig,xml/uiconfig/modules/dbreport/toolbar/sectionshrinkbar.xml,dbreport/toolbar/sectionshrinkbar.xml))

+$(eval $(call gb_Package_add_file,reportdesign_uiconfig,xml/uiconfig/modules/dbreport/toolbar/starshapes.xml,dbreport/toolbar/starshapes.xml))

+$(eval $(call gb_Package_add_file,reportdesign_uiconfig,xml/uiconfig/modules/dbreport/toolbar/symbolshapes.xml,dbreport/toolbar/symbolshapes.xml))

diff --git a/reportdesign/source/ui/inspection/makefile.mk b/reportdesign/Package_xml.mk
index cd2c6e9e5..627223f60 100644
--- a/reportdesign/source/ui/inspection/makefile.mk
+++ b/reportdesign/Package_xml.mk
@@ -2,7 +2,7 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
+# Copyright 2000, 2011 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
@@ -25,29 +25,5 @@
 #
 #*************************************************************************
 
-PRJ=..$/..$/..
-PRJINC=$(PRJ)$/source
-PRJNAME=reportdesign
-TARGET=ui_inspection
-ENABLE_EXCEPTIONS=TRUE
-VISIBILITY_HIDDEN=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES=\
-    $(SLO)$/DefaultInspection.obj		\
-    $(SLO)$/ReportComponentHandler.obj	\
-    $(SLO)$/GeometryHandler.obj			\
-    $(SLO)$/DataProviderHandler.obj		\
-    $(SLO)$/metadata.obj
-
-
-SRS1NAME=$(TARGET)
-SRC1FILES =  inspection.src
-# --- Targets ----------------------------------
-
-.INCLUDE :  target.mk
+$(eval $(call gb_Package_Package,reportdesign_xml,$(SRCDIR)/reportdesign/prj))
+$(eval $(call gb_Package_add_file,reportdesign_xml,prj/rpt.xml,rpt.xml))
diff --git a/reportdesign/inc/pch/precompiled_reportdesign.hxx b/reportdesign/inc/pch/precompiled_reportdesign.hxx
index 344ffc5cf..30f208343 100644
--- a/reportdesign/inc/pch/precompiled_reportdesign.hxx
+++ b/reportdesign/inc/pch/precompiled_reportdesign.hxx
@@ -33,6 +33,35 @@
 #include "com/sun/star/chart2/data/XDataReceiver.hpp"
 #include "com/sun/star/reflection/XProxyFactory.hpp"
 #include "com/sun/star/sdb/CommandType.hpp"
+#include "com/sun/star/report/XFormatCondition.hpp"

+#include "com/sun/star/report/XFunction.hpp"

+#include "com/sun/star/report/XReportComponent.hpp"

+#include <com/sun/star/report/ForceNewPage.hpp>

+#include <com/sun/star/report/GroupKeepTogether.hpp>

+#include <com/sun/star/report/GroupOn.hpp>

+#include <com/sun/star/report/KeepTogether.hpp>

+#include <com/sun/star/report/ReportPrintOption.hpp>

+#include <com/sun/star/report/XFixedLine.hpp>

+#include <com/sun/star/report/XFixedText.hpp>

+#include <com/sun/star/report/XFormatCondition.hpp>

+#include <com/sun/star/report/XFormattedField.hpp>

+#include <com/sun/star/report/XFunction.hpp>

+#include <com/sun/star/report/XFunctions.hpp>

+#include <com/sun/star/report/XFunctionsSupplier.hpp>

+#include <com/sun/star/report/XGroup.hpp>

+#include <com/sun/star/report/XGroups.hpp>

+#include <com/sun/star/report/XImageControl.hpp>

+#include <com/sun/star/report/XReportComponent.hpp>

+#include <com/sun/star/report/XReportControlFormat.hpp>

+#include <com/sun/star/report/XReportControlModel.hpp>

+#include <com/sun/star/report/XReportDefinition.hpp>

+#include <com/sun/star/report/XReportEngine.hpp>

+#include <com/sun/star/report/XSection.hpp>

+#include <com/sun/star/report/XShape.hpp>

+#include <com/sun/star/report/meta/XFormulaParser.hpp>

+#include <com/sun/star/report/meta/XFunctionCategory.hpp>

+#include <com/sun/star/report/meta/XFunctionDescription.hpp>

+#include <com/sun/star/report/meta/XFunctionManager.hpp>
 #include "comphelper/sequence.hxx"
 #include "comphelper/sequenceashashmap.hxx"
 #include "comphelper/documentconstants.hxx"
diff --git a/reportdesign/inc/pch/precompiled_rptui.cxx b/reportdesign/inc/pch/precompiled_rptui.cxx
new file mode 100644
index 000000000..cbca9edd5
--- /dev/null
+++ b/reportdesign/inc/pch/precompiled_rptui.cxx
@@ -0,0 +1,29 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include "precompiled_rptui.hxx"
+
diff --git a/reportdesign/inc/pch/precompiled_rptui.hxx b/reportdesign/inc/pch/precompiled_rptui.hxx
new file mode 100644
index 000000000..30f208343
--- /dev/null
+++ b/reportdesign/inc/pch/precompiled_rptui.hxx
@@ -0,0 +1,74 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): Generated on 2006-09-01 17:49:38.561560
+
+#ifdef PRECOMPILED_HEADERS
+#include "com/sun/star/sdb/CommandType.hpp"
+//#include "com/sun/star/chart2/data/DatabaseDataProvider.hpp"
+#include "com/sun/star/chart2/data/XDataReceiver.hpp"
+#include "com/sun/star/reflection/XProxyFactory.hpp"
+#include "com/sun/star/sdb/CommandType.hpp"
+#include "com/sun/star/report/XFormatCondition.hpp"

+#include "com/sun/star/report/XFunction.hpp"

+#include "com/sun/star/report/XReportComponent.hpp"

+#include <com/sun/star/report/ForceNewPage.hpp>

+#include <com/sun/star/report/GroupKeepTogether.hpp>

+#include <com/sun/star/report/GroupOn.hpp>

+#include <com/sun/star/report/KeepTogether.hpp>

+#include <com/sun/star/report/ReportPrintOption.hpp>

+#include <com/sun/star/report/XFixedLine.hpp>

+#include <com/sun/star/report/XFixedText.hpp>

+#include <com/sun/star/report/XFormatCondition.hpp>

+#include <com/sun/star/report/XFormattedField.hpp>

+#include <com/sun/star/report/XFunction.hpp>

+#include <com/sun/star/report/XFunctions.hpp>

+#include <com/sun/star/report/XFunctionsSupplier.hpp>

+#include <com/sun/star/report/XGroup.hpp>

+#include <com/sun/star/report/XGroups.hpp>

+#include <com/sun/star/report/XImageControl.hpp>

+#include <com/sun/star/report/XReportComponent.hpp>

+#include <com/sun/star/report/XReportControlFormat.hpp>

+#include <com/sun/star/report/XReportControlModel.hpp>

+#include <com/sun/star/report/XReportDefinition.hpp>

+#include <com/sun/star/report/XReportEngine.hpp>

+#include <com/sun/star/report/XSection.hpp>

+#include <com/sun/star/report/XShape.hpp>

+#include <com/sun/star/report/meta/XFormulaParser.hpp>

+#include <com/sun/star/report/meta/XFunctionCategory.hpp>

+#include <com/sun/star/report/meta/XFunctionDescription.hpp>

+#include <com/sun/star/report/meta/XFunctionManager.hpp>
+#include "comphelper/sequence.hxx"
+#include "comphelper/sequenceashashmap.hxx"
+#include "comphelper/documentconstants.hxx"
+#include "xmloff/attrlist.hxx"
+#include "xmloff/xmltoken.hxx"
+#include "xmloff/xmlement.hxx"
+#include "xmloff/xmluconv.hxx"
+#include "xmloff/xmltkmap.hxx"
+#include "xmloff/xmlnmspe.hxx"
+#endif
diff --git a/reportdesign/inc/pch/precompiled_rptxml.cxx b/reportdesign/inc/pch/precompiled_rptxml.cxx
new file mode 100644
index 000000000..98fe9e13b
--- /dev/null
+++ b/reportdesign/inc/pch/precompiled_rptxml.cxx
@@ -0,0 +1,29 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include "precompiled_rptxml.hxx"
+
diff --git a/reportdesign/inc/pch/precompiled_rptxml.hxx b/reportdesign/inc/pch/precompiled_rptxml.hxx
new file mode 100644
index 000000000..30f208343
--- /dev/null
+++ b/reportdesign/inc/pch/precompiled_rptxml.hxx
@@ -0,0 +1,74 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): Generated on 2006-09-01 17:49:38.561560
+
+#ifdef PRECOMPILED_HEADERS
+#include "com/sun/star/sdb/CommandType.hpp"
+//#include "com/sun/star/chart2/data/DatabaseDataProvider.hpp"
+#include "com/sun/star/chart2/data/XDataReceiver.hpp"
+#include "com/sun/star/reflection/XProxyFactory.hpp"
+#include "com/sun/star/sdb/CommandType.hpp"
+#include "com/sun/star/report/XFormatCondition.hpp"

+#include "com/sun/star/report/XFunction.hpp"

+#include "com/sun/star/report/XReportComponent.hpp"

+#include <com/sun/star/report/ForceNewPage.hpp>

+#include <com/sun/star/report/GroupKeepTogether.hpp>

+#include <com/sun/star/report/GroupOn.hpp>

+#include <com/sun/star/report/KeepTogether.hpp>

+#include <com/sun/star/report/ReportPrintOption.hpp>

+#include <com/sun/star/report/XFixedLine.hpp>

+#include <com/sun/star/report/XFixedText.hpp>

+#include <com/sun/star/report/XFormatCondition.hpp>

+#include <com/sun/star/report/XFormattedField.hpp>

+#include <com/sun/star/report/XFunction.hpp>

+#include <com/sun/star/report/XFunctions.hpp>

+#include <com/sun/star/report/XFunctionsSupplier.hpp>

+#include <com/sun/star/report/XGroup.hpp>

+#include <com/sun/star/report/XGroups.hpp>

+#include <com/sun/star/report/XImageControl.hpp>

+#include <com/sun/star/report/XReportComponent.hpp>

+#include <com/sun/star/report/XReportControlFormat.hpp>

+#include <com/sun/star/report/XReportControlModel.hpp>

+#include <com/sun/star/report/XReportDefinition.hpp>

+#include <com/sun/star/report/XReportEngine.hpp>

+#include <com/sun/star/report/XSection.hpp>

+#include <com/sun/star/report/XShape.hpp>

+#include <com/sun/star/report/meta/XFormulaParser.hpp>

+#include <com/sun/star/report/meta/XFunctionCategory.hpp>

+#include <com/sun/star/report/meta/XFunctionDescription.hpp>

+#include <com/sun/star/report/meta/XFunctionManager.hpp>
+#include "comphelper/sequence.hxx"
+#include "comphelper/sequenceashashmap.hxx"
+#include "comphelper/documentconstants.hxx"
+#include "xmloff/attrlist.hxx"
+#include "xmloff/xmltoken.hxx"
+#include "xmloff/xmlement.hxx"
+#include "xmloff/xmluconv.hxx"
+#include "xmloff/xmltkmap.hxx"
+#include "xmloff/xmlnmspe.hxx"
+#endif
diff --git a/reportdesign/prj/build.lst b/reportdesign/prj/build.lst
index 4a5667d20..ebbef11ac 100644
--- a/reportdesign/prj/build.lst
+++ b/reportdesign/prj/build.lst
@@ -1,18 +1,2 @@
 rd  reportdesign    :   L10N:l10n BOOST:boost comphelper dbaccess formula LIBXSLT:libxslt NULL
-rd  reportdesign                                                        usr1    -   all rd_mkout NULL
-rd  reportdesign\inc                                                    nmake   -   all rd_inc NULL
-rd  reportdesign\source\core\api                                        nmake   -   all rd_api rd_inc NULL
-rd  reportdesign\source\core\resource                                   nmake   -   all rd_res rd_inc NULL
-rd  reportdesign\source\core\sdr                                        nmake   -   all rd_sdr rd_inc NULL
-rd  reportdesign\source\core\misc                                       nmake   -   all rd_misc rd_inc NULL
-rd  reportdesign\source\shared                                          nmake   -   all rd_shared rd_inc NULL
-rd  reportdesign\source\ui\misc                                         nmake   -   all rd_uimisc rd_inc NULL
-rd  reportdesign\source\ui\dlg                                          nmake   -   all rd_uidlg rd_inc NULL
-rd  reportdesign\source\ui\report                                       nmake   -   all rd_uireport rd_inc NULL
-rd  reportdesign\source\ui\inspection                                   nmake   -   all rd_uiinspection rd_inc NULL
-rd  reportdesign\source\filter\xml                                      nmake   -   all rd_filter_xml rd_inc NULL
-rd  reportdesign\util                                                   nmake   -   all rd_util rd_api rd_res rd_shared rd_uimisc rd_uidlg rd_uireport rd_uiinspection rd_sdr rd_misc rd_filter_xml NULL
-
-# has problems in m78, in m83 also
-# rd  reportdesign\qa\complex\reportdesign                                nmake   -   all rd_qa_complex NULL
-
+rd  reportdesign\prj nmake - all rd_prj   NULL
diff --git a/reportdesign/prj/d.lst b/reportdesign/prj/d.lst
index d7cc5fad6..e69de29bb 100644
--- a/reportdesign/prj/d.lst
+++ b/reportdesign/prj/d.lst
@@ -1,24 +0,0 @@
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\dbreport\menubar
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\dbreport\statusbar
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\dbreport\toolbar
-
-..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid
-
-dos: sh -c "if test %OS% = MACOSX; then create-bundle %_DEST%\lib%_EXT%\*.dylib; fi"
-
-# Libraries
-..\%__SRC%\bin\rpt*.dll %_DEST%\bin%_EXT%\rpt*.dll
-..\%__SRC%\lib\librpt*.so %_DEST%\lib%_EXT%\librpt*.so
-# ..\%__SRC%\lib\irpt*.lib %_DEST%\lib%_EXT%\irpt*.lib
-..\%__SRC%\lib\librpt*.dylib %_DEST%\lib%_EXT%\librpt*.dylib
-
-# Resources
-..\%__SRC%\bin\*.res %_DEST%\bin%_EXT%\*.res
-
-..\uiconfig\dbreport\menubar\*.xml           %_DEST%\xml%_EXT%\uiconfig\modules\dbreport\menubar\*.xml
-..\uiconfig\dbreport\statusbar\*.xml         %_DEST%\xml%_EXT%\uiconfig\modules\dbreport\statusbar\*.xml
-..\uiconfig\dbreport\toolbar\*.xml           %_DEST%\xml%_EXT%\uiconfig\modules\dbreport\toolbar\*.xml
-
-..\%__SRC%\misc\rpt.component %_DEST%\xml%_EXT%\rpt.component
-..\%__SRC%\misc\rptui.component %_DEST%\xml%_EXT%\rptui.component
-..\%__SRC%\misc\rptxml.component %_DEST%\xml%_EXT%\rptxml.component
diff --git a/reportdesign/inc/makefile.mk b/reportdesign/prj/makefile.mk
index b24d73a7c..88cd9dfe0 100644
--- a/reportdesign/inc/makefile.mk
+++ b/reportdesign/prj/makefile.mk
@@ -24,24 +24,17 @@
 # for a copy of the LGPLv3 License.
 #
 #*************************************************************************
-PRJ=..
-
-PRJNAME=reportdesign
-TARGET=inc
-
-# --- Settings -----------------------------------------------------
 
-.INCLUDE :  settings.mk
-
-# --- Files --------------------------------------------------------
-# --- Targets -------------------------------------------------------
+PRJ=..
+TARGET=prj
 
-.INCLUDE :  target.mk
+.INCLUDE : settings.mk
 
-.IF "$(ENABLE_PCH)"!=""
-ALLTAR : \
-    $(SLO)$/precompiled.pch \
-    $(SLO)$/precompiled_ex.pch
-    
-.ENDIF			# "$(ENABLE_PCH)"!=""
+.IF "$(VERBOSE)"!=""
+VERBOSEFLAG :=
+.ELSE
+VERBOSEFLAG := -s
+.ENDIF
 
+all:
+	cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
diff --git a/reportdesign/source/core/api/FixedLine.cxx b/reportdesign/source/core/api/FixedLine.cxx
index 27460bf85..2d9d3a2cc 100644
--- a/reportdesign/source/core/api/FixedLine.cxx
+++ b/reportdesign/source/core/api/FixedLine.cxx
@@ -24,6 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
+#include "precompiled_reportdesign.hxx"
 #include "FixedLine.hxx"
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #ifndef REPORTDESIGN_SHARED_CORESTRINGS_HRC
diff --git a/reportdesign/source/core/api/FixedText.cxx b/reportdesign/source/core/api/FixedText.cxx
index 9b51a3521..0dc4d8cc3 100644
--- a/reportdesign/source/core/api/FixedText.cxx
+++ b/reportdesign/source/core/api/FixedText.cxx
@@ -24,6 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
+#include "precompiled_reportdesign.hxx"
 #include "FixedText.hxx"
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #ifndef REPORTDESIGN_SHARED_CORESTRINGS_HRC
diff --git a/reportdesign/source/core/api/FormatCondition.cxx b/reportdesign/source/core/api/FormatCondition.cxx
index 71553a93c..640f1bef5 100644
--- a/reportdesign/source/core/api/FormatCondition.cxx
+++ b/reportdesign/source/core/api/FormatCondition.cxx
@@ -24,11 +24,10 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
+#include "precompiled_reportdesign.hxx"
 #include "FormatCondition.hxx"
 #include <com/sun/star/beans/PropertyAttribute.hpp>
-#ifndef REPORTDESIGN_SHARED_CORESTRINGS_HRC
 #include "corestrings.hrc"
-#endif
 #include <tools/debug.hxx>
 #include <connectivity/dbtools.hxx>
 #include <comphelper/sequence.hxx>
diff --git a/reportdesign/source/core/api/FormattedField.cxx b/reportdesign/source/core/api/FormattedField.cxx
index e83e6ef61..9b8bc8b41 100644
--- a/reportdesign/source/core/api/FormattedField.cxx
+++ b/reportdesign/source/core/api/FormattedField.cxx
@@ -24,6 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
+#include "precompiled_reportdesign.hxx"
 #include "FormattedField.hxx"
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/beans/XPropertyState.hpp>
diff --git a/reportdesign/source/core/api/Function.cxx b/reportdesign/source/core/api/Function.cxx
index a3f1fcc1d..43280b0a9 100644
--- a/reportdesign/source/core/api/Function.cxx
+++ b/reportdesign/source/core/api/Function.cxx
@@ -24,6 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
+#include "precompiled_reportdesign.hxx"
 #include "Function.hxx"
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #ifndef REPORTDESIGN_SHARED_CORESTRINGS_HRC
diff --git a/reportdesign/source/core/api/Functions.cxx b/reportdesign/source/core/api/Functions.cxx
index 6b7ec515d..1373186ea 100644
--- a/reportdesign/source/core/api/Functions.cxx
+++ b/reportdesign/source/core/api/Functions.cxx
@@ -24,6 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
+#include "precompiled_reportdesign.hxx"
 #include "Functions.hxx"
 #include "Function.hxx"
 #include <tools/debug.hxx>
diff --git a/reportdesign/source/core/api/Group.cxx b/reportdesign/source/core/api/Group.cxx
index 7efc1ceb6..4253b8d50 100644
--- a/reportdesign/source/core/api/Group.cxx
+++ b/reportdesign/source/core/api/Group.cxx
@@ -24,6 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
+#include "precompiled_reportdesign.hxx"
 #include "Group.hxx"
 #include "Section.hxx"
 #include <com/sun/star/beans/PropertyAttribute.hpp>
diff --git a/reportdesign/source/core/api/Groups.cxx b/reportdesign/source/core/api/Groups.cxx
index 6dfa8c836..e2af4206c 100644
--- a/reportdesign/source/core/api/Groups.cxx
+++ b/reportdesign/source/core/api/Groups.cxx
@@ -24,6 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
+#include "precompiled_reportdesign.hxx"
 #include "Groups.hxx"
 #include "Group.hxx"
 #include <tools/debug.hxx>
diff --git a/reportdesign/source/core/api/ImageControl.cxx b/reportdesign/source/core/api/ImageControl.cxx
index b82241783..5adc09964 100644
--- a/reportdesign/source/core/api/ImageControl.cxx
+++ b/reportdesign/source/core/api/ImageControl.cxx
@@ -24,15 +24,12 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
+#include "precompiled_reportdesign.hxx"
 #include "ImageControl.hxx"
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/beans/XPropertyState.hpp>
-#ifndef REPORTDESIGN_SHARED_CORESTRINGS_HRC
 #include "corestrings.hrc"
-#endif
-#ifndef REPORTDESIGN_CORE_RESOURCE_HRC_
 #include "core_resource.hrc"
-#endif
 #include "core_resource.hxx"
 #include <comphelper/sequence.hxx>
 #include "Tools.hxx"
diff --git a/reportdesign/source/core/api/ReportComponent.cxx b/reportdesign/source/core/api/ReportComponent.cxx
index f213b4995..49e1b5e2c 100644
--- a/reportdesign/source/core/api/ReportComponent.cxx
+++ b/reportdesign/source/core/api/ReportComponent.cxx
@@ -24,11 +24,10 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
+#include "precompiled_reportdesign.hxx"
 #include "ReportComponent.hxx"
 
-#ifndef REPORTDESIGN_SHARED_CORESTRINGS_HRC
 #include "corestrings.hrc"
-#endif
 #include <vcl/svapp.hxx>
 #include <vcl/outdev.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
diff --git a/reportdesign/source/core/api/ReportControlModel.cxx b/reportdesign/source/core/api/ReportControlModel.cxx
index bf2e4b63c..1c946ed2c 100644
--- a/reportdesign/source/core/api/ReportControlModel.cxx
+++ b/reportdesign/source/core/api/ReportControlModel.cxx
@@ -24,6 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
+#include "precompiled_reportdesign.hxx"
 #include "ReportControlModel.hxx"
 #include <com/sun/star/beans/XMultiPropertySet.hpp>
 #include <com/sun/star/beans/XPropertyState.hpp>
diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx
index 37f96368b..6d70a24a0 100644
--- a/reportdesign/source/core/api/ReportDefinition.cxx
+++ b/reportdesign/source/core/api/ReportDefinition.cxx
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
+#include "precompiled_reportdesign.hxx"
 #include "ReportDefinition.hxx"
 
 #include "FixedLine.hxx"
diff --git a/reportdesign/source/core/api/ReportEngineJFree.cxx b/reportdesign/source/core/api/ReportEngineJFree.cxx
index 7b049d6d4..4a2df1009 100644
--- a/reportdesign/source/core/api/ReportEngineJFree.cxx
+++ b/reportdesign/source/core/api/ReportEngineJFree.cxx
@@ -24,6 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
+#include "precompiled_reportdesign.hxx"
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include "ReportEngineJFree.hxx"
 #include <comphelper/enumhelper.hxx>
diff --git a/reportdesign/source/core/api/ReportVisitor.cxx b/reportdesign/source/core/api/ReportVisitor.cxx
index d98bfff45..9c5f0dfd6 100644
--- a/reportdesign/source/core/api/ReportVisitor.cxx
+++ b/reportdesign/source/core/api/ReportVisitor.cxx
@@ -24,6 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
+#include "precompiled_reportdesign.hxx"
 #include "ReportVisitor.hxx"
 namespace reportdesign
 {
diff --git a/reportdesign/source/core/api/Section.cxx b/reportdesign/source/core/api/Section.cxx
index f3937d3e2..1349d73dc 100644
--- a/reportdesign/source/core/api/Section.cxx
+++ b/reportdesign/source/core/api/Section.cxx
@@ -24,6 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
+#include "precompiled_reportdesign.hxx"
 #include "Section.hxx"
 #include <comphelper/enumhelper.hxx>
 #include <connectivity/dbtools.hxx>
diff --git a/reportdesign/source/core/api/Shape.cxx b/reportdesign/source/core/api/Shape.cxx
index 6b5a58844..1588325fc 100644
--- a/reportdesign/source/core/api/Shape.cxx
+++ b/reportdesign/source/core/api/Shape.cxx
@@ -24,6 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
+#include "precompiled_reportdesign.hxx"
 #include "Shape.hxx"
 
 #include <com/sun/star/beans/NamedValue.hpp>
diff --git a/reportdesign/source/core/api/Tools.cxx b/reportdesign/source/core/api/Tools.cxx
index 6c74b7381..7cccabc49 100644
--- a/reportdesign/source/core/api/Tools.cxx
+++ b/reportdesign/source/core/api/Tools.cxx
@@ -24,10 +24,9 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
+#include "precompiled_reportdesign.hxx"
 #include "Tools.hxx"
-#ifndef REPORTDESIGN_CORE_RESOURCE_HRC_
 #include "core_resource.hrc"
-#endif
 #include "core_resource.hxx"
 #include <comphelper/property.hxx>
 
diff --git a/reportdesign/source/core/api/makefile.mk b/reportdesign/source/core/api/makefile.mk
deleted file mode 100644
index f19d7486a..000000000
--- a/reportdesign/source/core/api/makefile.mk
+++ /dev/null
@@ -1,63 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-PRJINC=$(PRJ)$/source
-PRJNAME=reportdesign
-TARGET=api
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings ----------------------------------
-.INCLUDE :  settings.mk
-.INCLUDE : $(PRJ)$/util$/dll.pmk
-
-# --- Files -------------------------------------
-SLOFILES=	\
-        $(SLO)$/FormattedField.obj		\
-        $(SLO)$/Groups.obj				\
-        $(SLO)$/Group.obj				\
-        $(SLO)$/Section.obj				\
-        $(SLO)$/services.obj			\
-        $(SLO)$/FixedText.obj			\
-        $(SLO)$/ImageControl.obj		\
-        $(SLO)$/ReportDefinition.obj	\
-        $(SLO)$/ReportComponent.obj		\
-        $(SLO)$/ReportEngineJFree.obj	\
-        $(SLO)$/Tools.obj				\
-        $(SLO)$/Function.obj			\
-        $(SLO)$/Functions.obj			\
-        $(SLO)$/ReportControlModel.obj	\
-        $(SLO)$/FormatCondition.obj		\
-        $(SLO)$/ReportVisitor.obj		\
-        $(SLO)$/Shape.obj				\
-        $(SLO)$/FixedLine.obj
-
-# --- Targets ----------------------------------
-
-.INCLUDE : target.mk
-
diff --git a/reportdesign/source/core/api/services.cxx b/reportdesign/source/core/api/services.cxx
index 738185549..80e2740b5 100644
--- a/reportdesign/source/core/api/services.cxx
+++ b/reportdesign/source/core/api/services.cxx
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
+#include "precompiled_reportdesign.hxx"
 #include "sal/types.h"
 #include <cppuhelper/factory.hxx>
 #include <osl/diagnose.h>
diff --git a/reportdesign/source/core/misc/conditionalexpression.cxx b/reportdesign/source/core/misc/conditionalexpression.cxx
index 523abd544..0cb37da76 100644
--- a/reportdesign/source/core/misc/conditionalexpression.cxx
+++ b/reportdesign/source/core/misc/conditionalexpression.cxx
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
+#include "precompiled_reportdesign.hxx"
 #include "conditionalexpression.hxx"
 
 /** === begin UNO includes === **/
diff --git a/reportdesign/source/core/misc/conditionupdater.cxx b/reportdesign/source/core/misc/conditionupdater.cxx
index f91fc2c35..bd76f8023 100644
--- a/reportdesign/source/core/misc/conditionupdater.cxx
+++ b/reportdesign/source/core/misc/conditionupdater.cxx
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
+#include "precompiled_reportdesign.hxx"
 #include "conditionupdater.hxx"
 #include "reportformula.hxx"
 
diff --git a/reportdesign/source/core/resource/core_resource.cxx b/reportdesign/source/core/resource/core_resource.cxx
index a1c0dc93b..8e7f0e7eb 100644
--- a/reportdesign/source/core/resource/core_resource.cxx
+++ b/reportdesign/source/core/resource/core_resource.cxx
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
+#include "precompiled_reportdesign.hxx"
 #include "core_resource.hxx"
 #include <tools/simplerm.hxx>
 
diff --git a/reportdesign/source/core/sdr/ModuleHelper.cxx b/reportdesign/source/core/sdr/ModuleHelper.cxx
index b74ab3489..345b2ae31 100644
--- a/reportdesign/source/core/sdr/ModuleHelper.cxx
+++ b/reportdesign/source/core/sdr/ModuleHelper.cxx
@@ -24,6 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
+#include "precompiled_reportdesign.hxx"
 #include "ModuleHelper.hxx"
 #include <comphelper/configurationhelper.hxx>
 #include <comphelper/processfactory.hxx>
diff --git a/reportdesign/source/core/sdr/PropertyForward.cxx b/reportdesign/source/core/sdr/PropertyForward.cxx
index 924902af1..8252ed108 100644
--- a/reportdesign/source/core/sdr/PropertyForward.cxx
+++ b/reportdesign/source/core/sdr/PropertyForward.cxx
@@ -24,6 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
+#include "precompiled_reportdesign.hxx"
 #include "PropertyForward.hxx"
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
diff --git a/reportdesign/source/core/sdr/ReportDrawPage.cxx b/reportdesign/source/core/sdr/ReportDrawPage.cxx
index 4a8d4f726..25357d46c 100644
--- a/reportdesign/source/core/sdr/ReportDrawPage.cxx
+++ b/reportdesign/source/core/sdr/ReportDrawPage.cxx
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
+#include "precompiled_reportdesign.hxx"
 #include "ReportDrawPage.hxx"
 #include "RptObject.hxx"
 #include "RptModel.hxx"
diff --git a/reportdesign/source/core/sdr/ReportUndoFactory.cxx b/reportdesign/source/core/sdr/ReportUndoFactory.cxx
index e1cfb61e9..338b5787e 100644
--- a/reportdesign/source/core/sdr/ReportUndoFactory.cxx
+++ b/reportdesign/source/core/sdr/ReportUndoFactory.cxx
@@ -24,6 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
+#include "precompiled_reportdesign.hxx"
 #include "ReportUndoFactory.hxx"
 #include "RptObject.hxx"
 #include "UndoActions.hxx"
diff --git a/reportdesign/source/core/sdr/RptModel.cxx b/reportdesign/source/core/sdr/RptModel.cxx
index a517511aa..2a82cff90 100644
--- a/reportdesign/source/core/sdr/RptModel.cxx
+++ b/reportdesign/source/core/sdr/RptModel.cxx
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
+#include "precompiled_reportdesign.hxx"
 
 #include "RptModel.hxx"
 #include "RptPage.hxx"
diff --git a/reportdesign/source/core/sdr/RptObjectListener.cxx b/reportdesign/source/core/sdr/RptObjectListener.cxx
index 0a77e3868..319f9b392 100644
--- a/reportdesign/source/core/sdr/RptObjectListener.cxx
+++ b/reportdesign/source/core/sdr/RptObjectListener.cxx
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
+#include "precompiled_reportdesign.hxx"
 #include "RptObjectListener.hxx"
 #include "RptObject.hxx"
 #include "RptDef.hxx"
diff --git a/reportdesign/source/core/sdr/RptPage.cxx b/reportdesign/source/core/sdr/RptPage.cxx
index 6209c2b71..fe7583d57 100644
--- a/reportdesign/source/core/sdr/RptPage.cxx
+++ b/reportdesign/source/core/sdr/RptPage.cxx
@@ -24,6 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
+#include "precompiled_reportdesign.hxx"
 #include "RptPage.hxx"
 #include "RptModel.hxx"
 #include "Section.hxx"
diff --git a/reportdesign/source/core/sdr/UndoEnv.cxx b/reportdesign/source/core/sdr/UndoEnv.cxx
index 1127a49b0..6e2ef7092 100644
--- a/reportdesign/source/core/sdr/UndoEnv.cxx
+++ b/reportdesign/source/core/sdr/UndoEnv.cxx
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
+#include "precompiled_reportdesign.hxx"
 #include "UndoActions.hxx"
 #include "UndoEnv.hxx"
 #include "formatnormalizer.hxx"
diff --git a/reportdesign/source/core/sdr/makefile.mk b/reportdesign/source/core/sdr/makefile.mk
deleted file mode 100644
index 5121b498b..000000000
--- a/reportdesign/source/core/sdr/makefile.mk
+++ /dev/null
@@ -1,52 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-PRJINC=$(PRJ)$/source
-PRJNAME=reportdesign
-TARGET=core_sdr
-ENABLE_EXCEPTIONS=TRUE
-# --- Settings -----------------------------------------------------
-.INCLUDE :  settings.mk
-.INCLUDE : $(PRJ)$/util$/dll.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES=	$(SLO)$/RptModel.obj			\
-            $(SLO)$/RptPage.obj				\
-            $(SLO)$/UndoActions.obj			\
-            $(SLO)$/RptObject.obj			\
-            $(SLO)$/RptObjectListener.obj	\
-            $(SLO)$/ModuleHelper.obj		\
-            $(SLO)$/PropertyForward.obj		\
-            $(SLO)$/ReportDrawPage.obj		\
-            $(SLO)$/ReportUndoFactory.obj   \
-            $(SLO)$/UndoEnv.obj \
-            $(SLO)$/formatnormalizer.obj
-# --- Targets ----------------------------------
-
-.INCLUDE :  target.mk
diff --git a/reportdesign/source/filter/xml/dbloader2.cxx b/reportdesign/source/filter/xml/dbloader2.cxx
index ce9a29763..023d59623 100644
--- a/reportdesign/source/filter/xml/dbloader2.cxx
+++ b/reportdesign/source/filter/xml/dbloader2.cxx
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptxml.hxx"
 #include "dbloader2.hxx"
 #include <comphelper/sequence.hxx>
 // -------------------------------------------------------------------------
diff --git a/reportdesign/source/filter/xml/makefile.mk b/reportdesign/source/filter/xml/makefile.mk
deleted file mode 100644
index 41761d7a7..000000000
--- a/reportdesign/source/filter/xml/makefile.mk
+++ /dev/null
@@ -1,70 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-PRJINC=$(PRJ)$/source
-PRJNAME=reportdesign
-TARGET=rptxml
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings ----------------------------------
-.INCLUDE :  	settings.mk
-
-# --- Files -------------------------------------
-SLOFILES=	$(SLO)$/xmlfilter.obj				\
-            $(SLO)$/xmlReport.obj				\
-            $(SLO)$/xmlMasterFields.obj			\
-            $(SLO)$/xmlGroup.obj				\
-            $(SLO)$/xmlHelper.obj				\
-            $(SLO)$/xmlSection.obj				\
-            $(SLO)$/xmlComponent.obj			\
-            $(SLO)$/xmlControlProperty.obj		\
-            $(SLO)$/xmlFormattedField.obj		\
-            $(SLO)$/xmlReportElement.obj		\
-            $(SLO)$/xmlReportElementBase.obj	\
-            $(SLO)$/xmlCondPrtExpr.obj			\
-            $(SLO)$/xmlImage.obj				\
-            $(SLO)$/xmlFunction.obj				\
-            $(SLO)$/xmlStyleImport.obj			\
-            $(SLO)$/xmlAutoStyle.obj			\
-            $(SLO)$/xmlExport.obj				\
-            $(SLO)$/dbloader2.obj				\
-            $(SLO)$/xmlFormatCondition.obj		\
-            $(SLO)$/xmlPropertyHandler.obj		\
-            $(SLO)$/xmlColumn.obj				\
-            $(SLO)$/xmlCell.obj					\
-            $(SLO)$/xmlTable.obj				\
-            $(SLO)$/xmlFixedContent.obj			\
-            $(SLO)$/xmlSubDocument.obj			\
-            $(SLO)$/xmlservices.obj				\
-            $(SLO)$/xmlImportDocumentHandler.obj \
-            $(SLO)$/xmlExportDocumentHandler.obj
-
-# --- Targets ----------------------------------
-
-.INCLUDE : target.mk
diff --git a/reportdesign/source/filter/xml/rptxml.component b/reportdesign/source/filter/xml/rptxml.component
new file mode 100644
index 000000000..c34758d64
--- /dev/null
+++ b/reportdesign/source/filter/xml/rptxml.component
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org.  If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.report.XMLSettingsExporter">
+    <service name="com.sun.star.document.ExportFilter"/>
+  </implementation>
+    <implementation name="com.sun.star.comp.report.XMLContentExporter">
+    <service name="com.sun.star.document.ExportFilter"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.report.XMLStylesExporter">
+    <service name="com.sun.star.document.ExportFilter"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.report.XMLMetaExporter">
+    <service name="com.sun.star.document.ExportFilter"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.report.XMLFullExporter">
+    <service name="com.sun.star.document.ExportFilter"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.report.ExportFilter">
+    <service name="com.sun.star.document.ExportFilter"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.report.ORptTypeDetection">
+    <service name="com.sun.star.document.ExtendedTypeDetection"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.Report.XMLOasisSettingsImporter">
+    <service name="com.sun.star.document.ImportFilter"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.Report.XMLOasisStylesImporter">
+    <service name="com.sun.star.document.ImportFilter"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.Report.XMLOasisContentImporter">
+    <service name="com.sun.star.document.ImportFilter"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.Report.XMLOasisMetaImporter">
+    <service name="com.sun.star.document.ImportFilter"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.report.OReportFilter">
+    <service name="com.sun.star.document.ImportFilter"/>
+  </implementation>
+</component>
diff --git a/reportdesign/source/filter/xml/xmlAutoStyle.cxx b/reportdesign/source/filter/xml/xmlAutoStyle.cxx
index 79bc658cb..1a4839eda 100644
--- a/reportdesign/source/filter/xml/xmlAutoStyle.cxx
+++ b/reportdesign/source/filter/xml/xmlAutoStyle.cxx
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptxml.hxx"
 #include "xmlAutoStyle.hxx"
 #include "xmlHelper.hxx"
 #include "xmlExport.hxx"
diff --git a/reportdesign/source/filter/xml/xmlCell.cxx b/reportdesign/source/filter/xml/xmlCell.cxx
index 0b8cb581e..5909894ba 100644
--- a/reportdesign/source/filter/xml/xmlCell.cxx
+++ b/reportdesign/source/filter/xml/xmlCell.cxx
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptxml.hxx"
 #include "xmlCell.hxx"
 #include "xmlHelper.hxx"
 #include <xmloff/xmluconv.hxx>
diff --git a/reportdesign/source/filter/xml/xmlColumn.cxx b/reportdesign/source/filter/xml/xmlColumn.cxx
index e23cef3cb..8174d8272 100644
--- a/reportdesign/source/filter/xml/xmlColumn.cxx
+++ b/reportdesign/source/filter/xml/xmlColumn.cxx
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptxml.hxx"
 
 #ifndef RPT_XMLCOLUMN_HXX
 #include "xmlColumn.hxx"
diff --git a/reportdesign/source/filter/xml/xmlComponent.cxx b/reportdesign/source/filter/xml/xmlComponent.cxx
index 1d0c092de..008cdbf09 100644
--- a/reportdesign/source/filter/xml/xmlComponent.cxx
+++ b/reportdesign/source/filter/xml/xmlComponent.cxx
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptxml.hxx"
 #include "xmlComponent.hxx"
 #include "xmlfilter.hxx"
 #include <xmloff/xmltoken.hxx>
diff --git a/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx b/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx
index 9832d1b1f..98db072a7 100644
--- a/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx
+++ b/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptxml.hxx"
 #include "xmlCondPrtExpr.hxx"
 #include "xmlfilter.hxx"
 #include <xmloff/xmltoken.hxx>
diff --git a/reportdesign/source/filter/xml/xmlControlProperty.cxx b/reportdesign/source/filter/xml/xmlControlProperty.cxx
index 2330c6aff..fb6c02255 100644
--- a/reportdesign/source/filter/xml/xmlControlProperty.cxx
+++ b/reportdesign/source/filter/xml/xmlControlProperty.cxx
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptxml.hxx"
 #include "xmlControlProperty.hxx"
 #include <xmloff/xmluconv.hxx>
 #include "xmlfilter.hxx"
diff --git a/reportdesign/source/filter/xml/xmlExport.cxx b/reportdesign/source/filter/xml/xmlExport.cxx
index c66cabb41..8e9b88a20 100644
--- a/reportdesign/source/filter/xml/xmlExport.cxx
+++ b/reportdesign/source/filter/xml/xmlExport.cxx
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptxml.hxx"
  
 #include "xmlExport.hxx"
 #include "xmlAutoStyle.hxx"
diff --git a/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx b/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx
index 3127a07f3..cfe98f6ed 100644
--- a/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx
+++ b/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptxml.hxx"
 
 #include "xmlExportDocumentHandler.hxx"
 #include <com/sun/star/sdb/CommandType.hpp>
diff --git a/reportdesign/source/filter/xml/xmlFixedContent.cxx b/reportdesign/source/filter/xml/xmlFixedContent.cxx
index ba2d0294f..38cca4ef2 100644
--- a/reportdesign/source/filter/xml/xmlFixedContent.cxx
+++ b/reportdesign/source/filter/xml/xmlFixedContent.cxx
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptxml.hxx"
 #include "xmlFixedContent.hxx"
 #include "xmlfilter.hxx"
 #include <xmloff/xmltoken.hxx>
diff --git a/reportdesign/source/filter/xml/xmlFormatCondition.cxx b/reportdesign/source/filter/xml/xmlFormatCondition.cxx
index b69d0a554..0d9bc7950 100644
--- a/reportdesign/source/filter/xml/xmlFormatCondition.cxx
+++ b/reportdesign/source/filter/xml/xmlFormatCondition.cxx
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptxml.hxx"
 #include "xmlFormatCondition.hxx"
 #include "xmlfilter.hxx"
 #include <xmloff/xmltoken.hxx>
diff --git a/reportdesign/source/filter/xml/xmlFormattedField.cxx b/reportdesign/source/filter/xml/xmlFormattedField.cxx
index 362c597d0..a4ee72256 100644
--- a/reportdesign/source/filter/xml/xmlFormattedField.cxx
+++ b/reportdesign/source/filter/xml/xmlFormattedField.cxx
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptxml.hxx"
 #include "xmlFormattedField.hxx"
 #include "xmlfilter.hxx"
 #include <xmloff/xmltoken.hxx>
diff --git a/reportdesign/source/filter/xml/xmlFunction.cxx b/reportdesign/source/filter/xml/xmlFunction.cxx
index f615188de..e2fa5c3f7 100644
--- a/reportdesign/source/filter/xml/xmlFunction.cxx
+++ b/reportdesign/source/filter/xml/xmlFunction.cxx
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptxml.hxx"
 #include "xmlFunction.hxx"
 #include "xmlfilter.hxx"
 #include <xmloff/xmltoken.hxx>
diff --git a/reportdesign/source/filter/xml/xmlGroup.cxx b/reportdesign/source/filter/xml/xmlGroup.cxx
index 18ae61973..b1550dd7e 100644
--- a/reportdesign/source/filter/xml/xmlGroup.cxx
+++ b/reportdesign/source/filter/xml/xmlGroup.cxx
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptxml.hxx"
 #include "xmlGroup.hxx"
 #include "xmlSection.hxx"
 #include "xmlFunction.hxx"
diff --git a/reportdesign/source/filter/xml/xmlHelper.cxx b/reportdesign/source/filter/xml/xmlHelper.cxx
index 513846e57..36f76784c 100644
--- a/reportdesign/source/filter/xml/xmlHelper.cxx
+++ b/reportdesign/source/filter/xml/xmlHelper.cxx
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptxml.hxx"
 #include "xmlHelper.hxx"
 #include <xmloff/xmlnmspe.hxx>
 #include <xmloff/xmltoken.hxx>
diff --git a/reportdesign/source/filter/xml/xmlImage.cxx b/reportdesign/source/filter/xml/xmlImage.cxx
index a7703cacd..f0b5db6fb 100644
--- a/reportdesign/source/filter/xml/xmlImage.cxx
+++ b/reportdesign/source/filter/xml/xmlImage.cxx
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptxml.hxx"
 #include "xmlImage.hxx"
 #include "xmlfilter.hxx"
 #include <xmloff/xmltoken.hxx>
diff --git a/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx b/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx
index 944e5b812..474360953 100644
--- a/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx
+++ b/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptxml.hxx"
 
 #include "xmlImportDocumentHandler.hxx"
 #include <com/sun/star/sdb/CommandType.hpp>
diff --git a/reportdesign/source/filter/xml/xmlMasterFields.cxx b/reportdesign/source/filter/xml/xmlMasterFields.cxx
index ed97d31d9..5c8876898 100644
--- a/reportdesign/source/filter/xml/xmlMasterFields.cxx
+++ b/reportdesign/source/filter/xml/xmlMasterFields.cxx
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptxml.hxx"
 #include "xmlMasterFields.hxx"
 #include "xmlfilter.hxx"
 #include <xmloff/xmltoken.hxx>
diff --git a/reportdesign/source/filter/xml/xmlPropertyHandler.cxx b/reportdesign/source/filter/xml/xmlPropertyHandler.cxx
index 6e87e27e6..1cedb959b 100644
--- a/reportdesign/source/filter/xml/xmlPropertyHandler.cxx
+++ b/reportdesign/source/filter/xml/xmlPropertyHandler.cxx
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptxml.hxx"
 
 #include "xmlPropertyHandler.hxx"
 #include "xmlfilter.hxx"
diff --git a/reportdesign/source/filter/xml/xmlReport.cxx b/reportdesign/source/filter/xml/xmlReport.cxx
index b3ee8a59f..b2939642b 100644
--- a/reportdesign/source/filter/xml/xmlReport.cxx
+++ b/reportdesign/source/filter/xml/xmlReport.cxx
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptxml.hxx"
 #include "xmlReport.hxx"
 #include "xmlfilter.hxx"
 #include <xmloff/xmltoken.hxx>
diff --git a/reportdesign/source/filter/xml/xmlReportElement.cxx b/reportdesign/source/filter/xml/xmlReportElement.cxx
index ebf6b411c..875e44cf6 100644
--- a/reportdesign/source/filter/xml/xmlReportElement.cxx
+++ b/reportdesign/source/filter/xml/xmlReportElement.cxx
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptxml.hxx"
 #include "xmlReportElement.hxx"
 #include "xmlfilter.hxx"
 #include <xmloff/xmltoken.hxx>
diff --git a/reportdesign/source/filter/xml/xmlReportElementBase.cxx b/reportdesign/source/filter/xml/xmlReportElementBase.cxx
index bbe0e6d16..66bcf1433 100644
--- a/reportdesign/source/filter/xml/xmlReportElementBase.cxx
+++ b/reportdesign/source/filter/xml/xmlReportElementBase.cxx
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptxml.hxx"
 #include "xmlReportElementBase.hxx"
 #include "xmlfilter.hxx"
 #include "xmlControlProperty.hxx"
diff --git a/reportdesign/source/filter/xml/xmlRow.cxx b/reportdesign/source/filter/xml/xmlRow.cxx
index 0006e4f73..033ab53a0 100644
--- a/reportdesign/source/filter/xml/xmlRow.cxx
+++ b/reportdesign/source/filter/xml/xmlRow.cxx
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptxml.hxx"
 
 #ifndef RPT_XMLCOLUMN_HXX
 #include "xmlColumn.hxx"
diff --git a/reportdesign/source/filter/xml/xmlSection.cxx b/reportdesign/source/filter/xml/xmlSection.cxx
index 31a852455..a2fb9c054 100644
--- a/reportdesign/source/filter/xml/xmlSection.cxx
+++ b/reportdesign/source/filter/xml/xmlSection.cxx
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptxml.hxx"
 #include "xmlSection.hxx"
 #include "xmlfilter.hxx"
 #include <xmloff/xmltoken.hxx>
diff --git a/reportdesign/source/filter/xml/xmlStyleImport.cxx b/reportdesign/source/filter/xml/xmlStyleImport.cxx
index 25db1bed4..9fb23ab34 100644
--- a/reportdesign/source/filter/xml/xmlStyleImport.cxx
+++ b/reportdesign/source/filter/xml/xmlStyleImport.cxx
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptxml.hxx"
 #include "xmlStyleImport.hxx"
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmlnmspe.hxx>
diff --git a/reportdesign/source/filter/xml/xmlSubDocument.cxx b/reportdesign/source/filter/xml/xmlSubDocument.cxx
index 5ebbc86dc..8019f9451 100644
--- a/reportdesign/source/filter/xml/xmlSubDocument.cxx
+++ b/reportdesign/source/filter/xml/xmlSubDocument.cxx
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptxml.hxx"
 #include "xmlSubDocument.hxx"
 #include "xmlCell.hxx"
 #include "xmlfilter.hxx"
diff --git a/reportdesign/source/filter/xml/xmlTable.cxx b/reportdesign/source/filter/xml/xmlTable.cxx
index 062452af9..344c7f50a 100644
--- a/reportdesign/source/filter/xml/xmlTable.cxx
+++ b/reportdesign/source/filter/xml/xmlTable.cxx
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptxml.hxx"
 #include "xmlTable.hxx"
 #include "xmlfilter.hxx"
 #include <xmloff/xmltoken.hxx>
diff --git a/reportdesign/source/filter/xml/xmlfilter.cxx b/reportdesign/source/filter/xml/xmlfilter.cxx
index 9d06ab5a6..4128b714d 100644
--- a/reportdesign/source/filter/xml/xmlfilter.cxx
+++ b/reportdesign/source/filter/xml/xmlfilter.cxx
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptxml.hxx"
 #include <com/sun/star/packages/zip/ZipIOException.hpp>
 #include <com/sun/star/embed/ElementModes.hpp>
 #include <com/sun/star/beans/NamedValue.hpp>
diff --git a/reportdesign/source/filter/xml/xmlservices.cxx b/reportdesign/source/filter/xml/xmlservices.cxx
index 9218c32bd..a3040063d 100644
--- a/reportdesign/source/filter/xml/xmlservices.cxx
+++ b/reportdesign/source/filter/xml/xmlservices.cxx
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptxml.hxx"
 #include <cppuhelper/factory.hxx>
 #include <osl/diagnose.h>
 #include <cppuhelper/implementationentry.hxx>
@@ -80,14 +80,14 @@ cppu::ImplementationEntry entries[] = {
 };
 }
 
-extern "C" void * SAL_CALL component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
     char const * implName, void * serviceManager, void * registryKey)
 {
     return cppu::component_getFactoryHelper(
         implName, serviceManager, registryKey, entries);
 }
 
-extern "C" void SAL_CALL component_getImplementationEnvironment(
+extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
     char const ** envTypeName, uno_Environment **)
 {
     *envTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
diff --git a/reportdesign/source/shared/makefile.mk b/reportdesign/source/shared/makefile.mk
deleted file mode 100644
index e399649bc..000000000
--- a/reportdesign/source/shared/makefile.mk
+++ /dev/null
@@ -1,67 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-PRJINC=$(PRJ)$/source
-PRJNAME=reportdesign
-LIBTARGET=NO
-TARGET=shared
-LIB1TARGET=$(SLB)$/coreshared.lib
-LIB2TARGET=$(SLB)$/xmlshared.lib
-LIB3TARGET=$(SLB)$/uishared.lib
-
-#ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings ----------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Types -------------------------------------
-
-# --- Files -------------------------------------
-    
-SLOFILES=	\
-        $(SLO)$/corestrings.obj		\
-        $(SLO)$/uistrings.obj		\
-        $(SLO)$/xmlstrings.obj		\
-
-
-LIB1OBJFILES=	\
-        $(SLO)$/corestrings.obj
-
-
-LIB2OBJFILES=	\
-        $(SLO)$/xmlstrings.obj
-        
-LIB3OBJFILES=	\
-        $(SLO)$/uistrings.obj		
-        
-
-# --- Targets ----------------------------------
-
-.INCLUDE : target.mk
-
diff --git a/reportdesign/source/shared/uistrings.cxx b/reportdesign/source/shared/uistrings.cxx
index 42338edb0..c0261d948 100644
--- a/reportdesign/source/shared/uistrings.cxx
+++ b/reportdesign/source/shared/uistrings.cxx
@@ -24,12 +24,13 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptui.hxx"
 
 #include "uistrings.hrc"
 
 namespace rptui
 {
+
 #include "stringconstants.cxx"
     IMPLEMENT_CONSTASCII_USTRING(PROPERTY_REPORTNAME			, "ReportName");
     IMPLEMENT_CONSTASCII_USTRING(CFG_REPORTDESIGNER				, "SunReportBuilder");
diff --git a/reportdesign/source/shared/xmlstrings.cxx b/reportdesign/source/shared/xmlstrings.cxx
index 99650bb1f..75a415303 100644
--- a/reportdesign/source/shared/xmlstrings.cxx
+++ b/reportdesign/source/shared/xmlstrings.cxx
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptxml.hxx"
 
 #include "xmlstrings.hrc"
 
@@ -34,7 +34,7 @@ namespace rptxml
 IMPLEMENT_CONSTASCII_USTRING(SERVICE_SETTINGSIMPORTER			, "com.sun.star.comp.Report.XMLOasisSettingsImporter");
 IMPLEMENT_CONSTASCII_USTRING(SERVICE_STYLESIMPORTER			    , "com.sun.star.comp.Report.XMLOasisStylesImporter");
 IMPLEMENT_CONSTASCII_USTRING(SERVICE_CONTENTIMPORTER			, "com.sun.star.comp.Report.XMLOasisContentImporter");
-IMPLEMENT_CONSTASCII_USTRING(SERVICE_IMPORTFILTER   			, "com.sun.star.comp.document.ImportFilter");
+IMPLEMENT_CONSTASCII_USTRING(SERVICE_IMPORTFILTER   			, "com.sun.star.document.ImportFilter");
 IMPLEMENT_CONSTASCII_USTRING(SERVICE_METAIMPORTER			    , "com.sun.star.comp.Report.XMLOasisMetaImporter");
 
 IMPLEMENT_CONSTASCII_USTRING(PROPERTY_BORDERLEFT   			    , "BorderLeft");
diff --git a/reportdesign/source/ui/dlg/AddField.cxx b/reportdesign/source/ui/dlg/AddField.cxx
index eff8e2226..426ee5c9e 100644
--- a/reportdesign/source/ui/dlg/AddField.cxx
+++ b/reportdesign/source/ui/dlg/AddField.cxx
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptui.hxx"
 #include "AddField.hxx"
 #include "UITools.hxx"
 #include <svx/dbaexchange.hxx>
diff --git a/reportdesign/source/ui/dlg/CondFormat.cxx b/reportdesign/source/ui/dlg/CondFormat.cxx
index a43a517df..929ae6e1e 100644
--- a/reportdesign/source/ui/dlg/CondFormat.cxx
+++ b/reportdesign/source/ui/dlg/CondFormat.cxx
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptui.hxx"
 
 #include "CondFormat.hxx"
 #include "CondFormat.hrc"
diff --git a/reportdesign/source/ui/dlg/Condition.cxx b/reportdesign/source/ui/dlg/Condition.cxx
index c4033dc80..6807420d6 100644
--- a/reportdesign/source/ui/dlg/Condition.cxx
+++ b/reportdesign/source/ui/dlg/Condition.cxx
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptui.hxx"
 
 #include "Condition.hxx"
 #include "UITools.hxx"
diff --git a/reportdesign/source/ui/dlg/DateTime.cxx b/reportdesign/source/ui/dlg/DateTime.cxx
index 07e79a1ab..3c001145e 100644
--- a/reportdesign/source/ui/dlg/DateTime.cxx
+++ b/reportdesign/source/ui/dlg/DateTime.cxx
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptui.hxx"
 #include "DateTime.hxx"
 #ifndef RPTUI_DATETIME_HRC
 #include "DateTime.hrc"
diff --git a/reportdesign/source/ui/dlg/Formula.cxx b/reportdesign/source/ui/dlg/Formula.cxx
index 85605f244..fd36f17ee 100644
--- a/reportdesign/source/ui/dlg/Formula.cxx
+++ b/reportdesign/source/ui/dlg/Formula.cxx
@@ -26,7 +26,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptui.hxx"
 
 
 //----------------------------------------------------------------------------
diff --git a/reportdesign/source/ui/dlg/GroupExchange.cxx b/reportdesign/source/ui/dlg/GroupExchange.cxx
index 887546df1..f0420a17d 100644
--- a/reportdesign/source/ui/dlg/GroupExchange.cxx
+++ b/reportdesign/source/ui/dlg/GroupExchange.cxx
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptui.hxx"
 #include "GroupExchange.hxx"
 #include <sot/formats.hxx>
 #include <sot/storage.hxx>
diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx b/reportdesign/source/ui/dlg/GroupsSorting.cxx
index 1e796531e..ec26adac4 100644
--- a/reportdesign/source/ui/dlg/GroupsSorting.cxx
+++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptui.hxx"
 #include "GroupsSorting.hxx"
 #include "GroupsSorting.hrc"
 #include <connectivity/dbtools.hxx>
diff --git a/reportdesign/source/ui/dlg/Navigator.cxx b/reportdesign/source/ui/dlg/Navigator.cxx
index 4517d4f45..76c427ba5 100644
--- a/reportdesign/source/ui/dlg/Navigator.cxx
+++ b/reportdesign/source/ui/dlg/Navigator.cxx
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptui.hxx"
 
 #include "Navigator.hxx"
 
diff --git a/reportdesign/source/ui/dlg/PageNumber.cxx b/reportdesign/source/ui/dlg/PageNumber.cxx
index 30b977440..f664ccc77 100644
--- a/reportdesign/source/ui/dlg/PageNumber.cxx
+++ b/reportdesign/source/ui/dlg/PageNumber.cxx
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptui.hxx"
 #include "PageNumber.hxx"
 #ifndef RPTUI_PAGENUMBER_HRC
 #include "PageNumber.hrc"
diff --git a/reportdesign/source/ui/dlg/dlgpage.cxx b/reportdesign/source/ui/dlg/dlgpage.cxx
index 42ea61af2..403677778 100644
--- a/reportdesign/source/ui/dlg/dlgpage.cxx
+++ b/reportdesign/source/ui/dlg/dlgpage.cxx
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptui.hxx"
 
 
 #include <svx/dialogs.hrc>
diff --git a/reportdesign/source/ui/dlg/makefile.mk b/reportdesign/source/ui/dlg/makefile.mk
deleted file mode 100644
index a2c775621..000000000
--- a/reportdesign/source/ui/dlg/makefile.mk
+++ /dev/null
@@ -1,77 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-PRJINC=$(PRJ)$/source
-PRJNAME=reportdesign
-TARGET=uidlg
-IMGLST_SRS=$(SRS)$/$(TARGET).srs
-BMP_IN=$(PRJ)$/res
-
-VISIBILITY_HIDDEN=TRUE
-
-# --- Settings ----------------------------------
-
-.INCLUDE : settings.mk
-# .INCLUDE : $(PRJ)$/util$/dll.pmk
-
-# --- Files -------------------------------------
-
-# ... resource files ............................
-
-SRS1NAME=$(TARGET)
-SRC1FILES =	\
-        dlgpage.src	\
-        PageNumber.src	\
-        DateTime.src	\
-        CondFormat.src	\
-        Navigator.src	\
-        GroupsSorting.src
-
-
-# ... object files ............................
-
-EXCEPTIONSFILES=	\
-        $(SLO)$/dlgpage.obj					\
-        $(SLO)$/Condition.obj				\
-        $(SLO)$/CondFormat.obj				\
-        $(SLO)$/GroupExchange.obj			\
-        $(SLO)$/PageNumber.obj				\
-        $(SLO)$/DateTime.obj				\
-        $(SLO)$/AddField.obj				\
-        $(SLO)$/Navigator.obj				\
-        $(SLO)$/GroupsSorting.obj           \
-        $(SLO)$/Formula.obj
-
-SLOFILES=	\
-        $(EXCEPTIONSFILES)					\
-
-
-# --- Targets ----------------------------------
-
-.INCLUDE : target.mk
-
diff --git a/reportdesign/source/ui/inspection/DataProviderHandler.cxx b/reportdesign/source/ui/inspection/DataProviderHandler.cxx
index f75985caf..dd4eb771e 100644
--- a/reportdesign/source/ui/inspection/DataProviderHandler.cxx
+++ b/reportdesign/source/ui/inspection/DataProviderHandler.cxx
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptui.hxx"
 #include "DataProviderHandler.hxx"
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <comphelper/namedvaluecollection.hxx>
diff --git a/reportdesign/source/ui/inspection/DefaultInspection.cxx b/reportdesign/source/ui/inspection/DefaultInspection.cxx
index bbbeea74f..9c728d3a0 100644
--- a/reportdesign/source/ui/inspection/DefaultInspection.cxx
+++ b/reportdesign/source/ui/inspection/DefaultInspection.cxx
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptui.hxx"
 #include "DefaultInspection.hxx"
 #include <comphelper/sequence.hxx>
 #include <com/sun/star/ucb/AlreadyInitializedException.hpp>
diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx b/reportdesign/source/ui/inspection/GeometryHandler.cxx
index 47cbe30fa..c2b3871ab 100644
--- a/reportdesign/source/ui/inspection/GeometryHandler.cxx
+++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptui.hxx"
 #include "GeometryHandler.hxx"
 
 #include <comphelper/sequence.hxx>
diff --git a/reportdesign/source/ui/inspection/ReportComponentHandler.cxx b/reportdesign/source/ui/inspection/ReportComponentHandler.cxx
index 3ec60ae6b..7bfb726a9 100644
--- a/reportdesign/source/ui/inspection/ReportComponentHandler.cxx
+++ b/reportdesign/source/ui/inspection/ReportComponentHandler.cxx
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptui.hxx"
 #include "ReportComponentHandler.hxx"
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <comphelper/sequence.hxx>
diff --git a/reportdesign/source/ui/inspection/metadata.cxx b/reportdesign/source/ui/inspection/metadata.cxx
index c3bef4846..90a5b17d2 100644
--- a/reportdesign/source/ui/inspection/metadata.cxx
+++ b/reportdesign/source/ui/inspection/metadata.cxx
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptui.hxx"
 #include "metadata.hxx"
 #include <svtools/localresaccess.hxx>
 #include "com/sun/star/inspection/XPropertyHandler.hpp"
diff --git a/reportdesign/source/ui/misc/ColorListener.cxx b/reportdesign/source/ui/misc/ColorListener.cxx
index b1e490cac..eb19d0fbe 100644
--- a/reportdesign/source/ui/misc/ColorListener.cxx
+++ b/reportdesign/source/ui/misc/ColorListener.cxx
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptui.hxx"
 #include "ColorListener.hxx"
 #include <svl/smplhint.hxx>
 #ifndef REPORTDESIGN_SHARED_UISTRINGS_HRC
diff --git a/reportdesign/source/ui/misc/FunctionHelper.cxx b/reportdesign/source/ui/misc/FunctionHelper.cxx
index da943b856..274b61e7f 100644
--- a/reportdesign/source/ui/misc/FunctionHelper.cxx
+++ b/reportdesign/source/ui/misc/FunctionHelper.cxx
@@ -26,7 +26,7 @@
  ************************************************************************/
 
 
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptui.hxx"
 #include "FunctionHelper.hxx"
 #include <tools/debug.hxx>
 
diff --git a/reportdesign/source/ui/misc/RptUndo.cxx b/reportdesign/source/ui/misc/RptUndo.cxx
index 21dc871f9..4d25d2d87 100644
--- a/reportdesign/source/ui/misc/RptUndo.cxx
+++ b/reportdesign/source/ui/misc/RptUndo.cxx
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptui.hxx"
 
 #include "RptUndo.hxx"
 #include "uistrings.hrc"
diff --git a/reportdesign/source/ui/misc/UITools.cxx b/reportdesign/source/ui/misc/UITools.cxx
index 1b47d2212..392ba3e7c 100644
--- a/reportdesign/source/ui/misc/UITools.cxx
+++ b/reportdesign/source/ui/misc/UITools.cxx
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptui.hxx"
 
 
 #include <toolkit/helper/convert.hxx>
diff --git a/reportdesign/source/ui/misc/makefile.mk b/reportdesign/source/ui/misc/makefile.mk
deleted file mode 100644
index 494b68023..000000000
--- a/reportdesign/source/ui/misc/makefile.mk
+++ /dev/null
@@ -1,62 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-PRJINC=$(PRJ)$/source
-PRJNAME=reportdesign
-TARGET=uimisc
-
-VISIBILITY_HIDDEN=TRUE
-
-# --- Settings ----------------------------------
-
-.INCLUDE : settings.mk
-# .INCLUDE : $(PRJ)$/util$/dll.pmk
-
-# --- Files -------------------------------------
-
-# ... resource files ............................
-
-# ... object files ............................
-
-EXCEPTIONSFILES=	\
-        $(SLO)$/RptUndo.obj					\
-        $(SLO)$/ColorListener.obj			\
-        $(SLO)$/UITools.obj					\
-        $(SLO)$/rptuiservices.obj			\
-        $(SLO)$/toolboxcontroller.obj		\
-        $(SLO)$/statusbarcontroller.obj		\
-        $(SLO)$/FunctionHelper.obj
-
-
-SLOFILES=	\
-        $(EXCEPTIONSFILES)
-
-# --- Targets ----------------------------------
-
-.INCLUDE : target.mk
-
diff --git a/reportdesign/source/ui/misc/rptuiservices.cxx b/reportdesign/source/ui/misc/rptuiservices.cxx
index 7eef147e8..4359807ae 100644
--- a/reportdesign/source/ui/misc/rptuiservices.cxx
+++ b/reportdesign/source/ui/misc/rptuiservices.cxx
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptui.hxx"
 #include <cppuhelper/factory.hxx>
 #include <osl/diagnose.h>
 #include <cppuhelper/implementationentry.hxx>
diff --git a/reportdesign/source/ui/misc/statusbarcontroller.cxx b/reportdesign/source/ui/misc/statusbarcontroller.cxx
index b601b312c..d570665b7 100644
--- a/reportdesign/source/ui/misc/statusbarcontroller.cxx
+++ b/reportdesign/source/ui/misc/statusbarcontroller.cxx
@@ -26,7 +26,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptui.hxx"
 #include "statusbarcontroller.hxx"
 
 #include <svx/zoomsliderctrl.hxx>
diff --git a/reportdesign/source/ui/misc/toolboxcontroller.cxx b/reportdesign/source/ui/misc/toolboxcontroller.cxx
index 6b67a073d..8b99c8bbf 100644
--- a/reportdesign/source/ui/misc/toolboxcontroller.cxx
+++ b/reportdesign/source/ui/misc/toolboxcontroller.cxx
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptui.hxx"
 #include "toolboxcontroller.hxx"
 #include <com/sun/star/ui/ImageType.hpp>
 #include <com/sun/star/frame/XDispatchProvider.hpp>
diff --git a/reportdesign/source/ui/report/DesignView.cxx b/reportdesign/source/ui/report/DesignView.cxx
index 35055252d..94bb5bf7e 100644
--- a/reportdesign/source/ui/report/DesignView.cxx
+++ b/reportdesign/source/ui/report/DesignView.cxx
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptui.hxx"
 
 #include "DesignView.hxx"
 #include <tools/debug.hxx>
diff --git a/reportdesign/source/ui/report/EndMarker.cxx b/reportdesign/source/ui/report/EndMarker.cxx
index ba5ca6b87..a7032c141 100644
--- a/reportdesign/source/ui/report/EndMarker.cxx
+++ b/reportdesign/source/ui/report/EndMarker.cxx
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptui.hxx"
 #include "EndMarker.hxx"
 #include "ColorChanger.hxx"
 #include "SectionWindow.hxx"
diff --git a/reportdesign/source/ui/report/FixedTextColor.cxx b/reportdesign/source/ui/report/FixedTextColor.cxx
index 8fc737a93..6538d938e 100644
--- a/reportdesign/source/ui/report/FixedTextColor.cxx
+++ b/reportdesign/source/ui/report/FixedTextColor.cxx
@@ -26,7 +26,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptui.hxx"
 
 #include <FixedTextColor.hxx>
 #include <com/sun/star/report/XFixedText.hpp>
diff --git a/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx b/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx
index 133f9b201..11b0677f1 100644
--- a/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx
+++ b/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx
@@ -26,7 +26,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptui.hxx"
 
 #include <FormattedFieldBeautifier.hxx>
 
diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx
index f0c424561..c57c361b0 100644
--- a/reportdesign/source/ui/report/ReportController.cxx
+++ b/reportdesign/source/ui/report/ReportController.cxx
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptui.hxx"
 
 #define RPTUI_ID_LRSPACE	1
 #define RPTUI_ID_ULSPACE	2
diff --git a/reportdesign/source/ui/report/ReportControllerObserver.cxx b/reportdesign/source/ui/report/ReportControllerObserver.cxx
index ef38d86f2..0b8aeb4fd 100644
--- a/reportdesign/source/ui/report/ReportControllerObserver.cxx
+++ b/reportdesign/source/ui/report/ReportControllerObserver.cxx
@@ -26,7 +26,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptui.hxx"
 
 #include <ReportControllerObserver.hxx>
 #include <ReportController.hxx>
diff --git a/reportdesign/source/ui/report/ReportRuler.cxx b/reportdesign/source/ui/report/ReportRuler.cxx
index 29775d47e..9c3acf83f 100644
--- a/reportdesign/source/ui/report/ReportRuler.cxx
+++ b/reportdesign/source/ui/report/ReportRuler.cxx
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptui.hxx"
 #include "ReportRuler.hxx"
 #include "ReportSection.hxx"
 #include "ReportWindow.hxx"
diff --git a/reportdesign/source/ui/report/ReportSection.cxx b/reportdesign/source/ui/report/ReportSection.cxx
index b0128c705..b7ee8ea8d 100644
--- a/reportdesign/source/ui/report/ReportSection.cxx
+++ b/reportdesign/source/ui/report/ReportSection.cxx
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptui.hxx"
 #include "ReportSection.hxx"
 #include "ReportWindow.hxx"
 #include "DesignView.hxx"
diff --git a/reportdesign/source/ui/report/ReportWindow.cxx b/reportdesign/source/ui/report/ReportWindow.cxx
index 7bf1abf57..721b45800 100644
--- a/reportdesign/source/ui/report/ReportWindow.cxx
+++ b/reportdesign/source/ui/report/ReportWindow.cxx
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptui.hxx"
 #include "ReportWindow.hxx"
 #include "ReportSection.hxx"
 #include "SectionView.hxx"
diff --git a/reportdesign/source/ui/report/ScrollHelper.cxx b/reportdesign/source/ui/report/ScrollHelper.cxx
index 22661f20a..9b518fccc 100644
--- a/reportdesign/source/ui/report/ScrollHelper.cxx
+++ b/reportdesign/source/ui/report/ScrollHelper.cxx
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptui.hxx"
 #include "ScrollHelper.hxx"
 #include "DesignView.hxx"
 #include "ReportController.hxx"
diff --git a/reportdesign/source/ui/report/SectionView.cxx b/reportdesign/source/ui/report/SectionView.cxx
index 3e99dc1ec..93bdceae3 100644
--- a/reportdesign/source/ui/report/SectionView.cxx
+++ b/reportdesign/source/ui/report/SectionView.cxx
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptui.hxx"
 #include "SectionView.hxx"
 #include "DesignView.hxx"
 #include <RptPage.hxx>
diff --git a/reportdesign/source/ui/report/SectionWindow.cxx b/reportdesign/source/ui/report/SectionWindow.cxx
index 191e35461..f59080714 100644
--- a/reportdesign/source/ui/report/SectionWindow.cxx
+++ b/reportdesign/source/ui/report/SectionWindow.cxx
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptui.hxx"
 #include "SectionWindow.hxx"
 #include "ReportWindow.hxx"
 #include "ReportRuler.hxx"
diff --git a/reportdesign/source/ui/report/StartMarker.cxx b/reportdesign/source/ui/report/StartMarker.cxx
index ec9005a2f..bdcb75e1c 100644
--- a/reportdesign/source/ui/report/StartMarker.cxx
+++ b/reportdesign/source/ui/report/StartMarker.cxx
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptui.hxx"
 #include "StartMarker.hxx"
 #include <vcl/image.hxx>
 #include <vcl/svapp.hxx>
diff --git a/reportdesign/source/ui/report/ViewsWindow.cxx b/reportdesign/source/ui/report/ViewsWindow.cxx
index 4e8acc367..421817dcc 100644
--- a/reportdesign/source/ui/report/ViewsWindow.cxx
+++ b/reportdesign/source/ui/report/ViewsWindow.cxx
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptui.hxx"
 
 #include "ViewsWindow.hxx"
 #include "ScrollHelper.hxx"
diff --git a/reportdesign/source/ui/report/dlgedclip.cxx b/reportdesign/source/ui/report/dlgedclip.cxx
index c940c6583..2d56f502f 100644
--- a/reportdesign/source/ui/report/dlgedclip.cxx
+++ b/reportdesign/source/ui/report/dlgedclip.cxx
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptui.hxx"
 #include "dlgedclip.hxx"
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/datatransfer/XMimeContentType.hpp>
diff --git a/reportdesign/source/ui/report/dlgedfac.cxx b/reportdesign/source/ui/report/dlgedfac.cxx
index 42cbf2098..fb09c95e8 100644
--- a/reportdesign/source/ui/report/dlgedfac.cxx
+++ b/reportdesign/source/ui/report/dlgedfac.cxx
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptui.hxx"
 #include "dlgedfac.hxx"
 #ifndef REPORTDESIGN_SHARED_UISTRINGS_HRC
 #include "uistrings.hrc"
diff --git a/reportdesign/source/ui/report/dlgedfunc.cxx b/reportdesign/source/ui/report/dlgedfunc.cxx
index 57e0c756f..824d5e26e 100644
--- a/reportdesign/source/ui/report/dlgedfunc.cxx
+++ b/reportdesign/source/ui/report/dlgedfunc.cxx
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptui.hxx"
 #include <vcl/scrbar.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/seleng.hxx>
diff --git a/reportdesign/source/ui/report/makefile.mk b/reportdesign/source/ui/report/makefile.mk
deleted file mode 100644
index 3c19923f4..000000000
--- a/reportdesign/source/ui/report/makefile.mk
+++ /dev/null
@@ -1,72 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-PRJINC=$(PRJ)$/source
-PRJNAME=reportdesign
-TARGET=report
-
-ENABLE_EXCEPTIONS=TRUE
-VISIBILITY_HIDDEN=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-# .INCLUDE : $(PRJ)$/util$/dll.pmk
-
-IMGLST_SRS=$(SRS)$/$(TARGET).srs
-# --- Files --------------------------------------------------------
-
-SLOFILES =\
-            $(SLO)$/SectionWindow.obj			\
-            $(SLO)$/ReportController.obj		\
-            $(SLO)$/ReportControllerObserver.obj \
-            $(SLO)$/FormattedFieldBeautifier.obj \
-            $(SLO)$/FixedTextColor.obj           \
-            $(SLO)$/ReportSection.obj			\
-            $(SLO)$/SectionView.obj				\
-            $(SLO)$/ViewsWindow.obj				\
-            $(SLO)$/ScrollHelper.obj			\
-            $(SLO)$/StartMarker.obj				\
-            $(SLO)$/EndMarker.obj				\
-            $(SLO)$/dlgedfunc.obj				\
-            $(SLO)$/dlgedfac.obj				\
-            $(SLO)$/dlgedclip.obj				\
-            $(SLO)$/ReportWindow.obj			\
-            $(SLO)$/DesignView.obj				\
-            $(SLO)$/propbrw.obj
-
-
-SRS1NAME=$(TARGET)
-SRC1FILES =  report.src
-
-# --- Targets -------------------------------------------------------
-
-
-.INCLUDE :  target.mk
-
-$(SRS)$/$(TARGET).srs: $(SOLARINCDIR)$/svx$/globlmn.hrc
diff --git a/reportdesign/source/ui/report/propbrw.cxx b/reportdesign/source/ui/report/propbrw.cxx
index 4c627c847..980ed707f 100644
--- a/reportdesign/source/ui/report/propbrw.cxx
+++ b/reportdesign/source/ui/report/propbrw.cxx
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#include "precompiled_reportdesign.hxx"
+#include "precompiled_rptui.hxx"
 #include "propbrw.hxx"
 #include "RptObject.hxx"
 #include "ReportController.hxx"
diff --git a/reportdesign/util/makefile.mk b/reportdesign/util/makefile.mk
deleted file mode 100644
index 4f0901843..000000000
--- a/reportdesign/util/makefile.mk
+++ /dev/null
@@ -1,253 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..
-PRJNAME=reportdesign
-TARGET=rpt
-TARGET2=$(TARGET)ui
-# USE_DEFFILE=TRUE
-GEN_HID=TRUE
-GEN_HID_OTHER=TRUE
-
-# --- Settings ----------------------------------
-.INCLUDE :  settings.mk
-
-.IF "$(L10N_framework)"==""
-
-# ------------------------------------------------------------------
-# --- reportdesign core (rpt) -----------------------------------
-
-LIB1TARGET=$(SLB)$/$(TARGET).lib
-LIB1FILES=\
-        $(SLB)$/api.lib				\
-        $(SLB)$/coreshared.lib		\
-        $(SLB)$/core_resource.lib	\
-        $(SLB)$/core_sdr.lib        \
-        $(SLB)$/core_misc.lib
-
-SHL1TARGET=$(TARGET)$(DLLPOSTFIX)
-
-SHL1STDLIBS= \
-    $(EDITENGLIB)			\
-        $(SVXCORELIB)			\
-        $(SVXLIB)				\
-        $(FWELIB)				\
-        $(SFXLIB)				\
-        $(TOOLSLIB) 			\
-        $(I18NISOLANGLIB) \
-        $(SVLLIB)				\
-        $(SVTOOLLIB)			\
-        $(UNOTOOLSLIB)			\
-        $(DBTOOLSLIB)			\
-        $(COMPHELPERLIB) 		\
-        $(CPPUHELPERLIB) 		\
-        $(CPPULIB)				\
-        $(VCLLIB)				\
-        $(TKLIB)				\
-        $(VOSLIB)				\
-        $(SALLIB)
-
-.IF "$(GUI)"=="OS2"
-SHL1STDLIBS+= \
-        idbu.lib
-.ELIF "$(GUI)"!="WNT" || "$(COM)"=="GCC"
-SHL1STDLIBS+= \
-        -ldbu$(DLLPOSTFIX)
-.ELSE
-SHL1STDLIBS+= \
-        idbu.lib
-.ENDIF
-
-SHL1IMPLIB=i$(TARGET)
-SHL1USE_EXPORTS=name
-SHL1LIBS=$(LIB1TARGET)
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-
-DEF1NAME=$(SHL1TARGET)
-DEFLIB1NAME=$(TARGET)
-.ENDIF
-# --- .res file ----------------------------------------------------------
-
-RES1FILELIST=\
-    $(SRS)$/core_strings.srs
-
-RESLIB1NAME=$(TARGET)
-RESLIB1IMAGES=$(PRJ)$/res
-RESLIB1SRSFILES=$(RES1FILELIST)
-
-.IF "$(L10N_framework)"==""
-# --- reportdesign UI core (rptui) -----------------------------------
-LIB2TARGET=$(SLB)$/$(TARGET2).lib
-LIB2FILES=\
-        $(SLB)$/uimisc.lib			\
-        $(SLB)$/uidlg.lib			\
-        $(SLB)$/uishared.lib		\
-        $(SLB)$/ui_inspection.lib	\
-        $(SLB)$/report.lib
-
-SHL2TARGET=$(TARGET2)$(DLLPOSTFIX)
-
-SHL2STDLIBS= \
-    $(EDITENGLIB)			\
-        $(SVXCORELIB)			\
-        $(SVXLIB)				\
-        $(SFXLIB)				\
-        $(SVTOOLLIB)			\
-        $(TKLIB)				\
-        $(VCLLIB)				\
-        $(SVLLIB)				\
-        $(SOTLIB)				\
-        $(UNOTOOLSLIB)			\
-        $(TOOLSLIB)				\
-        $(DBTOOLSLIB)			\
-        $(COMPHELPERLIB)		\
-        $(CPPUHELPERLIB)		\
-        $(CPPULIB)				\
-        $(FWELIB)				\
-        $(SO2LIB)				\
-        $(I18NISOLANGLIB)		\
-        $(SALLIB)
-.IF "$(GUI)"=="OS2"
-SHL2STDLIBS+= \
-        idbu.lib				\
-        i$(TARGET).lib
-.ELIF "$(GUI)"!="WNT" || "$(COM)"=="GCC"
-SHL2STDLIBS+= \
-        -ldbu$(DLLPOSTFIX) \
-        -l$(TARGET)$(DLLPOSTFIX)
-.ELSE
-SHL2STDLIBS+= \
-        idbu.lib				\
-        i$(TARGET).lib
-.ENDIF
-
-.IF "$(GUI)"=="OS2"
-SHL2STDLIBS+= \
-        ifor.lib \
-        iforui.lib
-.ELIF "$(GUI)"!="WNT" || "$(COM)"=="GCC"
-SHL2STDLIBS+= \
-        -lfor$(DLLPOSTFIX) \
-        -lforui$(DLLPOSTFIX)
-.ELSE
-SHL2STDLIBS+= \
-        ifor.lib \
-        iforui.lib
-.ENDIF
-
-
-SHL2DEPN=$(SHL1TARGETN)
-SHL2LIBS=$(LIB2TARGET)
-SHL2DEF=$(MISC)$/$(SHL2TARGET).def
-DEF2NAME=$(SHL2TARGET)
-SHL2VERSIONMAP=$(SOLARENV)/src/component.map
-.ENDIF
-# --- .res file ----------------------------------------------------------
-RES2FILELIST=\
-    $(SRS)$/uidlg.srs				\
-    $(SRS)$/ui_inspection.srs		\
-    $(SRS)$/report.srs
-
-RESLIB2NAME=$(TARGET2)
-RESLIB2IMAGES=$(PRJ)$/res
-RESLIB2SRSFILES=$(RES2FILELIST)
-.IF "$(L10N_framework)"==""
-
-# ------------------- rptxml -------------------
-TARGET3=rptxml
-# --- Library -----------------------------------
-LIB3TARGET=$(SLB)$/rpt_flt.lib
-LIB3FILES=\
-        $(SLB)$/xmlshared.lib	\
-        $(SLB)$/$(TARGET3).lib
-
-SHL3TARGET=$(TARGET3)$(DLLPOSTFIX)
-
-SHL3STDLIBS=\
-    $(EDITENGLIB)			\
-    $(SVXCORELIB)			\
-    $(XMLOFFLIB)		\
-    $(VCLLIB)			\
-    $(UNOTOOLSLIB)		\
-    $(TOOLSLIB)			\
-    $(DBTOOLSLIB)		\
-    $(COMPHELPERLIB)	\
-    $(CPPUHELPERLIB)	\
-    $(CPPULIB)			\
-    $(UCBHELPERLIB)		\
-    $(SFXLIB)			\
-    $(SVLLIB)			\
-    $(SOTLIB)			\
-    $(SO2LIB)			\
-    $(SALLIB)
-.IF "$(GUI)"=="OS2"
-SHL3STDLIBS+= \
-    irpt.lib
-.ELIF "$(GUI)"!="WNT" || "$(COM)"=="GCC"
-SHL3STDLIBS+= \
-        -l$(TARGET)$(DLLPOSTFIX)
-.ELSE
-SHL3STDLIBS+= \
-    irpt.lib
-.ENDIF
-
-
-SHL3DEPN=$(SHL1TARGETN)
-SHL3LIBS=$(LIB3TARGET)
-SHL3IMPLIB=	i$(SHL3TARGET)
-SHL3VERSIONMAP=$(SOLARENV)/src/component.map
-SHL3DEF=	$(MISC)$/$(SHL3TARGET).def
-
-DEF3NAME=$(SHL3TARGET)
-
-.ENDIF
-
-# --- Targets ----------------------------------
-
-.INCLUDE : target.mk
-
-
-
-ALLTAR : $(MISC)/rpt.component $(MISC)/rptui.component $(MISC)/rptxml.component
-
-$(MISC)/rpt.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
-        rpt.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt rpt.component
-
-$(MISC)/rptui.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
-        rptui.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL2TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt rptui.component
-
-$(MISC)/rptxml.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
-        rptxml.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL3TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt rptxml.component