kill more unneeded stuff; rename uiconfig Packages

Change-Id: Ib2f73d679ac4a6164142a370ce6d55c6de41117c

7 files changed, 3 insertions, 317 deletions

diff --git a/extensions/Module_extensions.mk b/extensions/Module_extensions.mk
index dba2d305fe99..0f7b6f1181d5 100644
--- a/extensions/Module_extensions.mk
+++ b/extensions/Module_extensions.mk
@@ -51,8 +51,7 @@ $(eval $(call gb_Module_add_targets,extensions,\
 	Library_bib \
 	Library_dbp \
 	Library_pcr \
-	Package_bib \
-	Package_pcr \
+	Package_uiconfig \
 ))
 endif
 
diff --git a/extensions/Package_pcr.mk b/extensions/Package_pcr.mk
deleted file mode 100644
index 48f46302e904..000000000000
--- a/extensions/Package_pcr.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@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,pcr,$(SRCDIR)/extensions/source/propctrlr))
-
-$(eval $(call gb_Package_add_file,pcr,xml/pcr.xml,pcr.xml))
-
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/extensions/Package_bib.mk b/extensions/Package_uiconfig.mk
index 5b7eb7769a7b..33e63b2eace5 100644
--- a/extensions/Package_bib.mk
+++ b/extensions/Package_uiconfig.mk
@@ -28,8 +28,8 @@
 # instead of those above.
 #
 
-$(eval $(call gb_Package_Package,bib,$(SRCDIR)/extensions/source/bibliography/uiconfig/sbibliography/menubar))
+$(eval $(call gb_Package_Package,extensions_uiconfig,$(SRCDIR)/extensions/source/bibliography/uiconfig/sbibliography/menubar))
 
-$(eval $(call gb_Package_add_file,bib,xml/uiconfig/modules/sbibliography/menubar/menubar.xml,menubar.xml))
+$(eval $(call gb_Package_add_file,extensions_uiconfig,xml/uiconfig/modules/sbibliography/menubar/menubar.xml,menubar.xml))
 
 # vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/extensions/source/propctrlr/pcr.xml b/extensions/source/propctrlr/pcr.xml
