gbuildize reportdesign

22 files changed, 533 insertions, 920 deletions

diff --git a/reportdesign/AllLangResTarget_rpt.mk b/reportdesign/AllLangResTarget_rpt.mk
new file mode 100644
index 000000000000..00b1d2022739
--- /dev/null
+++ b/reportdesign/AllLangResTarget_rpt.mk
@@ -0,0 +1,48 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#       David Tardon, Red Hat Inc. <dtardon@redhat.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_AllLangResTarget_AllLangResTarget,rpt))
+
+$(eval $(call gb_AllLangResTarget_set_reslocation,rpt,reportdesign))
+
+$(eval $(call gb_AllLangResTarget_add_srs,rpt,\
+    reportdesign/res \
+))
+
+$(eval $(call gb_SrsTarget_SrsTarget,reportdesign/res))
+
+$(eval $(call gb_SrsTarget_set_include,reportdesign/res,\
+    $$(INCLUDE) \
+    -I$(realpath $(SRCDIR)/reportdesign/source/core/inc) \
+    -I$(OUTDIR)/inc \
+))
+
+$(eval $(call gb_SrsTarget_add_files,reportdesign/res,\
+    reportdesign/source/core/resource/strings.src \
+))
+
+# vim: set noet ts=4 sw=4:
diff --git a/reportdesign/AllLangResTarget_rptui.mk b/reportdesign/AllLangResTarget_rptui.mk
new file mode 100644
index 000000000000..234c6a5eea80
--- /dev/null
+++ b/reportdesign/AllLangResTarget_rptui.mk
@@ -0,0 +1,57 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#       David Tardon, Red Hat Inc. <dtardon@redhat.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_AllLangResTarget_AllLangResTarget,rptui))
+
+$(eval $(call gb_AllLangResTarget_set_reslocation,rptui,reportdesign))
+
+$(eval $(call gb_AllLangResTarget_add_srs,rptui,\
+    reportdesign/ui \
+))
+
+$(eval $(call gb_SrsTarget_SrsTarget,reportdesign/ui))
+
+$(eval $(call gb_SrsTarget_set_include,reportdesign/ui,\
+    $$(INCLUDE) \
+    -I$(realpath $(SRCDIR)/reportdesign/inc) \
+    -I$(OUTDIR)/inc \
+))
+
+$(eval $(call gb_SrsTarget_add_files,reportdesign/ui,\
+    reportdesign/source/ui/dlg/CondFormat.src \
+    reportdesign/source/ui/inspection/inspection.src \
+    reportdesign/source/ui/report/report.src \
+    reportdesign/source/ui/dlg/DateTime.src \
+    reportdesign/source/ui/dlg/dlgpage.src \
+    reportdesign/source/ui/dlg/GroupsSorting.src \
+    reportdesign/source/ui/dlg/Navigator.src \
+    reportdesign/source/ui/dlg/PageNumber.src \
+))
+
+$(call gb_SrsTarget_get_target,reportdesign/ui) :| $(OUTDIR)/inc/svx/globlmn.hrc
+
+# vim: set noet ts=4 sw=4:
diff --git a/reportdesign/Library_rpt.mk b/reportdesign/Library_rpt.mk
new file mode 100644
index 000000000000..430f9d220962
--- /dev/null
+++ b/reportdesign/Library_rpt.mk
@@ -0,0 +1,108 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#       David Tardon, Red Hat Inc. <dtardon@redhat.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Library_Library,rpt))
+
+$(eval $(call gb_Library_add_precompiled_header,rpt,$(SRCDIR)/reportdesign/inc/pch/precompiled_reportdesign))
+
+$(eval $(call gb_Library_set_include,rpt,\
+    $$(INCLUDE) \
+    -I$(realpath $(SRCDIR)/reportdesign/inc) \
+    -I$(realpath $(SRCDIR)/reportdesign/inc/pch) \
+    -I$(realpath $(SRCDIR)/reportdesign/source/inc) \
+    -I$(realpath $(SRCDIR)/reportdesign/source/core/inc) \
+    -I$(OUTDIR)/inc \
+    -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_set_defs,rpt,\
+    $$(DEFS) \
+    -DREPORTDESIGN_DLLIMPLEMENTATION \
+))
+
+$(eval $(call gb_Library_add_linked_libs,rpt,\
+    comphelper \
+    cppu \
+    cppuhelper \
+    dbtools \
+    dbu \
+    editeng \
+    fwe \
+    i18nisolang1 \
+    sal \
+    sfx \
+    svl \
+    svt \
+    svxcore \
+    svx \
+    tk \
+    tl \
+    utl \
+    vcl \
+    $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_set_componentfile,rpt,reportdesign/util/rpt))
+
+$(eval $(call gb_Library_add_exception_objects,rpt,\
+    reportdesign/source/core/api/FixedLine \
+    reportdesign/source/core/api/FixedText \
+    reportdesign/source/core/api/FormatCondition \
+    reportdesign/source/core/api/FormattedField \
+    reportdesign/source/core/api/Function \
+    reportdesign/source/core/api/Functions \
+    reportdesign/source/core/api/Group \
+    reportdesign/source/core/api/Groups \
+    reportdesign/source/core/api/ImageControl \
+    reportdesign/source/core/api/ReportComponent \
+    reportdesign/source/core/api/ReportControlModel \
+    reportdesign/source/core/api/ReportDefinition \
+    reportdesign/source/core/api/ReportEngineJFree \
+    reportdesign/source/core/api/ReportVisitor \
+    reportdesign/source/core/api/Section \
+    reportdesign/source/core/api/services \
+    reportdesign/source/core/api/Shape \
+    reportdesign/source/core/api/Tools \
+    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/formatnormalizer \
+    reportdesign/source/core/sdr/ModuleHelper \
+    reportdesign/source/core/sdr/PropertyForward \
+    reportdesign/source/core/sdr/ReportDrawPage \
+    reportdesign/source/core/sdr/ReportUndoFactory \
+    reportdesign/source/core/sdr/RptModel \
+    reportdesign/source/core/sdr/RptObject \
+    reportdesign/source/core/sdr/RptObjectListener \
+    reportdesign/source/core/sdr/RptPage \
+    reportdesign/source/core/sdr/UndoActions \
+    reportdesign/source/core/sdr/UndoEnv \
+    reportdesign/source/shared/corestrings \
+))
+
+# vim: set noet ts=4 sw=4:
diff --git a/reportdesign/Library_rptui.mk b/reportdesign/Library_rptui.mk
new file mode 100644
index 000000000000..c532117ce9a7
--- /dev/null
+++ b/reportdesign/Library_rptui.mk
@@ -0,0 +1,113 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#       David Tardon, Red Hat Inc. <dtardon@redhat.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Library_Library,rptui))
+
+$(eval $(call gb_Library_add_precompiled_header,rptui,$(SRCDIR)/reportdesign/inc/pch/precompiled_reportdesign))
+
+$(eval $(call gb_Library_set_include,rptui,\
+    $$(INCLUDE) \
+    -I$(realpath $(SRCDIR)/reportdesign/inc) \
+    -I$(realpath $(SRCDIR)/reportdesign/inc/pch) \
+    -I$(realpath $(SRCDIR)/reportdesign/source/inc) \
+    -I$(realpath $(SRCDIR)/reportdesign/source/ui/inc) \
+    -I$(OUTDIR)/inc \
+    -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_add_linked_libs,rptui,\
+    comphelper \
+    cppu \
+    cppuhelper \
+    dbtools \
+    dbu \
+    editeng \
+    for \
+    forui \
+    fwe \
+    i18nisolang1 \
+    rpt \
+    sal \
+    sfx \
+    sot \
+    svl \
+    svt \
+    svxcore \
+    svx \
+    tk \
+    tl \
+    utl \
+    vcl \
+    $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_set_componentfile,rptui,reportdesign/util/rptui))
+
+$(eval $(call gb_Library_add_exception_objects,rptui,\
+    reportdesign/source/shared/uistrings \
+    reportdesign/source/ui/dlg/AddField \
+    reportdesign/source/ui/dlg/CondFormat \
+    reportdesign/source/ui/dlg/Condition \
+    reportdesign/source/ui/dlg/DateTime \
+    reportdesign/source/ui/dlg/dlgpage \
+    reportdesign/source/ui/dlg/Formula \
+    reportdesign/source/ui/dlg/GroupExchange \
+    reportdesign/source/ui/dlg/GroupsSorting \
+    reportdesign/source/ui/dlg/Navigator \
+    reportdesign/source/ui/dlg/PageNumber \
+    reportdesign/source/ui/inspection/DataProviderHandler \
+    reportdesign/source/ui/inspection/DefaultInspection \
+    reportdesign/source/ui/inspection/GeometryHandler \
+    reportdesign/source/ui/inspection/metadata \
+    reportdesign/source/ui/inspection/ReportComponentHandler \
+    reportdesign/source/ui/misc/ColorListener \
+    reportdesign/source/ui/misc/FunctionHelper \
+    reportdesign/source/ui/misc/rptuiservices \
+    reportdesign/source/ui/misc/RptUndo \
+    reportdesign/source/ui/misc/statusbarcontroller \
+    reportdesign/source/ui/misc/toolboxcontroller \
+    reportdesign/source/ui/misc/UITools \
+    reportdesign/source/ui/report/DesignView \
+    reportdesign/source/ui/report/dlgedclip \
+    reportdesign/source/ui/report/dlgedfac \
+    reportdesign/source/ui/report/dlgedfunc \
+    reportdesign/source/ui/report/EndMarker \
+    reportdesign/source/ui/report/FixedTextColor \
+    reportdesign/source/ui/report/FormattedFieldBeautifier \
+    reportdesign/source/ui/report/propbrw \
+    reportdesign/source/ui/report/ReportController \
+    reportdesign/source/ui/report/ReportControllerObserver \
+    reportdesign/source/ui/report/ReportSection \
+    reportdesign/source/ui/report/ReportWindow \
+    reportdesign/source/ui/report/ScrollHelper \
+    reportdesign/source/ui/report/SectionView \
+    reportdesign/source/ui/report/SectionWindow \
+    reportdesign/source/ui/report/StartMarker \
+    reportdesign/source/ui/report/ViewsWindow \
+))
+
+# vim: set noet ts=4 sw=4:
diff --git a/reportdesign/Library_rptxml.mk b/reportdesign/Library_rptxml.mk
new file mode 100644
index 000000000000..8a0b6864c8d4
--- /dev/null
+++ b/reportdesign/Library_rptxml.mk
@@ -0,0 +1,99 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#       David Tardon, Red Hat Inc. <dtardon@redhat.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Library_Library,rptxml))
+
+$(eval $(call gb_Library_add_precompiled_header,rptxml,$(SRCDIR)/reportdesign/inc/pch/precompiled_reportdesign))
+
+$(eval $(call gb_Library_set_include,rptxml,\
+    $$(INCLUDE) \
+    -I$(realpath $(SRCDIR)/reportdesign/inc) \
+    -I$(realpath $(SRCDIR)/reportdesign/inc/pch) \
+    -I$(realpath $(SRCDIR)/reportdesign/source/inc) \
+    -I$(OUTDIR)/inc \
+    -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_set_defs,rptxml,\
+    $$(DEFS) \
+))
+
+$(eval $(call gb_Library_add_linked_libs,rptxml,\
+    comphelper \
+    cppu \
+    cppuhelper \
+    dbtools \
+    editeng \
+    rpt \
+    sal \
+    sfx \
+    sot \
+    svl \
+    svxcore \
+    tl \
+    ucbhelper \
+    utl \
+    vcl \
+    xo \
+    $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_set_componentfile,rptxml,reportdesign/util/rptxml))
+
+$(eval $(call gb_Library_add_exception_objects,rptxml,\
+    reportdesign/source/filter/xml/dbloader2 \
+    reportdesign/source/filter/xml/xmlAutoStyle \
+    reportdesign/source/filter/xml/xmlCell \
+    reportdesign/source/filter/xml/xmlColumn \
+    reportdesign/source/filter/xml/xmlComponent \
+    reportdesign/source/filter/xml/xmlCondPrtExpr \
+    reportdesign/source/filter/xml/xmlControlProperty \
+    reportdesign/source/filter/xml/xmlExport \
+    reportdesign/source/filter/xml/xmlExportDocumentHandler \
+    reportdesign/source/filter/xml/xmlfilter \
+    reportdesign/source/filter/xml/xmlFixedContent \
+    reportdesign/source/filter/xml/xmlFormatCondition \
+    reportdesign/source/filter/xml/xmlFormattedField \
+    reportdesign/source/filter/xml/xmlFunction \
+    reportdesign/source/filter/xml/xmlGroup \
+    reportdesign/source/filter/xml/xmlHelper \
+    reportdesign/source/filter/xml/xmlImage \
+    reportdesign/source/filter/xml/xmlImportDocumentHandler \
+    reportdesign/source/filter/xml/xmlMasterFields \
+    reportdesign/source/filter/xml/xmlPropertyHandler \
+    reportdesign/source/filter/xml/xmlReport \
+    reportdesign/source/filter/xml/xmlReportElement \
+    reportdesign/source/filter/xml/xmlReportElementBase \
+    reportdesign/source/filter/xml/xmlSection \
+    reportdesign/source/filter/xml/xmlservices \
+    reportdesign/source/filter/xml/xmlStyleImport \
+    reportdesign/source/filter/xml/xmlSubDocument \
+    reportdesign/source/filter/xml/xmlTable \
+    reportdesign/source/shared/xmlstrings \
+))
+
+# vim: set noet ts=4 sw=4:
diff --git a/reportdesign/inc/makefile.mk b/reportdesign/Makefile
index b24d73a7cd92..c898975e5277 100644
--- a/reportdesign/inc/makefile.mk
+++ b/reportdesign/Makefile
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # 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
@@ -24,24 +24,15 @@
 # for a copy of the LGPLv3 License.
 #
 #*************************************************************************
