[PATCH] deliver all uiconfig files by UIConfig
David Tardon (via Code Review)
gerrit at gerrit.libreoffice.org
Sun Apr 7 07:06:21 PDT 2013
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3229
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/29/3229/1
deliver all uiconfig files by UIConfig
Change-Id: Ie78b7ce399ba34485146ca7622c59d31f8105d02
---
M basctl/Module_basctl.mk
D basctl/Package_uiconfig.mk
M basctl/UIConfig_basicide.mk
M chart2/Module_chart2.mk
D chart2/Package_uiconfig.mk
M chart2/UIConfig_chart2.mk
M dbaccess/Module_dbaccess.mk
D dbaccess/Package_uiconfig.mk
A dbaccess/UIConfig_dbapp.mk
A dbaccess/UIConfig_dbbrowser.mk
A dbaccess/UIConfig_dbquery.mk
A dbaccess/UIConfig_dbrelation.mk
A dbaccess/UIConfig_dbtable.mk
A dbaccess/UIConfig_dbtdata.mk
M extensions/Module_extensions.mk
D extensions/Package_uiconfig.mk
A extensions/UIConfig_sbibliography.mk
M framework/Module_framework.mk
D framework/Package_uiconfig.mk
A framework/UIConfig_startmodule.mk
M reportdesign/Module_reportdesign.mk
D reportdesign/Package_uiconfig.mk
A reportdesign/UIConfig_dbreport.mk
M sc/CustomTarget_uiconfig.mk
M sc/Module_sc.mk
D sc/Package_uiconfig.mk
M sc/UIConfig_scalc.mk
M sd/Module_sd.mk
D sd/Package_uiconfig.mk
M sd/UIConfig_sdraw.mk
M sd/UIConfig_simpress.mk
M starmath/Module_starmath.mk
D starmath/Package_uiconfig.mk
M starmath/UIConfig_smath.mk
M sw/Module_sw.mk
D sw/Package_uiconfig.mk
A sw/UIConfig_sglobal.mk
A sw/UIConfig_sweb.mk
A sw/UIConfig_swform.mk
A sw/UIConfig_swreport.mk
M sw/UIConfig_swriter.mk
A sw/UIConfig_swxform.mk
42 files changed, 799 insertions(+), 738 deletions(-)
diff --git a/basctl/Module_basctl.mk b/basctl/Module_basctl.mk
index ddb86ab..d87463e 100644
--- a/basctl/Module_basctl.mk
+++ b/basctl/Module_basctl.mk
@@ -38,7 +38,6 @@
endif
$(eval $(call gb_Module_add_targets,basctl,\
- Package_uiconfig \
UIConfig_basicide \
))
diff --git a/basctl/Package_uiconfig.mk b/basctl/Package_uiconfig.mk
deleted file mode 100644
index 229a465..0000000
--- a/basctl/Package_uiconfig.mk
+++ /dev/null
@@ -1,42 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# 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,basctl_uiconfig,$(SRCDIR)/basctl))
-
-$(eval $(call gb_Package_add_file,basctl_uiconfig,xml/uiconfig/modules/BasicIDE/menubar/menubar.xml,uiconfig/basicide/menubar/menubar.xml))
-$(eval $(call gb_Package_add_file,basctl_uiconfig,xml/uiconfig/modules/BasicIDE/statusbar/statusbar.xml,uiconfig/basicide/statusbar/statusbar.xml))
-$(eval $(call gb_Package_add_file,basctl_uiconfig,xml/uiconfig/modules/BasicIDE/toolbar/dialogbar.xml,uiconfig/basicide/toolbar/dialogbar.xml))
-$(eval $(call gb_Package_add_file,basctl_uiconfig,xml/uiconfig/modules/BasicIDE/toolbar/findbar.xml,uiconfig/basicide/toolbar/findbar.xml))
-$(eval $(call gb_Package_add_file,basctl_uiconfig,xml/uiconfig/modules/BasicIDE/toolbar/fullscreenbar.xml,uiconfig/basicide/toolbar/fullscreenbar.xml))
-$(eval $(call gb_Package_add_file,basctl_uiconfig,xml/uiconfig/modules/BasicIDE/toolbar/insertcontrolsbar.xml,uiconfig/basicide/toolbar/insertcontrolsbar.xml))
-$(eval $(call gb_Package_add_file,basctl_uiconfig,xml/uiconfig/modules/BasicIDE/toolbar/formcontrolsbar.xml,uiconfig/basicide/toolbar/formcontrolsbar.xml))
-$(eval $(call gb_Package_add_file,basctl_uiconfig,xml/uiconfig/modules/BasicIDE/toolbar/macrobar.xml,uiconfig/basicide/toolbar/macrobar.xml))
-$(eval $(call gb_Package_add_file,basctl_uiconfig,xml/uiconfig/modules/BasicIDE/toolbar/standardbar.xml,uiconfig/basicide/toolbar/standardbar.xml))
-$(eval $(call gb_Package_add_file,basctl_uiconfig,xml/uiconfig/modules/BasicIDE/toolbar/translationbar.xml,uiconfig/basicide/toolbar/translationbar.xml))
-
-# vim: set noet sw=4 ts=4:
diff --git a/basctl/UIConfig_basicide.mk b/basctl/UIConfig_basicide.mk
index 66dfb83..013df6e 100644
--- a/basctl/UIConfig_basicide.mk
+++ b/basctl/UIConfig_basicide.mk
@@ -9,6 +9,25 @@
$(eval $(call gb_UIConfig_UIConfig,modules/BasicIDE))
+$(eval $(call gb_UIConfig_add_menubarfiles,modules/BasicIDE,\
+ basctl/uiconfig/basicide/menubar/menubar \
+))
+
+$(eval $(call gb_UIConfig_add_statusbarfiles,modules/BasicIDE,\
+ basctl/uiconfig/basicide/statusbar/statusbar \
+))
+
+$(eval $(call gb_UIConfig_add_toolbarfiles,modules/BasicIDE,\
+ basctl/uiconfig/basicide/toolbar/dialogbar \
+ basctl/uiconfig/basicide/toolbar/findbar \
+ basctl/uiconfig/basicide/toolbar/fullscreenbar \
+ basctl/uiconfig/basicide/toolbar/insertcontrolsbar \
+ basctl/uiconfig/basicide/toolbar/formcontrolsbar \
+ basctl/uiconfig/basicide/toolbar/macrobar \
+ basctl/uiconfig/basicide/toolbar/standardbar \
+ basctl/uiconfig/basicide/toolbar/translationbar \
+))
+
$(eval $(call gb_UIConfig_add_uifiles,modules/BasicIDE,\
basctl/uiconfig/basicide/ui/basicmacrodialog \
))
diff --git a/chart2/Module_chart2.mk b/chart2/Module_chart2.mk
index e8b8567..970c558 100644
--- a/chart2/Module_chart2.mk
+++ b/chart2/Module_chart2.mk
@@ -32,7 +32,6 @@
AllLangResTarget_chartcontroller \
Library_chartcontroller \
Library_chartcore \
- Package_uiconfig \
UIConfig_chart2 \
))
diff --git a/chart2/Package_uiconfig.mk b/chart2/Package_uiconfig.mk
deleted file mode 100644
index 12806df..0000000
--- a/chart2/Package_uiconfig.mk
+++ /dev/null
@@ -1,44 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-# 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.
-#
-# Major Contributor(s):
-# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon at redhat.com>
-# (initial developer)
-#
-# All Rights Reserved.
-#
-# 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,chart2_uiconfig,$(SRCDIR)/chart2/uiconfig))
-
-# TODO: this was not listed in d.lst
-# $(eval $(call gb_Package_add_file,chart2_uiconfig,xml/uiconfig/modules/schart/accelerator/en-US/default.xml,accelerator/en-US/default.xml))
-$(eval $(call gb_Package_add_file,chart2_uiconfig,xml/uiconfig/modules/schart/menubar/menubar.xml,menubar/menubar.xml))
-$(eval $(call gb_Package_add_file,chart2_uiconfig,xml/uiconfig/modules/schart/statusbar/statusbar.xml,statusbar/statusbar.xml))
-$(eval $(call gb_Package_add_file,chart2_uiconfig,xml/uiconfig/modules/schart/toolbar/arrowshapes.xml,toolbar/arrowshapes.xml))
-$(eval $(call gb_Package_add_file,chart2_uiconfig,xml/uiconfig/modules/schart/toolbar/basicshapes.xml,toolbar/basicshapes.xml))
-$(eval $(call gb_Package_add_file,chart2_uiconfig,xml/uiconfig/modules/schart/toolbar/calloutshapes.xml,toolbar/calloutshapes.xml))
-$(eval $(call gb_Package_add_file,chart2_uiconfig,xml/uiconfig/modules/schart/toolbar/drawbar.xml,toolbar/drawbar.xml))
-$(eval $(call gb_Package_add_file,chart2_uiconfig,xml/uiconfig/modules/schart/toolbar/flowchartshapes.xml,toolbar/flowchartshapes.xml))
-$(eval $(call gb_Package_add_file,chart2_uiconfig,xml/uiconfig/modules/schart/toolbar/standardbar.xml,toolbar/standardbar.xml))
-$(eval $(call gb_Package_add_file,chart2_uiconfig,xml/uiconfig/modules/schart/toolbar/starshapes.xml,toolbar/starshapes.xml))
-$(eval $(call gb_Package_add_file,chart2_uiconfig,xml/uiconfig/modules/schart/toolbar/symbolshapes.xml,toolbar/symbolshapes.xml))
-$(eval $(call gb_Package_add_file,chart2_uiconfig,xml/uiconfig/modules/schart/toolbar/toolbar.xml,toolbar/toolbar.xml))
-
-# vim: set noet sw=4 ts=4:
diff --git a/chart2/UIConfig_chart2.mk b/chart2/UIConfig_chart2.mk
index 4c19d79..da90c19 100644
--- a/chart2/UIConfig_chart2.mk
+++ b/chart2/UIConfig_chart2.mk
@@ -9,6 +9,26 @@
$(eval $(call gb_UIConfig_UIConfig,modules/schart))
+$(eval $(call gb_UIConfig_add_menubarfiles,modules/schart,\
+ chart2/uiconfig/menubar/menubar \
+))
+
+$(eval $(call gb_UIConfig_add_statusbarfiles,modules/schart,\
+ chart2/uiconfig/statusbar/statusbar \
+))
+
+$(eval $(call gb_UIConfig_add_toolbarfiles,modules/schart,\
+ chart2/uiconfig/toolbar/arrowshapes \
+ chart2/uiconfig/toolbar/basicshapes \
+ chart2/uiconfig/toolbar/calloutshapes \
+ chart2/uiconfig/toolbar/drawbar \
+ chart2/uiconfig/toolbar/flowchartshapes \
+ chart2/uiconfig/toolbar/standardbar \
+ chart2/uiconfig/toolbar/starshapes \
+ chart2/uiconfig/toolbar/symbolshapes \
+ chart2/uiconfig/toolbar/toolbar \
+))
+
$(eval $(call gb_UIConfig_add_uifiles,modules/schart,\
chart2/uiconfig/ui/smoothlinesdlg \
))
diff --git a/dbaccess/Module_dbaccess.mk b/dbaccess/Module_dbaccess.mk
index 598ec42..afa9f98 100644
--- a/dbaccess/Module_dbaccess.mk
+++ b/dbaccess/Module_dbaccess.mk
@@ -42,8 +42,13 @@
Library_dbu \
Library_sdbt \
Package_inc \
- Package_uiconfig \
UIConfig_dbaccess \
+ UIConfig_dbapp \
+ UIConfig_dbbrowser \
+ UIConfig_dbquery \
+ UIConfig_dbrelation \
+ UIConfig_dbtable \
+ UIConfig_dbtdata \
))
$(eval $(call gb_Module_add_check_targets,dbaccess,\
diff --git a/dbaccess/Package_uiconfig.mk b/dbaccess/Package_uiconfig.mk
deleted file mode 100644
index cf06bb1..0000000
--- a/dbaccess/Package_uiconfig.mk
+++ /dev/null
@@ -1,50 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-# 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.
-#
-# Major Contributor(s):
-# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon at redhat.com>
-# (initial developer)
-#
-# All Rights Reserved.
-#
-# 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,dbaccess_uiconfig,$(SRCDIR)/dbaccess/uiconfig))
-
-$(eval $(call gb_Package_add_file,dbaccess_uiconfig,xml/uiconfig/modules/dbapp/menubar/menubar.xml,dbapp/menubar/menubar.xml))
-$(eval $(call gb_Package_add_file,dbaccess_uiconfig,xml/uiconfig/modules/dbapp/statusbar/statusbar.xml,dbapp/statusbar/statusbar.xml))
-$(eval $(call gb_Package_add_file,dbaccess_uiconfig,xml/uiconfig/modules/dbapp/toolbar/formobjectbar.xml,dbapp/toolbar/formobjectbar.xml))
-$(eval $(call gb_Package_add_file,dbaccess_uiconfig,xml/uiconfig/modules/dbapp/toolbar/queryobjectbar.xml,dbapp/toolbar/queryobjectbar.xml))
-$(eval $(call gb_Package_add_file,dbaccess_uiconfig,xml/uiconfig/modules/dbapp/toolbar/reportobjectbar.xml,dbapp/toolbar/reportobjectbar.xml))
-$(eval $(call gb_Package_add_file,dbaccess_uiconfig,xml/uiconfig/modules/dbapp/toolbar/tableobjectbar.xml,dbapp/toolbar/tableobjectbar.xml))
-$(eval $(call gb_Package_add_file,dbaccess_uiconfig,xml/uiconfig/modules/dbapp/toolbar/toolbar.xml,dbapp/toolbar/toolbar.xml))
-$(eval $(call gb_Package_add_file,dbaccess_uiconfig,xml/uiconfig/modules/dbbrowser/menubar/compat.xml,dbbrowser/menubar/compat.xml))
-$(eval $(call gb_Package_add_file,dbaccess_uiconfig,xml/uiconfig/modules/dbbrowser/toolbar/toolbar.xml,dbbrowser/toolbar/toolbar.xml))
-$(eval $(call gb_Package_add_file,dbaccess_uiconfig,xml/uiconfig/modules/dbquery/menubar/menubar.xml,dbquery/menubar/menubar.xml))
-$(eval $(call gb_Package_add_file,dbaccess_uiconfig,xml/uiconfig/modules/dbquery/toolbar/designobjectbar.xml,dbquery/toolbar/designobjectbar.xml))
-$(eval $(call gb_Package_add_file,dbaccess_uiconfig,xml/uiconfig/modules/dbquery/toolbar/sqlobjectbar.xml,dbquery/toolbar/sqlobjectbar.xml))
-$(eval $(call gb_Package_add_file,dbaccess_uiconfig,xml/uiconfig/modules/dbquery/toolbar/toolbar.xml,dbquery/toolbar/toolbar.xml))
-$(eval $(call gb_Package_add_file,dbaccess_uiconfig,xml/uiconfig/modules/dbrelation/menubar/menubar.xml,dbrelation/menubar/menubar.xml))
-$(eval $(call gb_Package_add_file,dbaccess_uiconfig,xml/uiconfig/modules/dbrelation/toolbar/toolbar.xml,dbrelation/toolbar/toolbar.xml))
-$(eval $(call gb_Package_add_file,dbaccess_uiconfig,xml/uiconfig/modules/dbtable/menubar/menubar.xml,dbtable/menubar/menubar.xml))
-$(eval $(call gb_Package_add_file,dbaccess_uiconfig,xml/uiconfig/modules/dbtable/toolbar/toolbar.xml,dbtable/toolbar/toolbar.xml))
-$(eval $(call gb_Package_add_file,dbaccess_uiconfig,xml/uiconfig/modules/dbtdata/menubar/menubar.xml,dbtdata/menubar/menubar.xml))
-$(eval $(call gb_Package_add_file,dbaccess_uiconfig,xml/uiconfig/modules/dbtdata/toolbar/toolbar.xml,dbtdata/toolbar/toolbar.xml))
-
-# vim: set noet sw=4 ts=4:
diff --git a/dbaccess/UIConfig_dbapp.mk b/dbaccess/UIConfig_dbapp.mk
new file mode 100644
index 0000000..1611108
--- /dev/null
+++ b/dbaccess/UIConfig_dbapp.mk
@@ -0,0 +1,28 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_UIConfig_UIConfig,modules/dbapp))
+
+$(eval $(call gb_UIConfig_add_menubarfiles,modules/dbapp,\
+ dbaccess/uiconfig/dbapp/menubar/menubar \
+))
+
+$(eval $(call gb_UIConfig_add_statusbarfiles,modules/dbapp,\
+ dbaccess/uiconfig/dbapp/statusbar/statusbar \
+))
+
+$(eval $(call gb_UIConfig_add_toolbarfiles,modules/dbapp,\
+ dbaccess/uiconfig/dbapp/toolbar/formobjectbar \
+ dbaccess/uiconfig/dbapp/toolbar/queryobjectbar \
+ dbaccess/uiconfig/dbapp/toolbar/reportobjectbar \
+ dbaccess/uiconfig/dbapp/toolbar/tableobjectbar \
+ dbaccess/uiconfig/dbapp/toolbar/toolbar \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/dbaccess/UIConfig_dbbrowser.mk b/dbaccess/UIConfig_dbbrowser.mk
new file mode 100644
index 0000000..94f9c9f
--- /dev/null
+++ b/dbaccess/UIConfig_dbbrowser.mk
@@ -0,0 +1,20 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_UIConfig_UIConfig,modules/dbbrowser))
+
+$(eval $(call gb_UIConfig_add_menubarfiles,modules/dbbrowser,\
+ dbaccess/uiconfig/dbbrowser/menubar/compat \
+))
+
+$(eval $(call gb_UIConfig_add_toolbarfiles,modules/dbbrowser,\
+ dbaccess/uiconfig/dbbrowser/toolbar/toolbar \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/dbaccess/UIConfig_dbquery.mk b/dbaccess/UIConfig_dbquery.mk
new file mode 100644
index 0000000..5af3093
--- /dev/null
+++ b/dbaccess/UIConfig_dbquery.mk
@@ -0,0 +1,22 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_UIConfig_UIConfig,modules/dbquery))
+
+$(eval $(call gb_UIConfig_add_menubarfiles,modules/dbquery,\
+ dbaccess/uiconfig/dbquery/menubar/menubar \
+))
+
+$(eval $(call gb_UIConfig_add_toolbarfiles,modules/dbquery,\
+ dbaccess/uiconfig/dbquery/toolbar/designobjectbar \
+ dbaccess/uiconfig/dbquery/toolbar/sqlobjectbar \
+ dbaccess/uiconfig/dbquery/toolbar/toolbar \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/dbaccess/UIConfig_dbrelation.mk b/dbaccess/UIConfig_dbrelation.mk
new file mode 100644
index 0000000..51a3b21
--- /dev/null
+++ b/dbaccess/UIConfig_dbrelation.mk
@@ -0,0 +1,20 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_UIConfig_UIConfig,modules/dbrelation))
+
+$(eval $(call gb_UIConfig_add_menubarfiles,modules/dbrelation,\
+ dbaccess/uiconfig/dbrelation/menubar/menubar \
+))
+
+$(eval $(call gb_UIConfig_add_toolbarfiles,modules/dbrelation,\
+ dbaccess/uiconfig/dbrelation/toolbar/toolbar \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/dbaccess/UIConfig_dbtable.mk b/dbaccess/UIConfig_dbtable.mk
new file mode 100644
index 0000000..9503cc2
--- /dev/null
+++ b/dbaccess/UIConfig_dbtable.mk
@@ -0,0 +1,20 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_UIConfig_UIConfig,modules/dbtable))
+
+$(eval $(call gb_UIConfig_add_menubarfiles,modules/dbtable,\
+ dbaccess/uiconfig/dbtable/menubar/menubar \
+))
+
+$(eval $(call gb_UIConfig_add_toolbarfiles,modules/dbtable,\
+ dbaccess/uiconfig/dbtable/toolbar/toolbar \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/dbaccess/UIConfig_dbtdata.mk b/dbaccess/UIConfig_dbtdata.mk
new file mode 100644
index 0000000..6fe0a85
--- /dev/null
+++ b/dbaccess/UIConfig_dbtdata.mk
@@ -0,0 +1,20 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_UIConfig_UIConfig,modules/dbtdata))
+
+$(eval $(call gb_UIConfig_add_menubarfiles,modules/dbtdata,\
+ dbaccess/uiconfig/dbtdata/menubar/menubar \
+))
+
+$(eval $(call gb_UIConfig_add_toolbarfiles,modules/dbtdata,\
+ dbaccess/uiconfig/dbtdata/toolbar/toolbar \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/extensions/Module_extensions.mk b/extensions/Module_extensions.mk
index 0e12f94..6238909 100644
--- a/extensions/Module_extensions.mk
+++ b/extensions/Module_extensions.mk
@@ -52,7 +52,7 @@
Library_bib \
Library_dbp \
Library_pcr \
- Package_uiconfig \
+ UIConfig_sbibliography \
))
endif
diff --git a/extensions/Package_uiconfig.mk b/extensions/Package_uiconfig.mk
deleted file mode 100644
index cf5a182..0000000
--- a/extensions/Package_uiconfig.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
-#
-# 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
-# Peter Foley <pefoley2 at verizon.net>
-# Portions created by the Initial Developer are Copyright (C) 2011 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,extensions_uiconfig,$(SRCDIR)/extensions/source/bibliography/uiconfig/sbibliography/menubar))
-
-$(eval $(call gb_Package_add_file,extensions_uiconfig,xml/uiconfig/modules/sbibliography/menubar/menubar.xml,menubar.xml))
-
-# vim:set noet sw=4 ts=4:
diff --git a/extensions/UIConfig_sbibliography.mk b/extensions/UIConfig_sbibliography.mk
new file mode 100644
index 0000000..465563c
--- /dev/null
+++ b/extensions/UIConfig_sbibliography.mk
@@ -0,0 +1,16 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_UIConfig_UIConfig,modules/sbibliography))
+
+$(eval $(call gb_UIConfig_add_menubarfiles,modules/sbibliography,\
+ extensions/source/bibliography/uiconfig/sbibliography/menubar/menubar \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/framework/Module_framework.mk b/framework/Module_framework.mk
index e408ffe..66e645f 100644
--- a/framework/Module_framework.mk
+++ b/framework/Module_framework.mk
@@ -28,7 +28,7 @@
Library_fwm \
Package_dtd \
Package_inc \
- Package_uiconfig \
+ UIConfig_startmodule \
))
ifneq ($(OOO_JUNIT_JAR),)
diff --git a/framework/Package_uiconfig.mk b/framework/Package_uiconfig.mk
deleted file mode 100644
index b655b40..0000000
--- a/framework/Package_uiconfig.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed
-# with this work for additional information regarding copyright
-# ownership. The ASF licenses this file to you under the Apache
-# License, Version 2.0 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-
-$(eval $(call gb_Package_Package,framework_uiconfig,$(SRCDIR)/framework/uiconfig))
-$(eval $(call gb_Package_add_file,framework_uiconfig,xml/uiconfig/modules/StartModule/menubar/menubar.xml,startmodule/menubar/menubar.xml))
-$(eval $(call gb_Package_add_file,framework_uiconfig,xml/uiconfig/modules/StartModule/statusbar/statusbar.xml,startmodule/statusbar/statusbar.xml))
-$(eval $(call gb_Package_add_file,framework_uiconfig,xml/uiconfig/modules/StartModule/toolbar/standardbar.xml,startmodule/toolbar/standardbar.xml))
-
-# vim: set noet sw=4 ts=4:
diff --git a/framework/UIConfig_startmodule.mk b/framework/UIConfig_startmodule.mk
new file mode 100644
index 0000000..6bbb68d
--- /dev/null
+++ b/framework/UIConfig_startmodule.mk
@@ -0,0 +1,24 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_UIConfig_UIConfig,modules/StartModule))
+
+$(eval $(call gb_UIConfig_add_menubarfiles,modules/StartModule,\
+ framework/uiconfig/startmodule/menubar/menubar \
+))
+
+$(eval $(call gb_UIConfig_add_statusbarfiles,modules/StartModule,\
+ framework/uiconfig/startmodule/statusbar/statusbar \
+))
+
+$(eval $(call gb_UIConfig_add_toolbarfiles,modules/StartModule,\
+ framework/uiconfig/startmodule/toolbar/standardbar \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/reportdesign/Module_reportdesign.mk b/reportdesign/Module_reportdesign.mk
index e72e430..08534f0 100644
--- a/reportdesign/Module_reportdesign.mk
+++ b/reportdesign/Module_reportdesign.mk
@@ -33,7 +33,7 @@
Library_rpt \
Library_rptui \
Library_rptxml \
- Package_uiconfig \
+ UIConfig_dbreport \
))
# deactivated since sb123;
diff --git a/reportdesign/Package_uiconfig.mk b/reportdesign/Package_uiconfig.mk
deleted file mode 100644
index 99b3f11..0000000
--- a/reportdesign/Package_uiconfig.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-# 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.
-#
-# Major Contributor(s):
-# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon at redhat.com>
-# (initial developer)
-#
-# All Rights Reserved.
-#
-# 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 sw=4 ts=4:
diff --git a/reportdesign/UIConfig_dbreport.mk b/reportdesign/UIConfig_dbreport.mk
new file mode 100644
index 0000000..45e43b3
--- /dev/null
+++ b/reportdesign/UIConfig_dbreport.mk
@@ -0,0 +1,37 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_UIConfig_UIConfig,modules/dbreport))
+
+$(eval $(call gb_UIConfig_add_menubarfiles,modules/dbreport,\
+ reportdesign/uiconfig/dbreport/menubar/menubar \
+))
+
+$(eval $(call gb_UIConfig_add_statusbarfiles,modules/dbreport,\
+ reportdesign/uiconfig/dbreport/statusbar/statusbar \
+))
+
+$(eval $(call gb_UIConfig_add_toolbarfiles,modules/dbreport,\
+ reportdesign/uiconfig/dbreport/toolbar/alignmentbar \
+ reportdesign/uiconfig/dbreport/toolbar/arrowshapes \
+ reportdesign/uiconfig/dbreport/toolbar/basicshapes \
+ reportdesign/uiconfig/dbreport/toolbar/calloutshapes \
+ reportdesign/uiconfig/dbreport/toolbar/drawbar \
+ reportdesign/uiconfig/dbreport/toolbar/flowchartshapes \
+ reportdesign/uiconfig/dbreport/toolbar/Formatting \
+ reportdesign/uiconfig/dbreport/toolbar/reportcontrols \
+ reportdesign/uiconfig/dbreport/toolbar/resizebar \
+ reportdesign/uiconfig/dbreport/toolbar/sectionalignmentbar \
+ reportdesign/uiconfig/dbreport/toolbar/sectionshrinkbar \
+ reportdesign/uiconfig/dbreport/toolbar/starshapes \
+ reportdesign/uiconfig/dbreport/toolbar/symbolshapes \
+ reportdesign/uiconfig/dbreport/toolbar/toolbar \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sc/CustomTarget_uiconfig.mk b/sc/CustomTarget_uiconfig.mk
index 8e4e1ae..24d2cf3 100644
--- a/sc/CustomTarget_uiconfig.mk
+++ b/sc/CustomTarget_uiconfig.mk
@@ -9,14 +9,11 @@
$(eval $(call gb_CustomTarget_CustomTarget,sc/uiconfig))
-ifeq ($(ENABLE_TELEPATHY),TRUE)
-$(call gb_CustomTarget_get_target,sc/uiconfig) : \
- $(OUTDIR)/xml/uiconfig/modules/scalc/menubar/menubar.xml
+$(eval $(call gb_CustomTarget_register_targets,sc/uiconfig,\
+ scalc/menubar/menubar.xml \
+))
-$(OUTDIR)/xml/uiconfig/modules/scalc/menubar/menubar.xml : $(SRCDIR)/sc/uiconfig/scalc/menubar/menubar.xml \
- | $(OUTDIR)/xml/uiconfig/modules/scalc/menubar/.dir
+$(call gb_CustomTarget_get_workdir,sc/uiconfig)/scalc/menubar/menubar.xml : $(SRCDIR)/sc/uiconfig/scalc/menubar/menubar.xml
sed 's/.*.uno:Collaborate.*/ <menu:menuseparator\/>\n <menu:menuitem menu:id=".uno:Collaborate"\/>/' $< > $@
-
-endif
# vim: set noet sw=4 ts=4:
diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index 2d8231f..e651342 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -25,15 +25,21 @@
$(eval $(call gb_Module_add_targets,sc,\
AllLangResTarget_sc \
- CustomTarget_uiconfig \
Library_sc \
Library_scd \
Library_scfilt \
Library_scui \
- Package_uiconfig \
UIConfig_scalc \
))
+ifeq ($(ENABLE_TELEPATHY),TRUE)
+
+$(eval $(call gb_Module_add_targets,sc,\
+ CustomTarget_uiconfig \
+))
+
+endif
+
ifneq ($(DISABLE_SCRIPTING),TRUE)
$(eval $(call gb_Module_add_targets,sc,\
diff --git a/sc/Package_uiconfig.mk b/sc/Package_uiconfig.mk
deleted file mode 100644
index f85a789..0000000
--- a/sc/Package_uiconfig.mk
+++ /dev/null
@@ -1,61 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-# 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. 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
-# Norbert Thiebaud <nthiebaud at gmail.com> (C) 2010, All Rights Reserved.
-#
-# 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,sc_uiconfig,$(SRCDIR)/sc/uiconfig))
-ifneq ($(ENABLE_TELEPATHY),TRUE)
-$(eval $(call gb_Package_add_file,sc_uiconfig,xml/uiconfig/modules/scalc/menubar/menubar.xml,scalc/menubar/menubar.xml))
-endif
-$(eval $(call gb_Package_add_file,sc_uiconfig,xml/uiconfig/modules/scalc/statusbar/statusbar.xml,scalc/statusbar/statusbar.xml))
-$(eval $(call gb_Package_add_file,sc_uiconfig,xml/uiconfig/modules/scalc/toolbar/alignmentbar.xml,scalc/toolbar/alignmentbar.xml))
-$(eval $(call gb_Package_add_file,sc_uiconfig,xml/uiconfig/modules/scalc/toolbar/arrowshapes.xml,scalc/toolbar/arrowshapes.xml))
-$(eval $(call gb_Package_add_file,sc_uiconfig,xml/uiconfig/modules/scalc/toolbar/basicshapes.xml,scalc/toolbar/basicshapes.xml))
-$(eval $(call gb_Package_add_file,sc_uiconfig,xml/uiconfig/modules/scalc/toolbar/calloutshapes.xml,scalc/toolbar/calloutshapes.xml))
-$(eval $(call gb_Package_add_file,sc_uiconfig,xml/uiconfig/modules/scalc/toolbar/colorbar.xml,scalc/toolbar/colorbar.xml))
-$(eval $(call gb_Package_add_file,sc_uiconfig,xml/uiconfig/modules/scalc/toolbar/drawbar.xml,scalc/toolbar/drawbar.xml))
-$(eval $(call gb_Package_add_file,sc_uiconfig,xml/uiconfig/modules/scalc/toolbar/drawobjectbar.xml,scalc/toolbar/drawobjectbar.xml))
-$(eval $(call gb_Package_add_file,sc_uiconfig,xml/uiconfig/modules/scalc/toolbar/extrusionobjectbar.xml,scalc/toolbar/extrusionobjectbar.xml))
-$(eval $(call gb_Package_add_file,sc_uiconfig,xml/uiconfig/modules/scalc/toolbar/findbar.xml,scalc/toolbar/findbar.xml))
-$(eval $(call gb_Package_add_file,sc_uiconfig,xml/uiconfig/modules/scalc/toolbar/flowchartshapes.xml,scalc/toolbar/flowchartshapes.xml))
-$(eval $(call gb_Package_add_file,sc_uiconfig,xml/uiconfig/modules/scalc/toolbar/fontworkobjectbar.xml,scalc/toolbar/fontworkobjectbar.xml))
-$(eval $(call gb_Package_add_file,sc_uiconfig,xml/uiconfig/modules/scalc/toolbar/fontworkshapetype.xml,scalc/toolbar/fontworkshapetype.xml))
-$(eval $(call gb_Package_add_file,sc_uiconfig,xml/uiconfig/modules/scalc/toolbar/formatobjectbar.xml,scalc/toolbar/formatobjectbar.xml))
-$(eval $(call gb_Package_add_file,sc_uiconfig,xml/uiconfig/modules/scalc/toolbar/formcontrols.xml,scalc/toolbar/formcontrols.xml))
-$(eval $(call gb_Package_add_file,sc_uiconfig,xml/uiconfig/modules/scalc/toolbar/formdesign.xml,scalc/toolbar/formdesign.xml))
-$(eval $(call gb_Package_add_file,sc_uiconfig,xml/uiconfig/modules/scalc/toolbar/formsfilterbar.xml,scalc/toolbar/formsfilterbar.xml))
-$(eval $(call gb_Package_add_file,sc_uiconfig,xml/uiconfig/modules/scalc/toolbar/formsnavigationbar.xml,scalc/toolbar/formsnavigationbar.xml))
-$(eval $(call gb_Package_add_file,sc_uiconfig,xml/uiconfig/modules/scalc/toolbar/formtextobjectbar.xml,scalc/toolbar/formtextobjectbar.xml))
-$(eval $(call gb_Package_add_file,sc_uiconfig,xml/uiconfig/modules/scalc/toolbar/fullscreenbar.xml,scalc/toolbar/fullscreenbar.xml))
-$(eval $(call gb_Package_add_file,sc_uiconfig,xml/uiconfig/modules/scalc/toolbar/graffilterbar.xml,scalc/toolbar/graffilterbar.xml))
-$(eval $(call gb_Package_add_file,sc_uiconfig,xml/uiconfig/modules/scalc/toolbar/graphicobjectbar.xml,scalc/toolbar/graphicobjectbar.xml))
-$(eval $(call gb_Package_add_file,sc_uiconfig,xml/uiconfig/modules/scalc/toolbar/insertbar.xml,scalc/toolbar/insertbar.xml))
-$(eval $(call gb_Package_add_file,sc_uiconfig,xml/uiconfig/modules/scalc/toolbar/insertcellsbar.xml,scalc/toolbar/insertcellsbar.xml))
-$(eval $(call gb_Package_add_file,sc_uiconfig,xml/uiconfig/modules/scalc/toolbar/mediaobjectbar.xml,scalc/toolbar/mediaobjectbar.xml))
-$(eval $(call gb_Package_add_file,sc_uiconfig,xml/uiconfig/modules/scalc/toolbar/moreformcontrols.xml,scalc/toolbar/moreformcontrols.xml))
-$(eval $(call gb_Package_add_file,sc_uiconfig,xml/uiconfig/modules/scalc/toolbar/previewbar.xml,scalc/toolbar/previewbar.xml))
-$(eval $(call gb_Package_add_file,sc_uiconfig,xml/uiconfig/modules/scalc/toolbar/standardbar.xml,scalc/toolbar/standardbar.xml))
-$(eval $(call gb_Package_add_file,sc_uiconfig,xml/uiconfig/modules/scalc/toolbar/starshapes.xml,scalc/toolbar/starshapes.xml))
-$(eval $(call gb_Package_add_file,sc_uiconfig,xml/uiconfig/modules/scalc/toolbar/symbolshapes.xml,scalc/toolbar/symbolshapes.xml))
-$(eval $(call gb_Package_add_file,sc_uiconfig,xml/uiconfig/modules/scalc/toolbar/textobjectbar.xml,scalc/toolbar/textobjectbar.xml))
-$(eval $(call gb_Package_add_file,sc_uiconfig,xml/uiconfig/modules/scalc/toolbar/toolbar.xml,scalc/toolbar/toolbar.xml))
-$(eval $(call gb_Package_add_file,sc_uiconfig,xml/uiconfig/modules/scalc/toolbar/viewerbar.xml,scalc/toolbar/viewerbar.xml))
-
-# vim: set noet sw=4 ts=4:
diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk
index 224aa40..1f63e97 100644
--- a/sc/UIConfig_scalc.mk
+++ b/sc/UIConfig_scalc.mk
@@ -9,6 +9,55 @@
$(eval $(call gb_UIConfig_UIConfig,modules/scalc))
+ifeq ($(ENABLE_TELEPATHY),TRUE)
+$(eval $(call gb_UIConfig_add_generated_menubarfiles,modules/scalc,\
+ CustomTarget/sc/uiconfig/scalc/menubar/menubar \
+))
+else
+$(eval $(call gb_UIConfig_add_menubarfiles,modules/scalc,\
+ sc/uiconfig/scalc/menubar/menubar \
+))
+endif
+
+$(eval $(call gb_UIConfig_add_statusbarfiles,modules/scalc,\
+ sc/uiconfig/scalc/statusbar/statusbar \
+))
+
+$(eval $(call gb_UIConfig_add_toolbarfiles,modules/scalc,\
+ sc/uiconfig/scalc/toolbar/alignmentbar \
+ sc/uiconfig/scalc/toolbar/arrowshapes \
+ sc/uiconfig/scalc/toolbar/basicshapes \
+ sc/uiconfig/scalc/toolbar/calloutshapes \
+ sc/uiconfig/scalc/toolbar/colorbar \
+ sc/uiconfig/scalc/toolbar/drawbar \
+ sc/uiconfig/scalc/toolbar/drawobjectbar \
+ sc/uiconfig/scalc/toolbar/extrusionobjectbar \
+ sc/uiconfig/scalc/toolbar/findbar \
+ sc/uiconfig/scalc/toolbar/flowchartshapes \
+ sc/uiconfig/scalc/toolbar/fontworkobjectbar \
+ sc/uiconfig/scalc/toolbar/fontworkshapetype \
+ sc/uiconfig/scalc/toolbar/formatobjectbar \
+ sc/uiconfig/scalc/toolbar/formcontrols \
+ sc/uiconfig/scalc/toolbar/formdesign \
+ sc/uiconfig/scalc/toolbar/formsfilterbar \
+ sc/uiconfig/scalc/toolbar/formsnavigationbar \
+ sc/uiconfig/scalc/toolbar/formtextobjectbar \
+ sc/uiconfig/scalc/toolbar/fullscreenbar \
+ sc/uiconfig/scalc/toolbar/graffilterbar \
+ sc/uiconfig/scalc/toolbar/graphicobjectbar \
+ sc/uiconfig/scalc/toolbar/insertbar \
+ sc/uiconfig/scalc/toolbar/insertcellsbar \
+ sc/uiconfig/scalc/toolbar/mediaobjectbar \
+ sc/uiconfig/scalc/toolbar/moreformcontrols \
+ sc/uiconfig/scalc/toolbar/previewbar \
+ sc/uiconfig/scalc/toolbar/standardbar \
+ sc/uiconfig/scalc/toolbar/starshapes \
+ sc/uiconfig/scalc/toolbar/symbolshapes \
+ sc/uiconfig/scalc/toolbar/textobjectbar \
+ sc/uiconfig/scalc/toolbar/toolbar \
+ sc/uiconfig/scalc/toolbar/viewerbar \
+))
+
$(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\
sc/uiconfig/scalc/ui/cellprotectionpage \
sc/uiconfig/scalc/ui/definename \
diff --git a/sd/Module_sd.mk b/sd/Module_sd.mk
index 722bb13..b2df89a 100644
--- a/sd/Module_sd.mk
+++ b/sd/Module_sd.mk
@@ -35,7 +35,6 @@
Library_sdfilt \
Library_sdui \
Package_inc \
- Package_uiconfig \
Package_web \
Package_xml \
UIConfig_sdraw \
diff --git a/sd/Package_uiconfig.mk b/sd/Package_uiconfig.mk
deleted file mode 100644
index 17552e4..0000000
--- a/sd/Package_uiconfig.mk
+++ /dev/null
@@ -1,129 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-# 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.
-#
-# Major Contributor(s):
-# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon at redhat.com>
-# (initial developer)
-#
-# All Rights Reserved.
-#
-# 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,sd_uiconfig,$(SRCDIR)/sd/uiconfig))
-
-$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/menubar/menubar.xml,sdraw/menubar/menubar.xml))
-$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/statusbar/statusbar.xml,sdraw/statusbar/statusbar.xml))
-$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/3dobjectsbar.xml,sdraw/toolbar/3dobjectsbar.xml))
-$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/alignmentbar.xml,sdraw/toolbar/alignmentbar.xml))
-$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/arrowsbar.xml,sdraw/toolbar/arrowsbar.xml))
-$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/arrowshapes.xml,sdraw/toolbar/arrowshapes.xml))
-$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/basicshapes.xml,sdraw/toolbar/basicshapes.xml))
-$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/bezierobjectbar.xml,sdraw/toolbar/bezierobjectbar.xml))
-$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/calloutshapes.xml,sdraw/toolbar/calloutshapes.xml))
-$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/choosemodebar.xml,sdraw/toolbar/choosemodebar.xml))
-$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/colorbar.xml,sdraw/toolbar/colorbar.xml))
-$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/commentsbar.xml,sdraw/toolbar/commentsbar.xml))
-$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/connectorsbar.xml,sdraw/toolbar/connectorsbar.xml))
-$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/drawingobjectbar.xml,sdraw/toolbar/drawingobjectbar.xml))
-$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/ellipsesbar.xml,sdraw/toolbar/ellipsesbar.xml))
-$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/extrusionobjectbar.xml,sdraw/toolbar/extrusionobjectbar.xml))
-$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/findbar.xml,sdraw/toolbar/findbar.xml))
-$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/flowchartshapes.xml,sdraw/toolbar/flowchartshapes.xml))
-$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/fontworkobjectbar.xml,sdraw/toolbar/fontworkobjectbar.xml))
-$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/fontworkshapetype.xml,sdraw/toolbar/fontworkshapetype.xml))
-$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/formcontrols.xml,sdraw/toolbar/formcontrols.xml))
-$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/formdesign.xml,sdraw/toolbar/formdesign.xml))
-$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/formsfilterbar.xml,sdraw/toolbar/formsfilterbar.xml))
-$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/formsnavigationbar.xml,sdraw/toolbar/formsnavigationbar.xml))
-$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/formtextobjectbar.xml,sdraw/toolbar/formtextobjectbar.xml))
-$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/fullscreenbar.xml,sdraw/toolbar/fullscreenbar.xml))
-$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/gluepointsobjectbar.xml,sdraw/toolbar/gluepointsobjectbar.xml))
-$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/graffilterbar.xml,sdraw/toolbar/graffilterbar.xml))
-$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/graphicobjectbar.xml,sdraw/toolbar/graphicobjectbar.xml))
-$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/insertbar.xml,sdraw/toolbar/insertbar.xml))
-$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/linesbar.xml,sdraw/toolbar/linesbar.xml))
-$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/masterviewtoolbar.xml,sdraw/toolbar/masterviewtoolbar.xml))
-$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/mediaobjectbar.xml,sdraw/toolbar/mediaobjectbar.xml))
-$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/moreformcontrols.xml,sdraw/toolbar/moreformcontrols.xml))
-$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/optimizetablebar.xml,sdraw/toolbar/optimizetablebar.xml))
-$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/optionsbar.xml,sdraw/toolbar/optionsbar.xml))
-$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/positionbar.xml,sdraw/toolbar/positionbar.xml))
-$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/rectanglesbar.xml,sdraw/toolbar/rectanglesbar.xml))
-$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/standardbar.xml,sdraw/toolbar/standardbar.xml))
-$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/starshapes.xml,sdraw/toolbar/starshapes.xml))
-$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/symbolshapes.xml,sdraw/toolbar/symbolshapes.xml))
-$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/tableobjectbar.xml,sdraw/toolbar/tableobjectbar.xml))
-$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/textbar.xml,sdraw/toolbar/textbar.xml))
-$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/textobjectbar.xml,sdraw/toolbar/textobjectbar.xml))
-$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/toolbar.xml,sdraw/toolbar/toolbar.xml))
-$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/viewerbar.xml,sdraw/toolbar/viewerbar.xml))
-$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/sdraw/toolbar/zoombar.xml,sdraw/toolbar/zoombar.xml))
-$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/menubar/menubar.xml,simpress/menubar/menubar.xml))
-$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/statusbar/statusbar.xml,simpress/statusbar/statusbar.xml))
-$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/3dobjectsbar.xml,simpress/toolbar/3dobjectsbar.xml))
-$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/alignmentbar.xml,simpress/toolbar/alignmentbar.xml))
-$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/arrowsbar.xml,simpress/toolbar/arrowsbar.xml))
-$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/arrowshapes.xml,simpress/toolbar/arrowshapes.xml))
-$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/basicshapes.xml,simpress/toolbar/basicshapes.xml))
-$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/bezierobjectbar.xml,simpress/toolbar/bezierobjectbar.xml))
-$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/calloutshapes.xml,simpress/toolbar/calloutshapes.xml))
-$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/choosemodebar.xml,simpress/toolbar/choosemodebar.xml))
-$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/colorbar.xml,simpress/toolbar/colorbar.xml))
-$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/commentsbar.xml,simpress/toolbar/commentsbar.xml))
-$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/commontaskbar.xml,simpress/toolbar/commontaskbar.xml))
-$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/connectorsbar.xml,simpress/toolbar/connectorsbar.xml))
-$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/drawingobjectbar.xml,simpress/toolbar/drawingobjectbar.xml))
-$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/ellipsesbar.xml,simpress/toolbar/ellipsesbar.xml))
-$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/extrusionobjectbar.xml,simpress/toolbar/extrusionobjectbar.xml))
-$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/findbar.xml,simpress/toolbar/findbar.xml))
-$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/flowchartshapes.xml,simpress/toolbar/flowchartshapes.xml))
-$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/fontworkobjectbar.xml,simpress/toolbar/fontworkobjectbar.xml))
-$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/fontworkshapetype.xml,simpress/toolbar/fontworkshapetype.xml))
-$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/formcontrols.xml,simpress/toolbar/formcontrols.xml))
-$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/formdesign.xml,simpress/toolbar/formdesign.xml))
-$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/formsfilterbar.xml,simpress/toolbar/formsfilterbar.xml))
-$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/formsnavigationbar.xml,simpress/toolbar/formsnavigationbar.xml))
-$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/formtextobjectbar.xml,simpress/toolbar/formtextobjectbar.xml))
-$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/fullscreenbar.xml,simpress/toolbar/fullscreenbar.xml))
-$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/gluepointsobjectbar.xml,simpress/toolbar/gluepointsobjectbar.xml))
-$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/graffilterbar.xml,simpress/toolbar/graffilterbar.xml))
-$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/graphicobjectbar.xml,simpress/toolbar/graphicobjectbar.xml))
-$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/insertbar.xml,simpress/toolbar/insertbar.xml))
-$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/linesbar.xml,simpress/toolbar/linesbar.xml))
-$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/masterviewtoolbar.xml,simpress/toolbar/masterviewtoolbar.xml))
-$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/mediaobjectbar.xml,simpress/toolbar/mediaobjectbar.xml))
-$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/moreformcontrols.xml,simpress/toolbar/moreformcontrols.xml))
-$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/optimizetablebar.xml,simpress/toolbar/optimizetablebar.xml))
-$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/optionsbar.xml,simpress/toolbar/optionsbar.xml))
-$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/outlinetoolbar.xml,simpress/toolbar/outlinetoolbar.xml))
-$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/positionbar.xml,simpress/toolbar/positionbar.xml))
-$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/rectanglesbar.xml,simpress/toolbar/rectanglesbar.xml))
-$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/slideviewobjectbar.xml,simpress/toolbar/slideviewobjectbar.xml))
-$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/slideviewtoolbar.xml,simpress/toolbar/slideviewtoolbar.xml))
-$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/standardbar.xml,simpress/toolbar/standardbar.xml))
-$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/starshapes.xml,simpress/toolbar/starshapes.xml))
-$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/symbolshapes.xml,simpress/toolbar/symbolshapes.xml))
-$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/tableobjectbar.xml,simpress/toolbar/tableobjectbar.xml))
-$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/textbar.xml,simpress/toolbar/textbar.xml))
-$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/textobjectbar.xml,simpress/toolbar/textobjectbar.xml))
-$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/toolbar.xml,simpress/toolbar/toolbar.xml))
-$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/viewerbar.xml,simpress/toolbar/viewerbar.xml))
-$(eval $(call gb_Package_add_file,sd_uiconfig,xml/uiconfig/modules/simpress/toolbar/zoombar.xml,simpress/toolbar/zoombar.xml))
-
-# vim: set noet sw=4 ts=4:
diff --git a/sd/UIConfig_sdraw.mk b/sd/UIConfig_sdraw.mk
index 7000202..fc7244c 100644
--- a/sd/UIConfig_sdraw.mk
+++ b/sd/UIConfig_sdraw.mk
@@ -9,6 +9,62 @@
$(eval $(call gb_UIConfig_UIConfig,modules/sdraw))
+$(eval $(call gb_UIConfig_add_menubarfiles,modules/sdraw,\
+ sd/uiconfig/sdraw/menubar/menubar \
+))
+
+$(eval $(call gb_UIConfig_add_statusbarfiles,modules/sdraw,\
+ sd/uiconfig/sdraw/statusbar/statusbar \
+))
+
+$(eval $(call gb_UIConfig_add_toolbarfiles,modules/sdraw,\
+ sd/uiconfig/sdraw/toolbar/3dobjectsbar \
+ sd/uiconfig/sdraw/toolbar/alignmentbar \
+ sd/uiconfig/sdraw/toolbar/arrowsbar \
+ sd/uiconfig/sdraw/toolbar/arrowshapes \
+ sd/uiconfig/sdraw/toolbar/basicshapes \
+ sd/uiconfig/sdraw/toolbar/bezierobjectbar \
+ sd/uiconfig/sdraw/toolbar/calloutshapes \
+ sd/uiconfig/sdraw/toolbar/choosemodebar \
+ sd/uiconfig/sdraw/toolbar/colorbar \
+ sd/uiconfig/sdraw/toolbar/commentsbar \
+ sd/uiconfig/sdraw/toolbar/connectorsbar \
+ sd/uiconfig/sdraw/toolbar/drawingobjectbar \
+ sd/uiconfig/sdraw/toolbar/ellipsesbar \
+ sd/uiconfig/sdraw/toolbar/extrusionobjectbar \
+ sd/uiconfig/sdraw/toolbar/findbar \
+ sd/uiconfig/sdraw/toolbar/flowchartshapes \
+ sd/uiconfig/sdraw/toolbar/fontworkobjectbar \
+ sd/uiconfig/sdraw/toolbar/fontworkshapetype \
+ sd/uiconfig/sdraw/toolbar/formcontrols \
+ sd/uiconfig/sdraw/toolbar/formdesign \
+ sd/uiconfig/sdraw/toolbar/formsfilterbar \
+ sd/uiconfig/sdraw/toolbar/formsnavigationbar \
+ sd/uiconfig/sdraw/toolbar/formtextobjectbar \
+ sd/uiconfig/sdraw/toolbar/fullscreenbar \
+ sd/uiconfig/sdraw/toolbar/gluepointsobjectbar \
+ sd/uiconfig/sdraw/toolbar/graffilterbar \
+ sd/uiconfig/sdraw/toolbar/graphicobjectbar \
+ sd/uiconfig/sdraw/toolbar/insertbar \
+ sd/uiconfig/sdraw/toolbar/linesbar \
+ sd/uiconfig/sdraw/toolbar/masterviewtoolbar \
+ sd/uiconfig/sdraw/toolbar/mediaobjectbar \
+ sd/uiconfig/sdraw/toolbar/moreformcontrols \
+ sd/uiconfig/sdraw/toolbar/optimizetablebar \
+ sd/uiconfig/sdraw/toolbar/optionsbar \
+ sd/uiconfig/sdraw/toolbar/positionbar \
+ sd/uiconfig/sdraw/toolbar/rectanglesbar \
+ sd/uiconfig/sdraw/toolbar/standardbar \
+ sd/uiconfig/sdraw/toolbar/starshapes \
+ sd/uiconfig/sdraw/toolbar/symbolshapes \
+ sd/uiconfig/sdraw/toolbar/tableobjectbar \
+ sd/uiconfig/sdraw/toolbar/textbar \
+ sd/uiconfig/sdraw/toolbar/textobjectbar \
+ sd/uiconfig/sdraw/toolbar/toolbar \
+ sd/uiconfig/sdraw/toolbar/viewerbar \
+ sd/uiconfig/sdraw/toolbar/zoombar \
+))
+
$(eval $(call gb_UIConfig_add_uifiles,modules/sdraw,\
sd/uiconfig/sdraw/ui/printeroptions \
))
diff --git a/sd/UIConfig_simpress.mk b/sd/UIConfig_simpress.mk
index 00f2849..b134d89 100644
--- a/sd/UIConfig_simpress.mk
+++ b/sd/UIConfig_simpress.mk
@@ -9,6 +9,66 @@
$(eval $(call gb_UIConfig_UIConfig,modules/simpress))
+$(eval $(call gb_UIConfig_add_menubarfiles,modules/simpress,\
+ sd/uiconfig/simpress/menubar/menubar \
+))
+
+$(eval $(call gb_UIConfig_add_statusbarfiles,modules/simpress,\
+ sd/uiconfig/simpress/statusbar/statusbar \
+))
+
+$(eval $(call gb_UIConfig_add_toolbarfiles,modules/simpress,\
+ sd/uiconfig/simpress/toolbar/3dobjectsbar \
+ sd/uiconfig/simpress/toolbar/alignmentbar \
+ sd/uiconfig/simpress/toolbar/arrowsbar \
+ sd/uiconfig/simpress/toolbar/arrowshapes \
+ sd/uiconfig/simpress/toolbar/basicshapes \
+ sd/uiconfig/simpress/toolbar/bezierobjectbar \
+ sd/uiconfig/simpress/toolbar/calloutshapes \
+ sd/uiconfig/simpress/toolbar/choosemodebar \
+ sd/uiconfig/simpress/toolbar/colorbar \
+ sd/uiconfig/simpress/toolbar/commentsbar \
+ sd/uiconfig/simpress/toolbar/commontaskbar \
+ sd/uiconfig/simpress/toolbar/connectorsbar \
+ sd/uiconfig/simpress/toolbar/drawingobjectbar \
+ sd/uiconfig/simpress/toolbar/ellipsesbar \
+ sd/uiconfig/simpress/toolbar/extrusionobjectbar \
+ sd/uiconfig/simpress/toolbar/findbar \
+ sd/uiconfig/simpress/toolbar/flowchartshapes \
+ sd/uiconfig/simpress/toolbar/fontworkobjectbar \
+ sd/uiconfig/simpress/toolbar/fontworkshapetype \
+ sd/uiconfig/simpress/toolbar/formcontrols \
+ sd/uiconfig/simpress/toolbar/formdesign \
+ sd/uiconfig/simpress/toolbar/formsfilterbar \
+ sd/uiconfig/simpress/toolbar/formsnavigationbar \
+ sd/uiconfig/simpress/toolbar/formtextobjectbar \
+ sd/uiconfig/simpress/toolbar/fullscreenbar \
+ sd/uiconfig/simpress/toolbar/gluepointsobjectbar \
+ sd/uiconfig/simpress/toolbar/graffilterbar \
+ sd/uiconfig/simpress/toolbar/graphicobjectbar \
+ sd/uiconfig/simpress/toolbar/insertbar \
+ sd/uiconfig/simpress/toolbar/linesbar \
+ sd/uiconfig/simpress/toolbar/masterviewtoolbar \
+ sd/uiconfig/simpress/toolbar/mediaobjectbar \
+ sd/uiconfig/simpress/toolbar/moreformcontrols \
+ sd/uiconfig/simpress/toolbar/optimizetablebar \
+ sd/uiconfig/simpress/toolbar/optionsbar \
+ sd/uiconfig/simpress/toolbar/outlinetoolbar \
+ sd/uiconfig/simpress/toolbar/positionbar \
+ sd/uiconfig/simpress/toolbar/rectanglesbar \
+ sd/uiconfig/simpress/toolbar/slideviewobjectbar \
+ sd/uiconfig/simpress/toolbar/slideviewtoolbar \
+ sd/uiconfig/simpress/toolbar/standardbar \
+ sd/uiconfig/simpress/toolbar/starshapes \
+ sd/uiconfig/simpress/toolbar/symbolshapes \
+ sd/uiconfig/simpress/toolbar/tableobjectbar \
+ sd/uiconfig/simpress/toolbar/textbar \
+ sd/uiconfig/simpress/toolbar/textobjectbar \
+ sd/uiconfig/simpress/toolbar/toolbar \
+ sd/uiconfig/simpress/toolbar/viewerbar \
+ sd/uiconfig/simpress/toolbar/zoombar \
+))
+
$(eval $(call gb_UIConfig_add_uifiles,modules/simpress,\
sd/uiconfig/simpress/ui/presentationdialog \
sd/uiconfig/simpress/ui/printeroptions \
diff --git a/starmath/Module_starmath.mk b/starmath/Module_starmath.mk
index 897f2f2..4f7ed0f 100644
--- a/starmath/Module_starmath.mk
+++ b/starmath/Module_starmath.mk
@@ -27,7 +27,6 @@
AllLangResTarget_sm \
Library_sm \
Library_smd \
- Package_uiconfig \
UIConfig_smath \
))
diff --git a/starmath/Package_uiconfig.mk b/starmath/Package_uiconfig.mk
deleted file mode 100644
index 589f111..0000000
--- a/starmath/Package_uiconfig.mk
+++ /dev/null
@@ -1,30 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-# 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. 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
-# Norbert Thiebaud <nthiebaud at gmail.com> (C) 2010, All Rights Reserved.
-#
-# 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,sm_uiconfig,$(SRCDIR)/starmath/uiconfig))
-$(eval $(call gb_Package_add_file,sm_uiconfig,xml/uiconfig/modules/smath/menubar/menubar.xml,smath/menubar/menubar.xml))
-$(eval $(call gb_Package_add_file,sm_uiconfig,xml/uiconfig/modules/smath/statusbar/statusbar.xml,smath/statusbar/statusbar.xml))
-$(eval $(call gb_Package_add_file,sm_uiconfig,xml/uiconfig/modules/smath/toolbar/toolbar.xml,smath/toolbar/toolbar.xml))
-$(eval $(call gb_Package_add_file,sm_uiconfig,xml/uiconfig/modules/smath/toolbar/standardbar.xml,smath/toolbar/standardbar.xml))
-$(eval $(call gb_Package_add_file,sm_uiconfig,xml/uiconfig/modules/smath/toolbar/fullscreenbar.xml,smath/toolbar/fullscreenbar.xml))
-
-# vim: set noet sw=4 ts=4:
diff --git a/starmath/UIConfig_smath.mk b/starmath/UIConfig_smath.mk
index a88475d..9fe1f8f 100644
--- a/starmath/UIConfig_smath.mk
+++ b/starmath/UIConfig_smath.mk
@@ -9,6 +9,20 @@
$(eval $(call gb_UIConfig_UIConfig,modules/smath))
+$(eval $(call gb_UIConfig_add_menubarfiles,modules/smath,\
+ starmath/uiconfig/smath/menubar/menubar \
+))
+
+$(eval $(call gb_UIConfig_add_statusbarfiles,modules/smath,\
+ starmath/uiconfig/smath/statusbar/statusbar \
+))
+
+$(eval $(call gb_UIConfig_add_toolbarfiles,modules/smath,\
+ starmath/uiconfig/smath/toolbar/toolbar \
+ starmath/uiconfig/smath/toolbar/standardbar \
+ starmath/uiconfig/smath/toolbar/fullscreenbar \
+))
+
$(eval $(call gb_UIConfig_add_uifiles,modules/smath,\
starmath/uiconfig/smath/ui/printeroptions \
))
diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk
index 0c8b6e9..7ae26cd 100644
--- a/sw/Module_sw.mk
+++ b/sw/Module_sw.mk
@@ -25,8 +25,12 @@
Library_sw \
Library_swd \
Library_swui \
- Package_uiconfig \
+ UIConfig_sglobal \
+ UIConfig_sweb \
+ UIConfig_swform \
+ UIConfig_swreport \
UIConfig_swriter \
+ UIConfig_swxform \
))
ifneq ($(DISABLE_SCRIPTING),TRUE)
diff --git a/sw/Package_uiconfig.mk b/sw/Package_uiconfig.mk
deleted file mode 100644
index 9d0bf55..0000000
--- a/sw/Package_uiconfig.mk
+++ /dev/null
@@ -1,257 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed
-# with this work for additional information regarding copyright
-# ownership. The ASF licenses this file to you under the Apache
-# License, Version 2.0 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-
-$(eval $(call gb_Package_Package,sw_uiconfig,$(SRCDIR)/sw/uiconfig))
-
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/menubar/menubar.xml,sglobal/menubar/menubar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/statusbar/statusbar.xml,sglobal/statusbar/statusbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/alignmentbar.xml,sglobal/toolbar/alignmentbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/arrowshapes.xml,sglobal/toolbar/arrowshapes.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/basicshapes.xml,sglobal/toolbar/basicshapes.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/bezierobjectbar.xml,sglobal/toolbar/bezierobjectbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/calloutshapes.xml,sglobal/toolbar/calloutshapes.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/colorbar.xml,sglobal/toolbar/colorbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/drawbar.xml,sglobal/toolbar/drawbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/drawingobjectbar.xml,sglobal/toolbar/drawingobjectbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/drawtextobjectbar.xml,sglobal/toolbar/drawtextobjectbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/extrusionobjectbar.xml,sglobal/toolbar/extrusionobjectbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/findbar.xml,sglobal/toolbar/findbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/flowchartshapes.xml,sglobal/toolbar/flowchartshapes.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/fontworkobjectbar.xml,sglobal/toolbar/fontworkobjectbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/fontworkshapetype.xml,sglobal/toolbar/fontworkshapetype.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/formcontrols.xml,sglobal/toolbar/formcontrols.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/formdesign.xml,sglobal/toolbar/formdesign.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/formsfilterbar.xml,sglobal/toolbar/formsfilterbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/formsnavigationbar.xml,sglobal/toolbar/formsnavigationbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/formtextobjectbar.xml,sglobal/toolbar/formtextobjectbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/frameobjectbar.xml,sglobal/toolbar/frameobjectbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/fullscreenbar.xml,sglobal/toolbar/fullscreenbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/graffilterbar.xml,sglobal/toolbar/graffilterbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/graphicobjectbar.xml,sglobal/toolbar/graphicobjectbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/insertbar.xml,sglobal/toolbar/insertbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/insertobjectbar.xml,sglobal/toolbar/insertobjectbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/mediaobjectbar.xml,sglobal/toolbar/mediaobjectbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/moreformcontrols.xml,sglobal/toolbar/moreformcontrols.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/numobjectbar.xml,sglobal/toolbar/numobjectbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/oleobjectbar.xml,sglobal/toolbar/oleobjectbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/optimizetablebar.xml,sglobal/toolbar/optimizetablebar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/previewobjectbar.xml,sglobal/toolbar/previewobjectbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/standardbar.xml,sglobal/toolbar/standardbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/starshapes.xml,sglobal/toolbar/starshapes.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/symbolshapes.xml,sglobal/toolbar/symbolshapes.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/tableobjectbar.xml,sglobal/toolbar/tableobjectbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/textobjectbar.xml,sglobal/toolbar/textobjectbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/toolbar.xml,sglobal/toolbar/toolbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/viewerbar.xml,sglobal/toolbar/viewerbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/menubar/menubar.xml,sweb/menubar/menubar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/statusbar/statusbar.xml,sweb/statusbar/statusbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/arrowshapes.xml,sweb/toolbar/arrowshapes.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/basicshapes.xml,sweb/toolbar/basicshapes.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/bezierobjectbar.xml,sweb/toolbar/bezierobjectbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/calloutshapes.xml,sweb/toolbar/calloutshapes.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/colorbar.xml,sweb/toolbar/colorbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/drawingobjectbar.xml,sweb/toolbar/drawingobjectbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/drawtextobjectbar.xml,sweb/toolbar/drawtextobjectbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/extrusionobjectbar.xml,sweb/toolbar/extrusionobjectbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/findbar.xml,sweb/toolbar/findbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/flowchartshapes.xml,sweb/toolbar/flowchartshapes.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/fontworkobjectbar.xml,sweb/toolbar/fontworkobjectbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/fontworkshapetype.xml,sweb/toolbar/fontworkshapetype.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/formcontrols.xml,sweb/toolbar/formcontrols.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/formdesign.xml,sweb/toolbar/formdesign.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/formsfilterbar.xml,sweb/toolbar/formsfilterbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/formsnavigationbar.xml,sweb/toolbar/formsnavigationbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/formtextobjectbar.xml,sweb/toolbar/formtextobjectbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/frameobjectbar.xml,sweb/toolbar/frameobjectbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/fullscreenbar.xml,sweb/toolbar/fullscreenbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/graffilterbar.xml,sweb/toolbar/graffilterbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/graphicobjectbar.xml,sweb/toolbar/graphicobjectbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/insertbar.xml,sweb/toolbar/insertbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/mediaobjectbar.xml,sweb/toolbar/mediaobjectbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/numobjectbar.xml,sweb/toolbar/numobjectbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/oleobjectbar.xml,sweb/toolbar/oleobjectbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/optimizetablebar.xml,sweb/toolbar/optimizetablebar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/previewobjectbar.xml,sweb/toolbar/previewobjectbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/standardbar.xml,sweb/toolbar/standardbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/starshapes.xml,sweb/toolbar/starshapes.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/symbolshapes.xml,sweb/toolbar/symbolshapes.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/tableobjectbar.xml,sweb/toolbar/tableobjectbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/textobjectbar.xml,sweb/toolbar/textobjectbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/toolbar.xml,sweb/toolbar/toolbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/viewerbar.xml,sweb/toolbar/viewerbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/menubar/menubar.xml,swform/menubar/menubar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/statusbar/statusbar.xml,swform/statusbar/statusbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/alignmentbar.xml,swform/toolbar/alignmentbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/arrowshapes.xml,swform/toolbar/arrowshapes.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/basicshapes.xml,swform/toolbar/basicshapes.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/bezierobjectbar.xml,swform/toolbar/bezierobjectbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/calloutshapes.xml,swform/toolbar/calloutshapes.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/colorbar.xml,swform/toolbar/colorbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/drawbar.xml,swform/toolbar/drawbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/drawingobjectbar.xml,swform/toolbar/drawingobjectbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/drawtextobjectbar.xml,swform/toolbar/drawtextobjectbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/extrusionobjectbar.xml,swform/toolbar/extrusionobjectbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/flowchartshapes.xml,swform/toolbar/flowchartshapes.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/fontworkobjectbar.xml,swform/toolbar/fontworkobjectbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/fontworkshapetype.xml,swform/toolbar/fontworkshapetype.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/formcontrols.xml,swform/toolbar/formcontrols.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/formdesign.xml,swform/toolbar/formdesign.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/formsfilterbar.xml,swform/toolbar/formsfilterbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/formsnavigationbar.xml,swform/toolbar/formsnavigationbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/formtextobjectbar.xml,swform/toolbar/formtextobjectbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/frameobjectbar.xml,swform/toolbar/frameobjectbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/fullscreenbar.xml,swform/toolbar/fullscreenbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/graffilterbar.xml,swform/toolbar/graffilterbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/graphicobjectbar.xml,swform/toolbar/graphicobjectbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/insertbar.xml,swform/toolbar/insertbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/insertobjectbar.xml,swform/toolbar/insertobjectbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/mediaobjectbar.xml,swform/toolbar/mediaobjectbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/moreformcontrols.xml,swform/toolbar/moreformcontrols.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/numobjectbar.xml,swform/toolbar/numobjectbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/oleobjectbar.xml,swform/toolbar/oleobjectbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/optimizetablebar.xml,swform/toolbar/optimizetablebar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/previewobjectbar.xml,swform/toolbar/previewobjectbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/standardbar.xml,swform/toolbar/standardbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/starshapes.xml,swform/toolbar/starshapes.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/symbolshapes.xml,swform/toolbar/symbolshapes.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/tableobjectbar.xml,swform/toolbar/tableobjectbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/textobjectbar.xml,swform/toolbar/textobjectbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/toolbar.xml,swform/toolbar/toolbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/viewerbar.xml,swform/toolbar/viewerbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/menubar/menubar.xml,swreport/menubar/menubar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/statusbar/statusbar.xml,swreport/statusbar/statusbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/alignmentbar.xml,swreport/toolbar/alignmentbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/arrowshapes.xml,swreport/toolbar/arrowshapes.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/basicshapes.xml,swreport/toolbar/basicshapes.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/bezierobjectbar.xml,swreport/toolbar/bezierobjectbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/calloutshapes.xml,swreport/toolbar/calloutshapes.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/colorbar.xml,swreport/toolbar/colorbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/drawbar.xml,swreport/toolbar/drawbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/drawingobjectbar.xml,swreport/toolbar/drawingobjectbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/drawtextobjectbar.xml,swreport/toolbar/drawtextobjectbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/extrusionobjectbar.xml,swreport/toolbar/extrusionobjectbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/flowchartshapes.xml,swreport/toolbar/flowchartshapes.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/fontworkobjectbar.xml,swreport/toolbar/fontworkobjectbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/fontworkshapetype.xml,swreport/toolbar/fontworkshapetype.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/formcontrols.xml,swreport/toolbar/formcontrols.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/formdesign.xml,swreport/toolbar/formdesign.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/formsfilterbar.xml,swreport/toolbar/formsfilterbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/formsnavigationbar.xml,swreport/toolbar/formsnavigationbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/formtextobjectbar.xml,swreport/toolbar/formtextobjectbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/frameobjectbar.xml,swreport/toolbar/frameobjectbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/fullscreenbar.xml,swreport/toolbar/fullscreenbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/graffilterbar.xml,swreport/toolbar/graffilterbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/graphicobjectbar.xml,swreport/toolbar/graphicobjectbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/insertbar.xml,swreport/toolbar/insertbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/insertobjectbar.xml,swreport/toolbar/insertobjectbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/mediaobjectbar.xml,swreport/toolbar/mediaobjectbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/moreformcontrols.xml,swreport/toolbar/moreformcontrols.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/numobjectbar.xml,swreport/toolbar/numobjectbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/oleobjectbar.xml,swreport/toolbar/oleobjectbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/optimizetablebar.xml,swreport/toolbar/optimizetablebar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/previewobjectbar.xml,swreport/toolbar/previewobjectbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/standardbar.xml,swreport/toolbar/standardbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/starshapes.xml,swreport/toolbar/starshapes.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/symbolshapes.xml,swreport/toolbar/symbolshapes.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/tableobjectbar.xml,swreport/toolbar/tableobjectbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/textobjectbar.xml,swreport/toolbar/textobjectbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/toolbar.xml,swreport/toolbar/toolbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/viewerbar.xml,swreport/toolbar/viewerbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/menubar/menubar.xml,swriter/menubar/menubar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/statusbar/statusbar.xml,swriter/statusbar/statusbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/alignmentbar.xml,swriter/toolbar/alignmentbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/arrowshapes.xml,swriter/toolbar/arrowshapes.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/basicshapes.xml,swriter/toolbar/basicshapes.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/bezierobjectbar.xml,swriter/toolbar/bezierobjectbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/calloutshapes.xml,swriter/toolbar/calloutshapes.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/colorbar.xml,swriter/toolbar/colorbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/drawbar.xml,swriter/toolbar/drawbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/drawingobjectbar.xml,swriter/toolbar/drawingobjectbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/drawtextobjectbar.xml,swriter/toolbar/drawtextobjectbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/extrusionobjectbar.xml,swriter/toolbar/extrusionobjectbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/findbar.xml,swriter/toolbar/findbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/flowchartshapes.xml,swriter/toolbar/flowchartshapes.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/fontworkobjectbar.xml,swriter/toolbar/fontworkobjectbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/fontworkshapetype.xml,swriter/toolbar/fontworkshapetype.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/formcontrols.xml,swriter/toolbar/formcontrols.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/formdesign.xml,swriter/toolbar/formdesign.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/formsfilterbar.xml,swriter/toolbar/formsfilterbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/formsnavigationbar.xml,swriter/toolbar/formsnavigationbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/formtextobjectbar.xml,swriter/toolbar/formtextobjectbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/frameobjectbar.xml,swriter/toolbar/frameobjectbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/fullscreenbar.xml,swriter/toolbar/fullscreenbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/graffilterbar.xml,swriter/toolbar/graffilterbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/graphicobjectbar.xml,swriter/toolbar/graphicobjectbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/insertbar.xml,swriter/toolbar/insertbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/mediaobjectbar.xml,swriter/toolbar/mediaobjectbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/moreformcontrols.xml,swriter/toolbar/moreformcontrols.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/navigationobjectbar.xml,swriter/toolbar/navigationobjectbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/numobjectbar.xml,swriter/toolbar/numobjectbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/oleobjectbar.xml,swriter/toolbar/oleobjectbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/optimizetablebar.xml,swriter/toolbar/optimizetablebar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/previewobjectbar.xml,swriter/toolbar/previewobjectbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/standardbar.xml,swriter/toolbar/standardbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/starshapes.xml,swriter/toolbar/starshapes.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/symbolshapes.xml,swriter/toolbar/symbolshapes.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/tableobjectbar.xml,swriter/toolbar/tableobjectbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/textobjectbar.xml,swriter/toolbar/textobjectbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/toolbar.xml,swriter/toolbar/toolbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/viewerbar.xml,swriter/toolbar/viewerbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/menubar/menubar.xml,swxform/menubar/menubar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/statusbar/statusbar.xml,swxform/statusbar/statusbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/alignmentbar.xml,swxform/toolbar/alignmentbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/arrowshapes.xml,swxform/toolbar/arrowshapes.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/basicshapes.xml,swxform/toolbar/basicshapes.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/bezierobjectbar.xml,swxform/toolbar/bezierobjectbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/calloutshapes.xml,swxform/toolbar/calloutshapes.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/colorbar.xml,swxform/toolbar/colorbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/drawbar.xml,swxform/toolbar/drawbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/drawingobjectbar.xml,swxform/toolbar/drawingobjectbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/drawtextobjectbar.xml,swxform/toolbar/drawtextobjectbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/extrusionobjectbar.xml,swxform/toolbar/extrusionobjectbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/findbar.xml,swxform/toolbar/findbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/flowchartshapes.xml,swxform/toolbar/flowchartshapes.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/fontworkobjectbar.xml,swxform/toolbar/fontworkobjectbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/fontworkshapetype.xml,swxform/toolbar/fontworkshapetype.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/formcontrols.xml,swxform/toolbar/formcontrols.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/formdesign.xml,swxform/toolbar/formdesign.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/formsfilterbar.xml,swxform/toolbar/formsfilterbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/formsnavigationbar.xml,swxform/toolbar/formsnavigationbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/formtextobjectbar.xml,swxform/toolbar/formtextobjectbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/frameobjectbar.xml,swxform/toolbar/frameobjectbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/fullscreenbar.xml,swxform/toolbar/fullscreenbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/graffilterbar.xml,swxform/toolbar/graffilterbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/graphicobjectbar.xml,swxform/toolbar/graphicobjectbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/insertbar.xml,swxform/toolbar/insertbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/insertobjectbar.xml,swxform/toolbar/insertobjectbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/mediaobjectbar.xml,swxform/toolbar/mediaobjectbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/moreformcontrols.xml,swxform/toolbar/moreformcontrols.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/numobjectbar.xml,swxform/toolbar/numobjectbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/oleobjectbar.xml,swxform/toolbar/oleobjectbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/optimizetablebar.xml,swxform/toolbar/optimizetablebar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/previewobjectbar.xml,swxform/toolbar/previewobjectbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/standardbar.xml,swxform/toolbar/standardbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/starshapes.xml,swxform/toolbar/starshapes.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/symbolshapes.xml,swxform/toolbar/symbolshapes.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/tableobjectbar.xml,swxform/toolbar/tableobjectbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/textobjectbar.xml,swxform/toolbar/textobjectbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/toolbar.xml,swxform/toolbar/toolbar.xml))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/viewerbar.xml,swxform/toolbar/viewerbar.xml))
-
-# vim: set noet sw=4 ts=4:
diff --git a/sw/UIConfig_sglobal.mk b/sw/UIConfig_sglobal.mk
new file mode 100644
index 0000000..1f5eddf
--- /dev/null
+++ b/sw/UIConfig_sglobal.mk
@@ -0,0 +1,61 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_UIConfig_UIConfig,modules/sglobal))
+
+$(eval $(call gb_UIConfig_add_menubarfiles,modules/sglobal,\
+ sw/uiconfig/sglobal/menubar/menubar \
+))
+
+$(eval $(call gb_UIConfig_add_statusbarfiles,modules/sglobal,\
+ sw/uiconfig/sglobal/statusbar/statusbar \
+))
+
+$(eval $(call gb_UIConfig_add_toolbarfiles,modules/sglobal,\
+ sw/uiconfig/sglobal/toolbar/alignmentbar \
+ sw/uiconfig/sglobal/toolbar/arrowshapes \
+ sw/uiconfig/sglobal/toolbar/basicshapes \
+ sw/uiconfig/sglobal/toolbar/bezierobjectbar \
+ sw/uiconfig/sglobal/toolbar/calloutshapes \
+ sw/uiconfig/sglobal/toolbar/colorbar \
+ sw/uiconfig/sglobal/toolbar/drawbar \
+ sw/uiconfig/sglobal/toolbar/drawingobjectbar \
+ sw/uiconfig/sglobal/toolbar/drawtextobjectbar \
+ sw/uiconfig/sglobal/toolbar/extrusionobjectbar \
+ sw/uiconfig/sglobal/toolbar/findbar \
+ sw/uiconfig/sglobal/toolbar/flowchartshapes \
+ sw/uiconfig/sglobal/toolbar/fontworkobjectbar \
+ sw/uiconfig/sglobal/toolbar/fontworkshapetype \
+ sw/uiconfig/sglobal/toolbar/formcontrols \
+ sw/uiconfig/sglobal/toolbar/formdesign \
+ sw/uiconfig/sglobal/toolbar/formsfilterbar \
+ sw/uiconfig/sglobal/toolbar/formsnavigationbar \
+ sw/uiconfig/sglobal/toolbar/formtextobjectbar \
+ sw/uiconfig/sglobal/toolbar/frameobjectbar \
+ sw/uiconfig/sglobal/toolbar/fullscreenbar \
+ sw/uiconfig/sglobal/toolbar/graffilterbar \
+ sw/uiconfig/sglobal/toolbar/graphicobjectbar \
+ sw/uiconfig/sglobal/toolbar/insertbar \
+ sw/uiconfig/sglobal/toolbar/insertobjectbar \
+ sw/uiconfig/sglobal/toolbar/mediaobjectbar \
+ sw/uiconfig/sglobal/toolbar/moreformcontrols \
+ sw/uiconfig/sglobal/toolbar/numobjectbar \
+ sw/uiconfig/sglobal/toolbar/oleobjectbar \
+ sw/uiconfig/sglobal/toolbar/optimizetablebar \
+ sw/uiconfig/sglobal/toolbar/previewobjectbar \
+ sw/uiconfig/sglobal/toolbar/standardbar \
+ sw/uiconfig/sglobal/toolbar/starshapes \
+ sw/uiconfig/sglobal/toolbar/symbolshapes \
+ sw/uiconfig/sglobal/toolbar/tableobjectbar \
+ sw/uiconfig/sglobal/toolbar/textobjectbar \
+ sw/uiconfig/sglobal/toolbar/toolbar \
+ sw/uiconfig/sglobal/toolbar/viewerbar \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sw/UIConfig_sweb.mk b/sw/UIConfig_sweb.mk
new file mode 100644
index 0000000..5c8a12f
--- /dev/null
+++ b/sw/UIConfig_sweb.mk
@@ -0,0 +1,57 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_UIConfig_UIConfig,modules/sweb))
+
+$(eval $(call gb_UIConfig_add_menubarfiles,modules/sweb,\
+ sw/uiconfig/sweb/menubar/menubar \
+))
+
+$(eval $(call gb_UIConfig_add_statusbarfiles,modules/sweb,\
+ sw/uiconfig/sweb/statusbar/statusbar \
+))
+
+$(eval $(call gb_UIConfig_add_toolbarfiles,modules/sweb,\
+ sw/uiconfig/sweb/toolbar/arrowshapes \
+ sw/uiconfig/sweb/toolbar/basicshapes \
+ sw/uiconfig/sweb/toolbar/bezierobjectbar \
+ sw/uiconfig/sweb/toolbar/calloutshapes \
+ sw/uiconfig/sweb/toolbar/colorbar \
+ sw/uiconfig/sweb/toolbar/drawingobjectbar \
+ sw/uiconfig/sweb/toolbar/drawtextobjectbar \
+ sw/uiconfig/sweb/toolbar/extrusionobjectbar \
+ sw/uiconfig/sweb/toolbar/findbar \
+ sw/uiconfig/sweb/toolbar/flowchartshapes \
+ sw/uiconfig/sweb/toolbar/fontworkobjectbar \
+ sw/uiconfig/sweb/toolbar/fontworkshapetype \
+ sw/uiconfig/sweb/toolbar/formcontrols \
+ sw/uiconfig/sweb/toolbar/formdesign \
+ sw/uiconfig/sweb/toolbar/formsfilterbar \
+ sw/uiconfig/sweb/toolbar/formsnavigationbar \
+ sw/uiconfig/sweb/toolbar/formtextobjectbar \
+ sw/uiconfig/sweb/toolbar/frameobjectbar \
+ sw/uiconfig/sweb/toolbar/fullscreenbar \
+ sw/uiconfig/sweb/toolbar/graffilterbar \
+ sw/uiconfig/sweb/toolbar/graphicobjectbar \
+ sw/uiconfig/sweb/toolbar/insertbar \
+ sw/uiconfig/sweb/toolbar/mediaobjectbar \
+ sw/uiconfig/sweb/toolbar/numobjectbar \
+ sw/uiconfig/sweb/toolbar/oleobjectbar \
+ sw/uiconfig/sweb/toolbar/optimizetablebar \
+ sw/uiconfig/sweb/toolbar/previewobjectbar \
+ sw/uiconfig/sweb/toolbar/standardbar \
+ sw/uiconfig/sweb/toolbar/starshapes \
+ sw/uiconfig/sweb/toolbar/symbolshapes \
+ sw/uiconfig/sweb/toolbar/tableobjectbar \
+ sw/uiconfig/sweb/toolbar/textobjectbar \
+ sw/uiconfig/sweb/toolbar/toolbar \
+ sw/uiconfig/sweb/toolbar/viewerbar \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sw/UIConfig_swform.mk b/sw/UIConfig_swform.mk
new file mode 100644
index 0000000..359a35a
--- /dev/null
+++ b/sw/UIConfig_swform.mk
@@ -0,0 +1,60 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_UIConfig_UIConfig,modules/swform))
+
+$(eval $(call gb_UIConfig_add_menubarfiles,modules/swform,\
+ sw/uiconfig/swform/menubar/menubar \
+))
+
+$(eval $(call gb_UIConfig_add_statusbarfiles,modules/swform,\
+ sw/uiconfig/swform/statusbar/statusbar \
+))
+
+$(eval $(call gb_UIConfig_add_toolbarfiles,modules/swform,\
+ sw/uiconfig/swform/toolbar/alignmentbar \
+ sw/uiconfig/swform/toolbar/arrowshapes \
+ sw/uiconfig/swform/toolbar/basicshapes \
+ sw/uiconfig/swform/toolbar/bezierobjectbar \
+ sw/uiconfig/swform/toolbar/calloutshapes \
+ sw/uiconfig/swform/toolbar/colorbar \
+ sw/uiconfig/swform/toolbar/drawbar \
+ sw/uiconfig/swform/toolbar/drawingobjectbar \
+ sw/uiconfig/swform/toolbar/drawtextobjectbar \
+ sw/uiconfig/swform/toolbar/extrusionobjectbar \
+ sw/uiconfig/swform/toolbar/flowchartshapes \
+ sw/uiconfig/swform/toolbar/fontworkobjectbar \
+ sw/uiconfig/swform/toolbar/fontworkshapetype \
+ sw/uiconfig/swform/toolbar/formcontrols \
+ sw/uiconfig/swform/toolbar/formdesign \
+ sw/uiconfig/swform/toolbar/formsfilterbar \
+ sw/uiconfig/swform/toolbar/formsnavigationbar \
+ sw/uiconfig/swform/toolbar/formtextobjectbar \
+ sw/uiconfig/swform/toolbar/frameobjectbar \
+ sw/uiconfig/swform/toolbar/fullscreenbar \
+ sw/uiconfig/swform/toolbar/graffilterbar \
+ sw/uiconfig/swform/toolbar/graphicobjectbar \
+ sw/uiconfig/swform/toolbar/insertbar \
+ sw/uiconfig/swform/toolbar/insertobjectbar \
+ sw/uiconfig/swform/toolbar/mediaobjectbar \
+ sw/uiconfig/swform/toolbar/moreformcontrols \
+ sw/uiconfig/swform/toolbar/numobjectbar \
+ sw/uiconfig/swform/toolbar/oleobjectbar \
+ sw/uiconfig/swform/toolbar/optimizetablebar \
+ sw/uiconfig/swform/toolbar/previewobjectbar \
+ sw/uiconfig/swform/toolbar/standardbar \
+ sw/uiconfig/swform/toolbar/starshapes \
+ sw/uiconfig/swform/toolbar/symbolshapes \
+ sw/uiconfig/swform/toolbar/tableobjectbar \
+ sw/uiconfig/swform/toolbar/textobjectbar \
+ sw/uiconfig/swform/toolbar/toolbar \
+ sw/uiconfig/swform/toolbar/viewerbar \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sw/UIConfig_swreport.mk b/sw/UIConfig_swreport.mk
new file mode 100644
index 0000000..ac807fb5
--- /dev/null
+++ b/sw/UIConfig_swreport.mk
@@ -0,0 +1,60 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_UIConfig_UIConfig,modules/swreport))
+
+$(eval $(call gb_UIConfig_add_menubarfiles,modules/swreport,\
+ sw/uiconfig/swreport/menubar/menubar \
+))
+
+$(eval $(call gb_UIConfig_add_statusbarfiles,modules/swreport,\
+ sw/uiconfig/swreport/statusbar/statusbar \
+))
+
+$(eval $(call gb_UIConfig_add_toolbarfiles,modules/swreport,\
+ sw/uiconfig/swreport/toolbar/alignmentbar \
+ sw/uiconfig/swreport/toolbar/arrowshapes \
+ sw/uiconfig/swreport/toolbar/basicshapes \
+ sw/uiconfig/swreport/toolbar/bezierobjectbar \
+ sw/uiconfig/swreport/toolbar/calloutshapes \
+ sw/uiconfig/swreport/toolbar/colorbar \
+ sw/uiconfig/swreport/toolbar/drawbar \
+ sw/uiconfig/swreport/toolbar/drawingobjectbar \
+ sw/uiconfig/swreport/toolbar/drawtextobjectbar \
+ sw/uiconfig/swreport/toolbar/extrusionobjectbar \
+ sw/uiconfig/swreport/toolbar/flowchartshapes \
+ sw/uiconfig/swreport/toolbar/fontworkobjectbar \
+ sw/uiconfig/swreport/toolbar/fontworkshapetype \
+ sw/uiconfig/swreport/toolbar/formcontrols \
+ sw/uiconfig/swreport/toolbar/formdesign \
+ sw/uiconfig/swreport/toolbar/formsfilterbar \
+ sw/uiconfig/swreport/toolbar/formsnavigationbar \
+ sw/uiconfig/swreport/toolbar/formtextobjectbar \
+ sw/uiconfig/swreport/toolbar/frameobjectbar \
+ sw/uiconfig/swreport/toolbar/fullscreenbar \
+ sw/uiconfig/swreport/toolbar/graffilterbar \
+ sw/uiconfig/swreport/toolbar/graphicobjectbar \
+ sw/uiconfig/swreport/toolbar/insertbar \
+ sw/uiconfig/swreport/toolbar/insertobjectbar \
+ sw/uiconfig/swreport/toolbar/mediaobjectbar \
+ sw/uiconfig/swreport/toolbar/moreformcontrols \
+ sw/uiconfig/swreport/toolbar/numobjectbar \
+ sw/uiconfig/swreport/toolbar/oleobjectbar \
+ sw/uiconfig/swreport/toolbar/optimizetablebar \
+ sw/uiconfig/swreport/toolbar/previewobjectbar \
+ sw/uiconfig/swreport/toolbar/standardbar \
+ sw/uiconfig/swreport/toolbar/starshapes \
+ sw/uiconfig/swreport/toolbar/symbolshapes \
+ sw/uiconfig/swreport/toolbar/tableobjectbar \
+ sw/uiconfig/swreport/toolbar/textobjectbar \
+ sw/uiconfig/swreport/toolbar/toolbar \
+ sw/uiconfig/swreport/toolbar/viewerbar \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk
index 125707e..3bf94ce 100644
--- a/sw/UIConfig_swriter.mk
+++ b/sw/UIConfig_swriter.mk
@@ -9,6 +9,55 @@
$(eval $(call gb_UIConfig_UIConfig,modules/swriter))
+$(eval $(call gb_UIConfig_add_menubarfiles,modules/swriter,\
+ sw/uiconfig/swriter/menubar/menubar \
+))
+
+$(eval $(call gb_UIConfig_add_statusbarfiles,modules/swriter,\
+ sw/uiconfig/swriter/statusbar/statusbar \
+))
+
+$(eval $(call gb_UIConfig_add_toolbarfiles,modules/swriter,\
+ sw/uiconfig/swriter/toolbar/alignmentbar \
+ sw/uiconfig/swriter/toolbar/arrowshapes \
+ sw/uiconfig/swriter/toolbar/basicshapes \
+ sw/uiconfig/swriter/toolbar/bezierobjectbar \
+ sw/uiconfig/swriter/toolbar/calloutshapes \
+ sw/uiconfig/swriter/toolbar/colorbar \
+ sw/uiconfig/swriter/toolbar/drawbar \
+ sw/uiconfig/swriter/toolbar/drawingobjectbar \
+ sw/uiconfig/swriter/toolbar/drawtextobjectbar \
+ sw/uiconfig/swriter/toolbar/extrusionobjectbar \
+ sw/uiconfig/swriter/toolbar/findbar \
+ sw/uiconfig/swriter/toolbar/flowchartshapes \
+ sw/uiconfig/swriter/toolbar/fontworkobjectbar \
+ sw/uiconfig/swriter/toolbar/fontworkshapetype \
+ sw/uiconfig/swriter/toolbar/formcontrols \
+ sw/uiconfig/swriter/toolbar/formdesign \
+ sw/uiconfig/swriter/toolbar/formsfilterbar \
+ sw/uiconfig/swriter/toolbar/formsnavigationbar \
+ sw/uiconfig/swriter/toolbar/formtextobjectbar \
+ sw/uiconfig/swriter/toolbar/frameobjectbar \
+ sw/uiconfig/swriter/toolbar/fullscreenbar \
+ sw/uiconfig/swriter/toolbar/graffilterbar \
+ sw/uiconfig/swriter/toolbar/graphicobjectbar \
+ sw/uiconfig/swriter/toolbar/insertbar \
+ sw/uiconfig/swriter/toolbar/mediaobjectbar \
+ sw/uiconfig/swriter/toolbar/moreformcontrols \
+ sw/uiconfig/swriter/toolbar/navigationobjectbar \
+ sw/uiconfig/swriter/toolbar/numobjectbar \
+ sw/uiconfig/swriter/toolbar/oleobjectbar \
+ sw/uiconfig/swriter/toolbar/optimizetablebar \
+ sw/uiconfig/swriter/toolbar/previewobjectbar \
+ sw/uiconfig/swriter/toolbar/standardbar \
+ sw/uiconfig/swriter/toolbar/starshapes \
+ sw/uiconfig/swriter/toolbar/symbolshapes \
+ sw/uiconfig/swriter/toolbar/tableobjectbar \
+ sw/uiconfig/swriter/toolbar/textobjectbar \
+ sw/uiconfig/swriter/toolbar/toolbar \
+ sw/uiconfig/swriter/toolbar/viewerbar \
+))
+
$(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/autoformattable \
sw/uiconfig/swriter/ui/autotext \
diff --git a/sw/UIConfig_swxform.mk b/sw/UIConfig_swxform.mk
new file mode 100644
index 0000000..ff6b383
--- /dev/null
+++ b/sw/UIConfig_swxform.mk
@@ -0,0 +1,61 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_UIConfig_UIConfig,modules/swxform))
+
+$(eval $(call gb_UIConfig_add_menubarfiles,modules/swxform,\
+ sw/uiconfig/swxform/menubar/menubar \
+))
+
+$(eval $(call gb_UIConfig_add_statusbarfiles,modules/swxform,\
+ sw/uiconfig/swxform/statusbar/statusbar \
+))
+
+$(eval $(call gb_UIConfig_add_toolbarfiles,modules/swxform,\
+ sw/uiconfig/swxform/toolbar/alignmentbar \
+ sw/uiconfig/swxform/toolbar/arrowshapes \
+ sw/uiconfig/swxform/toolbar/basicshapes \
+ sw/uiconfig/swxform/toolbar/bezierobjectbar \
+ sw/uiconfig/swxform/toolbar/calloutshapes \
+ sw/uiconfig/swxform/toolbar/colorbar \
+ sw/uiconfig/swxform/toolbar/drawbar \
+ sw/uiconfig/swxform/toolbar/drawingobjectbar \
+ sw/uiconfig/swxform/toolbar/drawtextobjectbar \
+ sw/uiconfig/swxform/toolbar/extrusionobjectbar \
+ sw/uiconfig/swxform/toolbar/findbar \
+ sw/uiconfig/swxform/toolbar/flowchartshapes \
+ sw/uiconfig/swxform/toolbar/fontworkobjectbar \
+ sw/uiconfig/swxform/toolbar/fontworkshapetype \
+ sw/uiconfig/swxform/toolbar/formcontrols \
+ sw/uiconfig/swxform/toolbar/formdesign \
+ sw/uiconfig/swxform/toolbar/formsfilterbar \
+ sw/uiconfig/swxform/toolbar/formsnavigationbar \
+ sw/uiconfig/swxform/toolbar/formtextobjectbar \
+ sw/uiconfig/swxform/toolbar/frameobjectbar \
+ sw/uiconfig/swxform/toolbar/fullscreenbar \
+ sw/uiconfig/swxform/toolbar/graffilterbar \
+ sw/uiconfig/swxform/toolbar/graphicobjectbar \
+ sw/uiconfig/swxform/toolbar/insertbar \
+ sw/uiconfig/swxform/toolbar/insertobjectbar \
+ sw/uiconfig/swxform/toolbar/mediaobjectbar \
+ sw/uiconfig/swxform/toolbar/moreformcontrols \
+ sw/uiconfig/swxform/toolbar/numobjectbar \
+ sw/uiconfig/swxform/toolbar/oleobjectbar \
+ sw/uiconfig/swxform/toolbar/optimizetablebar \
+ sw/uiconfig/swxform/toolbar/previewobjectbar \
+ sw/uiconfig/swxform/toolbar/standardbar \
+ sw/uiconfig/swxform/toolbar/starshapes \
+ sw/uiconfig/swxform/toolbar/symbolshapes \
+ sw/uiconfig/swxform/toolbar/tableobjectbar \
+ sw/uiconfig/swxform/toolbar/textobjectbar \
+ sw/uiconfig/swxform/toolbar/toolbar \
+ sw/uiconfig/swxform/toolbar/viewerbar \
+))
+
+# vim: set noet sw=4 ts=4:
--
To view, visit https://gerrit.libreoffice.org/3229
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie78b7ce399ba34485146ca7622c59d31f8105d02
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: David Tardon <dtardon at redhat.com>
More information about the LibreOffice
mailing list