deleted file mode 100644
index abd86572fc6b..000000000000
--- a/extensions/source/propctrlr/pcr.xml
+++ /dev/null
@@ -1,146 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE module-description SYSTEM "module-description.dtd">
-<module-description>
-  <module-name>pcr</module-name>
-
-  <component-description>
-    <author>Frank Sch&#246;nheit</author>
-    <name>org.openoffice.comp.form.ui.OTabOrderDialog</name>
-    <description></description>
-    <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-    <language>c++</language>
-    <status value="non-published"/>
-    <supported-service>com.sun.star.form.ui.TabOrderDialog</supported-service>
-  </component-description>
-
-  <component-description>
-    <author>Frank Sch&#246;nheit</author>
-    <name>org.openoffice.comp.form.ControlFontDialog</name>
-    <description></description>
-    <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-    <language>c++</language>
-    <status value="non-published"/>
-    <supported-service>com.sun.star.form.ui.TabOrderDialog</supported-service>
-  </component-description>
-
-  <component-description>
-    <author>Frank Sch&#246;nheit</author>
-    <name>com.sun.star.comp.extensions.FormComponentPropertyHandler</name>
-    <description></description>
-    <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-    <language>c++</language>
-    <status value="non-published"/>
-    <supported-service>com.sun.star.form.inspection.FormComponentPropertyHandler</supported-service>
-  </component-description>
-
-  <component-description>
-    <author>Frank Sch&#246;nheit</author>
-    <name>com.sun.star.comp.extensions.EFormsPropertyHandler</name>
-    <description></description>
-    <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-    <language>c++</language>
-    <status value="beta"/>
-    <supported-service>com.sun.star.form.inspection.XMLFormsPropertyHandler</supported-service>
-  </component-description>
-
-  <component-description>
-    <author>Frank Sch&#246;nheit</author>
-    <name>com.sun.star.comp.extensions.EditPropertyHandler</name>
-    <description></description>
-    <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-    <language>c++</language>
-    <status value="beta"/>
-    <supported-service>com.sun.star.form.inspection.EditPropertyHandler</supported-service>
-  </component-description>
-
-  <component-description>
-    <author>Frank Sch&#246;nheit</author>
-    <name>org.openoffice.comp.extensions.ObjectInspector</name>
-    <description></description>
-    <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-    <language>c++</language>
-    <status value="beta"/>
-    <supported-service>com.sun.star.inspection.ObjectInspector</supported-service>
-  </component-description>
-
-  <component-description>
-    <author>Frank Sch&#246;nheit</author>
-    <name>org.openoffice.comp.extensions.ObjectInspectorModel</name>
-    <description></description>
-    <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-    <language>c++</language>
-    <status value="beta"/>
-    <supported-service>com.sun.star.inspection.ObjectInspectorModel</supported-service>
-  </component-description>
-
-  <component-description>
-    <author>Frank Sch&#246;nheit</author>
-    <name>org.openoffice.comp.extensions.FormController</name>
-    <description></description>
-    <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-    <language>c++</language>
-    <status value="beta"/>
-    <supported-service>com.sun.star.form.PropertyBrowserController</supported-service>
-  </component-description>
-
-  <component-description>
-    <author>Frank Sch&#246;nheit</author>
-    <name>com.sun.star.comp.extensions.GenericPropertyHandler</name>
-    <description></description>
-    <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-    <language>c++</language>
-    <status value="beta"/>
-    <supported-service>com.sun.star.inspection.GenericPropertyHandler</supported-service>
-  </component-description>
-
-  <component-description>
-    <author>Frank Sch&#246;nheit</author>
-    <name>com.sun.star.comp.extensions.EventHandler</name>
-    <description></description>
-    <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-    <language>c++</language>
-    <status value="beta"/>
-    <supported-service>com.sun.star.form.inspection.EventHandler</supported-service>
-  </component-description>
-
-  <component-description>
-    <author>Frank Sch&#246;nheit</author>
-    <name>com.sun.star.comp.extensions.XSDValidationPropertyHandler</name>
-    <description></description>
-    <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-    <language>c++</language>
-    <status value="beta"/>
-    <supported-service>com.sun.star.form.inspection.XSDValidationPropertyHandler</supported-service>
-  </component-description>
-
-  <component-description>
-    <author>Frank Sch&#246;nheit</author>
-    <name>com.sun.star.comp.extensions.CellBindingPropertyHandler</name>
-    <description></description>
-    <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-    <language>c++</language>
-    <status value="beta"/>
-    <supported-service>com.sun.star.form.inspection.CellBindingPropertyHandler</supported-service>
-  </component-description>
-
-  <component-description>
-    <author>Frank Sch&#246;nheit</author>
-    <name>com.sun.star.comp.extensions.ButtonNavigationHandler</name>
-    <description></description>
-    <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-    <language>c++</language>
-    <status value="beta"/>
-    <supported-service>com.sun.star.form.inspection.ButtonNavigationHandler</supported-service>
-  </component-description>
-
-  <component-description>
-    <author>Frank Sch&#246;nheit</author>
-    <name>com.sun.star.comp.extensions.DefaultFormComponentInspectorModel</name>
-    <description></description>
-    <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-    <language>c++</language>
-    <status value="beta"/>
-    <supported-service>com.sun.star.form.inspection.DefaultFormComponentInspectorModel</supported-service>
-  </component-description>
-
-</module-description>
diff --git a/extensions/source/update/check/updchk.xml b/extensions/source/update/check/updchk.xml
deleted file mode 100644
index 25d5d361e1d0..000000000000
--- a/extensions/source/update/check/updchk.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
-<module-description xmlns:xlink="http://www.w3.org/1999/xlink">
-    <module-name>updchk</module-name>
-    <component-description>
-        <author> Oliver Braun </author>
-        <name>vnd.sun.UpdateCheck</name>
-        <description> The  </description>
-        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-        <language>c++</language>
-        <status value="beta"/>
-        <supported-service>com.sun.star.setup.UpdateCheck</supported-service>
-        <service-dependency>...</service-dependency>
-        <type>com.sun.star.beans.NamedValue</type>
-        <type>com.sun.star.beans.PropertyValue</type>
-        <type>com.sun.star.container.XNameReplace</type>
-        <type>com.sun.star.deployment.UpdateInformationProvider</type>
-        <type>com.sun.star.frame.DispatchResultEvent</type>
-        <type>com.sun.star.frame.DispatchResultState</type>
-        <type>com.sun.star.frame.XFrame</type>
-        <type>com.sun.star.io.XInputStream</type>
-        <type>com.sun.star.io.XOutputStream</type>
-        <type>com.sun.star.lang.XComponent</type>
-        <type>com.sun.star.lang.XMultiComponentFactory</type>
-        <type>com.sun.star.lang.XMultiServiceFactory</type>
-        <type>com.sun.star.lang.XServiceInfo</type>
-        <type>com.sun.star.lang.XSingleComponentFactory</type>
-        <type>com.sun.star.lang.XSingleServiceFactory</type>
-        <type>com.sun.star.lang.XTypeProvider</type>
-        <type>com.sun.star.registry.XRegistryKey</type>
-        <type>com.sun.star.system.SystemShellExecuteFlags</type>
-        <type>com.sun.star.system.XSystemShellExecute</type>
-        <type>com.sun.star.task.XInteractionHandler</type>
-        <type>com.sun.star.task.XJob</type>
-        <type>com.sun.star.uno.TypeClass</type>
-        <type>com.sun.star.uno.XAggregation</type>
-        <type>com.sun.star.uno.XComponentContext</type>
-        <type>com.sun.star.uno.XCurrentContext</type>
-        <type>com.sun.star.uno.XWeak</type>
-        <type>com.sun.star.util.XChangesBatch</type>
-        <type>com.sun.star.xml.xpath.XXPathAPI</type>
-    </component-description>
-    <project-build-dependency>cppuhelper</project-build-dependency>
-    <project-build-dependency>cppu</project-build-dependency>
-    <project-build-dependency>sal</project-build-dependency>
-    <runtime-module-dependency>cppuhelper3$(COM)</runtime-module-dependency>
-    <runtime-module-dependency>cppu3</runtime-module-dependency>
-    <runtime-module-dependency>sal3</runtime-module-dependency>
-</module-description>
diff --git a/extensions/source/update/feed/updatefeed.xml b/extensions/source/update/feed/updatefeed.xml
deleted file mode 100644
index 1b0557db3db2..000000000000
--- a/extensions/source/update/feed/updatefeed.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
-<module-description xmlns:xlink="http://www.w3.org/1999/xlink">
-    <module-name>updatefeed</module-name>
-    <component-description>
-        <author> Oliver Braun </author>
-        <name>vnd.sun.UpdateCheck</name>
-        <description> The  </description>
-        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-        <language>c++</language>
-        <status value="beta"/>
-        <supported-service>com.sun.star.deployment.UpdateInformationProvider</supported-service>
-        <service-dependency>...</service-dependency>
-        <type>com.sun.star.beans.NamedValue</type>
-        <type>com.sun.star.beans.PropertyValue</type>
-        <type>com.sun.star.container.XNameReplace</type>
-        <type>com.sun.star.deployment.UpdateInformationProvider</type>
-        <type>com.sun.star.io.XInputStream</type>
-        <type>com.sun.star.io.XOutputStream</type>
-        <type>com.sun.star.lang.XComponent</type>
-        <type>com.sun.star.lang.XInitialization</type>
-        <type>com.sun.star.lang.XMultiComponentFactory</type>
-        <type>com.sun.star.lang.XMultiServiceFactory</type>
-        <type>com.sun.star.lang.XServiceInfo</type>
-        <type>com.sun.star.lang.XSingleComponentFactory</type>
-        <type>com.sun.star.lang.XSingleServiceFactory</type>
-        <type>com.sun.star.lang.XTypeProvider</type>
-        <type>com.sun.star.registry.XRegistryKey</type>
-        <type>com.sun.star.task.XInteractionHandler</type>
-        <type>com.sun.star.ucb.PostCommandArgument2</type>
-        <type>com.sun.star.ucb.XCommandEnvironment</type>
-        <type>com.sun.star.ucb.XCommandProcessor2</type>
-        <type>com.sun.star.ucb.XContentIdentifierFactory</type>
-        <type>com.sun.star.ucb.XContentProvider</type>
-        <type>com.sun.star.ucb.XProgressHandler</type>
-        <type>com.sun.star.uno.TypeClass</type>
-        <type>com.sun.star.uno.XAggregation</type>
-        <type>com.sun.star.uno.XComponentContext</type>
-        <type>com.sun.star.uno.XCurrentContext</type>
-        <type>com.sun.star.uno.XWeak</type>
-        <type>com.sun.star.util.XChangesBatch</type>
-    </component-description>
-    <project-build-dependency>cppuhelper</project-build-dependency>
-    <project-build-dependency>cppu</project-build-dependency>
-    <project-build-dependency>sal</project-build-dependency>
-    <runtime-module-dependency>cppuhelper3$(COM)</runtime-module-dependency>
-    <runtime-module-dependency>cppu3</runtime-module-dependency>
-    <runtime-module-dependency>sal3</runtime-module-dependency>
-</module-description>
diff --git a/extensions/source/update/ui/updchkui.xml b/extensions/source/update/ui/updchkui.xml
deleted file mode 100644
index a9005d8b255f..000000000000
--- a/extensions/source/update/ui/updchkui.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
-<module-description xmlns:xlink="http://www.w3.org/1999/xlink">
-    <module-name>updchkui</module-name>
-    <component-description>
-        <author> Oliver Braun </author>
-        <name>vnd.sun.UpdateCheck</name>
-        <description> The  </description>
-        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-        <language>c++</language>
-        <status value="beta"/>
-        <supported-service>com.sun.star.setup.UpdateCheckUI</supported-service>
-        <service-dependency>...</service-dependency>
-        <type>com.sun.star.document.XEventBroadcaster</type>
-        <type>com.sun.star.document.XEventListener</type>
-        <type>com.sun.star.lang.XEventListener</type>
-        <type>com.sun.star.lang.XMultiComponentFactory</type>
-        <type>com.sun.star.lang.XServiceInfo</type>
-        <type>com.sun.star.lang.XSingleComponentFactory</type>
-        <type>com.sun.star.lang.XTypeProvider</type>
-        <type>com.sun.star.uno.TypeClass</type>
-        <type>com.sun.star.uno.XAggregation</type>
-        <type>com.sun.star.uno.XComponentContext</type>
-        <type>com.sun.star.uno.XCurrentContext</type>
-        <type>com.sun.star.uno.XWeak</type>
-        <type>com.sun.star.registry.XRegistryKey</type>
-    </component-description>
-    <project-build-dependency>cppuhelper</project-build-dependency>
-    <project-build-dependency>cppu</project-build-dependency>
-    <project-build-dependency>sal</project-build-dependency>
-    <runtime-module-dependency>cppuhelper3$(COM)</runtime-module-dependency>
-    <runtime-module-dependency>cppu3</runtime-module-dependency>
-    <runtime-module-dependency>sal3</runtime-module-dependency>
-</module-description>