-PRJ=..
-
-PRJNAME=reportdesign
-TARGET=inc
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
 
-# --- Files --------------------------------------------------------
-# --- Targets -------------------------------------------------------
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set!)
+endif
 
-.INCLUDE :  target.mk
+gb_PARTIALBUILD := T
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
 
-.IF "$(ENABLE_PCH)"!=""
-ALLTAR : \
-    $(SLO)$/precompiled.pch \
-    $(SLO)$/precompiled_ex.pch
-    
-.ENDIF			# "$(ENABLE_PCH)"!=""
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
 
+# vim: set noet sw=4 ts=4:
diff --git a/reportdesign/Module_reportdesign.mk b/reportdesign/Module_reportdesign.mk
new file mode 100644
index 000000000000..b348b8943d8f
--- /dev/null
+++ b/reportdesign/Module_reportdesign.mk
@@ -0,0 +1,39 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#       David Tardon, Red Hat Inc. <dtardon@redhat.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Module_Module,reportdesign))
+
+$(eval $(call gb_Module_add_targets,reportdesign,\
+    AllLangResTarget_rpt \
+    AllLangResTarget_rptui \
+    Library_rpt \
+    Library_rptui \
+    Library_rptxml \
+    Package_uiconfig \
+))
+
+# vim: set noet ts=4 sw=4:
diff --git a/reportdesign/Package_uiconfig.mk b/reportdesign/Package_uiconfig.mk
new file mode 100644
index 000000000000..ac773f044744
--- /dev/null
+++ b/reportdesign/Package_uiconfig.mk
@@ -0,0 +1,47 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#       David Tardon, Red Hat Inc. <dtardon@redhat.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Package_Package,reportdesign_uiconfig,$(SRCDIR)/reportdesign/uiconfig/dbreport))
+
+$(eval $(call gb_Package_add_file,reportdesign_uiconfig,xml/uiconfig/modules/dbreport/menubar/menubar.xml,menubar/menubar.xml))
+$(eval $(call gb_Package_add_file,reportdesign_uiconfig,xml/uiconfig/modules/dbreport/statusbar/statusbar.xml,statusbar/statusbar.xml))
+$(eval $(call gb_Package_add_file,reportdesign_uiconfig,xml/uiconfig/modules/dbreport/toolbar/alignmentbar.xml,toolbar/alignmentbar.xml))
+$(eval $(call gb_Package_add_file,reportdesign_uiconfig,xml/uiconfig/modules/dbreport/toolbar/arrowshapes.xml,toolbar/arrowshapes.xml))
+$(eval $(call gb_Package_add_file,reportdesign_uiconfig,xml/uiconfig/modules/dbreport/toolbar/basicshapes.xml,toolbar/basicshapes.xml))
+$(eval $(call gb_Package_add_file,reportdesign_uiconfig,xml/uiconfig/modules/dbreport/toolbar/calloutshapes.xml,toolbar/calloutshapes.xml))
+$(eval $(call gb_Package_add_file,reportdesign_uiconfig,xml/uiconfig/modules/dbreport/toolbar/drawbar.xml,toolbar/drawbar.xml))
+$(eval $(call gb_Package_add_file,reportdesign_uiconfig,xml/uiconfig/modules/dbreport/toolbar/flowchartshapes.xml,toolbar/flowchartshapes.xml))
+$(eval $(call gb_Package_add_file,reportdesign_uiconfig,xml/uiconfig/modules/dbreport/toolbar/Formatting.xml,toolbar/Formatting.xml))
+$(eval $(call gb_Package_add_file,reportdesign_uiconfig,xml/uiconfig/modules/dbreport/toolbar/reportcontrols.xml,toolbar/reportcontrols.xml))
+$(eval $(call gb_Package_add_file,reportdesign_uiconfig,xml/uiconfig/modules/dbreport/toolbar/resizebar.xml,toolbar/resizebar.xml))
+$(eval $(call gb_Package_add_file,reportdesign_uiconfig,xml/uiconfig/modules/dbreport/toolbar/sectionalignmentbar.xml,toolbar/sectionalignmentbar.xml))
+$(eval $(call gb_Package_add_file,reportdesign_uiconfig,xml/uiconfig/modules/dbreport/toolbar/sectionshrinkbar.xml,toolbar/sectionshrinkbar.xml))
+$(eval $(call gb_Package_add_file,reportdesign_uiconfig,xml/uiconfig/modules/dbreport/toolbar/starshapes.xml,toolbar/starshapes.xml))
+$(eval $(call gb_Package_add_file,reportdesign_uiconfig,xml/uiconfig/modules/dbreport/toolbar/symbolshapes.xml,toolbar/symbolshapes.xml))
+$(eval $(call gb_Package_add_file,reportdesign_uiconfig,xml/uiconfig/modules/dbreport/toolbar/toolbar.xml,toolbar/toolbar.xml))
+
+# vim: set noet ts=4 sw=4:
diff --git a/reportdesign/prj/build.lst b/reportdesign/prj/build.lst
index cfa1e92f8a95..9ae4cc7d7455 100644
--- a/reportdesign/prj/build.lst
+++ b/reportdesign/prj/build.lst
@@ -1,18 +1,3 @@
 rd  reportdesign    :   TRANSLATIONS:translations 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 d7cc5fad6396..e69de29bb2d1 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/util/dll.pmk b/reportdesign/prj/makefile.mk
index c2ce7d89d88f..e312a7ccab65 100644..100755
--- a/reportdesign/util/dll.pmk
+++ b/reportdesign/prj/makefile.mk
@@ -25,7 +25,16 @@
 #
 #*************************************************************************
 
-# define REPORTDESIGN_DLLIMPLEMENTATION (see @ dllapi.h)
-CDEFS += -DREPORTDESIGN_DLLIMPLEMENTATION
+PRJ=..
+TARGET=prj
 
-VISIBILITY_HIDDEN=TRUE
+.INCLUDE : settings.mk
+
+.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/makefile.mk b/reportdesign/source/core/api/makefile.mk
deleted file mode 100644
index f19d7486a0cd..000000000000
--- 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/misc/makefile.mk b/reportdesign/source/core/misc/makefile.mk
deleted file mode 100644
index 749eb8214125..000000000000
--- a/reportdesign/source/core/misc/makefile.mk
+++ /dev/null
@@ -1,46 +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_misc
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  settings.mk
-.INCLUDE : $(PRJ)$/util$/dll.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES=	$(SLO)$/conditionalexpression.obj \
-            $(SLO)$/conditionupdater.obj \
-            $(SLO)$/reportformula.obj
-
-# --- Targets ----------------------------------
-
-.INCLUDE :  target.mk
diff --git a/reportdesign/source/core/resource/makefile.mk b/reportdesign/source/core/resource/makefile.mk
deleted file mode 100644
index d80adb525656..000000000000
--- a/reportdesign/source/core/resource/makefile.mk
+++ /dev/null
@@ -1,48 +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_resource
-ENABLE_EXCEPTIONS=TRUE
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE : $(PRJ)$/util$/dll.pmk
-
-# --- Files --------------------------------------------------------
-
-SRS1NAME=core_strings
-SRC1FILES= \
-    strings.src 	\
-
-SLOFILES=	$(SLO)$/core_resource.obj \
-
-# --- Targets ----------------------------------
-
-.INCLUDE :  target.mk
diff --git a/reportdesign/source/core/sdr/makefile.mk b/reportdesign/source/core/sdr/makefile.mk
deleted file mode 100644
index 5121b498b68d..000000000000
--- 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/makefile.mk b/reportdesign/source/filter/xml/makefile.mk
deleted file mode 100644
index 41761d7a7822..000000000000
--- 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/shared/makefile.mk b/reportdesign/source/shared/makefile.mk
deleted file mode 100644
index 62f78561dcf2..000000000000
--- a/reportdesign/source/shared/makefile.mk
+++ /dev/null
@@ -1,65 +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
-
-# --- 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/ui/dlg/makefile.mk b/reportdesign/source/ui/dlg/makefile.mk
deleted file mode 100644
index a2c7756213fc..000000000000
--- 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/makefile.mk b/reportdesign/source/ui/inspection/makefile.mk
deleted file mode 100644
index cd2c6e9e52cd..000000000000
--- a/reportdesign/source/ui/inspection/makefile.mk
+++ /dev/null
@@ -1,53 +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=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
diff --git a/reportdesign/source/ui/misc/makefile.mk b/reportdesign/source/ui/misc/makefile.mk
deleted file mode 100644
index 494b68023d62..000000000000
--- 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/report/makefile.mk b/reportdesign/source/ui/report/makefile.mk
deleted file mode 100644
index 0383a98be4a8..000000000000
--- a/reportdesign/source/ui/report/makefile.mk
+++ /dev/null
@@ -1,71 +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
-
-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/util/makefile.mk b/reportdesign/util/makefile.mk
deleted file mode 100644
index dc58db3f61a0..000000000000
--- a/reportdesign/util/makefile.mk
+++ /dev/null
@@ -1,252 +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)				\
-        $(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